# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1460211742 -10800
# Node ID 7877ddbcbdbe7f9e4c1ce4cb71776aad71c2b35a
# Parent  fee6f859a768dce86ecde8b97c46308a90b9e0c1
Fix i18n & L10n

diff -r fee6f859a768 -r 7877ddbcbdbe Makefile
--- a/Makefile	Wed Apr 06 09:52:43 2016 +0300
+++ b/Makefile	Sat Apr 09 17:22:22 2016 +0300
@@ -19,14 +19,17 @@
 	xgettext -o po/tazinst/tazinst.pot -L Shell \
 		--package-name="TazInst" \
 		--package-version="$(VERSION)" \
+		-k_ -k_n \
 		./tazinst
 	xgettext -o po/slitaz-installer/slitaz-installer.pot -L Shell \
 		--package-name="slitaz-installer" \
 		--package-version="$(VERSION)" \
+		-k_ -k_n \
 		./slitaz-installer
 	xgettext -o po/installer/installer.pot -L Shell \
 		--package-name="installer.cgi" \
 		--package-version="$(VERSION)" \
+		-k_ -k_n \
 		./installer.cgi
 
 msgmerge:
diff -r fee6f859a768 -r 7877ddbcbdbe installer.cgi
--- a/installer.cgi	Wed Apr 06 09:52:43 2016 +0300
+++ b/installer.cgi	Sat Apr 09 17:22:22 2016 +0300
@@ -17,7 +17,7 @@
 . lib/libtazpanel
 get_config
 
-TITLE=$(gettext 'TazPanel - Installer')
+TITLE=$(_ 'TazPanel - Installer')
 
 # export package name for gettext.
 TEXTDOMAIN='installer'
@@ -39,16 +39,16 @@
 	menu)
 		cat <<EOT
 <li tabindex="0">
-	<span>$(gettext 'Installation')</span>
+	<span>$(_ 'Installation')</span>
 	<menu>
 		<li><a data-icon="install"
-			href="installer.cgi" data-root>$(gettext 'Installation')</a></li>
+			href="installer.cgi" data-root>$(_ 'Installation')</a></li>
 		<li><a data-icon="slitaz"
-			href="installer.cgi?page=install" data-root>$(gettext 'Install SliTaz')</a></li>
+			href="installer.cgi?page=install" data-root>$(_ 'Install SliTaz')</a></li>
 		<li><a data-icon="upgrade"
-			href="installer.cgi?page=upgrade" data-root>$(gettext 'Upgrade system')</a></li>
+			href="installer.cgi?page=upgrade" data-root>$(_ 'Upgrade system')</a></li>
 		<li><a data-icon="slitaz"
-			href="installer.cgi?page=evaluate" data-root>$(gettext 'Evaluate SliTaz')</a></li>
+			href="installer.cgi?page=evaluate" data-root>$(_ 'Evaluate SliTaz')</a></li>
 	</menu>
 </li>
 EOT
@@ -64,16 +64,16 @@
 	cat <<EOT
 <!-- Welcome message -->
 
-<h2>$(gettext "Welcome to the SliTaz Installer!")</h2>
+<h2>$(_ 'Welcome to the SliTaz Installer!')</h2>
 
-<p>$(gettext "The SliTaz Installer installs or upgrades SliTaz to a \
+<p>$(_ "The SliTaz Installer installs or upgrades SliTaz to a \
 hard disk drive from a device like a Live-CD or LiveUSB key, from a SliTaz \
 ISO file, or from the web by downloading an ISO file.")</p>
 
-<p>$(gettext "Windows&trade; users can evaluate SliTaz in the directory \
+<p>$(_ "Windows&trade; users can evaluate SliTaz in the directory \
 \\slitaz on their hard disk.")</p>
 
-<p>$(gettext "Which type of installation do you want to start?")</p>
+<p>$(_ "Which type of installation do you want to start?")</p>
 EOT
 }
 
@@ -83,14 +83,14 @@
 <!-- Install message -->
 
 <section>
-	<header>$(gettext 'Install')</header>
+	<header>$(_ 'Install')</header>
 
 	<div>
-		<p>$(gettext "Install SliTaz on a partition of your hard disk drive. If \
+		<p>$(_ "Install SliTaz on a partition of your hard disk drive. If \
 you decide to format your partition, all data will be lost. If you do not \
 format, all data except for any existing /home directory will be removed \
 (the home directory will be kept as is).")</p>
-		<p>$(gettext "Before installation, you may need to create or resize \
+		<p>$(_ "Before installation, you may need to create or resize \
 partitions on your hard disk drive in order to make space for SliTaz \
 GNU/Linux. You can graphically manage your partitions with Gparted")</p>
 	</div>
@@ -98,8 +98,8 @@
 	<footer>
 		<form>
 			<button name="page" value="install" data-icon="slitaz"
-				title="$(gettext 'Proceed to a new SliTaz installation')"
-				>$(gettext 'Install SliTaz')</button>
+				title="$(_ 'Proceed to a new SliTaz installation')"
+				>$(_ 'Install SliTaz')</button>
 		</form>
 	</footer>
 </section>
@@ -112,10 +112,10 @@
 <!-- Upgrade message -->
 
 <section>
-	<header>$(gettext 'Upgrade')</header>
+	<header>$(_ 'Upgrade')</header>
 
 	<div>
-		<p>$(gettext "Upgrade an already installed SliTaz system on your hard disk \
+		<p>$(_ "Upgrade an already installed SliTaz system on your hard disk \
 drive. Your /home /etc /var/www directories will be kept, all other \
 directories will be removed. Any additional packages added to your old \
 SliTaz system will be updated as long you have an active internet connection.")</p>
@@ -124,8 +124,8 @@
 	<footer>
 		<form>
 			<button name="page" value="upgrade" data-icon="upgrade"
-				title="$(gettext 'Upgrade an existing SliTaz system')"
-				>$(gettext 'Upgrade SliTaz')</button>
+				title="$(_ 'Upgrade an existing SliTaz system')"
+				>$(_ 'Upgrade SliTaz')</button>
 		</form>
 	</footer>
 </section>
@@ -138,12 +138,12 @@
 <!-- Evaluate message -->
 
 <section>
-	<header>$(gettext "Evaluate:") $(gettext "Without Partitioning / Formating")</header>
+	<header>$(_ 'Evaluate: Without Partitioning / Formating')</header>
 
 	<div>
-	<p>$(gettext "SliTaz and Windows&trade; can coexist in the same partition.")</p>
-	<p>$(gettext "SliTaz will be in the \slitaz directory like UMSDOS did \
-in the previous century...")</p>
+	<p>$(_ 'SliTaz and Windows&trade; can coexist in the same partition.')</p>
+	<p>$(_ "SliTaz will be in the %s directory like UMSDOS did \
+in the previous century..." '\slitaz')</p>
 	</div>
 
 	<footer>
@@ -151,13 +151,13 @@
 			<input type="hidden" name="iso"/>
 			<input type="hidden" name="action" value="install"/>
 			<table>
-			<tr><td>$(gettext 'ISO image file full path')
-				<span data-img="info" title="$(gettext 'set /dev/cdrom for a physical CD-ROM')"></span>
+			<tr><td>$(_ 'ISO image file full path')
+				<span data-img="info" title="$(_ 'set %s for a physical CD-ROM' '/dev/cdrom')"></span>
 			</td>
 			<td>$(file_chooser "iso" "")</td></tr>
-			<tr><td>$(gettext 'Target partition')</td>
+			<tr><td>$(_ 'Target partition')</td>
 			<td><select name="instdev">
-				<option value="/dev/null">$(gettext 'Choose a partition')</option>
+				<option value="/dev/null">$(_ 'Choose a partition')</option>
 EOT
 	blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \
 		sed -e 's|[A-Z]*ID="[^"]*"||g;s| SEC[^ ]*||;s|LABEL=||;s|:||' \
@@ -169,7 +169,7 @@
 	cat <<EOT
 			</select></td></tr>
 			</table>
-			<button data-icon="install">$(gettext 'Install')</button>
+			<button data-icon="install">$(_ 'Install')</button>
 		</form>
 	</footer>
 </section>
@@ -192,27 +192,27 @@
 <!-- GParted message -->
 
 <section>
-	<header>$(gettext "Partitioning")</header>
+	<header>$(_ 'Partitioning')</header>
 
 	<div>
-		<p>$(gettext "On most used systems, the hard drive is already dedicated to \
+		<p>$(_ "On most used systems, the hard drive is already dedicated to \
 partitions for Windows&trade;, or Linux, or another operating \
 system. You'll need to resize these partitions in order to make space for \
 SliTaz GNU/Linux. SliTaz will co-exist with other operating systems already \
 installed on your hard drive.")</p>
-	<p>$(gettext "The amount of space needed depends on how much software you \
+	<p>$(_ "The amount of space needed depends on how much software you \
 plan to install and how much space you require for users. It's conceivable \
 that you could run a minimal SliTaz system in 300 megs or less, but 2 gigs \
 is indeed more comfy.")</p>
-	<p>$(gettext "A separate home partition and a partition that will be used \
+	<p>$(_ "A separate home partition and a partition that will be used \
 as Linux swap space may be created if needed. SliTaz detects and uses swap \
 partitions automatically.")</p>
 	<hr/>
-	<p>$(gettext "You can graphically manage your partitions with GParted. \
+	<p>$(_ "You can graphically manage your partitions with GParted. \
 GParted is a partition editor for graphically managing your disk partitions. \
 GParted allows you to create, destroy, resize and copy partitions without \
 data loss.")</p>
-	<p>$(gettext "GParted supports ext2, ext3, ext4, linux swap, ntfs and \
+	<p>$(_ "GParted supports ext2, ext3, ext4, linux swap, ntfs and \
 fat32 filesystems right out of the box. Support for xjs, jfs, hfs and other \
 filesystems is available as well but you first need to add drivers for these \
 filesystems by installing the related packages xfsprogs, jfsutils, linux-hfs \
@@ -223,15 +223,15 @@
 		<!-- Launch GParted -->
 		<form>
 			<button name="page" value="gparted" data-icon="hdd"
-				title="$(gettext 'Launch GParted, the partition editor tool')"
-				>$(gettext 'Execute GParted')</button>
+				title="$(_ 'Launch GParted, the partition editor tool')"
+				>$(_ 'Execute GParted')</button>
 		</form>
 	</footer>
 </section>
 
-<h5>$(gettext "Continue installation")</h5>
+<h5>$(_ 'Continue installation')</h5>
 
-<p>$(gettext "Once you've made room for SliTaz on your drive, you should \
+<p>$(_ "Once you've made room for SliTaz on your drive, you should \
 be able to continue installation.")</p>
 EOT
 }
@@ -256,9 +256,9 @@
 		input_media "cdrom" \
 			"$media"
 		label_media "cdrom" \
-			"$(gettext 'LiveCD')" \
+			"$(_ 'LiveCD')" \
 			"$media" \
-			"$(gettext 'Use the SliTaz LiveCD')"
+			"$(_ 'Use the SliTaz LiveCD')"
 		br
 	fi
 	# usb
@@ -266,10 +266,10 @@
 		input_media "usb" \
 			"$media"
 		label_media "usb" \
-			"$(gettext 'LiveUSB:')" \
+			"$(_ 'LiveUSB:')" \
 			"$media" \
-			"$(gettext 'Enter the partition where SliTaz Live is located on
- your USB Key')"
+			"$(_ 'Enter the partition where SliTaz Live is located on your USB Key')"
+
 		error="$?"
 		select "$(/usr/sbin/tazinst list usb "$INSTFILE" | cut -d' ' -f2)" \
 			"$source" \
@@ -283,22 +283,22 @@
 	input_media "iso" \
 		"$media"
 	label_media "iso" \
-		"$(gettext 'ISO file:')" \
+		"$(_ 'ISO file:')" \
 		"$media" \
-		"$(gettext 'Select a SliTaz ISO file located on a local disk')"
+		"$(_ 'Select a SliTaz ISO file located on a local disk')"
 	error="$?"
 	if [ "$media" == "iso" ]; then
 		input "text" \
 			"src_iso" \
 			"$source" "" \
-			"$(gettext 'Select an ISO or enter the full path to the ISO file')"\
+			"$(_ 'Select an ISO or enter the full path to the ISO file')"\
 			"iso"
 	else
 		input "text" \
 			"src_iso" \
 			"" \
 			"none" \
-			"$(gettext 'Select an ISO or enter the full path to the ISO file')"\
+			"$(_ 'Select an ISO or enter the full path to the ISO file')"\
 			"iso"
 	fi
 	datalist "$(/usr/sbin/tazinst list iso "$INSTFILE")" \
@@ -310,23 +310,23 @@
 	input_media "web" \
 		"$media"
 	label_media "web" \
-		"$(gettext 'Web:')" \
+		"$(_ 'Web:')" \
 		"$media" \
-		"$(gettext 'Select a SliTaz version on the Web')"
+		"$(_ 'Select a SliTaz version on the Web')"
 	error="$?"
 
 	if [ "$media" == "web" ]; then
 		input "text" \
 			"src_web" \
 			"$source" "" \
-			"$(gettext 'Select a version or enter the full url to an ISO file')"\
+			"$(_ 'Select a version or enter the full URL to an ISO file')"\
 			"web"
 	else
 		input "text" \
 			"src_web" \
 			"" \
 			"none" \
-			"$(gettext 'Select a version or enter the full url to an ISO file')"\
+			"$(_ 'Select a version or enter the full URL to an ISO file')"\
 			"web"
 	fi
 	datalist "$(/usr/sbin/tazinst help web "$INSTFILE")" \
@@ -342,13 +342,13 @@
 	comment "root_uuid selection"
 	if [ "$mode" == "upgrade" ]; then
 		label "root_uuid" \
-			"$(gettext 'Existing SliTaz partition to upgrade:')" \
-			"$(gettext 'Specify the partition containing the system to upgrade')"
+			"$(_ 'Existing SliTaz partition to upgrade:')" \
+			"$(_ 'Specify the partition containing the system to upgrade')"
 		error="$?"
 	else
 		label "root_uuid" \
-			"$(gettext 'Install SliTaz to partition:')" \
-			"$(gettext 'Specify the partition where to install SliTaz')"
+			"$(_ 'Install SliTaz to partition:')" \
+			"$(_ 'Specify the partition where to install SliTaz')"
 		error="$?"
 	fi
 	select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \
@@ -377,12 +377,12 @@
 <!-- home_uuid selection -->
 
 <fieldset>
-	<legend>$(gettext "home partition")</legend>
+	<legend>$(_ 'home partition')</legend>
 
 	$(
 	label "home_uuid" \
-		"$(gettext 'Separate partition for /home:')" \
-		"$(gettext 'Specify the partition containing /home')"
+		"$(_ 'Separate partition for %s:' '/home')" \
+		"$(_ 'Specify the partition containing %s' '/home')"
 	select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \
 		"$home_uuid" \
 		"HOME_UUID" \
@@ -413,17 +413,17 @@
 <!-- hostname selection -->
 
 <fieldset>
-	<legend>$(gettext "Hostname")</legend>
+	<legend>$(_ 'Hostname')</legend>
 	$(
 	label "hostname" \
-		"$(gettext 'Set Hostname to:')" \
-		"$(gettext 'Hostname configuration allows you to specify the machine name')"
+		"$(_ 'Set Hostname to:')" \
+		"$(_ 'Hostname configuration allows you to specify the machine name')"
 	error=$?
 	input "text" \
 		"HOSTNAME" \
 		"$hostname" \
 		"" \
-		"$(gettext 'Name of your system')"
+		"$(_ 'Name of your system')"
 	error_msg "$error" \
 		"hostname" \
 		2
@@ -440,17 +440,17 @@
 <!-- root_pwd selection -->
 
 <fieldset>
-	<legend>$(gettext "Root superuser")</legend>
+	<legend>$(_ 'Root superuser')</legend>
 	$(
 	label "root_pwd" \
-		"$(gettext 'Root passwd:')" \
-		"$(gettext 'Enter the password for root')"
+		"$(_ 'Root password:')" \
+		"$(_ 'Enter the password for root')"
 	error="$?"
 	input "text" \
 		"ROOT_PWD" \
 		"$root_pwd" \
 		"" \
-		"$(gettext 'Password of root')"
+		"$(_ 'Password of root')"
 	error_msg "$error" \
 		"root_pwd"
 	)
@@ -466,17 +466,17 @@
 <!-- user_login selection -->
 
 <fieldset>
-	<legend>$(gettext "User")</legend>
+	<legend>$(_ 'User')</legend>
 	$(
 	label "user_login" \
-		"$(gettext 'User login:')" \
-		"$(gettext 'Enter the name of the first user')"
+		"$(_ 'User login:')" \
+		"$(_ 'Enter the name of the first user')"
 	error="$?"
 	input "text" \
 		"USER_LOGIN" \
 		"$user_login" \
 		"" \
-		"$(gettext 'Name of the first user')"
+		"$(_ 'Name of the first user')"
 	error_msg "$error" \
 		"user_login" \
 		2
@@ -491,14 +491,14 @@
 	local user_pwd="$(/usr/sbin/tazinst get user_pwd "$INSTFILE")" error
 
 	label "user_pwd" \
-		"$(gettext 'User passwd:')" \
-		"$(gettext 'The password for default user')"
+		"$(_ 'User password:')" \
+		"$(_ 'The password for default user')"
 	error="$?"
 	input "text" \
 		"USER_PWD" \
 		"$user_pwd" \
 		"" \
-		"$(gettext 'Password of the first user')"
+		"$(_ 'Password of the first user')"
 	error_msg "$error" \
 		"user_pwd"
 	cat <<EOT
@@ -515,7 +515,7 @@
 <!-- bootloader selection -->
 
 <fieldset>
-	<legend>$(gettext "Bootloader")</legend>
+	<legend>$(_ 'Bootloader')</legend>
 
 	$(
 	input "checkbox" \
@@ -523,8 +523,8 @@
 		"auto" \
 		"$bootloader"
 	label "bootloader" \
-		"$(gettext 'Install a bootloader.')" \
-		"$(gettext "Usually you should answer yes, unless you want to install \
+		"$(_ 'Install a bootloader.')" \
+		"$(_ "Usually you should answer yes, unless you want to install \
 a bootloader by hand yourself.")"
 	error="$?"
 	error_msg "$error" \
@@ -545,8 +545,8 @@
 		"auto" \
 		"$winboot"
 	label "winboot" \
-		"$(gettext 'Enable Windows Dual-Boot.')" \
-		"$(gettext "At start-up, you will be asked whether you want to boot \
+		"$(_ 'Enable Windows Dual-Boot.')" \
+		"$(_ "At start-up, you will be asked whether you want to boot \
 into Windows&trade; or SliTaz GNU/Linux.")"
 	error="$?"
 	error_msg "$error" \
@@ -561,7 +561,7 @@
 {
 	if [ "$CHECK" ]; then
 		echo '<span class="alert">'
-		p "$(gettext "Errors found. Please check your settings.")"
+		p "$(_ "Errors found. Please check your settings.")"
 		echo '</span>'
 	fi
 }
@@ -574,14 +574,14 @@
 
 	cat<<EOT
 <fieldset>
-	<legend>$(gettext "Select source media:")</legend>
+	<legend>$(_ 'Select source media:')</legend>
 
 	<div class="media">$(select_source)</div>
 </fieldset>
 
 
 <fieldset>
-	<legend>$(gettext "Select destination")</legend>
+	<legend>$(_ 'Select destination')</legend>
 
 	<div>$(
 		select_root_uuid
@@ -591,7 +591,7 @@
 
 
 <fieldset id="options">
-	<legend>$(gettext 'Options')</legend>
+	<legend>$(_ 'Options')</legend>
 
 	<div class="options">$(
 	printf '%s' "$settings" | grep -q "home_uuid" && select_home_uuid
@@ -619,7 +619,7 @@
 
 save_settings()
 {
-	h5 "$(gettext "Checking settings...")"
+	h5 "$(_ 'Checking settings...')"
 
 	# install type
 	/usr/sbin/tazinst set media "$(GET MEDIA)" "$INSTFILE"
@@ -686,7 +686,7 @@
 tazinst_run()
 {
 	local mode="$(/usr/sbin/tazinst get mode "$INSTFILE")" error
-	h4 "$(gettext 'Proceeding to:') $(gettext "$mode")"
+	h4 "$(_ 'Proceeding to: %s' "$(gettext "$mode")")"
 	/usr/sbin/tazinst execute "$INSTFILE" | /bin/busybox awk '{
 		num=$1+0
 		if (num>0 && num<=100){
@@ -704,7 +704,7 @@
 		echo "<script type=\"text/javascript\">"
 		printf "document.write(\047<div id=\"progress\">"
 		printf "<img src=\"/styles/default/images/stop.png\" />"
-		printf "$(gettext 'Errors encountered.')"
+		_n 'Errors encountered.'
 		printf "</div>\047)\n"
 		echo "</script>"
 		br
@@ -717,13 +717,13 @@
 		echo "<script type=\"text/javascript\">"
 		printf "document.write(\047<div id=\"progress\">"
 		printf "<img src=\"/styles/default/images/tux.png\" />"
-		printf "$(gettext 'Process completed!')"
+		_n 'Process completed!'
 		printf "</div>\047)\n"
 		echo "</script>"
 		br
 		br
 		br
-		p $(gettext "Installation is now finished, you can exit the installer \
+		p $(_ "Installation is now finished, you can exit the installer \
 or reboot on your new SliTaz GNU/Linux operating system.")
 	fi
 	return "$error"
@@ -733,7 +733,7 @@
 
 tazinst_log()
 {
-	h4 "$(gettext "Tazinst log")"
+	h4 "$(_ "Tazinst log")"
 	printf '<pre>%s</pre>' "$(/usr/sbin/tazinst log | sed 's/\%/ percent/g')"
 }
 
@@ -747,9 +747,9 @@
 	case $mode in
 		install)
 			cat <<EOT
-<h2>$(gettext "Install SliTaz")</h2>
+<h2>$(_ 'Install SliTaz')</h2>
 
-<p>$(gettext "You're going to install SliTaz on a partition of \
+<p>$(_ "You're going to install SliTaz on a partition of \
 your hard disk drive. If you decide to format your HDD, all data will be \
 lost. If you do not format, all data except for any existing /home \
 directory will be removed (the home directory will be kept as is).")</p>
@@ -757,9 +757,9 @@
 			;;
 		upgrade)
 			cat <<EOT
-<h2>$(gettext "Upgrade SliTaz")</h2>
+<h2>$(_ 'Upgrade SliTaz')</h2>
 
-<p>$(gettext "You're going to upgrade an already installed SliTaz \
+<p>$(_ "You're going to upgrade an already installed SliTaz \
 system on your hard disk drive. Your /home /etc /var/www directories \
 will be kept, all other directories will be removed. Any additional \
 packages added to your old SliTaz system will be updated as long you \
@@ -776,24 +776,24 @@
 
 	case "$back_page" in
 		partitioning)
-			back_msg=$(gettext 'Back to partitioning') ;;
+			back_msg=$(_ 'Back to partitioning') ;;
 		input)
-			back_msg=$(gettext 'Back to entering settings') ;;
+			back_msg=$(_ 'Back to entering settings') ;;
 		*)
-			back_msg=$(gettext 'Back to Installer Start Page') ;;
+			back_msg=$(_ 'Back to Installer Start Page') ;;
 	esac
 
 	case "$next_page" in
 		execute|run)
-			next_msg=$(gettext 'Proceed to SliTaz installation') ;;
+			next_msg=$(_ 'Proceed to SliTaz installation') ;;
 		reboot)
-			next_msg=$(gettext 'Installation complete. You can now restart') ;;
+			next_msg=$(_ 'Installation complete. You can now restart') ;;
 		failed)
-			next_msg=$(gettext 'Installation failed. See log') ;;
+			next_msg=$(_ 'Installation failed. See log') ;;
 		input)
-			next_msg=$(gettext 'Continue installation.') ;;
+			next_msg=$(_ 'Continue installation.') ;;
 		*)
-			next_msg=$(gettext 'Back to Installer Start Page') ;;
+			next_msg=$(_ 'Back to Installer Start Page') ;;
 	esac
 
 	cat <<EOT
@@ -810,7 +810,7 @@
 	cat <<EOT
 <form>
 	<button name="page" value="home" data-icon="back"
-	>$(gettext 'Back to Installer Start Page')</button>
+	>$(_ 'Back to Installer Start Page')</button>
 </form>
 EOT
 }
@@ -823,15 +823,15 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>$(gettext "A web page that points a browser to a different page after \
+<title>$(_ "A web page that points a browser to a different page after \
 2 seconds")</title>
 <meta http-equiv="refresh" content="0; URL=$SCRIPT_NAME?page=$1">
 <meta name="keywords" content="automatic redirection">
 </head>
 <body>
-<p>$(gettext "If your browser doesn't automatically redirect within a few \
-seconds, you may want to go there manually")
-<a href="$SCRIPT_NAME?page=$page">$(gettext "here")</a></p>
+<p>$(_ "If your browser doesn't automatically redirect within a few \
+seconds, you may want to go there manually [here]" | \
+sed "s|\[|<a href=\"?page=$page\">|; s|\]|</a>|")</p>
 </body>
 </html>
 EOT
@@ -846,11 +846,11 @@
 	local errorcode=0
 	comment "check_ressources"
 	if ! [ -x /usr/sbin/tazinst ] ; then
-		h4 $(gettext "Tazinst Error")
-		p $(gettext "<strong>tazinst</strong>, the backend to slitaz-installer \
-is missing. Any installation can not be done without tazinst.")
-		p $(gettext "Check tazinst permissions, or reinstall the \
-slitaz-installer package.")
+		h4 $(_ 'Tazinst Error')
+		p $(_ '%s, the backend to %s is missing.' '<strong>tazinst</strong>' 'slitaz-installer';
+		_ 'Any installation can not be done without %s.' 'tazinst')
+		p $(_ "Check %s permissions, or reinstall the %s package." \
+		'tazinst' 'slitaz-installer')
 		errorcode=1
 	else
 		# check tazinst minimum version
@@ -858,12 +858,12 @@
 		r=$TAZINST_MINIMUM_VERSION
 		if ! (printf '%s' "$v" | /bin/busybox awk -v r=$r \
 				'{v=$v+0}{ if (v < r) exit 1}') ; then
-			h4 $(gettext "Tazinst Error")
-			p $(gettext "<strong>tazinst</strong>, the slitaz-installer \
-backend, is not at the minimum required version. Any installation \
-cannot be done without tazinst.")
-			p $(gettext "Reinstall the slitaz-installer package, or use \
-tazinst in CLI mode.")
+			h4 $(_ 'Tazinst Error')
+			p $(_ '%s, the %s backend, is not at the minimum required version.' \
+			'<strong>tazinst</strong>' 'slitaz-installer';
+			_ 'Any installation can not be done without %s.' 'tazinst')
+			p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \
+			'slitaz-installer' 'tazinst')
 			errorcode=1
 		fi
 		# check tazinst maximum version
@@ -871,12 +871,12 @@
 		r=$TAZINST_MAXIMUM_VERSION
 		if ! (printf '%s' "$v" | /bin/busybox awk -v r=$r \
 				'{v=$v+0}{ if (v > r) exit 1}') ; then
-			h4 $(gettext "Tazinst Error")
-			p $(gettext "<strong>tazinst</strong>, the slitaz-installer \
-backend, is at a higher version than the maximum authorized \
-by the slitaz-installer. Any installation cannot be done.")
-			p $(gettext "Reinstall the slitaz-installer package, or use \
-tazinst in CLI mode.")
+			h4 $(_ 'Tazinst Error')
+			p $(_ "%s, the %s backend, is at a higher version than the maximum authorized \
+by the %s." '<strong>tazinst</strong>' 'slitaz-installer' 'slitaz-installer';
+			_ 'Any installation cannot be done.')
+			p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \
+			'slitaz-installer' 'tazinst')
 			errorcode=1
 		fi
 	fi
@@ -902,8 +902,8 @@
 
 a() {
 	local page="$1" text="$2"
-	printf '<a class="button" value="%s" href="%s?page=%s">%s</a>\n' \
-		"$page" "$SCRIPT_NAME" "$page" "$text"
+	printf '<a class="button" value="%s" href="?page=%s">%s</a>\n' \
+		"$page" "$page" "$text"
 }
 
 button() {
@@ -992,11 +992,11 @@
 select() {
 	local list="$1" selected="$2" name="$3" type="$4"
 	printf '%s' "$list" | \
-		/bin/busybox awk -v SELECTED="$selected" -v NONE="$(gettext "None")" \
+		/bin/busybox awk -v SELECTED="$selected" -v NONE="$(_ 'None')" \
 		-v NAME="$name" -v TYPE="$type" 'BEGIN{
 		TYPE=TYPE+0
 		print "<select name=\"" NAME "\">"
-		print "<option value=>< " NONE " ></option>"
+		print "<option value=>&lt; " NONE " &gt;</option>"
 	}
 	{
 		printf "<option value=\"" $1 "\""
@@ -1049,7 +1049,7 @@
 
 	# workaround ..end
 	printf '%s' "$list" | \
-		/bin/busybox awk -v NONE="$(gettext "None")" 'BEGIN{
+		/bin/busybox awk -v NONE="$(_ 'None')" 'BEGIN{
 		line=0
 	}
 	{
@@ -1060,7 +1060,7 @@
 	}
 	END{
 		if (line < 1)
-			printf "<option value=>< %s ></option>\n", NONE
+			printf "<option value=>&lt; %s &gt;</option>\n", NONE
 	}'
 	echo "</select>"
 	echo "</datalist>"
@@ -1068,11 +1068,11 @@
 
 format()
 {
-	list_fs="$1" selected="$2" name="$3" none="$(gettext 'Do not format')"
+	list_fs="$1" selected="$2" name="$3" none="$(_ 'Do not format')"
 	printf '<label for="%s" ' "$name"
-	printf 'title="%s">' "$(gettext "To format this partition, select a \
+	printf 'title="%s">' "$(_ "To format this partition, select a \
 filesystem, usually it's safe to use ext4")"
-	printf '%s</label>\n' "$(gettext "Formatting option:")"
+	printf '%s</label>\n' "$(_ 'Formatting option:')"
 	printf '%s' "$list_fs" | \
 		/bin/busybox awk -v SELECTED=$selected -v NONE="$none" -v NAME="$name" '
 BEGIN{
diff -r fee6f859a768 -r 7877ddbcbdbe po/installer/el.po
--- a/po/installer/el.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/installer/el.po	Sat Apr 09 17:22:22 2016 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: installer.cgi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 19:03+0100\n"
+"POT-Creation-Date: 2016-04-09 17:07+0300\n"
 "PO-Revision-Date: 2012-06-10 17:15+0200\n"
 "Last-Translator: Douros Dimitris <dourosdimitris@gmail.com>\n"
 "Language-Team: \n"
@@ -127,11 +127,7 @@
 msgstr "Αναβάθμιση SliTaz"
 
 #: installer.cgi:141
-msgid "Evaluate:"
-msgstr ""
-
-#: installer.cgi:141
-msgid "Without Partitioning / Formating"
+msgid "Evaluate: Without Partitioning / Formating"
 msgstr ""
 
 #: installer.cgi:144
@@ -140,8 +136,7 @@
 
 #: installer.cgi:145
 msgid ""
-"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous "
-"century..."
+"SliTaz will be in the %s directory like UMSDOS did in the previous century..."
 msgstr ""
 
 #: installer.cgi:154
@@ -149,7 +144,7 @@
 msgstr ""
 
 #: installer.cgi:155
-msgid "set /dev/cdrom for a physical CD-ROM"
+msgid "set %s for a physical CD-ROM"
 msgstr ""
 
 #: installer.cgi:158
@@ -268,9 +263,7 @@
 msgstr "Ζωντανό USB"
 
 #: installer.cgi:271
-msgid ""
-"Enter the partition where SliTaz Live is located on\n"
-" your USB Key"
+msgid "Enter the partition where SliTaz Live is located on your USB Key"
 msgstr ""
 
 #: installer.cgi:286
@@ -294,7 +287,7 @@
 msgstr ""
 
 #: installer.cgi:322 installer.cgi:329
-msgid "Select a version or enter the full url to an ISO file"
+msgid "Select a version or enter the full URL to an ISO file"
 msgstr ""
 
 #: installer.cgi:345
@@ -318,14 +311,13 @@
 msgstr "Διαμέρισμα home"
 
 #: installer.cgi:384
-#, fuzzy
-msgid "Separate partition for /home:"
-msgstr "Χρησιμοποιήστε ξεχωριστό διαμέρισμα για το /home:"
+msgid "Separate partition for %s:"
+msgstr "Χρησιμοποιήστε ξεχωριστό διαμέρισμα για το %s:"
 
 #: installer.cgi:385
 #, fuzzy
-msgid "Specify the partition containing /home"
-msgstr "Χρησιμοποιήστε ξεχωριστό διαμέρισμα για το /home:"
+msgid "Specify the partition containing %s"
+msgstr "Χρησιμοποιήστε ξεχωριστό διαμέρισμα για το %s:"
 
 #: installer.cgi:416
 msgid "Hostname"
@@ -348,7 +340,7 @@
 msgstr ""
 
 #: installer.cgi:446
-msgid "Root passwd:"
+msgid "Root password:"
 msgstr "Κωδικός διαχειριστή:"
 
 #: installer.cgi:447
@@ -378,7 +370,7 @@
 msgstr "Όνομα του πρώτου χρήστη"
 
 #: installer.cgi:494
-msgid "User passwd:"
+msgid "User password:"
 msgstr "Κωδικός χρήστη:"
 
 #: installer.cgi:495
@@ -442,7 +434,7 @@
 msgstr "Έλεγχος για αναβαθμίσεις..."
 
 #: installer.cgi:689
-msgid "Proceeding to:"
+msgid "Proceeding to: %s"
 msgstr ""
 
 #: installer.cgi:707
@@ -531,14 +523,10 @@
 #: installer.cgi:832
 msgid ""
 "If your browser doesn't automatically redirect within a few seconds, you may "
-"want to go there manually"
+"want to go there manually [here]"
 msgstr ""
 "Αν το πρόγραμμα περιήγησής σας δεν ανακατευθυνθεί αυτόματα μέσα σε λίγα "
-"δευτερόλεπτα, μπορεί να θέλετε να πάτε εκεί χειροκίνητα"
-
-#: installer.cgi:834
-msgid "here"
-msgstr ""
+"δευτερόλεπτα, μπορεί να θέλετε να πάτε εκεί χειροκίνητα [here]"
 
 #: installer.cgi:849 installer.cgi:861 installer.cgi:874
 msgid "Tazinst Error"
@@ -546,44 +534,41 @@
 
 #: installer.cgi:850
 #, fuzzy
-msgid ""
-"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any "
-"installation can not be done without tazinst."
+msgid "%s, the backend to %s is missing."
 msgstr ""
-"<strong>tazinst</strong>, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz "
-"σε σκληρό δίσκο. Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το "
-"tazinst."
+"%s, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz (%s) σε σκληρό δίσκο. "
+
+#: installer.cgi:851 installer.cgi:864
+msgid "Any installation can not be done without %s."
+msgstr "Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το %s."
 
 #: installer.cgi:852
-#, fuzzy
-msgid "Check tazinst permissions, or reinstall the slitaz-installer package."
-msgstr ""
-"Ελέγξτε τα δικαιώματα του tazinst ή επανεγκαταστήστε το πακέτο slitaz-tools:"
+msgid "Check %s permissions, or reinstall the %s package."
+msgstr "Ελέγξτε τα δικαιώματα του %s ή επανεγκαταστήστε το πακέτο %s."
 
 #: installer.cgi:862
 #, fuzzy
-msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is not at the "
-"minimum required version. Any installation cannot be done without tazinst."
+msgid "%s, the %s backend, is not at the minimum required version."
 msgstr ""
-"<strong>tazinst</strong>, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz "
-"σε σκληρό δίσκο. Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το "
-"tazinst."
+"%s, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz (%s) σε σκληρό δίσκο."
 
 #: installer.cgi:865 installer.cgi:878
-msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode."
+msgid "Reinstall the %s package, or use %s in CLI mode."
 msgstr ""
 
 #: installer.cgi:875
 #, fuzzy
 msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher "
-"version than the maximum authorized by the slitaz-installer. Any "
-"installation cannot be done."
+"%s, the %s backend, is at a higher version than the maximum authorized by "
+"the %s."
 msgstr ""
-"<strong>tazinst</strong>, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz "
-"σε σκληρό δίσκο. Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το "
-"tazinst."
+"%s, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz (%s) σε σκληρό δίσκο "
+"%s."
+
+#: installer.cgi:877
+#, fuzzy
+msgid "Any installation cannot be done."
+msgstr "Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το."
 
 #: installer.cgi:995 installer.cgi:1052
 msgid "None"
diff -r fee6f859a768 -r 7877ddbcbdbe po/installer/es.po
--- a/po/installer/es.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/installer/es.po	Sat Apr 09 17:22:22 2016 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: installer.cgi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 19:03+0100\n"
+"POT-Creation-Date: 2016-04-09 17:07+0300\n"
 "PO-Revision-Date: 2012-06-11 03:13-0000\n"
 "Last-Translator: kevin fabian quintero <kefaquin@gmail.com>\n"
 "Language-Team: \n"
@@ -126,11 +126,7 @@
 msgstr "Actualizar SliTaz"
 
 #: installer.cgi:141
-msgid "Evaluate:"
-msgstr ""
-
-#: installer.cgi:141
-msgid "Without Partitioning / Formating"
+msgid "Evaluate: Without Partitioning / Formating"
 msgstr ""
 
 #: installer.cgi:144
@@ -139,8 +135,7 @@
 
 #: installer.cgi:145
 msgid ""
-"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous "
-"century..."
+"SliTaz will be in the %s directory like UMSDOS did in the previous century..."
 msgstr ""
 
 #: installer.cgi:154
@@ -148,7 +143,7 @@
 msgstr ""
 
 #: installer.cgi:155
-msgid "set /dev/cdrom for a physical CD-ROM"
+msgid "set %s for a physical CD-ROM"
 msgstr ""
 
 #: installer.cgi:158
@@ -265,9 +260,7 @@
 msgstr "USB Vivo:"
 
 #: installer.cgi:271
-msgid ""
-"Enter the partition where SliTaz Live is located on\n"
-" your USB Key"
+msgid "Enter the partition where SliTaz Live is located on your USB Key"
 msgstr ""
 
 #: installer.cgi:286
@@ -291,7 +284,7 @@
 msgstr ""
 
 #: installer.cgi:322 installer.cgi:329
-msgid "Select a version or enter the full url to an ISO file"
+msgid "Select a version or enter the full URL to an ISO file"
 msgstr ""
 
 #: installer.cgi:345
@@ -315,14 +308,13 @@
 msgstr "Partición Home"
 
 #: installer.cgi:384
-#, fuzzy
-msgid "Separate partition for /home:"
-msgstr "Usar otra partición para /home:"
+msgid "Separate partition for %s:"
+msgstr "Usar otra partición para %s:"
 
 #: installer.cgi:385
 #, fuzzy
-msgid "Specify the partition containing /home"
-msgstr "Usar otra partición para /home:"
+msgid "Specify the partition containing %s"
+msgstr "Usar otra partición para %s:"
 
 #: installer.cgi:416
 msgid "Hostname"
@@ -345,7 +337,7 @@
 msgstr ""
 
 #: installer.cgi:446
-msgid "Root passwd:"
+msgid "Root password:"
 msgstr "Contraseña Root:"
 
 #: installer.cgi:447
@@ -375,7 +367,7 @@
 msgstr "Nombre de usuario"
 
 #: installer.cgi:494
-msgid "User passwd:"
+msgid "User password:"
 msgstr "Contraseña de usuario:"
 
 #: installer.cgi:495
@@ -439,7 +431,7 @@
 msgstr "Comprobar actualizaciónes..."
 
 #: installer.cgi:689
-msgid "Proceeding to:"
+msgid "Proceeding to: %s"
 msgstr ""
 
 #: installer.cgi:707
@@ -526,14 +518,10 @@
 #: installer.cgi:832
 msgid ""
 "If your browser doesn't automatically redirect within a few seconds, you may "
-"want to go there manually"
+"want to go there manually [here]"
 msgstr ""
 "Si su navegador no lo redirige de manera automatica en unos segundos,usted "
-"puede ir de manera manual"
-
-#: installer.cgi:834
-msgid "here"
-msgstr ""
+"puede ir de manera manual [here]"
 
 #: installer.cgi:849 installer.cgi:861 installer.cgi:874
 msgid "Tazinst Error"
@@ -541,40 +529,37 @@
 
 #: installer.cgi:850
 #, fuzzy
-msgid ""
-"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any "
-"installation can not be done without tazinst."
-msgstr ""
-"<strong>tazinst</strong>, El instalador de SliTaz no se encuentra,no se "
-"puede realizar la instalacion sin tazinst."
+msgid "%s, the backend to %s is missing."
+msgstr "%s, El instalador de SliTaz (%s) no se encuentra."
+
+#: installer.cgi:851 installer.cgi:864
+msgid "Any installation can not be done without %s."
+msgstr "No se puede realizar la instalacion sin %s."
 
 #: installer.cgi:852
-#, fuzzy
-msgid "Check tazinst permissions, or reinstall the slitaz-installer package."
-msgstr "Verifique los permisos tazinst' , o reinstale el paquete slitaz-tools:"
+msgid "Check %s permissions, or reinstall the %s package."
+msgstr "Verifique los permisos %s, o reinstale el paquete %s."
 
 #: installer.cgi:862
 #, fuzzy
-msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is not at the "
-"minimum required version. Any installation cannot be done without tazinst."
-msgstr ""
-"<strong>tazinst</strong>, El instalador de SliTaz no se encuentra,no se "
-"puede realizar la instalacion sin tazinst."
+msgid "%s, the %s backend, is not at the minimum required version."
+msgstr "%s, El instalador de SliTaz (%s) no se encuentra."
 
 #: installer.cgi:865 installer.cgi:878
-msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode."
+msgid "Reinstall the %s package, or use %s in CLI mode."
 msgstr ""
 
 #: installer.cgi:875
 #, fuzzy
 msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher "
-"version than the maximum authorized by the slitaz-installer. Any "
-"installation cannot be done."
-msgstr ""
-"<strong>tazinst</strong>, El instalador de SliTaz no se encuentra,no se "
-"puede realizar la instalacion sin tazinst."
+"%s, the %s backend, is at a higher version than the maximum authorized by "
+"the %s."
+msgstr "%s, El instalador de SliTaz (%s) no se encuentra."
+
+#: installer.cgi:877
+#, fuzzy
+msgid "Any installation cannot be done."
+msgstr "No se puede realizar la instalacion."
 
 #: installer.cgi:995 installer.cgi:1052
 msgid "None"
diff -r fee6f859a768 -r 7877ddbcbdbe po/installer/fr.po
--- a/po/installer/fr.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/installer/fr.po	Sat Apr 09 17:22:22 2016 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: installer.cgi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-04 11:45+0200\n"
+"POT-Creation-Date: 2016-04-09 17:07+0300\n"
 "PO-Revision-Date: 2016-04-04 11:45+0200\n"
 "Last-Translator: Pascal Bellard <pascal.bellard@slitaz.org>\n"
 "Language-Team: French\n"
@@ -57,7 +57,7 @@
 "hard disk."
 msgstr ""
 "Les utilisateurs de Windows&trade; pouvent évaluer SliTaz dans le répertoire "
-"\\slitaz de leur disque dur.""
+"\\slitaz de leur disque dur."
 
 #: installer.cgi:76
 msgid "Which type of installation do you want to start?"
@@ -119,12 +119,8 @@
 msgstr "Mettre à jour SliTaz"
 
 #: installer.cgi:141
-msgid "Evaluate:"
-msgstr "Evaluer :"
-
-#: installer.cgi:141
-msgid "Without Partitioning / Formating"
-msgstr "Sans partitionner ni formater"
+msgid "Evaluate: Without Partitioning / Formating"
+msgstr "Evaluer : Sans partitionner ni formater"
 
 #: installer.cgi:144
 msgid "SliTaz and Windows&trade; can coexist in the same partition."
@@ -132,19 +128,17 @@
 
 #: installer.cgi:145
 msgid ""
-"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous "
-"century..."
+"SliTaz will be in the %s directory like UMSDOS did in the previous century..."
 msgstr ""
-"SliTaz sera dans le répertoire \\slitaz comme UMSDOS faisait au siècle "
-"dernier..."
+"SliTaz sera dans le répertoire %s comme UMSDOS faisait au siècle dernier..."
 
 #: installer.cgi:154
 msgid "ISO image file full path"
 msgstr "Chemin complet de l'image ISO"
 
 #: installer.cgi:155
-msgid "set /dev/cdrom for a physical CD-ROM"
-msgstr "Mettre /dev/cdrom pour indiquer le lecteur de CD-ROM"
+msgid "set %s for a physical CD-ROM"
+msgstr "Mettre %s pour indiquer le lecteur de CD-ROM"
 
 #: installer.cgi:158
 msgid "Target partition"
@@ -249,9 +243,7 @@
 msgstr "LiveUSB"
 
 #: installer.cgi:271
-msgid ""
-"Enter the partition where SliTaz Live is located on\n"
-" your USB Key"
+msgid "Enter the partition where SliTaz Live is located on your USB Key"
 msgstr "Sur quelle partition de la clef USB se trouve SliTaz Live ?"
 
 #: installer.cgi:286
@@ -275,7 +267,7 @@
 msgstr "Choisissez une version de SliTaz sur le Web"
 
 #: installer.cgi:322 installer.cgi:329
-msgid "Select a version or enter the full url to an ISO file"
+msgid "Select a version or enter the full URL to an ISO file"
 msgstr "Choisissez une version ou entrez l'URL vers le fichier ISO"
 
 #: installer.cgi:345
@@ -299,12 +291,12 @@
 msgstr "Partition /home"
 
 #: installer.cgi:384
-msgid "Separate partition for /home:"
-msgstr "Utiliser une autre partition pour /home"
+msgid "Separate partition for %s:"
+msgstr "Utiliser une autre partition pour %s :"
 
 #: installer.cgi:385
-msgid "Specify the partition containing /home"
-msgstr "Spécifiez la partition pour /home"
+msgid "Specify the partition containing %s"
+msgstr "Spécifiez la partition pour %s"
 
 #: installer.cgi:416
 msgid "Hostname"
@@ -328,7 +320,7 @@
 msgstr "administrateur Root"
 
 #: installer.cgi:446
-msgid "Root passwd:"
+msgid "Root password:"
 msgstr "Mot de passe de root :"
 
 #: installer.cgi:447
@@ -356,7 +348,7 @@
 msgstr "Nom du premier compte d'utilisateur"
 
 #: installer.cgi:494
-msgid "User passwd:"
+msgid "User password:"
 msgstr "Mot de passe utilisateur :"
 
 #: installer.cgi:495
@@ -416,8 +408,8 @@
 msgstr "Vérification des mises à jours..."
 
 #: installer.cgi:689
-msgid "Proceeding to:"
-msgstr "Lancement de :"
+msgid "Proceeding to: %s"
+msgstr "Lancement de : %s"
 
 #: installer.cgi:707
 msgid "Errors encountered."
@@ -499,55 +491,49 @@
 #: installer.cgi:832
 msgid ""
 "If your browser doesn't automatically redirect within a few seconds, you may "
-"want to go there manually"
+"want to go there manually [here]"
 msgstr ""
 "Si votre navigateur ne vous redirige pas automatiquement dans quelques "
-"secondes, vous devrez le faire manuellement"
-
-#: installer.cgi:834
-msgid "here"
-msgstr "ici"
+"secondes, vous devrez le faire manuellement [ici]"
 
 #: installer.cgi:849 installer.cgi:861 installer.cgi:874
 msgid "Tazinst Error"
 msgstr "Erreur de Tazinst"
 
 #: installer.cgi:850
-msgid ""
-"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any "
-"installation can not be done without tazinst."
-msgstr ""
-"L'installeur léger de SliTaz n'a pas été trouvé. Aucune installation ne peut "
-"être entreprise sans <strong>tazinst</strong>."
+#, fuzzy
+msgid "%s, the backend to %s is missing."
+msgstr "%s, L'installeur léger de SliTaz (%s) n'a pas été trouvé."
+
+#: installer.cgi:851 installer.cgi:864
+msgid "Any installation can not be done without %s."
+msgstr "Aucune installation ne peut être entreprise sans %s."
 
 #: installer.cgi:852
-msgid "Check tazinst permissions, or reinstall the slitaz-installer package."
-msgstr ""
-"Vérifiez les permissions de tazinst, ou réinstallez le paquet slitaz-"
-"installer :"
+msgid "Check %s permissions, or reinstall the %s package."
+msgstr "Vérifiez les permissions de %s, ou réinstallez le paquet %s."
 
 #: installer.cgi:862
-msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is not at the "
-"minimum required version. Any installation cannot be done without tazinst."
+#, fuzzy
+msgid "%s, the %s backend, is not at the minimum required version."
 msgstr ""
-"L'installeur léger de SliTaz n'a pas la version minimum requise. Aucune "
-"installation ne peut être entreprise sans <strong>tazinst</strong>."
+"%s, L'installeur léger de SliTaz (%s) n'a pas la version minimum requise."
 
 #: installer.cgi:865 installer.cgi:878
-msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode."
-msgstr ""
-"Réinstallez le paquet slitaz-installer, ou lancez tazinst en ligne de "
-"commande"
+msgid "Reinstall the %s package, or use %s in CLI mode."
+msgstr "Réinstallez le paquet %s, ou lancez %s en ligne de commande"
 
 #: installer.cgi:875
 msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher "
-"version than the maximum authorized by the slitaz-installer. Any "
-"installation cannot be done."
+"%s, the %s backend, is at a higher version than the maximum authorized by "
+"the %s."
 msgstr ""
-"L'installeur léger de SliTaz n'a pas la version maximum requise. Aucune "
-"installation ne peut être entreprise sans <strong>tazinst</strong>."
+"%s, L'installeur léger de SliTaz (%s) n'a pas la version maximum requise "
+"(%s)."
+
+#: installer.cgi:877
+msgid "Any installation cannot be done."
+msgstr "Aucune installation ne peut être entreprise."
 
 #: installer.cgi:995 installer.cgi:1052
 msgid "None"
diff -r fee6f859a768 -r 7877ddbcbdbe po/installer/installer.pot
--- a/po/installer/installer.pot	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/installer/installer.pot	Sat Apr 09 17:22:22 2016 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: installer.cgi \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 19:03+0100\n"
+"POT-Creation-Date: 2016-04-09 17:07+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"
@@ -102,11 +102,7 @@
 msgstr ""
 
 #: installer.cgi:141
-msgid "Evaluate:"
-msgstr ""
-
-#: installer.cgi:141
-msgid "Without Partitioning / Formating"
+msgid "Evaluate: Without Partitioning / Formating"
 msgstr ""
 
 #: installer.cgi:144
@@ -115,8 +111,7 @@
 
 #: installer.cgi:145
 msgid ""
-"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous "
-"century..."
+"SliTaz will be in the %s directory like UMSDOS did in the previous century..."
 msgstr ""
 
 #: installer.cgi:154
@@ -124,7 +119,7 @@
 msgstr ""
 
 #: installer.cgi:155
-msgid "set /dev/cdrom for a physical CD-ROM"
+msgid "set %s for a physical CD-ROM"
 msgstr ""
 
 #: installer.cgi:158
@@ -208,9 +203,7 @@
 msgstr ""
 
 #: installer.cgi:271
-msgid ""
-"Enter the partition where SliTaz Live is located on\n"
-" your USB Key"
+msgid "Enter the partition where SliTaz Live is located on your USB Key"
 msgstr ""
 
 #: installer.cgi:286
@@ -234,7 +227,7 @@
 msgstr ""
 
 #: installer.cgi:322 installer.cgi:329
-msgid "Select a version or enter the full url to an ISO file"
+msgid "Select a version or enter the full URL to an ISO file"
 msgstr ""
 
 #: installer.cgi:345
@@ -258,11 +251,11 @@
 msgstr ""
 
 #: installer.cgi:384
-msgid "Separate partition for /home:"
+msgid "Separate partition for %s:"
 msgstr ""
 
 #: installer.cgi:385
-msgid "Specify the partition containing /home"
+msgid "Specify the partition containing %s"
 msgstr ""
 
 #: installer.cgi:416
@@ -286,7 +279,7 @@
 msgstr ""
 
 #: installer.cgi:446
-msgid "Root passwd:"
+msgid "Root password:"
 msgstr ""
 
 #: installer.cgi:447
@@ -314,7 +307,7 @@
 msgstr ""
 
 #: installer.cgi:494
-msgid "User passwd:"
+msgid "User password:"
 msgstr ""
 
 #: installer.cgi:495
@@ -370,7 +363,7 @@
 msgstr ""
 
 #: installer.cgi:689
-msgid "Proceeding to:"
+msgid "Proceeding to: %s"
 msgstr ""
 
 #: installer.cgi:707
@@ -442,11 +435,7 @@
 #: installer.cgi:832
 msgid ""
 "If your browser doesn't automatically redirect within a few seconds, you may "
-"want to go there manually"
-msgstr ""
-
-#: installer.cgi:834
-msgid "here"
+"want to go there manually [here]"
 msgstr ""
 
 #: installer.cgi:849 installer.cgi:861 installer.cgi:874
@@ -454,30 +443,33 @@
 msgstr ""
 
 #: installer.cgi:850
-msgid ""
-"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any "
-"installation can not be done without tazinst."
+msgid "%s, the backend to %s is missing."
+msgstr ""
+
+#: installer.cgi:851 installer.cgi:864
+msgid "Any installation can not be done without %s."
 msgstr ""
 
 #: installer.cgi:852
-msgid "Check tazinst permissions, or reinstall the slitaz-installer package."
+msgid "Check %s permissions, or reinstall the %s package."
 msgstr ""
 
 #: installer.cgi:862
-msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is not at the "
-"minimum required version. Any installation cannot be done without tazinst."
+msgid "%s, the %s backend, is not at the minimum required version."
 msgstr ""
 
 #: installer.cgi:865 installer.cgi:878
-msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode."
+msgid "Reinstall the %s package, or use %s in CLI mode."
 msgstr ""
 
 #: installer.cgi:875
 msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher "
-"version than the maximum authorized by the slitaz-installer. Any "
-"installation cannot be done."
+"%s, the %s backend, is at a higher version than the maximum authorized by "
+"the %s."
+msgstr ""
+
+#: installer.cgi:877
+msgid "Any installation cannot be done."
 msgstr ""
 
 #: installer.cgi:995 installer.cgi:1052
diff -r fee6f859a768 -r 7877ddbcbdbe po/installer/pt_BR.po
--- a/po/installer/pt_BR.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/installer/pt_BR.po	Sat Apr 09 17:22:22 2016 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: installer.cgi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 19:03+0100\n"
+"POT-Creation-Date: 2016-04-09 17:07+0300\n"
 "PO-Revision-Date: 2016-03-28 05:01-0300\n"
 "Last-Translator: Leonardo Laporte <hackdorte@sapo.pt>\n"
 "Language-Team: Portuguese <i18n@slitaz.org>\n"
@@ -119,12 +119,8 @@
 msgstr "Atualizar o SliTaz"
 
 #: installer.cgi:141
-msgid "Evaluate:"
-msgstr ""
-
-#: installer.cgi:141
-msgid "Without Partitioning / Formating"
-msgstr "Sem partições / Formatação"
+msgid "Evaluate: Without Partitioning / Formating"
+msgstr "Evaluate: Sem partições / Formatação"
 
 #: installer.cgi:144
 msgid "SliTaz and Windows&trade; can coexist in the same partition."
@@ -133,16 +129,15 @@
 #: installer.cgi:145
 #, fuzzy
 msgid ""
-"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous "
-"century..."
-msgstr "SliTaz estará no diretório \\slitaz como previsto anteriormente..."
+"SliTaz will be in the %s directory like UMSDOS did in the previous century..."
+msgstr "SliTaz estará no diretório %s como previsto anteriormente..."
 
 #: installer.cgi:154
 msgid "ISO image file full path"
 msgstr ""
 
 #: installer.cgi:155
-msgid "set /dev/cdrom for a physical CD-ROM"
+msgid "set %s for a physical CD-ROM"
 msgstr ""
 
 #: installer.cgi:158
@@ -246,12 +241,8 @@
 msgstr "LiveUSB"
 
 #: installer.cgi:271
-msgid ""
-"Enter the partition where SliTaz Live is located on\n"
-" your USB Key"
-msgstr ""
-"Informe a partição da mídia USB onde o SliTaz Live\n"
-"está localizado"
+msgid "Enter the partition where SliTaz Live is located on your USB Key"
+msgstr "Informe a partição da mídia USB onde o SliTaz Live está localizado"
 
 #: installer.cgi:286
 msgid "ISO file:"
@@ -274,7 +265,7 @@
 msgstr "Selecionar uma versão do SliTaz na Web"
 
 #: installer.cgi:322 installer.cgi:329
-msgid "Select a version or enter the full url to an ISO file"
+msgid "Select a version or enter the full URL to an ISO file"
 msgstr "Selecionar uma versão ou informar url completa para arquivo ISO"
 
 #: installer.cgi:345
@@ -298,12 +289,12 @@
 msgstr "Partição home"
 
 #: installer.cgi:384
-msgid "Separate partition for /home:"
-msgstr "Usar uma partição separada para a /home:"
+msgid "Separate partition for %s:"
+msgstr "Usar uma partição separada para a %s:"
 
 #: installer.cgi:385
-msgid "Specify the partition containing /home"
-msgstr "Definir uma partição separada para a /home:"
+msgid "Specify the partition containing %s"
+msgstr "Definir uma partição separada para a %s:"
 
 #: installer.cgi:416
 msgid "Hostname"
@@ -326,7 +317,7 @@
 msgstr "Usuário root"
 
 #: installer.cgi:446
-msgid "Root passwd:"
+msgid "Root password:"
 msgstr "Senha do root:"
 
 #: installer.cgi:447
@@ -354,7 +345,7 @@
 msgstr "Nome do primeiro usuário"
 
 #: installer.cgi:494
-msgid "User passwd:"
+msgid "User password:"
 msgstr "Senha do usuário:"
 
 #: installer.cgi:495
@@ -414,7 +405,7 @@
 msgstr "Checando configurações..."
 
 #: installer.cgi:689
-msgid "Proceeding to:"
+msgid "Proceeding to: %s"
 msgstr ""
 
 #: installer.cgi:707
@@ -496,51 +487,48 @@
 #: installer.cgi:832
 msgid ""
 "If your browser doesn't automatically redirect within a few seconds, you may "
-"want to go there manually"
+"want to go there manually [here]"
 msgstr ""
 "Se o navegador não for redirecionado automaticamente após alguns segundos, "
-"deve-se ir ao endereço manualmente"
-
-#: installer.cgi:834
-msgid "here"
-msgstr "aqui"
+"deve-se ir ao endereço manualmente [aqui]"
 
 #: installer.cgi:849 installer.cgi:861 installer.cgi:874
 msgid "Tazinst Error"
 msgstr "Erro do Tazinst"
 
 #: installer.cgi:850
-msgid ""
-"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any "
-"installation can not be done without tazinst."
-msgstr ""
-"<strong>Tazinst</strong>, o instalador do SliTaz não foi encontrado. A "
-"instalação ou atualização não pode ser feita sem ele."
+#, fuzzy
+msgid "%s, the backend to %s is missing."
+msgstr "%s, o instalador do SliTaz (%s) não foi encontrado."
+
+#: installer.cgi:851 installer.cgi:864
+msgid "Any installation can not be done without %s."
+msgstr "A instalação ou atualização não pode ser feita sem ele %s."
 
 #: installer.cgi:852
-msgid "Check tazinst permissions, or reinstall the slitaz-installer package."
-msgstr "Checar permissões do Tazinst, ou reinstalar o pacote slitaz-instaler."
+msgid "Check %s permissions, or reinstall the %s package."
+msgstr "Checar permissões do %s, ou reinstalar o pacote %s."
 
 #: installer.cgi:862
-msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is not at the "
-"minimum required version. Any installation cannot be done without tazinst."
-msgstr ""
-"<strong>Tazinst</strong>, o instalador do SliTaz não foi encontrado. A "
-"instalação ou atualização não pode ser feita sem ele."
+#, fuzzy
+msgid "%s, the %s backend, is not at the minimum required version."
+msgstr "%s, o instalador do SliTaz (%s) não foi encontrado."
 
 #: installer.cgi:865 installer.cgi:878
-msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode."
-msgstr "Reinstalar o pacote slitaz-instaler, ou usar o tazinst em modo texto."
+msgid "Reinstall the %s package, or use %s in CLI mode."
+msgstr "Reinstalar o pacote %s, ou usar o %s em modo texto."
 
 #: installer.cgi:875
+#, fuzzy
 msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher "
-"version than the maximum authorized by the slitaz-installer. Any "
-"installation cannot be done."
-msgstr ""
-"<strong>Tazinst</strong>, o instalador do SliTaz não foi encontrado. A "
-"instalação ou atualização não pode ser feita sem ele."
+"%s, the %s backend, is at a higher version than the maximum authorized by "
+"the %s."
+msgstr "%s, o instalador do SliTaz (%s) não foi encontrado (%s)."
+
+#: installer.cgi:877
+#, fuzzy
+msgid "Any installation cannot be done."
+msgstr "A instalação ou atualização não pode ser feita sem ele."
 
 #: installer.cgi:995 installer.cgi:1052
 msgid "None"
diff -r fee6f859a768 -r 7877ddbcbdbe po/installer/ru.po
--- a/po/installer/ru.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/installer/ru.po	Sat Apr 09 17:22:22 2016 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: installer.cgi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-04 19:19+0100\n"
+"POT-Creation-Date: 2016-04-09 17:07+0300\n"
 "PO-Revision-Date: 2016-04-05 10:51+0300\n"
 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
 "Language-Team: \n"
@@ -119,12 +119,8 @@
 msgstr "Обновить SliTaz"
 
 #: installer.cgi:141
-msgid "Evaluate:"
-msgstr "Оценить:"
-
-#: installer.cgi:141
-msgid "Without Partitioning / Formating"
-msgstr "без изменения разделов и форматирования"
+msgid "Evaluate: Without Partitioning / Formating"
+msgstr "Оценить: без изменения разделов и форматирования"
 
 #: installer.cgi:144
 msgid "SliTaz and Windows&trade; can coexist in the same partition."
@@ -132,19 +128,17 @@
 
 #: installer.cgi:145
 msgid ""
-"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous "
-"century..."
+"SliTaz will be in the %s directory like UMSDOS did in the previous century..."
 msgstr ""
-"SliTaz будет располагаться в папке \\slitaz как это было с UMSDOS в прошлом "
-"веке…"
+"SliTaz будет располагаться в папке %s как это было с UMSDOS в прошлом веке…"
 
 #: installer.cgi:154
 msgid "ISO image file full path"
 msgstr "Полный путь к образу ISO"
 
 #: installer.cgi:155
-msgid "set /dev/cdrom for a physical CD-ROM"
-msgstr "выберите /dev/cdrom для доступа к физическому CD-ROM"
+msgid "set %s for a physical CD-ROM"
+msgstr "выберите %s для доступа к физическому CD-ROM"
 
 #: installer.cgi:158
 msgid "Target partition"
@@ -249,9 +243,7 @@
 msgstr "LiveUSB:"
 
 #: installer.cgi:271
-msgid ""
-"Enter the partition where SliTaz Live is located on\n"
-" your USB Key"
+msgid "Enter the partition where SliTaz Live is located on your USB Key"
 msgstr "Введите раздел USB-накопителя, на котором находится SliTaz Live"
 
 #: installer.cgi:286
@@ -275,7 +267,7 @@
 msgstr "Выберите версию SliTaz в интернете"
 
 #: installer.cgi:322 installer.cgi:329
-msgid "Select a version or enter the full url to an ISO file"
+msgid "Select a version or enter the full URL to an ISO file"
 msgstr ""
 "Выберите версию либо введите URL, по которому можно получить файл образа ISO"
 
@@ -300,12 +292,12 @@
 msgstr "домашняя папка"
 
 #: installer.cgi:384
-msgid "Separate partition for /home:"
-msgstr "Отдельный раздел для /home:"
+msgid "Separate partition for %s:"
+msgstr "Отдельный раздел для %s:"
 
 #: installer.cgi:385
-msgid "Specify the partition containing /home"
-msgstr "Укажите раздел для /home"
+msgid "Specify the partition containing %s"
+msgstr "Укажите раздел для %s"
 
 #: installer.cgi:416
 msgid "Hostname"
@@ -328,7 +320,7 @@
 msgstr "Администратор root"
 
 #: installer.cgi:446
-msgid "Root passwd:"
+msgid "Root password:"
 msgstr "Пароль root:"
 
 #: installer.cgi:447
@@ -356,7 +348,7 @@
 msgstr "Имя первого пользователя"
 
 #: installer.cgi:494
-msgid "User passwd:"
+msgid "User password:"
 msgstr "Пароль пользователя:"
 
 #: installer.cgi:495
@@ -416,8 +408,8 @@
 msgstr "Проверка настроек…"
 
 #: installer.cgi:689
-msgid "Proceeding to:"
-msgstr "Перейти к:"
+msgid "Proceeding to: %s"
+msgstr "Переход к %s"
 
 #: installer.cgi:707
 msgid "Errors encountered."
@@ -499,54 +491,44 @@
 #: installer.cgi:832
 msgid ""
 "If your browser doesn't automatically redirect within a few seconds, you may "
-"want to go there manually"
+"want to go there manually [here]"
 msgstr ""
 "Если через несколько секунд ваш браузер не перейдет дальше автоматически, "
-"сделайте это вручную"
-
-#: installer.cgi:834
-msgid "here"
-msgstr "(перейти)"
+"сделайте это вручную ([перейти])"
 
 #: installer.cgi:849 installer.cgi:861 installer.cgi:874
 msgid "Tazinst Error"
 msgstr "Ошибка TazInst"
 
 #: installer.cgi:850
-msgid ""
-"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any "
-"installation can not be done without tazinst."
-msgstr ""
-"Отсутствует <strong>tazinst</strong>, установщик SliTaz на жесткий диск. Без "
-"tazinst ничего не удастся установить."
+msgid "%s, the backend to %s is missing."
+msgstr "Отсутствует %s, бэкенд к %s."
+
+#: installer.cgi:851 installer.cgi:864
+msgid "Any installation can not be done without %s."
+msgstr "Без %s ничего не удастся установить."
 
 #: installer.cgi:852
-msgid "Check tazinst permissions, or reinstall the slitaz-installer package."
-msgstr ""
-"Проверьте права доступа tazinst, либо переустановите пакет slitaz-installer:"
+msgid "Check %s permissions, or reinstall the %s package."
+msgstr "Проверьте права доступа %s, либо переустановите пакет %s."
 
 #: installer.cgi:862
-msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is not at the "
-"minimum required version. Any installation cannot be done without tazinst."
-msgstr ""
-"<strong>tazinst</strong>, установщик SliTaz на жесткий диск, старее "
-"минимально необходимой версии. Без tazinst ничего не удастся установить."
+msgid "%s, the %s backend, is not at the minimum required version."
+msgstr "%s, бэкенд к %s, старее минимально необходимой версии."
 
 #: installer.cgi:865 installer.cgi:878
-msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode."
-msgstr ""
-"Переустановите пакет slitaz-installer, либо используйте tazinst в консольном "
-"режиме."
+msgid "Reinstall the %s package, or use %s in CLI mode."
+msgstr "Переустановите пакет %s, либо используйте %s в консольном режиме."
 
 #: installer.cgi:875
 msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher "
-"version than the maximum authorized by the slitaz-installer. Any "
-"installation cannot be done."
-msgstr ""
-"<strong>tazinst</strong>, установщик SliTaz на жесткий диск, более новой "
-"версии, чем поддерживается slitaz-installer. Ничего не удастся установить."
+"%s, the %s backend, is at a higher version than the maximum authorized by "
+"the %s."
+msgstr "%s, бэкенд %s, более новой версии, чем поддерживается %s."
+
+#: installer.cgi:877
+msgid "Any installation cannot be done."
+msgstr "Ничего не удастся установить."
 
 #: installer.cgi:995 installer.cgi:1052
 msgid "None"
diff -r fee6f859a768 -r 7877ddbcbdbe po/installer/sv.po
--- a/po/installer/sv.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/installer/sv.po	Sat Apr 09 17:22:22 2016 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: installer.cgi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 19:03+0100\n"
+"POT-Creation-Date: 2016-04-09 17:07+0300\n"
 "PO-Revision-Date: 2012-07-11 11:33-0000\n"
 "Last-Translator: Emil Eklund <emileklund123@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -126,11 +126,7 @@
 msgstr "Upgradera SliTaz"
 
 #: installer.cgi:141
-msgid "Evaluate:"
-msgstr ""
-
-#: installer.cgi:141
-msgid "Without Partitioning / Formating"
+msgid "Evaluate: Without Partitioning / Formating"
 msgstr ""
 
 #: installer.cgi:144
@@ -139,8 +135,7 @@
 
 #: installer.cgi:145
 msgid ""
-"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous "
-"century..."
+"SliTaz will be in the %s directory like UMSDOS did in the previous century..."
 msgstr ""
 
 #: installer.cgi:154
@@ -148,7 +143,7 @@
 msgstr ""
 
 #: installer.cgi:155
-msgid "set /dev/cdrom for a physical CD-ROM"
+msgid "set %s for a physical CD-ROM"
 msgstr ""
 
 #: installer.cgi:158
@@ -263,9 +258,7 @@
 msgstr "LiveUSB:"
 
 #: installer.cgi:271
-msgid ""
-"Enter the partition where SliTaz Live is located on\n"
-" your USB Key"
+msgid "Enter the partition where SliTaz Live is located on your USB Key"
 msgstr ""
 
 #: installer.cgi:286
@@ -289,7 +282,7 @@
 msgstr ""
 
 #: installer.cgi:322 installer.cgi:329
-msgid "Select a version or enter the full url to an ISO file"
+msgid "Select a version or enter the full URL to an ISO file"
 msgstr ""
 
 #: installer.cgi:345
@@ -313,14 +306,13 @@
 msgstr "hem partition"
 
 #: installer.cgi:384
-#, fuzzy
-msgid "Separate partition for /home:"
-msgstr "Använd en separat partition för /home:"
+msgid "Separate partition for %s:"
+msgstr "Använd en separat partition för %s:"
 
 #: installer.cgi:385
 #, fuzzy
-msgid "Specify the partition containing /home"
-msgstr "Använd en separat partition för /home:"
+msgid "Specify the partition containing %s"
+msgstr "Använd en separat partition för %s:"
 
 #: installer.cgi:416
 msgid "Hostname"
@@ -343,7 +335,7 @@
 msgstr ""
 
 #: installer.cgi:446
-msgid "Root passwd:"
+msgid "Root password:"
 msgstr "Root lösenord:"
 
 #: installer.cgi:447
@@ -373,7 +365,7 @@
 msgstr "Den första användarens namn"
 
 #: installer.cgi:494
-msgid "User passwd:"
+msgid "User password:"
 msgstr "Användar lösenord:"
 
 #: installer.cgi:495
@@ -437,7 +429,7 @@
 msgstr "Kollar efter uppdateringar..."
 
 #: installer.cgi:689
-msgid "Proceeding to:"
+msgid "Proceeding to: %s"
 msgstr ""
 
 #: installer.cgi:707
@@ -523,14 +515,10 @@
 #: installer.cgi:832
 msgid ""
 "If your browser doesn't automatically redirect within a few seconds, you may "
-"want to go there manually"
+"want to go there manually [here]"
 msgstr ""
 "Om du inte skickas vidare automatiskt inom några sekunder så kan du pröva "
-"manuellt."
-
-#: installer.cgi:834
-msgid "here"
-msgstr ""
+"manuellt [here]"
 
 #: installer.cgi:849 installer.cgi:861 installer.cgi:874
 msgid "Tazinst Error"
@@ -538,41 +526,37 @@
 
 #: installer.cgi:850
 #, fuzzy
-msgid ""
-"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any "
-"installation can not be done without tazinst."
-msgstr ""
-"<strong>tazinst</strong>, den lättviktiga SliTaz HDD installer saknas. Någon "
-"installation kan inte utföras utan tazinst."
+msgid "%s, the backend to %s is missing."
+msgstr "%s, den lättviktiga SliTaz HDD installer (%s) saknas."
+
+#: installer.cgi:851 installer.cgi:864
+msgid "Any installation can not be done without %s."
+msgstr "Någon installation kan inte utföras utan %s."
 
 #: installer.cgi:852
-#, fuzzy
-msgid "Check tazinst permissions, or reinstall the slitaz-installer package."
-msgstr ""
-"Kontrollera tazinst's rättighete eller installera om slitaz-tools paketet:"
+msgid "Check %s permissions, or reinstall the %s package."
+msgstr "Kontrollera %s's rättighete eller installera om %s paketet."
 
 #: installer.cgi:862
 #, fuzzy
-msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is not at the "
-"minimum required version. Any installation cannot be done without tazinst."
-msgstr ""
-"<strong>tazinst</strong>, den lättviktiga SliTaz HDD installer saknas. Någon "
-"installation kan inte utföras utan tazinst."
+msgid "%s, the %s backend, is not at the minimum required version."
+msgstr "%s, den lättviktiga SliTaz HDD installer (%s) saknas."
 
 #: installer.cgi:865 installer.cgi:878
-msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode."
+msgid "Reinstall the %s package, or use %s in CLI mode."
 msgstr ""
 
 #: installer.cgi:875
 #, fuzzy
 msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher "
-"version than the maximum authorized by the slitaz-installer. Any "
-"installation cannot be done."
-msgstr ""
-"<strong>tazinst</strong>, den lättviktiga SliTaz HDD installer saknas. Någon "
-"installation kan inte utföras utan tazinst."
+"%s, the %s backend, is at a higher version than the maximum authorized by "
+"the %s."
+msgstr "%s, den lättviktiga SliTaz HDD installer (%s) saknas (%s)."
+
+#: installer.cgi:877
+#, fuzzy
+msgid "Any installation cannot be done."
+msgstr "Någon installation kan inte utföras."
 
 #: installer.cgi:995 installer.cgi:1052
 msgid "None"
diff -r fee6f859a768 -r 7877ddbcbdbe po/installer/zh_CN.po
--- a/po/installer/zh_CN.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/installer/zh_CN.po	Sat Apr 09 17:22:22 2016 +0300
@@ -198,7 +198,7 @@
 msgstr "从网站上选择一个 SliTaz 版本"
 
 #: installer.cgi:223 installer.cgi:230
-msgid "Select a version or enter the full url to an ISO file"
+msgid "Select a version or enter the full URL to an ISO file"
 msgstr "选择版本或输入完整镜像文件链接"
 
 #: installer.cgi:246
@@ -226,12 +226,12 @@
 msgstr "home 分区"
 
 #: installer.cgi:285
-msgid "Separate partition for /home:"
-msgstr "单独的 /home 分区"
+msgid "Separate partition for %s:"
+msgstr "单独的 %s 分区"
 
 #: installer.cgi:286
-msgid "Specify the partition containing /home"
-msgstr "指定含有 /home 的分区"
+msgid "Specify the partition containing %s"
+msgstr "指定含有 %s 的分区"
 
 #: installer.cgi:307
 msgid "Hostname"
@@ -254,7 +254,7 @@
 msgstr "Root 超级用户"
 
 #: installer.cgi:328
-msgid "Root passwd:"
+msgid "Root password:"
 msgstr "Root 密码："
 
 #: installer.cgi:329
@@ -282,7 +282,7 @@
 msgstr "第一个用户名"
 
 #: installer.cgi:364
-msgid "User passwd:"
+msgid "User password:"
 msgstr "用户密码："
 
 #: installer.cgi:365
@@ -420,37 +420,35 @@
 msgstr "Tazinst 错误"
 
 #: installer.cgi:670
-msgid ""
-"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any "
-"installation can not be done without tazinst."
-msgstr ""
-"<strong>tazinst</strong>,  slitaz-installer 安装工具的后台进程丢失. 没有 "
-"tazinst ,任何安装都不能完成的."
+msgid "%s, the backend to %s is missing."
+msgstr "%s, %s 安装工具的后台进程丢失."
+
+#: installer.cgi:671 installer.cgi:864
+msgid "Any installation can not be done without %s."
+msgstr "没有 %s,任何安装都不能完成的."
 
 #: installer.cgi:672
-msgid "Check tazinst permissions, or reinstall the slitaz-installer package."
-msgstr "检察 tazinst  权限,或重新安装  slitaz-installer 软件包。"
+msgid "Check %s permissions, or reinstall the %s package."
+msgstr "检察 %s 权限,或重新安装 %s 软件包。"
 
 #: installer.cgi:682
-msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is not at the "
-"minimum required version. Any installation cannot be done without tazinst."
-msgstr ""
-"<strong>tazinst</strong>, slitaz-installer 软件后台进程，不是要求的最低版本，"
-"没有 tazinst ,任何安装都不能完成的."
+msgid "%s, the %s backend, is not at the minimum required version."
+msgstr "%s, %s 软件后台进程，不是要求的最低版本。"
 
 #: installer.cgi:685 installer.cgi:698
-msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode."
-msgstr "重新安装 slitaz-installer 软件包或使用 tazinst 的 CLI 模式"
+msgid "Reinstall the %s package, or use %s in CLI mode."
+msgstr "重新安装 %s 软件包或使用 %s 的 CLI 模式"
 
 #: installer.cgi:695
 msgid ""
-"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher "
-"version than the maximum authorized by the slitaz-installer. Any "
-"installation cannot be done."
-msgstr ""
-"<strong>tazinst</strong>, slitaz-installer 软件后台进程，版本已经高过 slitaz-"
-"installer 要求版本。没有 tazinst ,任何安装都不能完成的."
+"%s, the %s backend, is at a higher version than the maximum authorized by "
+"the %s."
+msgstr "%s, %s 软件后台进程，版本已经高过 %s 要求版本。"
+
+#: installer.cgi:697
+#, fuzzy
+msgid "Any installation cannot be done."
+msgstr "没有 tazinst ,任何安装都不能完成的."
 
 #: installer.cgi:825 installer.cgi:873
 msgid "None"
diff -r fee6f859a768 -r 7877ddbcbdbe po/slitaz-installer/fr.po
--- a/po/slitaz-installer/fr.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/slitaz-installer/fr.po	Sat Apr 09 17:22:22 2016 +0300
@@ -18,8 +18,8 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: slitaz-installer:23
-msgid "Welcome to the slitaz-installer"
-msgstr "Bienvenue dans l'installeur SliTaz"
+msgid "Welcome to the slitaz-installer."
+msgstr "Bienvenue dans l'installeur SliTaz."
 
 #: slitaz-installer:24
 msgid "Which type of installation do you want to start?"
@@ -34,39 +34,39 @@
 msgstr "Sélectionnez un media dans la liste suivante :"
 
 #: slitaz-installer:29
-msgid "You have selected the option to install SliTaz from an USB Key"
-msgstr "Vous avez choisi d'installer SliTaz depuis une clé USB"
+msgid "You have selected the option to install SliTaz from an USB Key."
+msgstr "Vous avez choisi d'installer SliTaz depuis une clé USB."
 
-#: slitaz-installer:31
+#: slitaz-installer:30
 msgid "Enter the partition where SliTaz Live is located:"
 msgstr "Entrez la partition où se trouve SliTaz Live :"
 
-#: slitaz-installer:33
+#: slitaz-installer:32
 msgid ""
 "You have selected the option to install SliTaz from an ISO file located on a "
 "local disk."
 msgstr ""
 "Vous avez choisi d'installer SliTaz depuis un fichier ISO du disque dur."
 
-#: slitaz-installer:35
+#: slitaz-installer:34
 msgid "Please, select a file below:"
 msgstr "Veuillez choisir un fichier ci-dessous :"
 
+#: slitaz-installer:36
+msgid "You have selected the option to install SliTaz from the web."
+msgstr "Vous avez choisi d'installer SliTaz depuis le web."
+
 #: slitaz-installer:37
-msgid "You have selected the option to install SliTaz from the web"
-msgstr "Vous avez choisi d'installer SliTaz depuis le web"
-
-#: slitaz-installer:38
 msgid "Please, select a version:"
 msgstr "Veuillez choisir une version :"
 
-#: slitaz-installer:40
-msgid "Select the source"
-msgstr "Selectionnez la source"
+#: slitaz-installer:39
+msgid "Select the source:"
+msgstr "Selectionnez la source :"
 
-#: slitaz-installer:42
-msgid "\\nDrive selection"
-msgstr "\\nChoix du disque"
+#: slitaz-installer:41
+msgid "Drive selection"
+msgstr "Choix du disque"
 
 #: slitaz-installer:42
 msgid "Please specify the partition where to install SliTaz:"
@@ -78,15 +78,17 @@
 "configuration files and the list of installed packages. Then, it will clean "
 "the partition and install the new version of SliTaz, restore the "
 "configuration files and reinstall any packages which are not present on the "
-"cdrom.\n"
-"You will need an active internet connection before upgrading."
+"CD-ROM."
 msgstr ""
 "L'installeur va mettre à jour un système SliTaz existant en "
 "sauvagardant tous les fichiers de configuration et la liste des paquets "
 "installés. Ensuite, il effacera la partition et installera la nouvelle "
 "version de SliTaz, restorera les fichiers de configuration et réinstallera "
-"les paquets absents du cdrom.\n"
-"Vous devez avoir un connexion active pour la mise à jour."
+"les paquets absents du cdrom."
+
+#: slitaz-installer:49
+msgid "You will need an active internet connection before upgrading."
+msgstr "Vous devez avoir un connexion active pour la mise à jour."
 
 #: slitaz-installer:50
 msgid "Partition containing the system to upgrade:"
@@ -96,14 +98,18 @@
 msgid ""
 "Only the filesystems actually installed on your system are listed. If you "
 "intend to use another filesystem, you have to install it before. Unless you "
-"know what you are doing, it is safe to use ext2, ext3 or ext4.\\n\\n\\Z2To "
-"format this partition, please select a filesystem below:"
+"know what you are doing, it is safe to use ext2, ext3 or ext4."
 msgstr ""
 "Seuls les systèmes de fichiers installés sur votre système sont listés. "
 "Si vous voulez utiliser un autre système de fichiers, vous devez "
 "l'installer auparavant. A moins de savoir ce que vous faîtes, vous pouvez "
-"utiliser ext2, ext3 or ext4.\\n\\n\\Z2Pour formatter cette partition, "
-"veuillez choisir un des systèmes de fichiers ci-dessous :"
+"utiliser ext2, ext3 or ext4."
+
+#: slitaz-installer:56
+msgid "To format this partition, please select a filesystem below:"
+msgstr ""
+"Pour formatter cette partition, veuillez choisir un des systèmes de fichiers "
+"ci-dessous :"
 
 #: slitaz-installer:58
 msgid "Separate /home partition"
@@ -117,13 +123,16 @@
 msgid ""
 "Hostname configuration allows you to specify the machine name. The hostname "
 "is used internally to identify the host on the network. This value can be "
-"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n"
+"changed after the system is installed."
 msgstr ""
 "La configuration du nom d'hôte ou 'hostname' vous permet de donner un nom "
 "à la machine. Le hostname est utilisé en interne pour identifier la "
 "machine sur le réseau. Il peut être changé après l'installation du "
-"système.\\n\\n\\Z2Entrez le hostname :\\Zn\\n"
-""
+"système."
+
+#: slitaz-installer:64
+msgid "Enter a hostname:"
+msgstr "Entrez le hostname :"
 
 #: slitaz-installer:66
 msgid ""
@@ -136,11 +145,11 @@
 "vous devriez toujours choisir un mot de passe compliqué avec des "
 "caractères spéciaux et/ou des chiffres."
 
-#: slitaz-installer:70
+#: slitaz-installer:69
 msgid "Enter the password for root:"
 msgstr "Entrez le mot de passe de root :"
 
-#: slitaz-installer:72
+#: slitaz-installer:71
 msgid ""
 "The default user for the system will have their personal files stored in /"
 "home/*user* (and will be automatically added to the audio group)"
@@ -153,8 +162,8 @@
 msgstr "Entrer le nom du premier utilisateur :"
 
 #: slitaz-installer:76
-msgid "The password for default user"
-msgstr "Le mot de passe du premier utilisateur"
+msgid "The password for default user."
+msgstr "Le mot de passe du premier utilisateur."
 
 #: slitaz-installer:77
 msgid ""
@@ -171,62 +180,74 @@
 #: slitaz-installer:81
 msgid ""
 "Installation is now finished, you can exit the installer or reboot on your "
-"new SliTaz GNU/Linux operating system"
+"new SliTaz GNU/Linux operating system."
 msgstr ""
 "L'installation est maintenant terminée, vous pouvez sortir de l'installeur "
-"ou redémarrer sur votre nouveau système GNU/Linux"
+"ou redémarrer sur votre nouveau système GNU/Linux."
 
 #: slitaz-installer:87
 msgid ""
 "The next step lets you format the target partition. Choose between robust, "
 "stable and/or journaled filesystem. If the partition is already formated you "
-"can skip this stage, if not just accept.\\n\n"
-"Warning! formating a partition will destroy all current data.\\n\n"
-"\\Z2Do you wish to format the partition ?\\Zn"
+"can skip this stage, if not just accept."
 msgstr ""
 "L'étape suivante consiste à formater la partition cible. Choisissez un "
 "système de fichiers stable, robuste et/ou journalé. Si la partition est "
-"déjà formattée, vous pouvez passer cette étape, sinon acceptez.\\n\n"
-"Attention ! le formatage de la partition va détruire toute vos données.\\n\n"
-"\\Z2Voulez vous formater la partition ?\\Zn"
+"déjà formattée, vous pouvez passer cette étape, sinon acceptez."
+
+#: slitaz-installer:90 slitaz-installer:101
+msgid "Warning! formating a partition will destroy all current data."
+msgstr ""
+"Attention ! le formatage de la partition va détruire toute vos données."
+
+#: slitaz-installer:91
+msgid "Do you wish to format the partition?"
+msgstr "Voulez vous formater la partition ?"
 
 #: slitaz-installer:93
 msgid ""
 "On most GNU/Linux systems users personal files are stored in the directory /"
-"home. Home can be on a separate partition or another hard disk.\\n\n"
-"\\Z2DO you want to use a separate Home partition ?\\Zn"
+"home. Home can be on a separate partition or another hard disk."
 msgstr ""
 "Sur la plupart des systèmes GNU/Linux, les fichiers personnels des "
 "utilisateurs sont placés dans le répertoire /home. /home peut être sur "
-"une partition séparée ou sur un autre disque.\\n\n"
-"\\Z2Voulez-vous utiliser une partition séparée pour /home ?\\2n"
+"une partition séparée ou sur un autre disque."
+
+#: slitaz-installer:96
+msgid "Do you want to use a separate Home partition?"
+msgstr "Voulez-vous utiliser une partition séparée pour /home ?"
 
 #: slitaz-installer:98
 msgid ""
 "/home will be installed on a separate partition. The next step lets you "
 "format the /home partition. If the partition is already formated you can "
-"skip this stage, if not just accept. Warning formating a partition will "
-"destroy all current data.\\n\n"
-"\\Z2Do you wish to format the /home partition ?\\Zn"
+"skip this stage, if not just accept."
 msgstr ""
 "/home sera installé sur une partition séparée. A l'étape suivante "
 "vous pouvez formater la partition /home. Si la partition est déjà "
-"formattée vous pouvez passer cette étape, sinon acceptez. "
-"Attention le formatage de la partititon va détruire toutes les données.\\n\n"
-"\\Z2Voulez vous formater la partition /home ?\\Zn"
+"formattée vous pouvez passer cette étape, sinon acceptez."
+
+#: slitaz-installer:102
+msgid "Do you wish to format the /home partition?"
+msgstr "Voulez vous formater la partition /home ?"
 
 #: slitaz-installer:104
 msgid ""
 "You have now the option to install a bootloader which is capable of booting "
-"almost any kind of operating system.\\n\\nIf you want to use an existing "
-"bootloader installation, skip this step and configure your bootloader to "
-"boot SliTaz (refer to your bootloader documentation on how to do this)"
+"almost any kind of operating system."
 msgstr ""
 "Vous pouvez maintenant installer un bootloader qui peut démarrer presque "
-"n'importe quel système d'exploitation.\\n\\nSi vous désirez utiliser un "
-"bootloader déjà présent, passez cette étape et configurez votre "
-"bootloader pour pouvoir lancer SliTaz (référez vous à sa documentation "
-"pour savoir comment faire)"
+"n'importe quel système d'exploitation."
+
+#: slitaz-installer:106
+msgid ""
+"If you want to use an existing bootloader installation, skip this step and "
+"configure your bootloader to boot SliTaz (refer to your bootloader "
+"documentation on how to do this)."
+msgstr ""
+"Si vous désirez utiliser un bootloader déjà présent, passez cette étape et "
+"configurez votre bootloader pour pouvoir lancer SliTaz (référez vous à sa "
+"documentation pour savoir comment faire)."
 
 #: slitaz-installer:109
 msgid "Install a bootloader?"
@@ -235,12 +256,14 @@
 #: slitaz-installer:111
 msgid ""
 "Do you want to implement a dual-boot with Windows? At start-up, you will be "
-"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n"
-"\\Z2Install a dual-boot with Windows ?"
+"asked whether you want to boot into Windows or SliTaz GNU/Linux."
 msgstr ""
 "Voulez vous avoir un double boot avec Windows ? A démarrage, on vous "
-"demandera si vous voulez démarrer Windows ou SliTaz GNU/Linux.\\n\n"
-"\\Z2Installer le double boot avec Windows ?"
+"demandera si vous voulez démarrer Windows ou SliTaz GNU/Linux."
+
+#: slitaz-installer:114
+msgid "Install a dual-boot with Windows?"
+msgstr "Installer le double boot avec Windows ?"
 
 #: slitaz-installer:116
 msgid ""
@@ -250,45 +273,59 @@
 "Résumé des paramètres d'installation et dernière chance pour abandonner "
 "ou recommencer toutes les étapes de l'installation."
 
+#: slitaz-installer:118
+msgid "Go and install SliTaz?"
+msgstr ""
+
 #: slitaz-installer:120
 msgid "Sorry, no device, nor file found or available."
 msgstr "Désolé, pas de périphérique et de fichier trouvé ou disponible."
 
 #: slitaz-installer:131 slitaz-installer:140
-msgid "Error 2: "
+msgid "Error 2:"
 msgstr "Erreur 2 :"
 
 #: slitaz-installer:132
+msgid "The lightweight SliTaz HDD installer '%s' is missing."
+msgstr "Il manque '%s', l'installeur SliTaz léger pour disque dur."
+
+#: slitaz-installer:133
+msgid "Check permissions, or reinstall the %s package."
+msgstr "Vérifiez les permissions, ou réinstallez le paquet %s."
+
+#: slitaz-installer:141
 msgid ""
-"The lightweight SliTaz HDD installer 'tazinst' is missing.\n"
-"Check permissions, or reinstall the slitaz-tools package."
+"The lightweight SliTaz HDD installer tazinst (%s) is not at the required "
+"version (%s)."
 msgstr ""
-"Il manque 'tazinst', l'installeur SliTaz léger pour disque dur.\n"
-"Vérifiez les permissions, ou réinstallez le paquet tazinst."
+
+#: slitaz-installer:143
+msgid "Use %s in an xterm or reinstall the %s package."
+msgstr ""
 
 #: slitaz-installer:268
-msgid "Mode"
-msgstr "Mode"
+msgid "Mode: %s"
+msgstr "Mode : %s"
 
 #: slitaz-installer:271
-msgid "From media"
-msgstr "Depuis le media"
+msgid "From media: %s"
+msgstr "Depuis le media : %s"
 
 #: slitaz-installer:276
-msgid "To the disk"
-msgstr "Vers le disque"
+msgid "To the disk: %s"
+msgstr "Vers le disque : %s"
 
 #: slitaz-installer:280 slitaz-installer:290
-msgid "(Formatting as"
-msgstr "(Formatage en"
+msgid "(Formatting as %s)"
+msgstr "(Formatage en %s)"
 
 #: slitaz-installer:281
 msgid "(No formatting)"
 msgstr "(Sans formatage)"
 
 #: slitaz-installer:285
-msgid "Separate /home is"
-msgstr "/home est séparé sur"
+msgid "Separate /home is: %s"
+msgstr "/home est séparé sur : %s"
 
 #: slitaz-installer:286
 msgid "No separate /home partition"
@@ -298,9 +335,13 @@
 msgid "(No /home formatting)"
 msgstr "(Pas de formatage de /home)"
 
+#: slitaz-installer:293
+msgid "Hostname: %s"
+msgstr ""
+
 #: slitaz-installer:295
-msgid "User login"
-msgstr "Login de l'utilisateur"
+msgid "User login: %s"
+msgstr "Login de l'utilisateur : %s"
 
 #: slitaz-installer:299
 msgid "Bootloader: installed"
@@ -318,6 +359,11 @@
 msgid ", no dual-boot"
 msgstr ", sans double boot"
 
+#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350
+#: slitaz-installer:378 slitaz-installer:391
+msgid "Select %s"
+msgstr ""
+
 #: slitaz-installer:325 slitaz-installer:379
 msgid "Next"
 msgstr "Suite"
@@ -334,10 +380,42 @@
 msgid "No"
 msgstr "Non"
 
+#: slitaz-installer:409
+msgid "Summary"
+msgstr ""
+
 #: slitaz-installer:419
 msgid "SliTaz install cancelled."
 msgstr "Installation de SliTaz avortée."
 
+#: slitaz-installer:567
+msgid "SliTaz Installer"
+msgstr ""
+
+#: slitaz-installer:567
+msgid "Installing..."
+msgstr ""
+
+#: slitaz-installer:573
+msgid "Installation complete"
+msgstr ""
+
+#: slitaz-installer:575
+msgid "Exit"
+msgstr ""
+
+#: slitaz-installer:576
+msgid "Reboot"
+msgstr ""
+
+#: slitaz-installer:585 slitaz-installer:597
+msgid "ESC pressed."
+msgstr ""
+
+#: slitaz-installer:588
+msgid "Process not completed"
+msgstr ""
+
 #~ msgid "Ok"
 #~ msgstr "Ok"
 
diff -r fee6f859a768 -r 7877ddbcbdbe po/slitaz-installer/pt_BR.po
--- a/po/slitaz-installer/pt_BR.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/slitaz-installer/pt_BR.po	Sat Apr 09 17:22:22 2016 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: slitaz-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-23 17:11+0100\n"
+"POT-Creation-Date: 2016-04-09 16:49+0300\n"
 "PO-Revision-Date: 2016-03-28 05:04-0300\n"
 "Last-Translator: Leonardo Laporte <hackdorte@sapo.pt>\n"
 "Language-Team: Brazilian Portuguese <i18n@slitaz.org>\n"
@@ -19,8 +19,8 @@
 "X-Generator: Poedit 1.8.6\n"
 
 #: slitaz-installer:23
-msgid "Welcome to the slitaz-installer"
-msgstr "Bem vindo ao instalador do SliTaz"
+msgid "Welcome to the slitaz-installer."
+msgstr "Bem vindo ao instalador do SliTaz."
 
 #: slitaz-installer:24
 msgid "Which type of installation do you want to start?"
@@ -35,14 +35,14 @@
 msgstr "Selecione uma mídia na lista a seguir:"
 
 #: slitaz-installer:29
-msgid "You have selected the option to install SliTaz from an USB Key"
-msgstr "Você selecionou a opção para instalar a partir de uma mídia USB"
+msgid "You have selected the option to install SliTaz from an USB Key."
+msgstr "Você selecionou a opção para instalar a partir de uma mídia USB."
 
-#: slitaz-installer:31
+#: slitaz-installer:30
 msgid "Enter the partition where SliTaz Live is located:"
 msgstr "Informe a partição na qual o SliTaz Live está localizado:"
 
-#: slitaz-installer:33
+#: slitaz-installer:32
 msgid ""
 "You have selected the option to install SliTaz from an ISO file located on a "
 "local disk."
@@ -50,25 +50,25 @@
 "Você selecionou a opção para instalar o SliTaz a partir de uma imagem ISO "
 "localizada no disco local."
 
-#: slitaz-installer:35
+#: slitaz-installer:34
 msgid "Please, select a file below:"
 msgstr "Selecione um arquivo abaixo:"
 
+#: slitaz-installer:36
+msgid "You have selected the option to install SliTaz from the web."
+msgstr "Você selecionou a opção para instalar o SliTaz a partir da web."
+
 #: slitaz-installer:37
-msgid "You have selected the option to install SliTaz from the web"
-msgstr "Você selecionou a opção para instalar o SliTaz a partir da web"
-
-#: slitaz-installer:38
 msgid "Please, select a version:"
 msgstr "Selecione uma versão:"
 
-#: slitaz-installer:40
-msgid "Select the source"
-msgstr "Selecione a origem"
+#: slitaz-installer:39
+msgid "Select the source:"
+msgstr "Selecione a origem:"
 
-#: slitaz-installer:42
-msgid "\\nDrive selection"
-msgstr "\\nSeleção de Drive"
+#: slitaz-installer:41
+msgid "Drive selection"
+msgstr "Seleção de Drive"
 
 #: slitaz-installer:42
 msgid "Please specify the partition where to install SliTaz:"
@@ -80,14 +80,16 @@
 "configuration files and the list of installed packages. Then, it will clean "
 "the partition and install the new version of SliTaz, restore the "
 "configuration files and reinstall any packages which are not present on the "
-"cdrom.\n"
-"You will need an active internet connection before upgrading."
+"CD-ROM."
 msgstr ""
 "O instalador atualizará um sistema SliTaz existente, salvando todos os "
 "arquivos de configuração e uma lista dos pacotes instalados. Então irá "
 "limpar a partição e instalar a nova versão do sistema, restaurando os "
-"arquivos de configuração e reinstalando os pacotes anterioremente "
-"existentes.\n"
+"arquivos de configuração e reinstalando os pacotes anterioremente existentes."
+
+#: slitaz-installer:49
+msgid "You will need an active internet connection before upgrading."
+msgstr ""
 "Será necessária uma conexão à internet antes do processo de atualização."
 
 #: slitaz-installer:50
@@ -98,14 +100,16 @@
 msgid ""
 "Only the filesystems actually installed on your system are listed. If you "
 "intend to use another filesystem, you have to install it before. Unless you "
-"know what you are doing, it is safe to use ext2, ext3 or ext4.\\n\\n\\Z2To "
-"format this partition, please select a filesystem below:"
+"know what you are doing, it is safe to use ext2, ext3 or ext4."
 msgstr ""
 "Somente os sistemas de arquivo existentes atualmente no sistema serão "
 "listados. Se você pretende utilizar outro sistema de arquivos, será "
 "necessário instalá-lo primeiro. A não ser que você saiba o que está fazendo, "
-"é seguro usar ext2, ext3 ou ext4.\\n\\n\\Z2 Para formatar esta partição, "
-"selecione o sistema de arquivos abaixo:"
+"é seguro usar ext2, ext3 ou ext4."
+
+#: slitaz-installer:56
+msgid "To format this partition, please select a filesystem below:"
+msgstr "Para formatar esta partição, selecione o sistema de arquivos abaixo:"
 
 #: slitaz-installer:58
 msgid "Separate /home partition"
@@ -119,12 +123,15 @@
 msgid ""
 "Hostname configuration allows you to specify the machine name. The hostname "
 "is used internally to identify the host on the network. This value can be "
-"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n"
+"changed after the system is installed."
 msgstr ""
 "A configuração de hostname permite especificar um nome para a máquina. O "
 "hostname é usado internamente pelo sistema para encontrar uma máquina na "
-"rede. Este valor pode ser mudado após o sistema ter sido instalado.\\n\\n"
-"\\Z2Informe o hostname:\\Zn\\n"
+"rede. Este valor pode ser mudado após o sistema ter sido instalado."
+
+#: slitaz-installer:64
+msgid "Enter a hostname:"
+msgstr "Informe o hostname:"
 
 #: slitaz-installer:66
 msgid ""
@@ -136,11 +143,11 @@
 "sistema. O usuário root pode danificar o sistema por isso é necessário "
 "sempre escolher uma senha forte com caracteres especiais e/ou números."
 
-#: slitaz-installer:70
+#: slitaz-installer:69
 msgid "Enter the password for root:"
 msgstr "Informe a senha para o root:"
 
-#: slitaz-installer:72
+#: slitaz-installer:71
 msgid ""
 "The default user for the system will have their personal files stored in /"
 "home/*user* (and will be automatically added to the audio group)"
@@ -153,8 +160,8 @@
 msgstr "Informe o nome do primeiro usuário:"
 
 #: slitaz-installer:76
-msgid "The password for default user"
-msgstr "Senha para o usuário padrão"
+msgid "The password for default user."
+msgstr "Senha para o usuário padrão."
 
 #: slitaz-installer:77
 msgid ""
@@ -171,62 +178,73 @@
 #: slitaz-installer:81
 msgid ""
 "Installation is now finished, you can exit the installer or reboot on your "
-"new SliTaz GNU/Linux operating system"
+"new SliTaz GNU/Linux operating system."
 msgstr ""
 "A instalação foi finalizada, você pode fechar o instalador ou reiniciar seu "
-"novo sistema operacional SliTaz GNU/Linux"
+"novo sistema operacional SliTaz GNU/Linux."
 
 #: slitaz-installer:87
 msgid ""
 "The next step lets you format the target partition. Choose between robust, "
 "stable and/or journaled filesystem. If the partition is already formated you "
-"can skip this stage, if not just accept.\\n\n"
-"Warning! formating a partition will destroy all current data.\\n\n"
-"\\Z2Do you wish to format the partition ?\\Zn"
+"can skip this stage, if not just accept."
 msgstr ""
 "O próximo passo permite formatar a partição alvo. Escolha entre sistemas de "
 "arquivos robustos, estáveis e/ou com suporte a journaling. Se a partição já "
-"estiver formatada você pode pular esse passo, caso contrário confirme.\\n\n"
-"Aviso! Formatar a partição irá apagar todos os dados nela encontrados.\\n\n"
-"\\Z2Você deseja formatar a partição?\\Zn"
+"estiver formatada você pode pular esse passo, caso contrário confirme."
+
+#: slitaz-installer:90 slitaz-installer:101
+msgid "Warning! formating a partition will destroy all current data."
+msgstr "Aviso! Formatar a partição irá apagar todos os dados nela encontrados."
+
+#: slitaz-installer:91
+msgid "Do you wish to format the partition?"
+msgstr "Você deseja formatar a partição?"
 
 #: slitaz-installer:93
 msgid ""
 "On most GNU/Linux systems users personal files are stored in the directory /"
-"home. Home can be on a separate partition or another hard disk.\\n\n"
-"\\Z2DO you want to use a separate Home partition ?\\Zn"
+"home. Home can be on a separate partition or another hard disk."
 msgstr ""
 "Na maioria dos sistemas GNU/Linux os arquivos pessoais dos usuários são "
 "armazenados no diretório /home, que pode estar numa partição em separado ou "
-"outro dísco rígido.\\n\n"
-"\\Z2Você deseja utilizar /home em separado?\\Zn"
+"outro dísco rígido."
+
+#: slitaz-installer:96
+msgid "Do you want to use a separate Home partition?"
+msgstr "Você deseja utilizar /home em separado?"
 
 #: slitaz-installer:98
 msgid ""
 "/home will be installed on a separate partition. The next step lets you "
 "format the /home partition. If the partition is already formated you can "
-"skip this stage, if not just accept. Warning formating a partition will "
-"destroy all current data.\\n\n"
-"\\Z2Do you wish to format the /home partition ?\\Zn"
+"skip this stage, if not just accept."
 msgstr ""
 "/home será instala numa partição em separado. O próximo passo permite "
 "formatar a partição. Se a partição já estiver formatada pule esse passo, "
-"caso contrário confirme. Aviso! Formatar a partição irá apagar  todos os "
-"dados nela encontrados.\\n\n"
-"\\Z2Você deseja formatar a partição /home?\\Zn"
+"caso contrário confirme."
+
+#: slitaz-installer:102
+msgid "Do you wish to format the /home partition?"
+msgstr "Você deseja formatar a partição /home?"
 
 #: slitaz-installer:104
 msgid ""
 "You have now the option to install a bootloader which is capable of booting "
-"almost any kind of operating system.\\n\\nIf you want to use an existing "
-"bootloader installation, skip this step and configure your bootloader to "
-"boot SliTaz (refer to your bootloader documentation on how to do this)"
+"almost any kind of operating system."
 msgstr ""
 "Você pode instalar o gerenciador de boot, que é capaz de iniciar "
-"praticamente todos os tipos de sistema operacional.\\n\\n Se você deseja "
-"usar um gerenciador de boot existente, pule este passo e configure seu "
-"gerenciador para iniciar o SliTaz (consulte a documentação do gerenciador de "
-"boot)"
+"praticamente todos os tipos de sistema operacional."
+
+#: slitaz-installer:106
+msgid ""
+"If you want to use an existing bootloader installation, skip this step and "
+"configure your bootloader to boot SliTaz (refer to your bootloader "
+"documentation on how to do this)."
+msgstr ""
+"Se você deseja usar um gerenciador de boot existente, pule este passo e "
+"configure seu gerenciador para iniciar o SliTaz (consulte a documentação do "
+"gerenciador de boot)."
 
 #: slitaz-installer:109
 msgid "Install a bootloader?"
@@ -235,12 +253,14 @@
 #: slitaz-installer:111
 msgid ""
 "Do you want to implement a dual-boot with Windows? At start-up, you will be "
-"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n"
-"\\Z2Install a dual-boot with Windows ?"
+"asked whether you want to boot into Windows or SliTaz GNU/Linux."
 msgstr ""
 "Deseja ativar o dual-boot com Windows? Na inicialização do sistema você "
-"deverá escolher se quer usar o Windows ou o SliTaz GNU/Linux.\\n\n"
-"\\Z2Ativar o dual-boot com Windows?"
+"deverá escolher se quer usar o Windows ou o SliTaz GNU/Linux."
+
+#: slitaz-installer:114
+msgid "Install a dual-boot with Windows?"
+msgstr "Ativar o dual-boot com Windows?"
 
 #: slitaz-installer:116
 msgid ""
@@ -250,45 +270,59 @@
 "Resumo das configurações de instalação e última chance para cancelar ou "
 "reiniciar todos os passos da instalação."
 
+#: slitaz-installer:118
+msgid "Go and install SliTaz?"
+msgstr ""
+
 #: slitaz-installer:120
 msgid "Sorry, no device, nor file found or available."
 msgstr "Nenhum dispositivo ou arquivo encontrado ou disponível."
 
 #: slitaz-installer:131 slitaz-installer:140
-msgid "Error 2: "
+msgid "Error 2:"
 msgstr "Erro 2:"
 
 #: slitaz-installer:132
+msgid "The lightweight SliTaz HDD installer '%s' is missing."
+msgstr "O Instalador do SliTaz (%s) não foi encontrado."
+
+#: slitaz-installer:133
+msgid "Check permissions, or reinstall the %s package."
+msgstr "Cheque as permissões ou reinstale o pacote %s."
+
+#: slitaz-installer:141
 msgid ""
-"The lightweight SliTaz HDD installer 'tazinst' is missing.\n"
-"Check permissions, or reinstall the slitaz-tools package."
+"The lightweight SliTaz HDD installer tazinst (%s) is not at the required "
+"version (%s)."
 msgstr ""
-"O Instalador do SliTaz (tazinst) não foi encontrado.\n"
-"Cheque as permissões ou reinstale o pacote slitaz-tools."
+
+#: slitaz-installer:143
+msgid "Use %s in an xterm or reinstall the %s package."
+msgstr ""
 
 #: slitaz-installer:268
-msgid "Mode"
-msgstr "Modo"
+msgid "Mode: %s"
+msgstr "Modo: %s"
 
 #: slitaz-installer:271
-msgid "From media"
-msgstr "À partir da mídia"
+msgid "From media: %s"
+msgstr "À partir da mídia: %s"
 
 #: slitaz-installer:276
-msgid "To the disk"
-msgstr "Para o disco"
+msgid "To the disk: %s"
+msgstr "Para o disco: %s"
 
 #: slitaz-installer:280 slitaz-installer:290
-msgid "(Formatting as"
-msgstr "(Formatando como"
+msgid "(Formatting as %s)"
+msgstr "(Formatando como %s)"
 
 #: slitaz-installer:281
 msgid "(No formatting)"
 msgstr "(Sem formatar)"
 
 #: slitaz-installer:285
-msgid "Separate /home is"
-msgstr "/home em separado é"
+msgid "Separate /home is: %s"
+msgstr "/home em separado é: %s"
 
 #: slitaz-installer:286
 msgid "No separate /home partition"
@@ -298,9 +332,13 @@
 msgid "(No /home formatting)"
 msgstr "(Sem formatar /home)"
 
+#: slitaz-installer:293
+msgid "Hostname: %s"
+msgstr ""
+
 #: slitaz-installer:295
-msgid "User login"
-msgstr "Login de usuário"
+msgid "User login: %s"
+msgstr "Login de usuário: %s"
 
 #: slitaz-installer:299
 msgid "Bootloader: installed"
@@ -318,6 +356,11 @@
 msgid ", no dual-boot"
 msgstr ", sem dual-boot"
 
+#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350
+#: slitaz-installer:378 slitaz-installer:391
+msgid "Select %s"
+msgstr ""
+
 #: slitaz-installer:325 slitaz-installer:379
 msgid "Next"
 msgstr "Próximo"
@@ -334,10 +377,42 @@
 msgid "No"
 msgstr "Não"
 
+#: slitaz-installer:409
+msgid "Summary"
+msgstr ""
+
 #: slitaz-installer:419
 msgid "SliTaz install cancelled."
 msgstr "Instalação do SliTaz cancelada."
 
+#: slitaz-installer:567
+msgid "SliTaz Installer"
+msgstr ""
+
+#: slitaz-installer:567
+msgid "Installing..."
+msgstr ""
+
+#: slitaz-installer:573
+msgid "Installation complete"
+msgstr ""
+
+#: slitaz-installer:575
+msgid "Exit"
+msgstr ""
+
+#: slitaz-installer:576
+msgid "Reboot"
+msgstr ""
+
+#: slitaz-installer:585 slitaz-installer:597
+msgid "ESC pressed."
+msgstr ""
+
+#: slitaz-installer:588
+msgid "Process not completed"
+msgstr ""
+
 #~ msgid "Ok"
 #~ msgstr "Ok"
 
diff -r fee6f859a768 -r 7877ddbcbdbe po/slitaz-installer/ru.po
--- a/po/slitaz-installer/ru.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/slitaz-installer/ru.po	Sat Apr 09 17:22:22 2016 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: slitaz-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-23 17:11+0100\n"
+"POT-Creation-Date: 2016-04-09 16:49+0300\n"
 "PO-Revision-Date: 2016-04-05 10:55+0300\n"
 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
 "Language-Team: \n"
@@ -21,8 +21,8 @@
 "X-Generator: Poedit 1.8.6\n"
 
 #: slitaz-installer:23
-msgid "Welcome to the slitaz-installer"
-msgstr "Вас приветствует программа установки SliTaz"
+msgid "Welcome to the slitaz-installer."
+msgstr "Вас приветствует программа установки SliTaz."
 
 #: slitaz-installer:24
 msgid "Which type of installation do you want to start?"
@@ -37,39 +37,39 @@
 msgstr "Выберите носитель из следующего списка:"
 
 #: slitaz-installer:29
-msgid "You have selected the option to install SliTaz from an USB Key"
-msgstr "Вы хотите установить SliTaz с USB-флешки"
+msgid "You have selected the option to install SliTaz from an USB Key."
+msgstr "Вы хотите установить SliTaz с USB-флешки."
 
-#: slitaz-installer:31
+#: slitaz-installer:30
 msgid "Enter the partition where SliTaz Live is located:"
 msgstr "Введите раздел диска, где находится SliTaz Live:"
 
-#: slitaz-installer:33
+#: slitaz-installer:32
 msgid ""
 "You have selected the option to install SliTaz from an ISO file located on a "
 "local disk."
 msgstr ""
 "Вы хотите установить SliTaz с ISO-образа, расположенного на локальном диске."
 
-#: slitaz-installer:35
+#: slitaz-installer:34
 msgid "Please, select a file below:"
 msgstr "Выберите файл:"
 
+#: slitaz-installer:36
+msgid "You have selected the option to install SliTaz from the web."
+msgstr "Вы хотите установить SliTaz из интернета."
+
 #: slitaz-installer:37
-msgid "You have selected the option to install SliTaz from the web"
-msgstr "Вы хотите установить SliTaz из интернета"
-
-#: slitaz-installer:38
 msgid "Please, select a version:"
 msgstr "Выберите версию:"
 
-#: slitaz-installer:40
-msgid "Select the source"
-msgstr "Выберите источник"
+#: slitaz-installer:39
+msgid "Select the source:"
+msgstr "Выберите источник:"
 
-#: slitaz-installer:42
-msgid "\\nDrive selection"
-msgstr "\\nВыбор привода"
+#: slitaz-installer:41
+msgid "Drive selection"
+msgstr "Выбор привода"
 
 #: slitaz-installer:42
 msgid "Please specify the partition where to install SliTaz:"
@@ -81,13 +81,16 @@
 "configuration files and the list of installed packages. Then, it will clean "
 "the partition and install the new version of SliTaz, restore the "
 "configuration files and reinstall any packages which are not present on the "
-"cdrom.\n"
-"You will need an active internet connection before upgrading."
+"CD-ROM."
 msgstr ""
 "Обновление существующей системы SliTaz: сначала будут сохранены все файлы "
 "настроек и список установленных пакетов. Затем, раздел будет очищен и "
 "установлена новая версия SliTaz, восстановлены файлы настроек и "
-"переустановлены все пакеты, отсутствующие на CD-ROM.\n"
+"переустановлены все пакеты, отсутствующие на CD-ROM."
+
+#: slitaz-installer:49
+msgid "You will need an active internet connection before upgrading."
+msgstr ""
 "Перед началом обновления убедитесь в наличии работающего соединения с "
 "интернетом."
 
@@ -99,13 +102,16 @@
 msgid ""
 "Only the filesystems actually installed on your system are listed. If you "
 "intend to use another filesystem, you have to install it before. Unless you "
-"know what you are doing, it is safe to use ext2, ext3 or ext4.\\n\\n\\Z2To "
-"format this partition, please select a filesystem below:"
+"know what you are doing, it is safe to use ext2, ext3 or ext4."
 msgstr ""
 "Список содержит только файловые системы, присутствующие в вашей системе. "
 "Если вы собираетесь использовать другую файловую систему, сначала вы должны "
 "создать ее. Если вы не знаете, что выбрать, хорошим решением будут ext2, "
-"ext3 или ext4.\\n\\n\\Z2В какую файловую систему форматировать этот раздел:"
+"ext3 или ext4."
+
+#: slitaz-installer:56
+msgid "To format this partition, please select a filesystem below:"
+msgstr "В какую файловую систему форматировать этот раздел:"
 
 #: slitaz-installer:58
 msgid "Separate /home partition"
@@ -119,11 +125,14 @@
 msgid ""
 "Hostname configuration allows you to specify the machine name. The hostname "
 "is used internally to identify the host on the network. This value can be "
-"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n"
+"changed after the system is installed."
 msgstr ""
 "Здесь вы можете выбрать имя вашего хоста. Оно используется для идентификации "
-"в сети. Его можно изменить после установки.\\n\\n\\Z2Введите  имя хоста:\\Zn"
-"\\n"
+"в сети. Его можно изменить после установки."
+
+#: slitaz-installer:64
+msgid "Enter a hostname:"
+msgstr "Введите имя хоста:"
 
 #: slitaz-installer:66
 msgid ""
@@ -135,11 +144,11 @@
 "обязательно выберите стойкий пароль, содержащий специальные символы и/или "
 "цифры."
 
-#: slitaz-installer:70
+#: slitaz-installer:69
 msgid "Enter the password for root:"
 msgstr "Введите пароль root:"
 
-#: slitaz-installer:72
+#: slitaz-installer:71
 msgid ""
 "The default user for the system will have their personal files stored in /"
 "home/*user* (and will be automatically added to the audio group)"
@@ -152,8 +161,8 @@
 msgstr "Введите имя первого пользователя:"
 
 #: slitaz-installer:76
-msgid "The password for default user"
-msgstr "Пароль первого пользователя"
+msgid "The password for default user."
+msgstr "Пароль пользователя по умолчанию."
 
 #: slitaz-installer:77
 msgid ""
@@ -170,61 +179,73 @@
 #: slitaz-installer:81
 msgid ""
 "Installation is now finished, you can exit the installer or reboot on your "
-"new SliTaz GNU/Linux operating system"
+"new SliTaz GNU/Linux operating system."
 msgstr ""
 "Установка завершена, вы можете покинуть программу инсталляции, или "
-"перезагрузиться в свежеустановленную систему SliTaz GNU/Linux"
+"перезагрузиться в свежеустановленную систему SliTaz GNU/Linux."
 
 #: slitaz-installer:87
 msgid ""
 "The next step lets you format the target partition. Choose between robust, "
 "stable and/or journaled filesystem. If the partition is already formated you "
-"can skip this stage, if not just accept.\\n\n"
-"Warning! formating a partition will destroy all current data.\\n\n"
-"\\Z2Do you wish to format the partition ?\\Zn"
+"can skip this stage, if not just accept."
 msgstr ""
 "Теперь можно отформатировать раздел. Выберите между надежной, стабильной и/"
 "или журналируемой файловой системой. Вы можете пропустить этот шаг, "
-"например, если раздел уже отформатирован.\\n\n"
-"Внимание! Форматирование раздела уничтожит все текущие данные на нём.\\n"
-"\\Z2Хотите форматировать раздел?\\Zn"
+"например, если раздел уже отформатирован."
+
+#: slitaz-installer:90 slitaz-installer:101
+msgid "Warning! formating a partition will destroy all current data."
+msgstr "Внимание! Форматирование раздела уничтожит все текущие данные на нём."
+
+#: slitaz-installer:91
+msgid "Do you wish to format the partition?"
+msgstr "Хотите форматировать раздел?"
 
 #: slitaz-installer:93
 msgid ""
 "On most GNU/Linux systems users personal files are stored in the directory /"
-"home. Home can be on a separate partition or another hard disk.\\n\n"
-"\\Z2DO you want to use a separate Home partition ?\\Zn"
+"home. Home can be on a separate partition or another hard disk."
 msgstr ""
 "Обычно в системах GNU/Linux пользовательские файлы хранятся в папке /home. "
 "Эта папка может находиться на другом разделе жесткого диска, или вообще на "
-"другом диске.\\n\n"
-"\\Z2Использовать ли отдельный раздел для папки /home?\\Zn"
+"другом диске."
+
+#: slitaz-installer:96
+msgid "Do you want to use a separate Home partition?"
+msgstr "Использовать ли отдельный раздел для папки /home?"
 
 #: slitaz-installer:98
 msgid ""
 "/home will be installed on a separate partition. The next step lets you "
 "format the /home partition. If the partition is already formated you can "
-"skip this stage, if not just accept. Warning formating a partition will "
-"destroy all current data.\\n\n"
-"\\Z2Do you wish to format the /home partition ?\\Zn"
+"skip this stage, if not just accept."
 msgstr ""
 "Папка /home будет установлена на отдельный раздел, сейчас речь идет о том, "
 "чтобы его отформатировать. Вы можете пропустить этот шаг, например, если он "
-"уже отформатирован. Внимание! Форматирование раздела уничтожит все текущие "
-"данные на нём.\\n\n"
-"\\Z2Хотите форматировать раздел /home?\\Zn"
+"уже отформатирован."
+
+#: slitaz-installer:102
+msgid "Do you wish to format the /home partition?"
+msgstr "Хотите форматировать раздел /home?"
 
 #: slitaz-installer:104
 msgid ""
 "You have now the option to install a bootloader which is capable of booting "
-"almost any kind of operating system.\\n\\nIf you want to use an existing "
-"bootloader installation, skip this step and configure your bootloader to "
-"boot SliTaz (refer to your bootloader documentation on how to do this)"
+"almost any kind of operating system."
 msgstr ""
 "Можно установить загрузчик, который поддерживает загрузку практически любой "
-"операционной системы.\\n\\nЕсли вы хотите использовать существующий "
-"загрузчик, пропустите этот шаг и настройте ваш загрузчик для запуска SliTaz "
-"(обратитесь к документации Вашего загрузчика о том, как это сделать)"
+"операционной системы."
+
+#: slitaz-installer:106
+msgid ""
+"If you want to use an existing bootloader installation, skip this step and "
+"configure your bootloader to boot SliTaz (refer to your bootloader "
+"documentation on how to do this)."
+msgstr ""
+"Если вы хотите использовать существующий загрузчик, пропустите этот шаг и "
+"настройте ваш загрузчик для запуска SliTaz (обратитесь к документации Вашего "
+"загрузчика о том, как это сделать)."
 
 #: slitaz-installer:109
 msgid "Install a bootloader?"
@@ -233,12 +254,14 @@
 #: slitaz-installer:111
 msgid ""
 "Do you want to implement a dual-boot with Windows? At start-up, you will be "
-"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n"
-"\\Z2Install a dual-boot with Windows ?"
+"asked whether you want to boot into Windows or SliTaz GNU/Linux."
 msgstr ""
 "Хотите создать режим двойной загрузки с Windows? При включении компьютера "
-"будет возможность выбрать — загрузиться в Windows или SliTaz GNU/Linux.\\n\n"
-"\\Z2Создать двойную загрузку с Windows?"
+"будет возможность выбрать — загрузиться в Windows или SliTaz GNU/Linux."
+
+#: slitaz-installer:114
+msgid "Install a dual-boot with Windows?"
+msgstr "Создать двойную загрузку с Windows?"
 
 #: slitaz-installer:116
 msgid ""
@@ -247,46 +270,62 @@
 msgstr ""
 "Итоговые настройки. Это последний шанс отменить, или начать все шаги сначала."
 
+#: slitaz-installer:118
+msgid "Go and install SliTaz?"
+msgstr "Перейти к установке SliTaz?"
+
 #: slitaz-installer:120
 msgid "Sorry, no device, nor file found or available."
 msgstr ""
 "К сожалению, ни устройство, ни файл не найдены. Возможно, они недоступны."
 
 #: slitaz-installer:131 slitaz-installer:140
-msgid "Error 2: "
-msgstr "Ошибка 2: "
+msgid "Error 2:"
+msgstr "Ошибка 2:"
 
 #: slitaz-installer:132
+msgid "The lightweight SliTaz HDD installer '%s' is missing."
+msgstr "Не удалось запустить %s, легковесный установщик SliTaz."
+
+#: slitaz-installer:133
+msgid "Check permissions, or reinstall the %s package."
+msgstr "Проверьте права доступа или переустановите пакет %s."
+
+#: slitaz-installer:141
 msgid ""
-"The lightweight SliTaz HDD installer 'tazinst' is missing.\n"
-"Check permissions, or reinstall the slitaz-tools package."
+"The lightweight SliTaz HDD installer tazinst (%s) is not at the required "
+"version (%s)."
 msgstr ""
-"Не удалось запустить tazinst, легковесный установщик SliTaz.\n"
-"Проверьте права доступа или переустановите пакет slitaz-installer."
+"Легковесный установщик SliTaz на жесткий диск tazinst (версия %s) не "
+"соответствует требуемой версии (%s)."
+
+#: slitaz-installer:143
+msgid "Use %s in an xterm or reinstall the %s package."
+msgstr "Используйте %s в терминале, либо переустановите пакет %s."
 
 #: slitaz-installer:268
-msgid "Mode"
-msgstr "Режим"
+msgid "Mode: %s"
+msgstr "Режим: %s"
 
 #: slitaz-installer:271
-msgid "From media"
-msgstr "С носителя"
+msgid "From media: %s"
+msgstr "С носителя: %s"
 
 #: slitaz-installer:276
-msgid "To the disk"
-msgstr "На диск"
+msgid "To the disk: %s"
+msgstr "На диск: %s"
 
 #: slitaz-installer:280 slitaz-installer:290
-msgid "(Formatting as"
-msgstr "(форматировать в"
+msgid "(Formatting as %s)"
+msgstr "(форматировать как %s)"
 
 #: slitaz-installer:281
 msgid "(No formatting)"
 msgstr "(не форматировать)"
 
 #: slitaz-installer:285
-msgid "Separate /home is"
-msgstr "Отдельный раздел /home"
+msgid "Separate /home is: %s"
+msgstr "Отдельный раздел /home: %s"
 
 #: slitaz-installer:286
 msgid "No separate /home partition"
@@ -296,9 +335,13 @@
 msgid "(No /home formatting)"
 msgstr "(не форматировать /home)"
 
+#: slitaz-installer:293
+msgid "Hostname: %s"
+msgstr "Название хоста: %s"
+
 #: slitaz-installer:295
-msgid "User login"
-msgstr "Логин пользователя"
+msgid "User login: %s"
+msgstr "Логин пользователя: %s"
 
 #: slitaz-installer:299
 msgid "Bootloader: installed"
@@ -316,6 +359,11 @@
 msgid ", no dual-boot"
 msgstr ", без двойной загрузки"
 
+#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350
+#: slitaz-installer:378 slitaz-installer:391
+msgid "Select %s"
+msgstr "Выбор значения %s"
+
 #: slitaz-installer:325 slitaz-installer:379
 msgid "Next"
 msgstr "Дальше"
@@ -332,10 +380,42 @@
 msgid "No"
 msgstr "Нет"
 
+#: slitaz-installer:409
+msgid "Summary"
+msgstr "Сводка"
+
 #: slitaz-installer:419
 msgid "SliTaz install cancelled."
 msgstr "Установка SliTaz отменена."
 
+#: slitaz-installer:567
+msgid "SliTaz Installer"
+msgstr "Установщик SliTaz"
+
+#: slitaz-installer:567
+msgid "Installing..."
+msgstr "Установка…"
+
+#: slitaz-installer:573
+msgid "Installation complete"
+msgstr "Установка завершена"
+
+#: slitaz-installer:575
+msgid "Exit"
+msgstr "Выйти"
+
+#: slitaz-installer:576
+msgid "Reboot"
+msgstr "Перезагрузить"
+
+#: slitaz-installer:585 slitaz-installer:597
+msgid "ESC pressed."
+msgstr "Была нажата клавиша Esc."
+
+#: slitaz-installer:588
+msgid "Process not completed"
+msgstr "Процесс не завершен"
+
 #~ msgid "Ok"
 #~ msgstr "Ок"
 
diff -r fee6f859a768 -r 7877ddbcbdbe po/slitaz-installer/slitaz-installer.pot
--- a/po/slitaz-installer/slitaz-installer.pot	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/slitaz-installer/slitaz-installer.pot	Sat Apr 09 17:22:22 2016 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: slitaz-installer \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 19:03+0100\n"
+"POT-Creation-Date: 2016-04-09 17:07+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"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: slitaz-installer:23
-msgid "Welcome to the slitaz-installer"
+msgid "Welcome to the slitaz-installer."
 msgstr ""
 
 #: slitaz-installer:24
@@ -34,37 +34,37 @@
 msgstr ""
 
 #: slitaz-installer:29
-msgid "You have selected the option to install SliTaz from an USB Key"
+msgid "You have selected the option to install SliTaz from an USB Key."
 msgstr ""
 
-#: slitaz-installer:31
+#: slitaz-installer:30
 msgid "Enter the partition where SliTaz Live is located:"
 msgstr ""
 
-#: slitaz-installer:33
+#: slitaz-installer:32
 msgid ""
 "You have selected the option to install SliTaz from an ISO file located on a "
 "local disk."
 msgstr ""
 
-#: slitaz-installer:35
+#: slitaz-installer:34
 msgid "Please, select a file below:"
 msgstr ""
 
-#: slitaz-installer:37
-msgid "You have selected the option to install SliTaz from the web"
+#: slitaz-installer:36
+msgid "You have selected the option to install SliTaz from the web."
 msgstr ""
 
-#: slitaz-installer:38
+#: slitaz-installer:37
 msgid "Please, select a version:"
 msgstr ""
 
-#: slitaz-installer:40
-msgid "Select the source"
+#: slitaz-installer:39
+msgid "Select the source:"
 msgstr ""
 
-#: slitaz-installer:42
-msgid "\\nDrive selection"
+#: slitaz-installer:41
+msgid "Drive selection"
 msgstr ""
 
 #: slitaz-installer:42
@@ -77,8 +77,11 @@
 "configuration files and the list of installed packages. Then, it will clean "
 "the partition and install the new version of SliTaz, restore the "
 "configuration files and reinstall any packages which are not present on the "
-"cdrom.\n"
-"You will need an active internet connection before upgrading."
+"CD-ROM."
+msgstr ""
+
+#: slitaz-installer:49
+msgid "You will need an active internet connection before upgrading."
 msgstr ""
 
 #: slitaz-installer:50
@@ -89,8 +92,11 @@
 msgid ""
 "Only the filesystems actually installed on your system are listed. If you "
 "intend to use another filesystem, you have to install it before. Unless you "
-"know what you are doing, it is safe to use ext2, ext3 or ext4.\\n\\n\\Z2To "
-"format this partition, please select a filesystem below:"
+"know what you are doing, it is safe to use ext2, ext3 or ext4."
+msgstr ""
+
+#: slitaz-installer:56
+msgid "To format this partition, please select a filesystem below:"
 msgstr ""
 
 #: slitaz-installer:58
@@ -105,7 +111,11 @@
 msgid ""
 "Hostname configuration allows you to specify the machine name. The hostname "
 "is used internally to identify the host on the network. This value can be "
-"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n"
+"changed after the system is installed."
+msgstr ""
+
+#: slitaz-installer:64
+msgid "Enter a hostname:"
 msgstr ""
 
 #: slitaz-installer:66
@@ -115,11 +125,11 @@
 "strong password with special characters and/or numbers."
 msgstr ""
 
-#: slitaz-installer:70
+#: slitaz-installer:69
 msgid "Enter the password for root:"
 msgstr ""
 
-#: slitaz-installer:72
+#: slitaz-installer:71
 msgid ""
 "The default user for the system will have their personal files stored in /"
 "home/*user* (and will be automatically added to the audio group)"
@@ -130,7 +140,7 @@
 msgstr ""
 
 #: slitaz-installer:76
-msgid "The password for default user"
+msgid "The password for default user."
 msgstr ""
 
 #: slitaz-installer:77
@@ -146,40 +156,56 @@
 #: slitaz-installer:81
 msgid ""
 "Installation is now finished, you can exit the installer or reboot on your "
-"new SliTaz GNU/Linux operating system"
+"new SliTaz GNU/Linux operating system."
 msgstr ""
 
 #: slitaz-installer:87
 msgid ""
 "The next step lets you format the target partition. Choose between robust, "
 "stable and/or journaled filesystem. If the partition is already formated you "
-"can skip this stage, if not just accept.\\n\n"
-"Warning! formating a partition will destroy all current data.\\n\n"
-"\\Z2Do you wish to format the partition ?\\Zn"
+"can skip this stage, if not just accept."
+msgstr ""
+
+#: slitaz-installer:90 slitaz-installer:101
+msgid "Warning! formating a partition will destroy all current data."
+msgstr ""
+
+#: slitaz-installer:91
+msgid "Do you wish to format the partition?"
 msgstr ""
 
 #: slitaz-installer:93
 msgid ""
 "On most GNU/Linux systems users personal files are stored in the directory /"
-"home. Home can be on a separate partition or another hard disk.\\n\n"
-"\\Z2DO you want to use a separate Home partition ?\\Zn"
+"home. Home can be on a separate partition or another hard disk."
+msgstr ""
+
+#: slitaz-installer:96
+msgid "Do you want to use a separate Home partition?"
 msgstr ""
 
 #: slitaz-installer:98
 msgid ""
 "/home will be installed on a separate partition. The next step lets you "
 "format the /home partition. If the partition is already formated you can "
-"skip this stage, if not just accept. Warning formating a partition will "
-"destroy all current data.\\n\n"
-"\\Z2Do you wish to format the /home partition ?\\Zn"
+"skip this stage, if not just accept."
+msgstr ""
+
+#: slitaz-installer:102
+msgid "Do you wish to format the /home partition?"
 msgstr ""
 
 #: slitaz-installer:104
 msgid ""
 "You have now the option to install a bootloader which is capable of booting "
-"almost any kind of operating system.\\n\\nIf you want to use an existing "
-"bootloader installation, skip this step and configure your bootloader to "
-"boot SliTaz (refer to your bootloader documentation on how to do this)"
+"almost any kind of operating system."
+msgstr ""
+
+#: slitaz-installer:106
+msgid ""
+"If you want to use an existing bootloader installation, skip this step and "
+"configure your bootloader to boot SliTaz (refer to your bootloader "
+"documentation on how to do this)."
 msgstr ""
 
 #: slitaz-installer:109
@@ -189,8 +215,11 @@
 #: slitaz-installer:111
 msgid ""
 "Do you want to implement a dual-boot with Windows? At start-up, you will be "
-"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n"
-"\\Z2Install a dual-boot with Windows ?"
+"asked whether you want to boot into Windows or SliTaz GNU/Linux."
+msgstr ""
+
+#: slitaz-installer:114
+msgid "Install a dual-boot with Windows?"
 msgstr ""
 
 #: slitaz-installer:116
@@ -199,34 +228,50 @@
 "installation steps."
 msgstr ""
 
+#: slitaz-installer:118
+msgid "Go and install SliTaz?"
+msgstr ""
+
 #: slitaz-installer:120
 msgid "Sorry, no device, nor file found or available."
 msgstr ""
 
 #: slitaz-installer:131 slitaz-installer:140
-msgid "Error 2: "
+msgid "Error 2:"
 msgstr ""
 
 #: slitaz-installer:132
+msgid "The lightweight SliTaz HDD installer '%s' is missing."
+msgstr ""
+
+#: slitaz-installer:133
+msgid "Check permissions, or reinstall the %s package."
+msgstr ""
+
+#: slitaz-installer:141
 msgid ""
-"The lightweight SliTaz HDD installer 'tazinst' is missing.\n"
-"Check permissions, or reinstall the slitaz-tools package."
+"The lightweight SliTaz HDD installer tazinst (%s) is not at the required "
+"version (%s)."
+msgstr ""
+
+#: slitaz-installer:143
+msgid "Use %s in an xterm or reinstall the %s package."
 msgstr ""
 
 #: slitaz-installer:268
-msgid "Mode"
+msgid "Mode: %s"
 msgstr ""
 
 #: slitaz-installer:271
-msgid "From media"
+msgid "From media: %s"
 msgstr ""
 
 #: slitaz-installer:276
-msgid "To the disk"
+msgid "To the disk: %s"
 msgstr ""
 
 #: slitaz-installer:280 slitaz-installer:290
-msgid "(Formatting as"
+msgid "(Formatting as %s)"
 msgstr ""
 
 #: slitaz-installer:281
@@ -234,7 +279,7 @@
 msgstr ""
 
 #: slitaz-installer:285
-msgid "Separate /home is"
+msgid "Separate /home is: %s"
 msgstr ""
 
 #: slitaz-installer:286
@@ -245,8 +290,12 @@
 msgid "(No /home formatting)"
 msgstr ""
 
+#: slitaz-installer:293
+msgid "Hostname: %s"
+msgstr ""
+
 #: slitaz-installer:295
-msgid "User login"
+msgid "User login: %s"
 msgstr ""
 
 #: slitaz-installer:299
@@ -265,6 +314,11 @@
 msgid ", no dual-boot"
 msgstr ""
 
+#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350
+#: slitaz-installer:378 slitaz-installer:391
+msgid "Select %s"
+msgstr ""
+
 #: slitaz-installer:325 slitaz-installer:379
 msgid "Next"
 msgstr ""
@@ -281,6 +335,38 @@
 msgid "No"
 msgstr ""
 
+#: slitaz-installer:409
+msgid "Summary"
+msgstr ""
+
 #: slitaz-installer:419
 msgid "SliTaz install cancelled."
 msgstr ""
+
+#: slitaz-installer:567
+msgid "SliTaz Installer"
+msgstr ""
+
+#: slitaz-installer:567
+msgid "Installing..."
+msgstr ""
+
+#: slitaz-installer:573
+msgid "Installation complete"
+msgstr ""
+
+#: slitaz-installer:575
+msgid "Exit"
+msgstr ""
+
+#: slitaz-installer:576
+msgid "Reboot"
+msgstr ""
+
+#: slitaz-installer:585 slitaz-installer:597
+msgid "ESC pressed."
+msgstr ""
+
+#: slitaz-installer:588
+msgid "Process not completed"
+msgstr ""
diff -r fee6f859a768 -r 7877ddbcbdbe po/slitaz-installer/zh_CN.po
--- a/po/slitaz-installer/zh_CN.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/slitaz-installer/zh_CN.po	Sat Apr 09 17:22:22 2016 +0300
@@ -19,8 +19,8 @@
 "Language: zh_CN\n"
 
 #: slitaz-installer:23
-msgid "Welcome to the slitaz-installer"
-msgstr "欢迎使用 slitaz-installer"
+msgid "Welcome to the slitaz-installer."
+msgstr "欢迎使用 slitaz-installer。"
 
 #: slitaz-installer:24
 msgid "Which type of installation do you want to start?"
@@ -35,37 +35,37 @@
 msgstr "请从下面的列表中选择一个媒介："
 
 #: slitaz-installer:29
-msgid "You have selected the option to install SliTaz from an USB Key"
-msgstr "你选择了一个选项来从 USB设备中安装系统"
+msgid "You have selected the option to install SliTaz from an USB Key."
+msgstr "你选择了一个选项来从 USB设备中安装系统。"
 
-#: slitaz-installer:31
+#: slitaz-installer:30
 msgid "Enter the partition where SliTaz Live is located:"
 msgstr "请输入 SliTaz Live 系统所在位置："
 
-#: slitaz-installer:33
+#: slitaz-installer:32
 msgid ""
 "You have selected the option to install SliTaz from an ISO file located on a "
 "local disk."
 msgstr "你选择了一个选项从本地硬盘的 ISO 文件来安装系统"
 
-#: slitaz-installer:35
+#: slitaz-installer:34
 msgid "Please, select a file below:"
 msgstr "请从下面选择一个文件："
 
+#: slitaz-installer:36
+msgid "You have selected the option to install SliTaz from the web."
+msgstr "你已经选择了从网络安装系统。"
+
 #: slitaz-installer:37
-msgid "You have selected the option to install SliTaz from the web"
-msgstr "你已经选择了从网络安装系统"
-
-#: slitaz-installer:38
 msgid "Please, select a version:"
 msgstr "请选择一个版本："
 
-#: slitaz-installer:40
-msgid "Select the source"
-msgstr "请选择源"
+#: slitaz-installer:39
+msgid "Select the source:"
+msgstr "请选择源："
 
-#: slitaz-installer:42
-msgid "\\nDrive selection"
+#: slitaz-installer:41
+msgid "Drive selection"
 msgstr "盘区选择"
 
 #: slitaz-installer:42
@@ -78,12 +78,15 @@
 "configuration files and the list of installed packages. Then, it will clean "
 "the partition and install the new version of SliTaz, restore the "
 "configuration files and reinstall any packages which are not present on the "
-"cdrom.\n"
-"You will need an active internet connection before upgrading."
+"CD-ROM."
 msgstr ""
 "安装工具会升级已经存在的 SliTaz 系统，保存所有的配置文件和已经安装的软件包列"
 "表。然后它会清空分区并安装新版本的 SliTaz 系统，重新载入配置文件，重新安装光"
-"盘镜像中不存在的软件包。升级前，你需要有效地网络连接。"
+"盘镜像中不存在的软件包。"
+
+#: slitaz-installer:49
+msgid "You will need an active internet connection before upgrading."
+msgstr "升级前，你需要有效地网络连接。"
 
 #: slitaz-installer:50
 msgid "Partition containing the system to upgrade:"
@@ -93,12 +96,14 @@
 msgid ""
 "Only the filesystems actually installed on your system are listed. If you "
 "intend to use another filesystem, you have to install it before. Unless you "
-"know what you are doing, it's safe to use ext2, ext3 or ext4.\\n\\n\\Z2To "
-"format this partition, please select a filesystem below:"
+"know what you are doing, it's safe to use ext2, ext3 or ext4."
 msgstr ""
 "只有你系统中已经安装的文件系统格式被列出。如果你想使用其它的文件系统，你需要"
-"提前安装。除非你知道你在做什么，安全起见，请使用 ext2, ext3  或 ext4。请选择"
-"下列的文件格式来格式化分区："
+"提前安装。除非你知道你在做什么，安全起见，请使用 ext2, ext3  或 ext4。"
+
+#: slitaz-installer:56
+msgid "To format this partition, please select a filesystem below:"
+msgstr "请选择下列的文件格式来格式化分区："
 
 #: slitaz-installer:58
 msgid "Separate /home partition"
@@ -112,10 +117,14 @@
 msgid ""
 "Hostname configuration allows you to specify the machine name. The hostname "
 "is used internally to identify the host on the network. This value can be "
-"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n"
+"changed after the system is installed."
 msgstr ""
 "主机名是用来指定机器的名字。主机名是用来在网络上辨识主机的。它可以在系统安装"
-"完后修改。请输入一个主机名："
+"完后修改。"
+
+#: slitaz-installer:64
+msgid "Enter a hostname:"
+msgstr "请输入一个主机名："
 
 #: slitaz-installer:66
 msgid ""
@@ -126,11 +135,11 @@
 "根管理员允许你管理和配置整个系统。根用户可以破坏你的系统，因此你应该设置一个"
 "使用特殊字符或数字的强密码。"
 
-#: slitaz-installer:70
+#: slitaz-installer:69
 msgid "Enter the password for root:"
 msgstr "请输入跟用户密码："
 
-#: slitaz-installer:72
+#: slitaz-installer:71
 msgid ""
 "The default user for the system will have their personal files stored in /"
 "home/*user* (and will be automatically added to the audio group)"
@@ -143,8 +152,8 @@
 msgstr "请输入第一个用户名："
 
 #: slitaz-installer:76
-msgid "The password for default user"
-msgstr "默认用户密码"
+msgid "The password for default user."
+msgstr "默认用户密码。"
 
 #: slitaz-installer:77
 msgid ""
@@ -159,49 +168,65 @@
 #: slitaz-installer:81
 msgid ""
 "Installation is now finished, you can exit the installer or reboot on your "
-"new SliTaz GNU/Linux operating system"
+"new SliTaz GNU/Linux operating system."
 msgstr "安装已经完成了，你可以退出你的安装软件或重启你新的 SliTaz系统了。"
 
 #: slitaz-installer:87
 msgid ""
 "The next step lets you format the target partition. Choose between robust, "
 "stable and/or journaled filesystem. If the partition is already formated you "
-"can skip this stage, if not just accept.\\n\n"
-"Warning! formating a partition will destroy all current data.\\n\n"
-"\\Z2Do you wish to format the partition ?\\Zn"
+"can skip this stage, if not just accept."
 msgstr ""
 "下一步是格式化你的目的分区。请选择兼顾坚强、稳定或有日志功能的文件系统。如果"
-"你已经分区了，请跳过本步骤。注意：格式化分区会丢失现有数据。"
+"你已经分区了，请跳过本步骤。"
+
+#: slitaz-installer:90 slitaz-installer:101
+msgid "Warning! formating a partition will destroy all current data."
+msgstr "注意：格式化分区会丢失现有数据。"
+
+#: slitaz-installer:91
+msgid "Do you wish to format the partition?"
+msgstr ""
 
 #: slitaz-installer:93
 msgid ""
 "On most GNU/Linux systems users personal files are stored in the directory /"
-"home. Home can be on a separate partition or another hard disk.\\n\n"
-"\\Z2DO you want to use a separate Home partition ?\\Zn"
+"home. Home can be on a separate partition or another hard disk."
 msgstr ""
 "大多数 GNU/Linux 系统用户个人文件存储在 /home 目录下。 Home 目录可以放在单独"
-"的分区uo其它硬盘上。你想要使用单独的 Home 分区吗？"
+"的分区uo其它硬盘上。"
+
+#: slitaz-installer:96
+msgid "Do you want to use a separate Home partition?"
+msgstr "你想要使用单独的 Home 分区吗？"
 
 #: slitaz-installer:98
 msgid ""
 "/home will be installed on a separate partition. The next step lets you "
 "format the /home partition. If the partition is already formated you can "
-"skip this stage, if not just accept. Warning formating a partition will "
-"destroy all current data.\\n\n"
-"\\Z2Do you wish to format the /home partition ?\\Zn"
+"skip this stage, if not just accept."
 msgstr ""
 "/home 即将被安装在单独的分区。下一步需要你格式化 /home 分区。 如果你已经格式"
-"化，请跳过此步。注意：格式化分区会消除所有现存数据。你想格式化 /home 分区吗？"
+"化，请跳过此步。"
+
+#: slitaz-installer:102
+msgid "Do you wish to format the /home partition?"
+msgstr "你想格式化 /home 分区吗？"
 
 #: slitaz-installer:104
 msgid ""
 "You have now the option to install a bootloader which is capable of booting "
-"almost any kind of operating system.\\n\\nIf you want to use an existing "
-"bootloader installation, skip this step and configure your bootloader to "
-"boot SliTaz (refer to your bootloader's documentation on how to do this)"
+"almost any kind of operating system."
+msgstr "你需要选择安装一个兼容大多数系统的引导。"
+
+#: slitaz-installer:106
+msgid ""
+"If you want to use an existing bootloader installation, skip this step and "
+"configure your bootloader to boot SliTaz (refer to your bootloader's "
+"documentation on how to do this)."
 msgstr ""
-"你需要选择安装一个兼容大多数系统的引导。如果你想使用已经存在的引导，请跳过此"
-"步并配置引导来启动 SliTaz （请参考你的引导软件文档来操作）。"
+"如果你想使用已经存在的引导，请跳过此步并配置引导来启动 SliTaz （请参考你的引"
+"导软件文档来操作）。"
 
 #: slitaz-installer:109
 msgid "Install a bootloader?"
@@ -210,11 +235,14 @@
 #: slitaz-installer:111
 msgid ""
 "Do you want to implement a dual-boot with Windows? At start-up, you will be "
-"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n"
-"\\Z2Install a dual-boot with Windows ?"
+"asked whether you want to boot into Windows or SliTaz GNU/Linux."
 msgstr ""
 "你想实现和 Windows 系统双系统引导吗？开机时，你会被询问引导到 Windows 还是"
-"SliTaz 系统。安装与 Windows 的双引导？"
+"SliTaz 系统。"
+
+#: slitaz-installer:114
+msgid "Install a dual-boot with Windows?"
+msgstr "安装与 Windows 的双引导？"
 
 #: slitaz-installer:116
 msgid ""
@@ -222,43 +250,60 @@
 "installation steps."
 msgstr "安装设置汇总，也是最后取消或重启安装过程的机会。"
 
+#: slitaz-installer:118
+msgid "Go and install SliTaz?"
+msgstr ""
+
 #: slitaz-installer:120
 msgid "Sorry, no device, nor file found or available."
 msgstr "对不起，没有发现设备或文件。"
 
 #: slitaz-installer:131 slitaz-installer:140
-msgid "Error 2: "
+msgid "Error 2:"
 msgstr "错误2："
 
 #: slitaz-installer:132
 msgid ""
-"The lightweight SliTaz HDD installer 'tazinst' is missing.\n"
-"Check permissions, or reinstall the slitaz-tools package."
-msgstr "轻量级 SliTaz 硬盘安装工具 tazinst 丢失。请检查权限或重新安装工具包。"
+"The lightweight SliTaz HDD installer '%s' is missing."
+msgstr "轻量级 SliTaz 硬盘安装工具 %s 丢失。"
+
+#: slitaz-installer:133
+msgid "Check permissions, or reinstall the %s package."
+msgstr "请检查权限或重新安装工具包 %s 。"
+
+#: slitaz-installer:141
+msgid ""
+"The lightweight SliTaz HDD installer tazinst (%s) is not at the required "
+"version (%s)."
+msgstr ""
+
+#: slitaz-installer:143
+msgid "Use %s in an xterm or reinstall the %s package."
+msgstr ""
 
 #: slitaz-installer:268
-msgid "Mode"
-msgstr "模式"
+msgid "Mode: %s"
+msgstr "模式：%s"
 
 #: slitaz-installer:271
-msgid "From media"
-msgstr "从媒介"
+msgid "From media: %s"
+msgstr "从媒介：%s"
 
 #: slitaz-installer:276
-msgid "To the disk"
-msgstr "到硬盘上"
+msgid "To the disk: %s"
+msgstr "到硬盘上：%s"
 
 #: slitaz-installer:280 slitaz-installer:290
-msgid "(Formatting as"
-msgstr "格式化为"
+msgid "(Formatting as %s)"
+msgstr "（格式化为%s）"
 
 #: slitaz-installer:281
 msgid "(No formatting)"
 msgstr "（不格式化）"
 
 #: slitaz-installer:285
-msgid "Separate /home is"
-msgstr "单独 /home 为"
+msgid "Separate /home is: %s"
+msgstr "单独 /home 为：%s"
 
 #: slitaz-installer:286
 msgid "No separate /home partition"
@@ -268,9 +313,13 @@
 msgid "(No /home formatting)"
 msgstr "（不格式化 /home）"
 
+#: slitaz-installer:293
+msgid "Hostname: %s"
+msgstr ""
+
 #: slitaz-installer:295
-msgid "User login"
-msgstr "用户登录"
+msgid "User login: %s"
+msgstr "用户登录：%s"
 
 #: slitaz-installer:299
 msgid "Bootloader: installed"
@@ -288,6 +337,11 @@
 msgid ", no dual-boot"
 msgstr "无双引导"
 
+#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350
+#: slitaz-installer:378 slitaz-installer:391
+msgid "Select %s"
+msgstr ""
+
 #: slitaz-installer:325 slitaz-installer:379
 msgid "Ok"
 msgstr "确认"
@@ -303,3 +357,35 @@
 #: slitaz-installer:354 slitaz-installer:412
 msgid "No"
 msgstr "否"
+
+#: slitaz-installer:409
+msgid "Summary"
+msgstr ""
+
+#: slitaz-installer:567
+msgid "SliTaz Installer"
+msgstr ""
+
+#: slitaz-installer:567
+msgid "Installing..."
+msgstr ""
+
+#: slitaz-installer:573
+msgid "Installation complete"
+msgstr ""
+
+#: slitaz-installer:575
+msgid "Exit"
+msgstr ""
+
+#: slitaz-installer:576
+msgid "Reboot"
+msgstr ""
+
+#: slitaz-installer:585 slitaz-installer:597
+msgid "ESC pressed."
+msgstr ""
+
+#: slitaz-installer:588
+msgid "Process not completed"
+msgstr ""
diff -r fee6f859a768 -r 7877ddbcbdbe po/tazinst/es.po
--- a/po/tazinst/es.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/tazinst/es.po	Sat Apr 09 17:22:22 2016 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tazinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-04 11:45+0200\n"
+"POT-Creation-Date: 2016-04-09 16:49+0300\n"
 "PO-Revision-Date: 2011-08-11 20:52-0300\n"
 "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -77,7 +77,7 @@
 msgstr ""
 
 #: tazinst:83
-msgid "Grub legacy bootloader"
+msgid "GRUB legacy bootloader"
 msgstr ""
 
 #: tazinst:84
@@ -101,7 +101,7 @@
 msgstr ""
 
 #: tazinst:99
-msgid "Stable basic graphic version with only Gtk"
+msgid "Stable basic graphic version with only GTK"
 msgstr ""
 
 #: tazinst:101
@@ -113,119 +113,113 @@
 msgstr ""
 
 #: tazinst:114 tazinst:138 tazinst:150
-msgid "SliTaz GNU/Linux Installer - Version:"
+msgid "SliTaz GNU/Linux Installer - Version: %s"
 msgstr ""
 
+#: tazinst:115
+msgid "Usage:"
+msgstr "Uso:"
+
 #: tazinst:116
-msgid "Usage"
-msgstr "Uso"
+#, fuzzy
+msgid "%s [command] <setting> <value> <file>"
+msgstr "%s [commando] [config-file|url|optiones]"
 
 #: tazinst:117
-#, fuzzy
-msgid "tazinst [command] <setting> <value> <file>"
-msgstr "tazinst [commando] [config-file|url|optiones]"
+msgid "Commands:"
+msgstr "Comandos:"
 
 #: tazinst:119
-msgid "Commands"
-msgstr "Comandos"
-
-#: tazinst:120
 msgid "Create a new install file."
 msgstr ""
 
-#: tazinst:121
+#: tazinst:120
 msgid "Change value of a setting."
 msgstr ""
 
-#: tazinst:122
+#: tazinst:121
 msgid "Clear a setting."
 msgstr ""
 
-#: tazinst:123
+#: tazinst:122
 msgid "Get the value of a setting."
 msgstr ""
 
-#: tazinst:124
+#: tazinst:123
 msgid "Check settings."
 msgstr ""
 
-#: tazinst:125
+#: tazinst:124
 msgid "Print a short help on settings"
 msgstr ""
 
-#: tazinst:126
+#: tazinst:125
 msgid "List system resources."
 msgstr ""
 
+#: tazinst:126
+msgid "Execute a SliTaz installation."
+msgstr ""
+
 #: tazinst:127
-#, fuzzy
-msgid "Execute a SliTaz installation."
-msgstr "Tazinst - Instalador SliTaz - Versión"
-
-#: tazinst:128
 msgid "Display log file contents."
 msgstr ""
 
-#: tazinst:129
+#: tazinst:128
 msgid "Clean install and log files."
 msgstr ""
 
-#: tazinst:130
+#: tazinst:129
 msgid "Print version and exit."
 msgstr ""
 
-#: tazinst:131
+#: tazinst:130
 msgid "Print this short usage."
 msgstr "Imprime este corto uso."
 
-#: tazinst:141
-msgid "Unknown command!"
+#: tazinst:140
+msgid "'%s': Unknown command!"
 msgstr ""
 
 #: tazinst:142
-msgid "Run"
+msgid "Run: '%s' to get a list of available commands."
 msgstr ""
 
-#: tazinst:143
-msgid "to get a list of available commands"
-msgstr ""
-
-#: tazinst:153
-msgid "Unknown option!"
+#: tazinst:152
+msgid "'%s': Unknown option!"
 msgstr ""
 
 #: tazinst:154
-msgid "Please select one of these options"
+msgid "Please select one of these options:"
 msgstr ""
 
 #: tazinst:173
-#, fuzzy
 msgid "Warning: file already exists."
-msgstr "Partición en uso"
+msgstr ""
 
 #: tazinst:180
-#, fuzzy
 msgid "Error: Cannot create file."
-msgstr "Incapaz de leer el archivo de configuración"
+msgstr ""
 
 #: tazinst:278 tazinst:283
-#, fuzzy
-msgid "Error: Unable to read install file"
-msgstr "Incapaz de leer el archivo de configuración"
+msgid "Error: Unable to read install file."
+msgstr ""
 
-#: tazinst:389
-#, fuzzy
+#: tazinst:355
+msgid "Error: '%s' unknown setting."
+msgstr ""
+
+#: tazinst:383
 msgid "Error: Unable to write to install file."
-msgstr "Incapaz de leer el archivo de configuración"
+msgstr ""
 
 #: tazinst:443
-msgid "Deleting install file"
+msgid "Deleting install file: %s"
 msgstr ""
 
 #: tazinst:445
-#, fuzzy
-msgid "Error: Unable to delete install file"
-msgstr "Incapaz de leer el archivo de configuración"
+msgid "Error: Unable to delete install file."
+msgstr ""
 
 #: tazinst:460
 msgid ""
@@ -241,17 +235,11 @@
 msgstr ""
 
 #: tazinst:485
-#, fuzzy
-msgid "Error:"
-msgstr "Error"
-
-#: tazinst:485
-#, fuzzy
-msgid "Invalid keyword."
-msgstr "Fuente inválida"
+msgid "Error: '%s' Invalid keyword."
+msgstr ""
 
 #: tazinst:486
-msgid "Select one of these options:"
+msgid "Select one of these options: %s."
 msgstr ""
 
 #: tazinst:487
@@ -260,32 +248,30 @@
 
 #: tazinst:502
 #, fuzzy
-msgid "Error: Partition not found"
+msgid "Error: Partition not found."
 msgstr "Partición no encontrada"
 
 #: tazinst:503
-msgid "To see available partitions, run"
+msgid "To see available partitions, run '%s'."
 msgstr ""
 
 #: tazinst:518
-#, fuzzy
-msgid "Error: Source file not found"
-msgstr "Archivo no encontrado"
+msgid "Error: Source file not found."
+msgstr ""
 
 #: tazinst:533
-msgid "Error: invalid URL"
+msgid "Error: invalid URL."
 msgstr ""
 
-#: tazinst:549
+#: tazinst:548
 msgid "Error: multiple assignations for a disk."
 msgstr ""
 
 #: tazinst:562
-#, fuzzy
-msgid "Error: password too long"
-msgstr "Partición no encontrada"
+msgid "Error: password too long."
+msgstr ""
 
-#: tazinst:568
+#: tazinst:567
 msgid "Error: Unallowed characters in password."
 msgstr ""
 
@@ -297,12 +283,16 @@
 msgid "Warning: no password!"
 msgstr ""
 
+#: tazinst:590
+msgid "%s Error: Too short."
+msgstr ""
+
 #: tazinst:594
-msgid "Error: Too long."
+msgid "%s Error: Too long."
 msgstr ""
 
 #: tazinst:599
-msgid "Error: Invalid chars."
+msgid "%s Error: Invalid chars."
 msgstr ""
 
 #: tazinst:611
@@ -310,7 +300,7 @@
 msgstr ""
 
 #: tazinst:625
-msgid "Error: Unsupported Partition Table"
+msgid "Error: Unsupported Partition Table."
 msgstr ""
 
 #: tazinst:630
@@ -326,82 +316,82 @@
 msgstr ""
 
 #: tazinst:753
-msgid "Type: tazinst help web"
+msgid "Type: %s"
 msgstr ""
 
 #: tazinst:758
+msgid "List of settings:"
+msgstr ""
+
+#: tazinst:760
 #, fuzzy
 msgid "Mode of install"
 msgstr "No está instalado."
 
-#: tazinst:759
+#: tazinst:761
 msgid "Media containing the SliTaz source files"
 msgstr ""
 
-#: tazinst:760
+#: tazinst:762
 #, fuzzy
 msgid "Source file containing SliTaz"
 msgstr "Archivo no encontrado"
 
-#: tazinst:761
+#: tazinst:763
 #, fuzzy
 msgid "The name of the target partition"
 msgstr "Desmontando objetivo"
 
-#: tazinst:762
+#: tazinst:764
 #, fuzzy
 msgid "Format of the target partition"
 msgstr "Formato partición /home"
 
-#: tazinst:763
+#: tazinst:765
 #, fuzzy
 msgid "Separate home partition"
 msgstr "Formato partición /home"
 
-#: tazinst:764
+#: tazinst:766
 #, fuzzy
 msgid "Format of the root partition"
 msgstr "Formato partición /home"
 
-#: tazinst:765 tazinst:811
+#: tazinst:767 tazinst:811
 msgid "Name of the system"
 msgstr ""
 
-#: tazinst:766 tazinst:813
+#: tazinst:768 tazinst:813
 msgid "Superuser password"
 msgstr ""
 
-#: tazinst:767 tazinst:815
+#: tazinst:769 tazinst:815
 msgid "First user name"
 msgstr ""
 
-#: tazinst:768 tazinst:817
+#: tazinst:770 tazinst:817
 msgid "First user password"
 msgstr ""
 
-#: tazinst:769
+#: tazinst:771
 msgid "Install a bootloader"
 msgstr ""
 
-#: tazinst:770
+#: tazinst:772
 #, fuzzy
 msgid "Partition to dualboot Windows from"
 msgstr "Partición no encontrada"
 
-#: tazinst:771
-msgid "List of settings:"
-msgstr ""
-
 #: tazinst:790
 msgid "CD. Automatically set"
 msgstr ""
 
 #: tazinst:793
-msgid "USB partition. For a list, type: tazinst list usb"
+msgid "USB partition. For a list, type: %s"
 msgstr ""
 
 #: tazinst:796
-msgid "ISO file name. For a list, type: tazinst list iso"
+msgid "ISO file name. For a list, type: %s"
 msgstr ""
 
 #: tazinst:822
@@ -409,29 +399,31 @@
 msgstr ""
 
 #: tazinst:1127
-msgid "No mirror list found, run tazpkg recharge."
+msgid "No mirror list found, run %s."
 msgstr ""
 
 #: tazinst:1139
-msgid "Downloading:"
+msgid "Downloading: %s"
 msgstr ""
 
 #: tazinst:1146
-#, fuzzy
 msgid "Download completed."
-msgstr "Falló al descargar."
-
-#: tazinst:1148
-#, fuzzy
-msgid "Download failed."
-msgstr "Falló al descargar."
+msgstr ""
 
 #: tazinst:1157
-msgid "Installing package to the current system:"
+msgid "Installing package %s to the current system."
+msgstr ""
+
+#: tazinst:1159
+msgid "Cannot install %s."
 msgstr ""
 
 #: tazinst:1167
-msgid "Adding package to the target system:"
+msgid "Adding package %s to the target system..."
+msgstr ""
+
+#: tazinst:1182
+msgid "=== Tazinst: started on %s ==="
 msgstr ""
 
 #: tazinst:1208
@@ -439,8 +431,12 @@
 msgstr ""
 
 #: tazinst:1209 tazinst:1213
-msgid "Error"
-msgstr "Error"
+msgid "Error: %s"
+msgstr "Error: %s"
+
+#: tazinst:1216
+msgid "=== Tazinst error on %s ==="
+msgstr ""
 
 #: tazinst:1225
 #, fuzzy
@@ -452,21 +448,26 @@
 msgstr "Cancelado por usuario"
 
 #: tazinst:1251
-msgid "Using files from"
+msgid "Using files from %s."
 msgstr ""
 
 #: tazinst:1253
-msgid "Mount failed"
+msgid "%s: Mount failed."
 msgstr ""
 
-#: tazinst:1262 tazinst:1267
+#: tazinst:1262
 #, fuzzy
-msgid "Using files from USB device"
+msgid "Using files from USB device..."
+msgstr "Falló el montaje del dispositivo USB..."
+
+#: tazinst:1267
+#, fuzzy
+msgid "Using files from USB device %s."
 msgstr "Falló el montaje del dispositivo USB"
 
 #: tazinst:1269
-msgid "Failed to mount USB device"
-msgstr "Falló el montaje del dispositivo USB"
+msgid "%s: Failed to mount USB device."
+msgstr "%s: Falló el montaje del dispositivo USB."
 
 #: tazinst:1284
 msgid "md5sum error, file corrupted."
@@ -474,19 +475,19 @@
 
 #: tazinst:1287
 #, fuzzy
-msgid "md5 file not found, cannot check integrity."
-msgstr "archivo md5 no encontrado. Incapaz de comprobar integridad."
+msgid "%s: md5 file not found, cannot check integrity."
+msgstr "%s: archivo md5 no encontrado. Incapaz de comprobar integridad."
 
 #: tazinst:1292
-msgid "Using files from ISO"
+msgid "Using files from ISO %s."
 msgstr ""
 
 #: tazinst:1294
-msgid "Failed to mount ISO."
-msgstr "Falló al montar ISO."
+msgid "%s: Failed to mount ISO."
+msgstr "%s: Falló al montar ISO."
 
 #: tazinst:1316 tazinst:1404
-msgid "Creating mount point:"
+msgid "Creating mount point: %s..."
 msgstr ""
 
 #: tazinst:1332
@@ -502,9 +503,14 @@
 msgstr ""
 
 #: tazinst:1349
-msgid "Format"
+msgid "Format %s (%s)"
 msgstr ""
 
+#: tazinst:1354 tazinst:1366
+#, fuzzy
+msgid "Formatting has failed"
+msgstr "Formatear partición principal:"
+
 #: tazinst:1373
 #, fuzzy
 msgid "Preparing target partition..."
@@ -521,48 +527,46 @@
 msgstr "Partición en uso"
 
 #: tazinst:1389
-msgid "The partition will be cleaned..."
+msgid "%s: The partition will be cleaned..."
 msgstr ""
 
 #: tazinst:1398
-msgid "The partition will be kept..."
+msgid "%s: The partition will be kept..."
 msgstr ""
 
 #: tazinst:1413
-#, fuzzy
-msgid "Unable to mount partition"
-msgstr "Formato partición root"
+msgid "%s: Unable to mount partition"
+msgstr ""
 
 #: tazinst:1427
-#, fuzzy
-msgid "Unmounting target partition:"
-msgstr "Desmontando objetivo"
+msgid "Unmounting target partition: %s"
+msgstr ""
 
 #: tazinst:1433
-#, fuzzy
-msgid "Unmounting:"
-msgstr "Desmontando"
+msgid "Unmounting: %s"
+msgstr ""
 
 #: tazinst:1437
-#, fuzzy
-msgid "Unlinking:"
-msgstr "Desmontando"
+msgid "Unlinking: %s"
+msgstr ""
 
 #: tazinst:1443
-msgid "Ejecting cdrom..."
+msgid "Ejecting CD-ROM..."
 msgstr "eyectando cdrom..."
 
 #: tazinst:1452
 #, fuzzy
-msgid "Process completed. You can now restart (reboot)"
-msgstr "Instalación completa. Puede reiniciar"
+msgid ""
+"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux "
+"system."
+msgstr "Instalación completa. Puede reiniciar de su sistema SliTaz GNU/Linux."
 
-#: tazinst:1453
-msgid "from your SliTaz GNU/Linux system."
-msgstr "de su sistema SliTaz GNU/Linux"
+#: tazinst:1454
+msgid "=== Tazinst ended on %s ==="
+msgstr ""
 
 #: tazinst:1457
-msgid "Copying log to /var/log/tazinst.log"
+msgid "Copying log to %s"
 msgstr ""
 
 #: tazinst:1493
@@ -574,61 +578,75 @@
 msgstr "Activando inicio dual Windows"
 
 #: tazinst:1610
+msgid "Installing GRUB on: %s"
+msgstr ""
+
+#: tazinst:1611
 #, fuzzy
-msgid "Installing grub on:"
-msgstr "Instalando SliTaz en"
+msgid "GRUB not found"
+msgstr "Archivo no encontrado"
 
 #: tazinst:1615
 msgid "Setting the boot flag"
 msgstr ""
 
 #: tazinst:1620 tazinst:1748
-#, fuzzy
 msgid "Copying splash image"
-msgstr "Copiando archivos log"
+msgstr ""
 
 #: tazinst:1710
+msgid "Installing Syslinux"
+msgstr ""
+
+#: tazinst:1720
 #, fuzzy
-msgid "Installing syslinux"
-msgstr "Instalando SliTaz en"
+msgid "Syslinux not found"
+msgstr "Archivo no encontrado"
 
 #: tazinst:1724
 msgid "Setting the boot flag on"
 msgstr ""
 
+#: tazinst:1727
+#, fuzzy
+msgid "mbr.bin not found"
+msgstr "Archivo no encontrado"
+
 #: tazinst:1728
-#, fuzzy
-msgid "Installing mbr"
-msgstr "Instalar Grub"
+msgid "Installing MBR"
+msgstr ""
 
 #: tazinst:1732
 msgid "Setting the legacy_boot flag on"
 msgstr ""
 
 #: tazinst:1741
+msgid "Installing GPTMBR"
+msgstr ""
+
+#: tazinst:1742
 #, fuzzy
-msgid "Installing gptmbr"
-msgstr "Instalar Grub"
+msgid "gptmbr.bin not found"
+msgstr "Archivo no encontrado"
 
 #: tazinst:1781
-#, fuzzy
-msgid "Cleaning the root partition"
-msgstr "Desmontando objetivo"
+msgid "Cleaning the root partition (%s)..."
+msgstr ""
 
 #: tazinst:1790 tazinst:2063
-msgid "keeping /home found on:"
+msgid "keeping /home found on: %s"
 msgstr ""
 
-#: tazinst:1795
-msgid "removing target:"
+#: tazinst:1795 tazinst:2077
+msgid "removing target: %s"
 msgstr ""
 
 #: tazinst:1813
-msgid "Kernel name not found, falling back to:"
+msgid "Kernel name not found, falling back to: %s"
 msgstr ""
 
 #: tazinst:1819
-msgid "install_kernel:"
+msgid "install_kernel: %s"
 msgstr ""
 
 #: tazinst:1905
@@ -637,61 +655,61 @@
 msgstr "Restaurando /etc, /home"
 
 #: tazinst:1911
-msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..."
+msgid "Adding / partition and CHECK_FS to file %s..."
 msgstr ""
 
 #: tazinst:1914
-msgid "Configuring host name:"
-msgstr "Configurando el nombre de host:"
+msgid "Configuring host name: %s"
+msgstr "Configurando el nombre de host: %s"
 
 #: tazinst:1977
 #, fuzzy
-msgid "Configuring partition to be used as /home:"
-msgstr "Configurando partición para ser usada como /home..."
+msgid "Configuring partition to be used as /home: %s"
+msgstr "Configurando partición para ser usada como /home: %s"
 
 #: tazinst:1996
 #, fuzzy
-msgid "Installing SliTaz on:"
+msgid "Installing SliTaz on: %s"
 msgstr "Instalando SliTaz en"
 
 #: tazinst:1997 tazinst:2176
-msgid "Checking settings"
+msgid "Checking settings..."
 msgstr ""
 
 #: tazinst:2001 tazinst:2180
-msgid "Preparing source media"
+msgid "Preparing source media..."
 msgstr ""
 
 #: tazinst:2004 tazinst:2183
-msgid "Preparing target disk"
+msgid "Preparing target disk..."
 msgstr ""
 
 #: tazinst:2007
-msgid "Cleaning the root partition if necessary"
+msgid "Cleaning the root partition if necessary..."
 msgstr ""
 
 #: tazinst:2010 tazinst:2192
-msgid "Extracting the root system"
+msgid "Extracting the root system..."
 msgstr ""
 
 #: tazinst:2013 tazinst:2198
 #, fuzzy
-msgid "Installing the kernel"
+msgid "Installing the Kernel..."
 msgstr "Instalando SliTaz en"
 
 #: tazinst:2016
 #, fuzzy
-msgid "Preconfiguring the system"
+msgid "Preconfiguring the system..."
 msgstr "Configurando el nombre de host:"
 
 #: tazinst:2019
 #, fuzzy
-msgid "Configuring root and default user account"
+msgid "Configuring root and default user account..."
 msgstr "Configurando root y cuenta de usuario predeterminada..."
 
 #: tazinst:2022
 #, fuzzy
-msgid "Configuring /home"
+msgid "Configuring /home..."
 msgstr "Configurando el nombre de host:"
 
 #: tazinst:2025
@@ -703,31 +721,31 @@
 msgstr ""
 
 #: tazinst:2042
-msgid "Preparing upgrade of SliTaz release:"
-msgstr "Preparando actualización de SliTaz, versión:"
+msgid "Preparing upgrade of SliTaz release: %s"
+msgstr "Preparando actualización de SliTaz, versión: %s"
 
 #: tazinst:2044
 msgid ""
-"This partition doesn't appear to contain a valid SliTaz system, the file: /"
-"etc/slitaz-release doesn't exist."
+"%s: This partition doesn't appear to contain a valid SliTaz system, the "
+"file: %s doesn't exist."
 msgstr ""
-"Esta partición no parece contener un sistema válido SliTaz. La fila: /etc/"
-"slitaz-release no existe."
+"%s: Esta partición no parece contener un sistema válido SliTaz. La fila: %s "
+"no existe."
 
 #: tazinst:2067
-msgid "keeping /etc found on:"
+msgid "keeping /etc found on: %s"
 msgstr ""
 
 #: tazinst:2071
-msgid "keeping /var/www found on:"
+msgid "keeping /var/www found on: %s"
 msgstr ""
 
 #: tazinst:2098
-msgid "backups restored:"
+msgid "backups restored: %s"
 msgstr ""
 
 #: tazinst:2105
-msgid "backups saved in /var/lib/tazinst"
+msgid "backups saved in %s"
 msgstr ""
 
 #: tazinst:2112
@@ -745,7 +763,7 @@
 
 #: tazinst:2132
 #, fuzzy
-msgid "Installing:"
+msgid "Installing: %s..."
 msgstr "Instalando SliTaz en"
 
 #: tazinst:2141
@@ -757,12 +775,8 @@
 msgid "Creating package lists..."
 msgstr "Actualizando paquetes agregados..."
 
-#: tazinst:2152
-msgid "packages-source.list: done"
-msgstr ""
-
-#: tazinst:2156
-msgid "packages-selection.diff: done"
+#: tazinst:2152 tazinst:2156
+msgid "%s: done"
 msgstr ""
 
 #: tazinst:2163
@@ -770,44 +784,39 @@
 msgid ""
 "The list of available packages on the mirror could not be downloaded. No "
 "missing packages will be reinstalled now, but you can do so later by looking "
-"at the following list:\n"
-"/var/lib/tazinst/packages-selection.diff"
+"at the following list:"
 msgstr ""
 "La lista de los paquetes disponibles en el espejo, no pueden ser "
 "descargados. No missing packages will be reinstalled now, pero puedes luego "
-"mirar en la siguiente lista: /var/lib/tazinst/packages-selection.diff"
+"mirar en la siguiente lista:"
 
 #: tazinst:2175
-msgid "Upgrading SliTaz on:"
-msgstr "Actualizando SliTaz en :"
+msgid "Upgrading SliTaz on: %s"
+msgstr "Actualizando SliTaz en : %s"
 
 #: tazinst:2186
-msgid "Searching for /etc/slitaz-release"
+msgid "Searching for %s..."
 msgstr ""
 
 #: tazinst:2189
-msgid "Backup /etc, /home and the packages list"
-msgstr "Hacer copias de seguridad de /etc, /home y la lista de paquetes"
+msgid "Backup /etc, /home and the packages list..."
+msgstr "Hacer copias de seguridad de /etc, /home y la lista de paquetes..."
 
 #: tazinst:2195
 #, fuzzy
-msgid "Restoring configuration files"
+msgid "Restoring configuration files..."
 msgstr "Restaurando archivos de configuración..."
 
 #: tazinst:2201
 #, fuzzy
-msgid "Upgrading added packages"
+msgid "Upgrading added packages..."
 msgstr "Actualizando paquetes agregados..."
 
 #: tazinst:2204
-msgid "Bootloader"
+msgid "Bootloader..."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Using files from USB device..."
-#~ msgstr "Falló el montaje del dispositivo USB"
-
-#, fuzzy
 #~ msgid "Install SliTaz on HDD using setup file contents."
 #~ msgstr "Instala SliTaz en un disco duro usando un archivo de configuración."
 
@@ -849,10 +858,6 @@
 #~ msgstr "No provista de un archivo de configuración"
 
 #, fuzzy
-#~ msgid "URL not found"
-#~ msgstr "Archivo no encontrado"
-
-#, fuzzy
 #~ msgid "Unknown filesystem (/)"
 #~ msgstr "Sistema de archivos desconocido"
 
@@ -891,9 +896,6 @@
 #~ msgid "Grub update"
 #~ msgstr "Actualizar Grub"
 
-#~ msgid "Backup /etc, /home and the packages list..."
-#~ msgstr "Creando copia de seguridad /etc, /home y la lista de paquetes..."
-
 #, fuzzy
 #~ msgid "Upgrade finished. You can now restart (reboot)"
 #~ msgstr ""
@@ -997,9 +999,6 @@
 #~ msgid "Continue:(y/n)"
 #~ msgstr "Continuar:(y/n)"
 
-#~ msgid "Formatting main partition:"
-#~ msgstr "Formatear partición principal:"
-
 #~ msgid "Can't mount"
 #~ msgstr "No se puede montar"
 
diff -r fee6f859a768 -r 7877ddbcbdbe po/tazinst/fr.po
--- a/po/tazinst/fr.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/tazinst/fr.po	Sat Apr 09 17:22:22 2016 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-04 11:45+0200\n"
+"POT-Creation-Date: 2016-04-09 16:49+0300\n"
 "PO-Revision-Date: 2012-05-19 11:20+0200\n"
 "Last-Translator: Dominique Corbex <domcox@slitaz.org>\n"
 "Language-Team: French\n"
@@ -79,7 +79,7 @@
 msgstr "Sélection automatique"
 
 #: tazinst:83
-msgid "Grub legacy bootloader"
+msgid "GRUB legacy bootloader"
 msgstr "L'amorceur originel Grub"
 
 #: tazinst:84
@@ -103,7 +103,7 @@
 msgstr "Version stable graphique de base sans applications graphiques"
 
 #: tazinst:99
-msgid "Stable basic graphic version with only Gtk"
+msgid "Stable basic graphic version with only GTK"
 msgstr "Version stable graphique avec Gtk uniquement"
 
 #: tazinst:101
@@ -115,88 +115,84 @@
 msgstr "Version de développement en temps réel mise à jour chaque jour"
 
 #: tazinst:114 tazinst:138 tazinst:150
-msgid "SliTaz GNU/Linux Installer - Version:"
-msgstr "Installeur SliTaz GNU/Linux - Version :"
+msgid "SliTaz GNU/Linux Installer - Version: %s"
+msgstr "Installeur SliTaz GNU/Linux - Version : %s"
+
+#: tazinst:115
+msgid "Usage:"
+msgstr "Usage:"
 
 #: tazinst:116
-msgid "Usage"
-msgstr "Usage"
+msgid "%s [command] <setting> <value> <file>"
+msgstr "%s [commande] <paramétrage> <valeur> <fichier>"
 
 #: tazinst:117
-msgid "tazinst [command] <setting> <value> <file>"
-msgstr "tazinst [commande] <paramétrage> <valeur> <fichier>"
+msgid "Commands:"
+msgstr "Commandes:"
 
 #: tazinst:119
-msgid "Commands"
-msgstr "Commandes"
-
-#: tazinst:120
 msgid "Create a new install file."
 msgstr "Crée un nouveau fichier de paramètres."
 
-#: tazinst:121
+#: tazinst:120
 msgid "Change value of a setting."
 msgstr "Change un paramètre."
 
-#: tazinst:122
+#: tazinst:121
 msgid "Clear a setting."
 msgstr "Efface un paramètre."
 
-#: tazinst:123
+#: tazinst:122
 msgid "Get the value of a setting."
 msgstr "Lit un paramètre"
 
-#: tazinst:124
+#: tazinst:123
 msgid "Check settings."
 msgstr "Vérifie les paramètres."
 
-#: tazinst:125
+#: tazinst:124
 msgid "Print a short help on settings"
 msgstr "Affiche une aide succinte sur les paramètres."
 
-#: tazinst:126
+#: tazinst:125
 msgid "List system resources."
 msgstr "Liste des ressources système."
 
-#: tazinst:127
+#: tazinst:126
 msgid "Execute a SliTaz installation."
 msgstr "Lance une installation de SliTaz."
 
-#: tazinst:128
+#: tazinst:127
 msgid "Display log file contents."
 msgstr "Affiche le contenu du fichier journal."
 
-#: tazinst:129
+#: tazinst:128
 msgid "Clean install and log files."
 msgstr "Efface les fichiers journal et installation."
 
-#: tazinst:130
+#: tazinst:129
 msgid "Print version and exit."
 msgstr "Affiche la version et s'arrête."
 
-#: tazinst:131
+#: tazinst:130
 msgid "Print this short usage."
 msgstr "Affiche cette aide succinte."
 
-#: tazinst:141
-msgid "Unknown command!"
-msgstr "Commande inconnue !"
+#: tazinst:140
+msgid "'%s': Unknown command!"
+msgstr "'%s' : Commande inconnue !"
 
 #: tazinst:142
-msgid "Run"
-msgstr "Lance"
+msgid "Run: '%s' to get a list of available commands."
+msgstr "Lance : '%s' pour avoir la liste de commandes disponibles."
 
-#: tazinst:143
-msgid "to get a list of available commands"
-msgstr "pour avoir la liste de commandes disponibles"
-
-#: tazinst:153
-msgid "Unknown option!"
-msgstr "Option inconnue !"
+#: tazinst:152
+msgid "'%s': Unknown option!"
+msgstr "'%s' : Option inconnue !"
 
 #: tazinst:154
-msgid "Please select one of these options"
-msgstr "Veuillez choisir une option"
+msgid "Please select one of these options:"
+msgstr "Veuillez choisir une option :"
 
 #: tazinst:173
 msgid "Warning: file already exists."
@@ -207,20 +203,25 @@
 msgstr "Erreur : Ne peut créer le fichier."
 
 #: tazinst:278 tazinst:283
-msgid "Error: Unable to read install file"
-msgstr "Erreur : Impossible de lire le fichier d'installation"
+msgid "Error: Unable to read install file."
+msgstr "Erreur : Impossible de lire le fichier d'installation."
 
-#: tazinst:389
+#: tazinst:355
+#, fuzzy
+msgid "Error: '%s' unknown setting."
+msgstr "'%s' : Option inconnue !"
+
+#: tazinst:383
 msgid "Error: Unable to write to install file."
-msgstr "Erreur : Impossible d'écrire le fichier d'installation"
+msgstr "Erreur : Impossible d'écrire le fichier d'installation."
 
 #: tazinst:443
-msgid "Deleting install file"
-msgstr "Efface le fichier d'installation"
+msgid "Deleting install file: %s"
+msgstr "Efface le fichier d'installation : %s"
 
 #: tazinst:445
-msgid "Error: Unable to delete install file"
-msgstr "Erreur : Impossible d'éffacer le fichier d'installation"
+msgid "Error: Unable to delete install file."
+msgstr "Erreur : Impossible d'éffacer le fichier d'installation."
 
 #: tazinst:460
 msgid ""
@@ -236,46 +237,42 @@
 msgstr "Une autre instance de tazinst est en cours."
 
 #: tazinst:485
-msgid "Error:"
-msgstr "Erreur :"
-
-#: tazinst:485
-msgid "Invalid keyword."
-msgstr "Mot clé invalide."
+msgid "Error: '%s' Invalid keyword."
+msgstr "Erreur : '%s' Mot clé invalide."
 
 #: tazinst:486
-msgid "Select one of these options:"
-msgstr "Choisissez une option :"
+msgid "Select one of these options: %s."
+msgstr "Choisissez une option : %s."
 
 #: tazinst:487
 msgid "For more information, see tazinst Manual."
 msgstr "Pour plus d'information, voir le manuel de tazinst."
 
 #: tazinst:502
-msgid "Error: Partition not found"
-msgstr "Erreur : Partition non trouvée"
+msgid "Error: Partition not found."
+msgstr "Erreur : Partition non trouvée."
 
 #: tazinst:503
-msgid "To see available partitions, run"
-msgstr "Pour voir les partitions disponibles, lancez"
+msgid "To see available partitions, run '%s'."
+msgstr "Pour voir les partitions disponibles, lancez « %s »."
 
 #: tazinst:518
-msgid "Error: Source file not found"
-msgstr "Erreur : Fichier source introuvable"
+msgid "Error: Source file not found."
+msgstr "Erreur : Fichier source introuvable."
 
 #: tazinst:533
-msgid "Error: invalid URL"
-msgstr "Erreur : URL invalide"
+msgid "Error: invalid URL."
+msgstr "Erreur : URL invalide."
 
-#: tazinst:549
+#: tazinst:548
 msgid "Error: multiple assignations for a disk."
 msgstr "Erreur : utilisation multiple du même disque"
 
 #: tazinst:562
-msgid "Error: password too long"
-msgstr "Erreur : mot de passe trop long"
+msgid "Error: password too long."
+msgstr "Erreur : mot de passe trop long."
 
-#: tazinst:568
+#: tazinst:567
 msgid "Error: Unallowed characters in password."
 msgstr "Erreur : Caractères interdits dans le mot de passe"
 
@@ -287,21 +284,25 @@
 msgid "Warning: no password!"
 msgstr "Attention : pas mot de passe !"
 
+#: tazinst:590
+msgid "%s Error: Too short."
+msgstr ""
+
 #: tazinst:594
-msgid "Error: Too long."
-msgstr "Erreur : Trop long"
+msgid "%s Error: Too long."
+msgstr "%s Erreur : Trop long"
 
 #: tazinst:599
-msgid "Error: Invalid chars."
-msgstr "Erreur : Caract..res invalides."
+msgid "%s Error: Invalid chars."
+msgstr "%s Erreur : Caract..res invalides."
 
 #: tazinst:611
 msgid "Error: Dualboot set with no bootloader."
 msgstr "Erreur : Dualboot choisi sans amorceur."
 
 #: tazinst:625
-msgid "Error: Unsupported Partition Table"
-msgstr "Erreur : Table Partition non supportée"
+msgid "Error: Unsupported Partition Table."
+msgstr "Erreur : Table Partition non supportée."
 
 #: tazinst:630
 msgid "Error: No disk selected, cannot install any bootloader."
@@ -316,112 +317,120 @@
 msgstr "Nom ou URL de l'image sur le web."
 
 #: tazinst:753
-msgid "Type: tazinst help web"
-msgstr "Faire : tazinst help web"
+msgid "Type: %s"
+msgstr "Faire : %s"
 
 #: tazinst:758
+msgid "List of settings:"
+msgstr "Liste des paramètres :"
+
+#: tazinst:760
 msgid "Mode of install"
 msgstr "Mode d'installation"
 
-#: tazinst:759
+#: tazinst:761
 msgid "Media containing the SliTaz source files"
 msgstr "Media contenant les fichiers sources SliTaz"
 
-#: tazinst:760
+#: tazinst:762
 msgid "Source file containing SliTaz"
 msgstr "Fichier source contenant SliTaz"
 
-#: tazinst:761
+#: tazinst:763
 msgid "The name of the target partition"
 msgstr "Nom de la partition cible"
 
-#: tazinst:762
+#: tazinst:764
 msgid "Format of the target partition"
 msgstr "Format de la partition cible"
 
-#: tazinst:763
+#: tazinst:765
 msgid "Separate home partition"
 msgstr "Partition /home séparée"
 
-#: tazinst:764
+#: tazinst:766
 msgid "Format of the root partition"
 msgstr "Format de la partition racine"
 
-#: tazinst:765 tazinst:811
+#: tazinst:767 tazinst:811
 msgid "Name of the system"
 msgstr "Nom du système"
 
-#: tazinst:766 tazinst:813
+#: tazinst:768 tazinst:813
 msgid "Superuser password"
 msgstr "Mot de passe administrateur"
 
-#: tazinst:767 tazinst:815
+#: tazinst:769 tazinst:815
 msgid "First user name"
 msgstr "Nom du premier utilisateur"
 
-#: tazinst:768 tazinst:817
+#: tazinst:770 tazinst:817
 msgid "First user password"
 msgstr "Mot de passe du premier utilisateur"
 
-#: tazinst:769
+#: tazinst:771
 msgid "Install a bootloader"
 msgstr "Installe un amorceur"
 
-#: tazinst:770
+#: tazinst:772
 msgid "Partition to dualboot Windows from"
 msgstr "Partition d'où amorcer Windows en dualboot"
 
-#: tazinst:771
-msgid "List of settings:"
-msgstr "Liste des paramètres :"
-
 #: tazinst:790
 msgid "CD. Automatically set"
 msgstr "CD. Choisi automatiquement"
 
 #: tazinst:793
-msgid "USB partition. For a list, type: tazinst list usb"
-msgstr "Partition USB. Pour la liste, tapez : tazinst list usb"
+msgid "USB partition. For a list, type: %s"
+msgstr "Partition USB. Pour la liste, tapez : %s"
 
 #: tazinst:796
-msgid "ISO file name. For a list, type: tazinst list iso"
-msgstr "Nom de fichier ISO. Pour la liste, tapez : tazinst list iso"
+msgid "ISO file name. For a list, type: %s"
+msgstr "Nom de fichier ISO. Pour la liste, tapez : %s"
 
 #: tazinst:822
 msgid "Partition containing Windows, or 'auto'"
 msgstr "Partition contenant Windows, ou 'auto'"
 
 #: tazinst:1127
-msgid "No mirror list found, run tazpkg recharge."
-msgstr "Mirroir introuvable, lancer tazpkg recharge."
+msgid "No mirror list found, run %s."
+msgstr "Mirroir introuvable, lancer %s."
 
 #: tazinst:1139
-msgid "Downloading:"
-msgstr "Téléchargement :"
+msgid "Downloading: %s"
+msgstr "Téléchargement : %s"
 
 #: tazinst:1146
 msgid "Download completed."
 msgstr "Téléchargement réussi."
 
-#: tazinst:1148
-msgid "Download failed."
-msgstr "Téléchargement échoué."
+#: tazinst:1157
+msgid "Installing package %s to the current system."
+msgstr "Installation du paquet sur le système actuel : %s."
 
-#: tazinst:1157
-msgid "Installing package to the current system:"
-msgstr "Installation du paquet sur le système actuel :"
+#: tazinst:1159
+msgid "Cannot install %s."
+msgstr ""
 
 #: tazinst:1167
-msgid "Adding package to the target system:"
-msgstr "Ajout du paquet sur le syst..me cible :"
+msgid "Adding package %s to the target system..."
+msgstr "Ajout du paquet sur le syst..me cible : %s..."
+
+#: tazinst:1182
+msgid "=== Tazinst: started on %s ==="
+msgstr ""
 
 #: tazinst:1208
 msgid "Process not completed"
 msgstr "Action en cours"
 
 #: tazinst:1209 tazinst:1213
-msgid "Error"
-msgstr "Erreur"
+msgid "Error: %s"
+msgstr "Erreur : %s"
+
+#: tazinst:1216
+msgid "=== Tazinst error on %s ==="
+msgstr ""
 
 #: tazinst:1225
 msgid "Internal error"
@@ -432,40 +441,44 @@
 msgstr "Annulé par l'utilisateur"
 
 #: tazinst:1251
-msgid "Using files from"
-msgstr "Utilise les fichiers de"
+msgid "Using files from %s."
+msgstr "Utilise les fichiers de %s."
 
 #: tazinst:1253
-msgid "Mount failed"
-msgstr "Échec du montage"
+msgid "%s: Mount failed."
+msgstr "%s : Échec du montage."
 
-#: tazinst:1262 tazinst:1267
-msgid "Using files from USB device"
-msgstr "Utilise les fichiers du périphérique USB"
+#: tazinst:1262
+msgid "Using files from USB device..."
+msgstr "Utilise les fichiers du périphérique USB..."
+
+#: tazinst:1267
+msgid "Using files from USB device %s."
+msgstr "Utilise les fichiers du périphérique USB %s."
 
 #: tazinst:1269
-msgid "Failed to mount USB device"
-msgstr "Impossible de monter le périphérique USB"
+msgid "%s: Failed to mount USB device."
+msgstr "%s : Impossible de monter le périphérique USB."
 
 #: tazinst:1284
 msgid "md5sum error, file corrupted."
 msgstr "Erreur md5sum, fichier corrompu."
 
 #: tazinst:1287
-msgid "md5 file not found, cannot check integrity."
-msgstr "fichier md5 introuvable, impossible de vérifier l'intégrité."
+msgid "%s: md5 file not found, cannot check integrity."
+msgstr "%s : fichier md5 introuvable, impossible de vérifier l'intégrité."
 
 #: tazinst:1292
-msgid "Using files from ISO"
-msgstr "Utilise les fichiers de l'ISO"
+msgid "Using files from ISO %s."
+msgstr "Utilise les fichiers de l'ISO %s."
 
 #: tazinst:1294
-msgid "Failed to mount ISO."
-msgstr "Impossible de monter l'image ISO."
+msgid "%s: Failed to mount ISO."
+msgstr "%s : Impossible de monter l'image ISO."
 
 #: tazinst:1316 tazinst:1404
-msgid "Creating mount point:"
-msgstr "Création du point de montage :"
+msgid "Creating mount point: %s..."
+msgstr "Création du point de montage : %s..."
 
 #: tazinst:1332
 msgid "Checking installation media..."
@@ -480,9 +493,14 @@
 msgstr "Vérification du media d'installation réussie"
 
 #: tazinst:1349
-msgid "Format"
+msgid "Format %s (%s)"
 msgstr ""
 
+#: tazinst:1354 tazinst:1366
+#, fuzzy
+msgid "Formatting has failed"
+msgstr "Formatage de la partition principale :"
+
 #: tazinst:1373
 msgid "Preparing target partition..."
 msgstr "Prepare la partition cible..."
@@ -496,44 +514,48 @@
 msgstr "Partition déjà utilisée"
 
 #: tazinst:1389
-msgid "The partition will be cleaned..."
-msgstr "La partition sera effacée..."
+msgid "%s: The partition will be cleaned..."
+msgstr "%s : La partition sera effacée..."
 
 #: tazinst:1398
-msgid "The partition will be kept..."
-msgstr "La partition sera conservée..."
+msgid "%s: The partition will be kept..."
+msgstr "%s : La partition sera conservée..."
 
 #: tazinst:1413
-msgid "Unable to mount partition"
-msgstr "Impossible de monter la partition"
+msgid "%s: Unable to mount partition"
+msgstr "%s : Impossible de monter la partition"
 
 #: tazinst:1427
-msgid "Unmounting target partition:"
-msgstr "Démontage de la partition cible :"
+msgid "Unmounting target partition: %s"
+msgstr "Démontage de la partition cible : %s"
 
 #: tazinst:1433
-msgid "Unmounting:"
-msgstr "Démontage :"
+msgid "Unmounting: %s"
+msgstr "Démontage : %s"
 
 #: tazinst:1437
-msgid "Unlinking:"
-msgstr "Effaçage de :"
+msgid "Unlinking: %s"
+msgstr "Effaçage de : %s"
 
 #: tazinst:1443
-msgid "Ejecting cdrom..."
+msgid "Ejecting CD-ROM..."
 msgstr "Éjection du CD-Rom..."
 
 #: tazinst:1452
-msgid "Process completed. You can now restart (reboot)"
-msgstr "Installation terminée. Vous pouvez maintenant redémarrer "
+msgid ""
+"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux "
+"system."
+msgstr ""
+"Installation terminée. Vous pouvez maintenant redémarrer votre système "
+"SliTaz GNU/Linux."
 
-#: tazinst:1453
-msgid "from your SliTaz GNU/Linux system."
-msgstr "votre système SliTaz GNU/Linux."
+#: tazinst:1454
+msgid "=== Tazinst ended on %s ==="
+msgstr ""
 
 #: tazinst:1457
-msgid "Copying log to /var/log/tazinst.log"
-msgstr "Copie le journal dans /var/log/tazinst.log"
+msgid "Copying log to %s"
+msgstr "Copie le journal dans %s"
 
 #: tazinst:1493
 msgid "No bootloader to install."
@@ -544,8 +566,13 @@
 msgstr "Activation du Dual-boot avec Windows"
 
 #: tazinst:1610
-msgid "Installing grub on:"
-msgstr "Installation de grub sur :"
+msgid "Installing GRUB on: %s"
+msgstr "Installation de grub sur : %s"
+
+#: tazinst:1611
+#, fuzzy
+msgid "GRUB not found"
+msgstr "URL non trouvée"
 
 #: tazinst:1615
 msgid "Setting the boot flag"
@@ -556,15 +583,25 @@
 msgstr "Copie de l'image de fond"
 
 #: tazinst:1710
-msgid "Installing syslinux"
+msgid "Installing Syslinux"
 msgstr "Installation de syslinux"
 
+#: tazinst:1720
+#, fuzzy
+msgid "Syslinux not found"
+msgstr "URL non trouvée"
+
 #: tazinst:1724
 msgid "Setting the boot flag on"
 msgstr "Activation du boot flag"
 
+#: tazinst:1727
+#, fuzzy
+msgid "mbr.bin not found"
+msgstr "URL non trouvée"
+
 #: tazinst:1728
-msgid "Installing mbr"
+msgid "Installing MBR"
 msgstr "Installe le mbr"
 
 #: tazinst:1732
@@ -572,27 +609,32 @@
 msgstr "Activation du legacy_boot flag"
 
 #: tazinst:1741
-msgid "Installing gptmbr"
+msgid "Installing GPTMBR"
 msgstr "Installe gptmbr"
 
+#: tazinst:1742
+#, fuzzy
+msgid "gptmbr.bin not found"
+msgstr "URL non trouvée"
+
 #: tazinst:1781
-msgid "Cleaning the root partition"
-msgstr "Nettoyage de la partition racine"
+msgid "Cleaning the root partition (%s)..."
+msgstr "Nettoyage de la partition racine (%s)..."
 
 #: tazinst:1790 tazinst:2063
-msgid "keeping /home found on:"
-msgstr "garde /home sur :"
+msgid "keeping /home found on: %s"
+msgstr "garde /home sur : %s"
 
-#: tazinst:1795
-msgid "removing target:"
-msgstr "retire la cible :"
+#: tazinst:1795 tazinst:2077
+msgid "removing target: %s"
+msgstr "retire la cible : %s"
 
 #: tazinst:1813
-msgid "Kernel name not found, falling back to:"
-msgstr "Nom du noyau introuvable, retour à :"
+msgid "Kernel name not found, falling back to: %s"
+msgstr "Nom du noyau introuvable, retour à : %s"
 
 #: tazinst:1819
-msgid "install_kernel:"
+msgid "install_kernel: %s"
 msgstr ""
 
 #: tazinst:1905
@@ -600,56 +642,56 @@
 msgstr "Restauration de /home..."
 
 #: tazinst:1911
-msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..."
-msgstr "Ajoute la partition / et CHECK_FS au fichier /etc/rcS.conf..."
+msgid "Adding / partition and CHECK_FS to file %s..."
+msgstr "Ajoute la partition / et CHECK_FS au fichier %s..."
 
 #: tazinst:1914
-msgid "Configuring host name:"
-msgstr "Configuration du Hostname :"
+msgid "Configuring host name: %s"
+msgstr "Configuration du Hostname : %s"
 
 #: tazinst:1977
-msgid "Configuring partition to be used as /home:"
-msgstr "Configuration de la partition à utiliser comme /home :"
+msgid "Configuring partition to be used as /home: %s"
+msgstr "Configuration de la partition à utiliser comme /home : %s"
 
 #: tazinst:1996
-msgid "Installing SliTaz on:"
-msgstr "Installation de SliTaz sur :"
+msgid "Installing SliTaz on: %s"
+msgstr "Installation de SliTaz sur : %s"
 
 #: tazinst:1997 tazinst:2176
-msgid "Checking settings"
-msgstr "Vérification des paramètres"
+msgid "Checking settings..."
+msgstr "Vérification des paramètres..."
 
 #: tazinst:2001 tazinst:2180
-msgid "Preparing source media"
-msgstr "Préparation du media source"
+msgid "Preparing source media..."
+msgstr "Préparation du media source..."
 
 #: tazinst:2004 tazinst:2183
-msgid "Preparing target disk"
-msgstr "Préparation du disque cible"
+msgid "Preparing target disk..."
+msgstr "Préparation du disque cible..."
 
 #: tazinst:2007
-msgid "Cleaning the root partition if necessary"
-msgstr "Nettoyage de la partition racine si nécessaire"
+msgid "Cleaning the root partition if necessary..."
+msgstr "Nettoyage de la partition racine si nécessaire..."
 
 #: tazinst:2010 tazinst:2192
-msgid "Extracting the root system"
-msgstr "Extrait le système racine"
+msgid "Extracting the root system..."
+msgstr "Extrait le système racine..."
 
 #: tazinst:2013 tazinst:2198
-msgid "Installing the kernel"
-msgstr "Installation du noyau"
+msgid "Installing the Kernel..."
+msgstr "Installation du noyau..."
 
 #: tazinst:2016
-msgid "Preconfiguring the system"
-msgstr "Préconfiguration du système"
+msgid "Preconfiguring the system..."
+msgstr "Préconfiguration du système..."
 
 #: tazinst:2019
-msgid "Configuring root and default user account"
-msgstr "Configuration des comptes de root et de l'utilisateur par défaut"
+msgid "Configuring root and default user account..."
+msgstr "Configuration des comptes de root et de l'utilisateur par défaut..."
 
 #: tazinst:2022
-msgid "Configuring /home"
-msgstr "Configuration de /home"
+msgid "Configuring /home..."
+msgstr "Configuration de /home..."
 
 #: tazinst:2025
 msgid "Checking bootloader installation..."
@@ -660,32 +702,32 @@
 msgstr "Installation des fichiers réussie"
 
 #: tazinst:2042
-msgid "Preparing upgrade of SliTaz release:"
-msgstr "Préparation de la mise à jour de la version de SliTaz :"
+msgid "Preparing upgrade of SliTaz release: %s"
+msgstr "Préparation de la mise à jour de la version de SliTaz : %s"
 
 #: tazinst:2044
 msgid ""
-"This partition doesn't appear to contain a valid SliTaz system, the file: /"
-"etc/slitaz-release doesn't exist."
+"%s: This partition doesn't appear to contain a valid SliTaz system, the "
+"file: %s doesn't exist."
 msgstr ""
-"Cette partition ne semble pas contenir un système SliTaz valide, le "
-"fichier : /etc/slitaz-release n'existe pas."
+"%s: Cette partition ne semble pas contenir un système SliTaz valide, le "
+"fichier : %s n'existe pas."
 
 #: tazinst:2067
-msgid "keeping /etc found on:"
-msgstr "conserve /etc sur :"
+msgid "keeping /etc found on: %s"
+msgstr "conserve /etc sur : %s"
 
 #: tazinst:2071
-msgid "keeping /var/www found on:"
-msgstr "conserve /var/www sur :"
+msgid "keeping /var/www found on: %s"
+msgstr "conserve /var/www sur : %s"
 
 #: tazinst:2098
-msgid "backups restored:"
-msgstr "sauvegardes restorées :"
+msgid "backups restored: %s"
+msgstr "sauvegardes restorées : %s"
 
 #: tazinst:2105
-msgid "backups saved in /var/lib/tazinst"
-msgstr "sauvegardes placées dans /var/lib/tazinst"
+msgid "backups saved in %s"
+msgstr "sauvegardes placées dans %s"
 
 #: tazinst:2112
 msgid "Checking the availability of packages..."
@@ -700,8 +742,8 @@
 msgstr "Aucun paquet à installer."
 
 #: tazinst:2132
-msgid "Installing:"
-msgstr "Installation :"
+msgid "Installing: %s..."
+msgstr "Installation : %s..."
 
 #: tazinst:2141
 msgid "Installation of packages complete..."
@@ -711,52 +753,46 @@
 msgid "Creating package lists..."
 msgstr "Crée la liste de paquets..."
 
-#: tazinst:2152
-msgid "packages-source.list: done"
-msgstr "packages-source.list : fait"
-
-#: tazinst:2156
-msgid "packages-selection.diff: done"
-msgstr "packages-selection.diff : fait"
+#: tazinst:2152 tazinst:2156
+msgid "%s: done"
+msgstr "%s : fait"
 
 #: tazinst:2163
 msgid ""
 "The list of available packages on the mirror could not be downloaded. No "
 "missing packages will be reinstalled now, but you can do so later by looking "
-"at the following list:\n"
-"/var/lib/tazinst/packages-selection.diff"
+"at the following list:"
 msgstr ""
 "La liste des paquets disponibles sur le miroir ne peut être téléchargée. "
 "Aucun paquet manquant ne peut être réinstallé maintenant, mais il est "
-"possible de le faire ultérieurement à l'aide de la liste suivante : /var/lib/"
-"tazinst/packages-selection.diff"
+"possible de le faire ultérieurement à l'aide de la liste suivante :"
 
 #: tazinst:2175
-msgid "Upgrading SliTaz on:"
-msgstr "Mise à jour de SliTaz sur :"
+msgid "Upgrading SliTaz on: %s"
+msgstr "Mise à jour de SliTaz sur : %s"
 
 #: tazinst:2186
-msgid "Searching for /etc/slitaz-release"
-msgstr "Recherche de /etc/slitaz-release"
+msgid "Searching for %s..."
+msgstr "Recherche de %s..."
 
 #: tazinst:2189
-msgid "Backup /etc, /home and the packages list"
-msgstr "Sauvegarde de /etc, /home et de la liste des paquets"
+msgid "Backup /etc, /home and the packages list..."
+msgstr "Sauvegarde de /etc, /home et de la liste des paquets..."
 
 #: tazinst:2195
-msgid "Restoring configuration files"
+msgid "Restoring configuration files..."
 msgstr "Restauration des fichiers de configuration..."
 
 #: tazinst:2201
-msgid "Upgrading added packages"
+msgid "Upgrading added packages..."
 msgstr "Mise à jour des paquets additionnels..."
 
 #: tazinst:2204
-msgid "Bootloader"
-msgstr "Amorceur"
+msgid "Bootloader..."
+msgstr "Amorceur..."
 
-#~ msgid "Using files from USB device..."
-#~ msgstr "Utilise les fichiers du périphérique USB..."
+#~ msgid "%s: Download failed."
+#~ msgstr "%s : Téléchargement échoué."
 
 #~ msgid "Install SliTaz on HDD using setup file contents."
 #~ msgstr "Installe SliTaz sur HDD à l'aide d'un fichier de paramètres."
@@ -794,9 +830,6 @@
 #~ msgid "Unknown source type"
 #~ msgstr "Type de source inconnu"
 
-#~ msgid "URL not found"
-#~ msgstr "URL non trouvée"
-
 #~ msgid "Target and source partitions should be different"
 #~ msgstr "Les partitions cible et source doivent etre différentes"
 
@@ -839,9 +872,6 @@
 #~ msgid "Grub update"
 #~ msgstr "Mise à jour de Grub"
 
-#~ msgid "Backup /etc, /home and the packages list..."
-#~ msgstr "Sauvegarde de /etc, /home et de la liste des paquets..."
-
 #~ msgid "Upgrade finished. You can now restart (reboot)"
 #~ msgstr "La mise à jour est terminée. Vous pouvez redémarrer"
 
@@ -948,9 +978,6 @@
 #~ msgid "Continue:(y/n)"
 #~ msgstr "Continuer : (o/n)"
 
-#~ msgid "Formatting main partition:"
-#~ msgstr "Formatage de la partition principale :"
-
 #~ msgid "Can't mount"
 #~ msgstr "Montage impossible"
 
diff -r fee6f859a768 -r 7877ddbcbdbe po/tazinst/pt_BR.po
--- a/po/tazinst/pt_BR.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/tazinst/pt_BR.po	Sat Apr 09 17:22:22 2016 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tazinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-04 11:45+0200\n"
+"POT-Creation-Date: 2016-04-09 16:49+0300\n"
 "PO-Revision-Date: 2016-03-28 05:14-0300\n"
 "Last-Translator: Leonardo Laporte <hackdorte@sapo.pt>\n"
 "Language-Team: Brazilian Portuguese (i18n@slitaz.org>\n"
@@ -79,7 +79,7 @@
 msgstr "Seleção automática"
 
 #: tazinst:83
-msgid "Grub legacy bootloader"
+msgid "GRUB legacy bootloader"
 msgstr "Gerenciador de boot grub"
 
 #: tazinst:84
@@ -103,7 +103,7 @@
 msgstr "Versão estável básica em modo gráfico sem demais aplicativos gráficos"
 
 #: tazinst:99
-msgid "Stable basic graphic version with only Gtk"
+msgid "Stable basic graphic version with only GTK"
 msgstr "Versão estável básica em modo gráfico com Gtk"
 
 #: tazinst:101
@@ -115,88 +115,84 @@
 msgstr "Versão de desenvolvimento atualizada diariamente"
 
 #: tazinst:114 tazinst:138 tazinst:150
-msgid "SliTaz GNU/Linux Installer - Version:"
-msgstr "SliTaz GNU/Linux Instalador - Versão:"
+msgid "SliTaz GNU/Linux Installer - Version: %s"
+msgstr "SliTaz GNU/Linux Instalador - Versão: %s"
+
+#: tazinst:115
+msgid "Usage:"
+msgstr "Utilização:"
 
 #: tazinst:116
-msgid "Usage"
-msgstr "Utilização"
+msgid "%s [command] <setting> <value> <file>"
+msgstr "%s [comando] <configuração> <valor> <arquivo>"
 
 #: tazinst:117
-msgid "tazinst [command] <setting> <value> <file>"
-msgstr "tazinst [comando] <configuração> <valor> <arquivo>"
+msgid "Commands:"
+msgstr "Comandos:"
 
 #: tazinst:119
-msgid "Commands"
-msgstr "Comandos"
-
-#: tazinst:120
 msgid "Create a new install file."
 msgstr "Cria um novo arquivo de instalação."
 
-#: tazinst:121
+#: tazinst:120
 msgid "Change value of a setting."
 msgstr "Muda o valor de uma configuração"
 
-#: tazinst:122
+#: tazinst:121
 msgid "Clear a setting."
 msgstr "Limpa uma configuração."
 
-#: tazinst:123
+#: tazinst:122
 msgid "Get the value of a setting."
 msgstr "Obtém o valor de uma configuração."
 
-#: tazinst:124
+#: tazinst:123
 msgid "Check settings."
 msgstr "Checa as configurações."
 
-#: tazinst:125
+#: tazinst:124
 msgid "Print a short help on settings"
 msgstr "Mostra uma pequena ajuda sobre as configurações"
 
-#: tazinst:126
+#: tazinst:125
 msgid "List system resources."
 msgstr "Lista os recursos do sistema."
 
-#: tazinst:127
+#: tazinst:126
 msgid "Execute a SliTaz installation."
 msgstr "Executa uma instalação do SliTaz."
 
-#: tazinst:128
+#: tazinst:127
 msgid "Display log file contents."
 msgstr "Mostra o conteúdo do arquivo de log."
 
-#: tazinst:129
+#: tazinst:128
 msgid "Clean install and log files."
 msgstr "Limpa os arquivos de log da instalação."
 
-#: tazinst:130
+#: tazinst:129
 msgid "Print version and exit."
 msgstr "Mostra a versão e sai."
 
-#: tazinst:131
+#: tazinst:130
 msgid "Print this short usage."
 msgstr "Exibe esta utilização"
 
-#: tazinst:141
-msgid "Unknown command!"
-msgstr "Comando desconhecido!"
+#: tazinst:140
+msgid "'%s': Unknown command!"
+msgstr "'%s': Comando desconhecido!"
 
 #: tazinst:142
-msgid "Run"
-msgstr "Executar"
+msgid "Run: '%s' to get a list of available commands."
+msgstr "Executar: '%s' para obter a lista de comandos disponíveis."
 
-#: tazinst:143
-msgid "to get a list of available commands"
-msgstr "para obter a lista de comandos disponíveis"
-
-#: tazinst:153
-msgid "Unknown option!"
-msgstr "Opção desconhecida!"
+#: tazinst:152
+msgid "'%s': Unknown option!"
+msgstr "'%s': Opção desconhecida!"
 
 #: tazinst:154
-msgid "Please select one of these options"
-msgstr "Selecione uma das seguintes opções"
+msgid "Please select one of these options:"
+msgstr "Selecione uma das seguintes opções:"
 
 #: tazinst:173
 msgid "Warning: file already exists."
@@ -207,20 +203,25 @@
 msgstr "Erro: impossível criar arquivo."
 
 #: tazinst:278 tazinst:283
-msgid "Error: Unable to read install file"
-msgstr "Erro: Não foi possível ler o arquivo de instalação"
+msgid "Error: Unable to read install file."
+msgstr "Erro: Não foi possível ler o arquivo de instalação."
 
-#: tazinst:389
+#: tazinst:355
+#, fuzzy
+msgid "Error: '%s' unknown setting."
+msgstr "'%s': Opção desconhecida!"
+
+#: tazinst:383
 msgid "Error: Unable to write to install file."
 msgstr "Erro: Não foi possível gravar o arquivo de instalação."
 
 #: tazinst:443
-msgid "Deleting install file"
-msgstr "Deletando arquivo de instalação"
+msgid "Deleting install file: %s"
+msgstr "Deletando arquivo de instalação: %s"
 
 #: tazinst:445
-msgid "Error: Unable to delete install file"
-msgstr "Erro: Não foi possível apagar o arquivo de instalação"
+msgid "Error: Unable to delete install file."
+msgstr "Erro: Não foi possível apagar o arquivo de instalação."
 
 #: tazinst:460
 msgid ""
@@ -235,46 +236,42 @@
 msgstr "Outra instância do tazinst está em execução."
 
 #: tazinst:485
-msgid "Error:"
-msgstr "Erro:"
-
-#: tazinst:485
-msgid "Invalid keyword."
-msgstr "Palavra-chave inválida."
+msgid "Error: '%s' Invalid keyword."
+msgstr "Erro: '%s' Palavra-chave inválida."
 
 #: tazinst:486
-msgid "Select one of these options:"
-msgstr "Selecione uma das seguintes opções:"
+msgid "Select one of these options: %s."
+msgstr "Selecione uma das seguintes opções: %s."
 
 #: tazinst:487
 msgid "For more information, see tazinst Manual."
 msgstr "Para maiores informações, consulte o manual do tazinst."
 
 #: tazinst:502
-msgid "Error: Partition not found"
-msgstr "Erro: Partição não encontrada"
+msgid "Error: Partition not found."
+msgstr "Erro: Partição não encontrada."
 
 #: tazinst:503
-msgid "To see available partitions, run"
-msgstr "Para ver as partições disponíveis, execute"
+msgid "To see available partitions, run '%s'."
+msgstr "Para ver as partições disponíveis, execute '%s'."
 
 #: tazinst:518
-msgid "Error: Source file not found"
-msgstr "Erro: Arquivo fonte não encontrado"
+msgid "Error: Source file not found."
+msgstr "Erro: Arquivo fonte não encontrado."
 
 #: tazinst:533
-msgid "Error: invalid URL"
-msgstr "Erro: URL inválida"
+msgid "Error: invalid URL."
+msgstr "Erro: URL inválida."
 
-#: tazinst:549
+#: tazinst:548
 msgid "Error: multiple assignations for a disk."
 msgstr "Erro: designações múltiplas para disco rígido."
 
 #: tazinst:562
-msgid "Error: password too long"
-msgstr "Erro: senha muito grande"
+msgid "Error: password too long."
+msgstr "Erro: senha muito grande."
 
-#: tazinst:568
+#: tazinst:567
 msgid "Error: Unallowed characters in password."
 msgstr "Erro: caracteres não permitidos na senha."
 
@@ -286,21 +283,25 @@
 msgid "Warning: no password!"
 msgstr "Aviso: sem senha!"
 
+#: tazinst:590
+msgid "%s Error: Too short."
+msgstr ""
+
 #: tazinst:594
-msgid "Error: Too long."
-msgstr "Erro: muito grande."
+msgid "%s Error: Too long."
+msgstr "%s Erro: muito grande."
 
 #: tazinst:599
-msgid "Error: Invalid chars."
-msgstr "Erro: caracteres inválidos."
+msgid "%s Error: Invalid chars."
+msgstr "%s Erro: caracteres inválidos."
 
 #: tazinst:611
 msgid "Error: Dualboot set with no bootloader."
 msgstr "Erro: dual-boot configurado sem gerenciador de boot."
 
 #: tazinst:625
-msgid "Error: Unsupported Partition Table"
-msgstr "Erro: tábua de partição não suportada"
+msgid "Error: Unsupported Partition Table."
+msgstr "Erro: tábua de partição não suportada."
 
 #: tazinst:630
 msgid "Error: No disk selected, cannot install any bootloader."
@@ -316,112 +317,120 @@
 msgstr "Nome ou URL da imagem na web."
 
 #: tazinst:753
-msgid "Type: tazinst help web"
-msgstr "Digite: tazinst help web"
+msgid "Type: %s"
+msgstr "Digite: %s"
 
 #: tazinst:758
+msgid "List of settings:"
+msgstr "Lista de configurações:"
+
+#: tazinst:760
 msgid "Mode of install"
 msgstr "Modo de instalação"
 
-#: tazinst:759
+#: tazinst:761
 msgid "Media containing the SliTaz source files"
 msgstr "Mídia contendo os arquivos fontes do SliTaz"
 
-#: tazinst:760
+#: tazinst:762
 msgid "Source file containing SliTaz"
 msgstr "Arquivo fonte contendo o SliTaz"
 
-#: tazinst:761
+#: tazinst:763
 msgid "The name of the target partition"
 msgstr "Nome da partição alvo"
 
-#: tazinst:762
+#: tazinst:764
 msgid "Format of the target partition"
 msgstr "Formatação da partição alvo"
 
-#: tazinst:763
+#: tazinst:765
 msgid "Separate home partition"
 msgstr "Partição home separada"
 
-#: tazinst:764
+#: tazinst:766
 msgid "Format of the root partition"
 msgstr "Formatação da partição root"
 
-#: tazinst:765 tazinst:811
+#: tazinst:767 tazinst:811
 msgid "Name of the system"
 msgstr "Nome do sistema"
 
-#: tazinst:766 tazinst:813
+#: tazinst:768 tazinst:813
 msgid "Superuser password"
 msgstr "Senha do usuário root"
 
-#: tazinst:767 tazinst:815
+#: tazinst:769 tazinst:815
 msgid "First user name"
 msgstr "Nome do primeiro usuário"
 
-#: tazinst:768 tazinst:817
+#: tazinst:770 tazinst:817
 msgid "First user password"
 msgstr "Senha do primeiro usuário"
 
-#: tazinst:769
+#: tazinst:771
 msgid "Install a bootloader"
 msgstr "Instalar um gerenciador de boot"
 
-#: tazinst:770
+#: tazinst:772
 msgid "Partition to dualboot Windows from"
 msgstr "Partição para dual-boot com Windows de"
 
-#: tazinst:771
-msgid "List of settings:"
-msgstr "Lista de configurações:"
-
 #: tazinst:790
 msgid "CD. Automatically set"
 msgstr "Configurado automaticamente"
 
 #: tazinst:793
-msgid "USB partition. For a list, type: tazinst list usb"
-msgstr "Partição USB. Para uma lista, digite: tazinst list usb"
+msgid "USB partition. For a list, type: %s"
+msgstr "Partição USB. Para uma lista, digite: %s"
 
 #: tazinst:796
-msgid "ISO file name. For a list, type: tazinst list iso"
-msgstr "Nome da imagem ISO. Para uma lista, digite: tazinst list iso"
+msgid "ISO file name. For a list, type: %s"
+msgstr "Nome da imagem ISO. Para uma lista, digite: %s"
 
 #: tazinst:822
 msgid "Partition containing Windows, or 'auto'"
 msgstr "Partição contendo o Windows, ou 'auto'"
 
 #: tazinst:1127
-msgid "No mirror list found, run tazpkg recharge."
-msgstr "Nenhuma lista de mirror encontrada, execute 'tazpkg recharge'"
+msgid "No mirror list found, run %s."
+msgstr "Nenhuma lista de mirror encontrada, execute '%s'."
 
 #: tazinst:1139
-msgid "Downloading:"
-msgstr "Baixando:"
+msgid "Downloading: %s"
+msgstr "Baixando: %s"
 
 #: tazinst:1146
 msgid "Download completed."
 msgstr "Download completo."
 
-#: tazinst:1148
-msgid "Download failed."
-msgstr "Download falhou."
+#: tazinst:1157
+msgid "Installing package %s to the current system."
+msgstr "Instalando o pacote para o sistema atual: %s."
 
-#: tazinst:1157
-msgid "Installing package to the current system:"
-msgstr "Instalando o pacote para o sistema atual:"
+#: tazinst:1159
+msgid "Cannot install %s."
+msgstr ""
 
 #: tazinst:1167
-msgid "Adding package to the target system:"
-msgstr "Adicionando o pacote para o sistema alvo:"
+msgid "Adding package %s to the target system..."
+msgstr "Adicionando o pacote para o sistema alvo: %s..."
+
+#: tazinst:1182
+msgid "=== Tazinst: started on %s ==="
+msgstr ""
 
 #: tazinst:1208
 msgid "Process not completed"
 msgstr "Processo não completado"
 
 #: tazinst:1209 tazinst:1213
-msgid "Error"
-msgstr "Erro"
+msgid "Error: %s"
+msgstr "Erro: %s"
+
+#: tazinst:1216
+msgid "=== Tazinst error on %s ==="
+msgstr ""
 
 #: tazinst:1225
 msgid "Internal error"
@@ -432,40 +441,44 @@
 msgstr "Cancelado pelo usuário"
 
 #: tazinst:1251
-msgid "Using files from"
-msgstr "Usando arquivos de"
+msgid "Using files from %s."
+msgstr "Usando arquivos de %s."
 
 #: tazinst:1253
-msgid "Mount failed"
-msgstr "Comando mount falhou"
+msgid "%s: Mount failed."
+msgstr "%s: Comando mount falhou."
 
-#: tazinst:1262 tazinst:1267
-msgid "Using files from USB device"
-msgstr "Usando arquivos do dispositivo USB"
+#: tazinst:1262
+msgid "Using files from USB device..."
+msgstr "Usando arquivos do dispositivo USB..."
+
+#: tazinst:1267
+msgid "Using files from USB device %s."
+msgstr "Usando arquivos do dispositivo USB %s."
 
 #: tazinst:1269
-msgid "Failed to mount USB device"
-msgstr "Falha ao montar dispositivo USB"
+msgid "%s: Failed to mount USB device."
+msgstr "%s: Falha ao montar dispositivo USB."
 
 #: tazinst:1284
 msgid "md5sum error, file corrupted."
 msgstr "Divergência de md5sum, arquivo corrompido"
 
 #: tazinst:1287
-msgid "md5 file not found, cannot check integrity."
-msgstr "Arquivo md5 não existe, impossível checar integridade."
+msgid "%s: md5 file not found, cannot check integrity."
+msgstr "%s: Arquivo md5 não existe, impossível checar integridade."
 
 #: tazinst:1292
-msgid "Using files from ISO"
-msgstr "Usando arquivos da ISO"
+msgid "Using files from ISO %s."
+msgstr "Usando arquivos da ISO %s."
 
 #: tazinst:1294
-msgid "Failed to mount ISO."
-msgstr "Falha ao montar imagem ISO."
+msgid "%s: Failed to mount ISO."
+msgstr "%s: Falha ao montar imagem ISO."
 
 #: tazinst:1316 tazinst:1404
-msgid "Creating mount point:"
-msgstr "Criando ponto de montagem:"
+msgid "Creating mount point: %s..."
+msgstr "Criando ponto de montagem: %s..."
 
 #: tazinst:1332
 msgid "Checking installation media..."
@@ -480,8 +493,12 @@
 msgstr "Checagem de mídia de instalação ok"
 
 #: tazinst:1349
-msgid "Format"
-msgstr "Formatar"
+msgid "Format %s (%s)"
+msgstr "Formatar %s (%s)"
+
+#: tazinst:1354 tazinst:1366
+msgid "Formatting has failed"
+msgstr ""
 
 #: tazinst:1373
 msgid "Preparing target partition..."
@@ -496,44 +513,48 @@
 msgstr "Partição em uso."
 
 #: tazinst:1389
-msgid "The partition will be cleaned..."
-msgstr "A partição será limpa..."
+msgid "%s: The partition will be cleaned..."
+msgstr "%s: A partição será limpa..."
 
 #: tazinst:1398
-msgid "The partition will be kept..."
-msgstr "A partição será mantida..."
+msgid "%s: The partition will be kept..."
+msgstr "%s: A partição será mantida..."
 
 #: tazinst:1413
-msgid "Unable to mount partition"
-msgstr "Falha ao montar partição"
+msgid "%s: Unable to mount partition"
+msgstr "%s: Falha ao montar partição"
 
 #: tazinst:1427
-msgid "Unmounting target partition:"
-msgstr "Desmontando partição alvo:"
+msgid "Unmounting target partition: %s"
+msgstr "Desmontando partição alvo: %s"
 
 #: tazinst:1433
-msgid "Unmounting:"
-msgstr "Desmontando:"
+msgid "Unmounting: %s"
+msgstr "Desmontando: %s"
 
 #: tazinst:1437
-msgid "Unlinking:"
-msgstr "Desfazendo ligação:"
+msgid "Unlinking: %s"
+msgstr "Desfazendo ligação: %s"
 
 #: tazinst:1443
-msgid "Ejecting cdrom..."
+msgid "Ejecting CD-ROM..."
 msgstr "Ejetando cdrom..."
 
 #: tazinst:1452
-msgid "Process completed. You can now restart (reboot)"
-msgstr "Instalação completa. Você pode reiniciar (reboot)"
+msgid ""
+"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux "
+"system."
+msgstr ""
+"Instalação completa. Você pode reiniciar (reboot) do seu sistema SliTaz GNU/"
+"Linux."
 
-#: tazinst:1453
-msgid "from your SliTaz GNU/Linux system."
-msgstr "do seu sistema SliTaz GNU/Linux."
+#: tazinst:1454
+msgid "=== Tazinst ended on %s ==="
+msgstr ""
 
 #: tazinst:1457
-msgid "Copying log to /var/log/tazinst.log"
-msgstr "Copiando log para /var/log/tazinst.log"
+msgid "Copying log to %s"
+msgstr "Copiando log para %s"
 
 #: tazinst:1493
 msgid "No bootloader to install."
@@ -544,8 +565,13 @@
 msgstr "Habilitando dual-boot com windows"
 
 #: tazinst:1610
-msgid "Installing grub on:"
-msgstr "Instalando grub em:"
+msgid "Installing GRUB on: %s"
+msgstr "Instalando grub em: %s"
+
+#: tazinst:1611
+#, fuzzy
+msgid "GRUB not found"
+msgstr "URL não encontrada"
 
 #: tazinst:1615
 msgid "Setting the boot flag"
@@ -556,15 +582,25 @@
 msgstr "Copiando imagem splash"
 
 #: tazinst:1710
-msgid "Installing syslinux"
+msgid "Installing Syslinux"
 msgstr "Instalando syslinux"
 
+#: tazinst:1720
+#, fuzzy
+msgid "Syslinux not found"
+msgstr "URL não encontrada"
+
 #: tazinst:1724
 msgid "Setting the boot flag on"
 msgstr "Configurando flag de boot em"
 
+#: tazinst:1727
+#, fuzzy
+msgid "mbr.bin not found"
+msgstr "URL não encontrada"
+
 #: tazinst:1728
-msgid "Installing mbr"
+msgid "Installing MBR"
 msgstr "Instalando mbr"
 
 #: tazinst:1732
@@ -572,84 +608,89 @@
 msgstr "Configurando flag legacy_boot em"
 
 #: tazinst:1741
-msgid "Installing gptmbr"
+msgid "Installing GPTMBR"
 msgstr "Instalando gptmbr"
 
+#: tazinst:1742
+#, fuzzy
+msgid "gptmbr.bin not found"
+msgstr "URL não encontrada"
+
 #: tazinst:1781
-msgid "Cleaning the root partition"
-msgstr "Limpando partição alvo"
+msgid "Cleaning the root partition (%s)..."
+msgstr "Limpando partição alvo (%s)..."
 
 #: tazinst:1790 tazinst:2063
-msgid "keeping /home found on:"
-msgstr "mantendo /home encontrada em:"
+msgid "keeping /home found on: %s"
+msgstr "mantendo /home encontrada em: %s"
 
-#: tazinst:1795
-msgid "removing target:"
-msgstr "removendo alvo:"
+#: tazinst:1795 tazinst:2077
+msgid "removing target: %s"
+msgstr "removendo alvo: %s"
 
 #: tazinst:1813
-msgid "Kernel name not found, falling back to:"
-msgstr "Nome do Kernel não encontrado, voltando a:"
+msgid "Kernel name not found, falling back to: %s"
+msgstr "Nome do Kernel não encontrado, voltando a: %s"
 
 #: tazinst:1819
-msgid "install_kernel:"
-msgstr "install_kernel:"
+msgid "install_kernel: %s"
+msgstr "install_kernel: %s"
 
 #: tazinst:1905
 msgid "Restoring directory: /home..."
 msgstr "Restaurando diretório: /home..."
 
 #: tazinst:1911
-msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..."
-msgstr "Adicionando partição / e CHECK_FS ao arquivo /etc/rcS.conf..."
+msgid "Adding / partition and CHECK_FS to file %s..."
+msgstr "Adicionando partição / e CHECK_FS ao arquivo %s..."
 
 #: tazinst:1914
-msgid "Configuring host name:"
-msgstr "Configurando nome do host:"
+msgid "Configuring host name: %s"
+msgstr "Configurando nome do host: %s"
 
 #: tazinst:1977
-msgid "Configuring partition to be used as /home:"
-msgstr "Configurando partição a ser usada com /home:"
+msgid "Configuring partition to be used as /home: %s"
+msgstr "Configurando partição a ser usada com /home: %s"
 
 #: tazinst:1996
-msgid "Installing SliTaz on:"
-msgstr "Instalando SliTaz em:"
+msgid "Installing SliTaz on: %s"
+msgstr "Instalando SliTaz em: %s"
 
 #: tazinst:1997 tazinst:2176
-msgid "Checking settings"
-msgstr "Checando configurações"
+msgid "Checking settings..."
+msgstr "Checando configurações..."
 
 #: tazinst:2001 tazinst:2180
-msgid "Preparing source media"
-msgstr "Preparando mídia fonte"
+msgid "Preparing source media..."
+msgstr "Preparando mídia fonte..."
 
 #: tazinst:2004 tazinst:2183
-msgid "Preparing target disk"
-msgstr "Preparando disco alvo"
+msgid "Preparing target disk..."
+msgstr "Preparando disco alvo..."
 
 #: tazinst:2007
-msgid "Cleaning the root partition if necessary"
-msgstr "Limpando partição root se necessário"
+msgid "Cleaning the root partition if necessary..."
+msgstr "Limpando partição root se necessário..."
 
 #: tazinst:2010 tazinst:2192
-msgid "Extracting the root system"
-msgstr "Extraindo o sistema de arquivos raiz"
+msgid "Extracting the root system..."
+msgstr "Extraindo o sistema de arquivos raiz..."
 
 #: tazinst:2013 tazinst:2198
-msgid "Installing the kernel"
-msgstr "Instalando o kernel"
+msgid "Installing the Kernel..."
+msgstr "Instalando o kernel..."
 
 #: tazinst:2016
-msgid "Preconfiguring the system"
-msgstr "Pré-configurando o sistema"
+msgid "Preconfiguring the system..."
+msgstr "Pré-configurando o sistema..."
 
 #: tazinst:2019
-msgid "Configuring root and default user account"
-msgstr "Configurando conta dos usuários padrão e root"
+msgid "Configuring root and default user account..."
+msgstr "Configurando conta dos usuários padrão e root..."
 
 #: tazinst:2022
-msgid "Configuring /home"
-msgstr "Configurando /home"
+msgid "Configuring /home..."
+msgstr "Configurando /home..."
 
 #: tazinst:2025
 msgid "Checking bootloader installation..."
@@ -660,32 +701,32 @@
 msgstr "Instalação dos arquivos completa"
 
 #: tazinst:2042
-msgid "Preparing upgrade of SliTaz release:"
-msgstr "Preparando atualização do SliTaz:"
+msgid "Preparing upgrade of SliTaz release: %s"
+msgstr "Preparando atualização do SliTaz: %s"
 
 #: tazinst:2044
 msgid ""
-"This partition doesn't appear to contain a valid SliTaz system, the file: /"
-"etc/slitaz-release doesn't exist."
+"%s: This partition doesn't appear to contain a valid SliTaz system, the "
+"file: %s doesn't exist."
 msgstr ""
-"Esta partição parece não conter um sistema SliTaz válido, o arquivo: /etc/"
-"slitaz-release não existe."
+"%s: Esta partição parece não conter um sistema SliTaz válido, o arquivo: %s "
+"não existe."
 
 #: tazinst:2067
-msgid "keeping /etc found on:"
-msgstr "Mantendo /etc encontrado em:"
+msgid "keeping /etc found on: %s"
+msgstr "Mantendo /etc encontrado em: %s"
 
 #: tazinst:2071
-msgid "keeping /var/www found on:"
-msgstr "Mantendo /var/www encontrado em:"
+msgid "keeping /var/www found on: %s"
+msgstr "Mantendo /var/www encontrado em: %s"
 
 #: tazinst:2098
-msgid "backups restored:"
-msgstr "backups restaurados:"
+msgid "backups restored: %s"
+msgstr "backups restaurados: %s"
 
 #: tazinst:2105
-msgid "backups saved in /var/lib/tazinst"
-msgstr "backups salvos em /var/lib/tazinst"
+msgid "backups saved in %s"
+msgstr "backups salvos em %s"
 
 #: tazinst:2112
 msgid "Checking the availability of packages..."
@@ -700,8 +741,8 @@
 msgstr "pacotes para instalar: 0"
 
 #: tazinst:2132
-msgid "Installing:"
-msgstr "Instalando:"
+msgid "Installing: %s..."
+msgstr "Instalando: %s..."
 
 #: tazinst:2141
 msgid "Installation of packages complete..."
@@ -711,51 +752,46 @@
 msgid "Creating package lists..."
 msgstr "Criando lista de pacotes..."
 
-#: tazinst:2152
-msgid "packages-source.list: done"
-msgstr "packages-source.list: feito"
-
-#: tazinst:2156
-msgid "packages-selection.diff: done"
-msgstr "packages-selection.diff: feito"
+#: tazinst:2152 tazinst:2156
+msgid "%s: done"
+msgstr "%s: feito"
 
 #: tazinst:2163
 msgid ""
 "The list of available packages on the mirror could not be downloaded. No "
 "missing packages will be reinstalled now, but you can do so later by looking "
-"at the following list:\n"
-"/var/lib/tazinst/packages-selection.diff"
+"at the following list:"
 msgstr ""
 "A lista de pacotes disponíveis no mirror não pode ser obtida. Nenhum pacote "
 "perdido será reinstalado, mas pode-se fazer isso depois mediante verificação "
-"da seguinte lista: /var/lib/tazinst/packages-selection.diff"
+"da seguinte lista:"
 
 #: tazinst:2175
-msgid "Upgrading SliTaz on:"
-msgstr "Atualizando SliTaz em:"
+msgid "Upgrading SliTaz on: %s"
+msgstr "Atualizando SliTaz em: %s"
 
 #: tazinst:2186
-msgid "Searching for /etc/slitaz-release"
-msgstr "Procurando por /etc/slitaz-release"
+msgid "Searching for %s..."
+msgstr "Procurando por %s..."
 
 #: tazinst:2189
-msgid "Backup /etc, /home and the packages list"
-msgstr "Backup de /etc/, /home e da lista de pacotes"
+msgid "Backup /etc, /home and the packages list..."
+msgstr "Backup de /etc/, /home e da lista de pacotes..."
 
 #: tazinst:2195
-msgid "Restoring configuration files"
-msgstr "Restaurando arquivos de configuração"
+msgid "Restoring configuration files..."
+msgstr "Restaurando arquivos de configuração..."
 
 #: tazinst:2201
-msgid "Upgrading added packages"
-msgstr "Atualizando pacotes adicionados"
+msgid "Upgrading added packages..."
+msgstr "Atualizando pacotes adicionados..."
 
 #: tazinst:2204
-msgid "Bootloader"
-msgstr "Gerenciador de boot"
+msgid "Bootloader..."
+msgstr "Gerenciador de boot..."
 
-#~ msgid "Using files from USB device..."
-#~ msgstr "Usando arquivos do dispositivo USB..."
+#~ msgid "%s: Download failed."
+#~ msgstr "%s: Download falhou."
 
 #~ msgid "Error: Missing parameter."
 #~ msgstr "Erro: parâmetro não encontrado."
@@ -799,9 +835,6 @@
 #~ msgid "Unknown source type"
 #~ msgstr "Tipo de arquivo fonte desconhecido"
 
-#~ msgid "URL not found"
-#~ msgstr "URL não encontrada"
-
 #~ msgid "Target and source partitions should be different"
 #~ msgstr "Partição alvo e fonte devem ser diferentes"
 
diff -r fee6f859a768 -r 7877ddbcbdbe po/tazinst/ru.po
--- a/po/tazinst/ru.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/tazinst/ru.po	Sat Apr 09 17:22:22 2016 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazInst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-04 11:45+0200\n"
+"POT-Creation-Date: 2016-04-09 16:49+0300\n"
 "PO-Revision-Date: 2016-04-06 09:48+0300\n"
 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
 "Language-Team: \n"
@@ -82,8 +82,8 @@
 msgstr "автоматический выбор"
 
 #: tazinst:83
-msgid "Grub legacy bootloader"
-msgstr "загрузчик Grub legacy"
+msgid "GRUB legacy bootloader"
+msgstr "загрузчик GRUB legacy"
 
 #: tazinst:84
 msgid "Lightweight bootloader"
@@ -106,7 +106,7 @@
 msgstr "стабильная основная графическая версия без графических программ"
 
 #: tazinst:99
-msgid "Stable basic graphic version with only Gtk"
+msgid "Stable basic graphic version with only GTK"
 msgstr "стабильная основная графическая версия только с GTK"
 
 #: tazinst:101
@@ -118,88 +118,84 @@
 msgstr "свежайшая нестабильная версия, обновляющаяся ежедневно"
 
 #: tazinst:114 tazinst:138 tazinst:150
-msgid "SliTaz GNU/Linux Installer - Version:"
-msgstr "Установщик SliTaz GNU/Linux, версия"
+msgid "SliTaz GNU/Linux Installer - Version: %s"
+msgstr "Установщик SliTaz GNU/Linux, версия %s"
+
+#: tazinst:115
+msgid "Usage:"
+msgstr "Использование:"
 
 #: tazinst:116
-msgid "Usage"
-msgstr "Использование"
+msgid "%s [command] <setting> <value> <file>"
+msgstr "%s [команда] <параметр> <значение> <файл>"
 
 #: tazinst:117
-msgid "tazinst [command] <setting> <value> <file>"
-msgstr "tazinst [команда] <параметр> <значение> <файл>"
+msgid "Commands:"
+msgstr "Команды:"
 
 #: tazinst:119
-msgid "Commands"
-msgstr "Команды"
-
-#: tazinst:120
 msgid "Create a new install file."
 msgstr "Создать новый файл установки."
 
-#: tazinst:121
+#: tazinst:120
 msgid "Change value of a setting."
 msgstr "Изменить значение параметра."
 
-#: tazinst:122
+#: tazinst:121
 msgid "Clear a setting."
 msgstr "Очистить параметр."
 
-#: tazinst:123
+#: tazinst:122
 msgid "Get the value of a setting."
 msgstr "Получить значение параметра."
 
-#: tazinst:124
+#: tazinst:123
 msgid "Check settings."
 msgstr "Проверить параметры."
 
-#: tazinst:125
+#: tazinst:124
 msgid "Print a short help on settings"
 msgstr "Выдать короткую справку о параметрах"
 
-#: tazinst:126
+#: tazinst:125
 msgid "List system resources."
 msgstr "Список системных ресурсов."
 
-#: tazinst:127
+#: tazinst:126
 msgid "Execute a SliTaz installation."
 msgstr "Запустить установку SliTaz."
 
-#: tazinst:128
+#: tazinst:127
 msgid "Display log file contents."
 msgstr "Показать содержимое журнала."
 
-#: tazinst:129
+#: tazinst:128
 msgid "Clean install and log files."
 msgstr "Очистить файлы установки и журнала."
 
-#: tazinst:130
+#: tazinst:129
 msgid "Print version and exit."
 msgstr "Показать версию и выйти."
 
-#: tazinst:131
+#: tazinst:130
 msgid "Print this short usage."
 msgstr "Показать эту короткую справку об использовании."
 
-#: tazinst:141
-msgid "Unknown command!"
-msgstr "Неизвестная команда!"
+#: tazinst:140
+msgid "'%s': Unknown command!"
+msgstr "Неизвестная команда «%s»!"
 
 #: tazinst:142
-msgid "Run"
-msgstr "Запустите"
+msgid "Run: '%s' to get a list of available commands."
+msgstr "Запустите «%s», чтобы получить список доступных команд."
 
-#: tazinst:143
-msgid "to get a list of available commands"
-msgstr ", чтобы получить список доступных команд"
-
-#: tazinst:153
-msgid "Unknown option!"
-msgstr "Неизвестный параметр!"
+#: tazinst:152
+msgid "'%s': Unknown option!"
+msgstr "Неизвестный параметр «%s»!"
 
 #: tazinst:154
-msgid "Please select one of these options"
-msgstr "Выберите один из параметров"
+msgid "Please select one of these options:"
+msgstr "Выберите один из параметров:"
 
 #: tazinst:173
 msgid "Warning: file already exists."
@@ -210,20 +206,24 @@
 msgstr "Ошибка: Не удалось создать файл."
 
 #: tazinst:278 tazinst:283
-msgid "Error: Unable to read install file"
-msgstr "Ошибка: Не удалось прочитать установочный файл"
+msgid "Error: Unable to read install file."
+msgstr "Ошибка: Не удалось прочитать установочный файл."
 
-#: tazinst:389
+#: tazinst:355
+msgid "Error: '%s' unknown setting."
+msgstr "Ошибка: Неизвестная настройка «%s»."
+
+#: tazinst:383
 msgid "Error: Unable to write to install file."
 msgstr "Ошибка: Не удалось записать установочный файл."
 
 #: tazinst:443
-msgid "Deleting install file"
-msgstr "Удаление установочного файла"
+msgid "Deleting install file: %s"
+msgstr "Удаление установочного файла %s"
 
 #: tazinst:445
-msgid "Error: Unable to delete install file"
-msgstr "Ошибка: Не удалось удалить установочный файл"
+msgid "Error: Unable to delete install file."
+msgstr "Ошибка: Не удалось удалить установочный файл."
 
 #: tazinst:460
 msgid ""
@@ -239,46 +239,42 @@
 msgstr "Tazinst уже был запущен."
 
 #: tazinst:485
-msgid "Error:"
-msgstr "Ошибка:"
-
-#: tazinst:485
-msgid "Invalid keyword."
-msgstr "Недопустимое ключевое слово."
+msgid "Error: '%s' Invalid keyword."
+msgstr "Ошибка: Недопустимое ключевое слово «%s»."
 
 #: tazinst:486
-msgid "Select one of these options:"
-msgstr "Выберите один из параметров:"
+msgid "Select one of these options: %s."
+msgstr "Выберите один из параметров: %s."
 
 #: tazinst:487
 msgid "For more information, see tazinst Manual."
 msgstr "Просмотрите руководство TazInst, чтобы получить больше информации."
 
 #: tazinst:502
-msgid "Error: Partition not found"
-msgstr "Ошибка: Раздел не найден"
+msgid "Error: Partition not found."
+msgstr "Ошибка: Раздел не найден."
 
 #: tazinst:503
-msgid "To see available partitions, run"
-msgstr "Запустите, чтобы увидеть доступные разделы"
+msgid "To see available partitions, run '%s'."
+msgstr "Запустите «%s», чтобы увидеть доступные разделы."
 
 #: tazinst:518
-msgid "Error: Source file not found"
-msgstr "Ошибка: файл источника не найден"
+msgid "Error: Source file not found."
+msgstr "Ошибка: файл источника не найден."
 
 #: tazinst:533
-msgid "Error: invalid URL"
-msgstr "Ошибка: недопустимый URL"
+msgid "Error: invalid URL."
+msgstr "Ошибка: недопустимый URL."
 
-#: tazinst:549
+#: tazinst:548
 msgid "Error: multiple assignations for a disk."
 msgstr "Ошибка: множественные назначения для диска."
 
 #: tazinst:562
-msgid "Error: password too long"
-msgstr "Ошибка: пароль слишком длинный"
+msgid "Error: password too long."
+msgstr "Ошибка: пароль слишком длинный."
 
-#: tazinst:568
+#: tazinst:567
 msgid "Error: Unallowed characters in password."
 msgstr "Ошибка: неразрешенные символы в пароле."
 
@@ -290,21 +286,25 @@
 msgid "Warning: no password!"
 msgstr "Предупреждение: нет пароля!"
 
+#: tazinst:590
+msgid "%s Error: Too short."
+msgstr "%s Ошибка: слишком коротко."
+
 #: tazinst:594
-msgid "Error: Too long."
-msgstr "Ошибка: слишком длинно."
+msgid "%s Error: Too long."
+msgstr "%s Ошибка: слишком длинно."
 
 #: tazinst:599
-msgid "Error: Invalid chars."
-msgstr "Ошибка: недопустимые символы."
+msgid "%s Error: Invalid chars."
+msgstr "%s Ошибка: недопустимые символы."
 
 #: tazinst:611
 msgid "Error: Dualboot set with no bootloader."
 msgstr "Ошибка: включена двойная загрузка без загрузчика."
 
 #: tazinst:625
-msgid "Error: Unsupported Partition Table"
-msgstr "Ошибка: неподдерживаемая таблица разделов"
+msgid "Error: Unsupported Partition Table."
+msgstr "Ошибка: неподдерживаемая таблица разделов."
 
 #: tazinst:630
 msgid "Error: No disk selected, cannot install any bootloader."
@@ -319,113 +319,120 @@
 msgstr "Название или URL образа в интернете."
 
 #: tazinst:753
-msgid "Type: tazinst help web"
-msgstr "Напечатайте: tazinst help web"
+msgid "Type: %s"
+msgstr "Напечатайте: %s"
 
 #: tazinst:758
+msgid "List of settings:"
+msgstr "Список параметров:"
+
+#: tazinst:760
 msgid "Mode of install"
 msgstr "Режим установки"
 
-#: tazinst:759
+#: tazinst:761
 msgid "Media containing the SliTaz source files"
 msgstr "Носитель, содержащий исходные файлы SliTaz"
 
-#: tazinst:760
+#: tazinst:762
 msgid "Source file containing SliTaz"
 msgstr "Исходный файл, содержащий SliTaz"
 
-#: tazinst:761
+#: tazinst:763
 msgid "The name of the target partition"
 msgstr "Название целевого раздела"
 
-#: tazinst:762
+#: tazinst:764
 msgid "Format of the target partition"
 msgstr "Формат целевого раздела"
 
-#: tazinst:763
+#: tazinst:765
 msgid "Separate home partition"
 msgstr "Отдельный домашний раздел"
 
-#: tazinst:764
+#: tazinst:766
 msgid "Format of the root partition"
 msgstr "Формат корневого раздела"
 
-#: tazinst:765 tazinst:811
+#: tazinst:767 tazinst:811
 msgid "Name of the system"
 msgstr "Название системы"
 
-#: tazinst:766 tazinst:813
+#: tazinst:768 tazinst:813
 msgid "Superuser password"
 msgstr "Пароль администратора"
 
-#: tazinst:767 tazinst:815
+#: tazinst:769 tazinst:815
 msgid "First user name"
 msgstr "Логин первого пользователя"
 
-#: tazinst:768 tazinst:817
+#: tazinst:770 tazinst:817
 msgid "First user password"
 msgstr "Пароль первого пользователя"
 
-#: tazinst:769
+#: tazinst:771
 msgid "Install a bootloader"
 msgstr "Установить загрузчик"
 
-#: tazinst:770
+#: tazinst:772
 msgid "Partition to dualboot Windows from"
 msgstr "Раздел из которого будет двойная загрузка Windows"
 
-#: tazinst:771
-msgid "List of settings:"
-msgstr "Список параметров:"
-
 #: tazinst:790
 msgid "CD. Automatically set"
 msgstr "Компакт-диск. Автоматически установлено"
 
 #: tazinst:793
-msgid "USB partition. For a list, type: tazinst list usb"
-msgstr "Раздел USB. Чтобы получить список, напечатайте: tazinst list usb"
+msgid "USB partition. For a list, type: %s"
+msgstr "Раздел USB. Чтобы получить список, напечатайте: %s"
 
 #: tazinst:796
-msgid "ISO file name. For a list, type: tazinst list iso"
-msgstr ""
-"Название файла ISO. Чтобы получить список, напечатайте: tazinst list iso"
+msgid "ISO file name. For a list, type: %s"
+msgstr "Название файла ISO. Чтобы получить список, напечатайте: %s"
 
 #: tazinst:822
 msgid "Partition containing Windows, or 'auto'"
 msgstr "Раздел, содержащий Windows, или «auto»"
 
 #: tazinst:1127
-msgid "No mirror list found, run tazpkg recharge."
-msgstr "Список зеркал не найден, запустите tazpkg recharge."
+msgid "No mirror list found, run %s."
+msgstr "Список зеркал не найден, запустите %s."
 
 #: tazinst:1139
-msgid "Downloading:"
-msgstr "Загружается:"
+msgid "Downloading: %s"
+msgstr "Загружается: %s"
 
 #: tazinst:1146
 msgid "Download completed."
 msgstr "Загрузка завершена."
 
-#: tazinst:1148
-msgid "Download failed."
-msgstr "Ошибка загрузки."
+#: tazinst:1157
+msgid "Installing package %s to the current system."
+msgstr "Установка пакета %s на текущую систему."
 
-#: tazinst:1157
-msgid "Installing package to the current system:"
-msgstr "Установка пакета на текущую систему:"
+#: tazinst:1159
+msgid "Cannot install %s."
+msgstr "Не удалось установить %s."
 
 #: tazinst:1167
-msgid "Adding package to the target system:"
-msgstr "Добавление пакета в целевую систему:"
+msgid "Adding package %s to the target system..."
+msgstr "Добавление пакета %s на целевую систему…"
+
+#: tazinst:1182
+msgid "=== Tazinst: started on %s ==="
+msgstr "=== Tazinst запущен %s ==="
 
 #: tazinst:1208
 msgid "Process not completed"
 msgstr "Процесс не завершен"
 
 #: tazinst:1209 tazinst:1213
-msgid "Error"
-msgstr "Ошибка"
+msgid "Error: %s"
+msgstr "Ошибка: %s"
+
+#: tazinst:1216
+msgid "=== Tazinst error on %s ==="
+msgstr "=== Ошибка tazinst %s ==="
 
 #: tazinst:1225
 msgid "Internal error"
@@ -436,40 +443,45 @@
 msgstr "Отменено пользователем"
 
 #: tazinst:1251
-msgid "Using files from"
-msgstr "Используя файлы из"
+msgid "Using files from %s."
+msgstr "Используются файлы из %s."
 
 #: tazinst:1253
-msgid "Mount failed"
-msgstr "Подключение не удалось"
+msgid "%s: Mount failed."
+msgstr "Подключение %s не удалось."
 
-#: tazinst:1262 tazinst:1267
-msgid "Using files from USB device"
-msgstr "Используя файлы с накопителя USB"
+#: tazinst:1262
+msgid "Using files from USB device..."
+msgstr "Используются файлы с накопителя USB…"
+
+#: tazinst:1267
+msgid "Using files from USB device %s."
+msgstr "Используются файлы с накопителя USB %s."
 
 #: tazinst:1269
-msgid "Failed to mount USB device"
-msgstr "Не удалось подключить накопитель USB"
+msgid "%s: Failed to mount USB device."
+msgstr "Не удалось подключить накопитель USB %s."
 
 #: tazinst:1284
 msgid "md5sum error, file corrupted."
 msgstr "Ошибка контрольной суммы, файл поврежден."
 
 #: tazinst:1287
-msgid "md5 file not found, cannot check integrity."
-msgstr "Файл контрольной суммы не найден, проверить целостность невозможно."
+msgid "%s: md5 file not found, cannot check integrity."
+msgstr ""
+"Файл контрольной суммы не найден на %s, проверить целостность невозможно."
 
 #: tazinst:1292
-msgid "Using files from ISO"
-msgstr "Используя файлы из ISO"
+msgid "Using files from ISO %s."
+msgstr "Используются файлы из ISO %s."
 
 #: tazinst:1294
-msgid "Failed to mount ISO."
-msgstr "Не удалось подключить ISO."
+msgid "%s: Failed to mount ISO."
+msgstr "Не удалось подключить ISO %s."
 
 #: tazinst:1316 tazinst:1404
-msgid "Creating mount point:"
-msgstr "Создание точки подключения:"
+msgid "Creating mount point: %s..."
+msgstr "Создание точки подключения %s…"
 
 #: tazinst:1332
 msgid "Checking installation media..."
@@ -484,8 +496,12 @@
 msgstr "Установочный носитель в порядке"
 
 #: tazinst:1349
-msgid "Format"
-msgstr "Форматирование"
+msgid "Format %s (%s)"
+msgstr "Форматирование %s (%s)"
+
+#: tazinst:1354 tazinst:1366
+msgid "Formatting has failed"
+msgstr "Форматирование завершилось ошибкой"
 
 #: tazinst:1373
 msgid "Preparing target partition..."
@@ -500,44 +516,48 @@
 msgstr "Раздел уже используется."
 
 #: tazinst:1389
-msgid "The partition will be cleaned..."
-msgstr "Раздел будет очищен…"
+msgid "%s: The partition will be cleaned..."
+msgstr "Раздел %s будет очищен…"
 
 #: tazinst:1398
-msgid "The partition will be kept..."
-msgstr "Раздел будет сохранен…"
+msgid "%s: The partition will be kept..."
+msgstr "Раздел %s будет сохранен…"
 
 #: tazinst:1413
-msgid "Unable to mount partition"
-msgstr "Не удалось подключить раздел"
+msgid "%s: Unable to mount partition"
+msgstr "Не удалось подключить раздел %s"
 
 #: tazinst:1427
-msgid "Unmounting target partition:"
-msgstr "Отключение целевого раздела:"
+msgid "Unmounting target partition: %s"
+msgstr "Отключение целевого раздела %s"
 
 #: tazinst:1433
-msgid "Unmounting:"
-msgstr "Отключение:"
+msgid "Unmounting: %s"
+msgstr "Отключение %s"
 
 #: tazinst:1437
-msgid "Unlinking:"
-msgstr "Удаление ссылки:"
+msgid "Unlinking: %s"
+msgstr "Удаление ссылки %s"
 
 #: tazinst:1443
-msgid "Ejecting cdrom..."
+msgid "Ejecting CD-ROM..."
 msgstr "Извлечение CD-ROM…"
 
 #: tazinst:1452
-msgid "Process completed. You can now restart (reboot)"
-msgstr "Процесс завершен. Теперь вы можете перезагрузить"
+msgid ""
+"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux "
+"system."
+msgstr ""
+"Процесс завершен. Теперь вы можете перезагрузить вашу систему SliTaz GNU/"
+"Linux."
 
-#: tazinst:1453
-msgid "from your SliTaz GNU/Linux system."
-msgstr "вашу систему SliTaz GNU/Linux."
+#: tazinst:1454
+msgid "=== Tazinst ended on %s ==="
+msgstr "=== Tazinst завершен %s ==="
 
 #: tazinst:1457
-msgid "Copying log to /var/log/tazinst.log"
-msgstr "Копирование журнала в /var/log/tazinst.log"
+msgid "Copying log to %s"
+msgstr "Копирование журнала в %s"
 
 #: tazinst:1493
 msgid "No bootloader to install."
@@ -548,8 +568,12 @@
 msgstr "Включение двойной загрузки Windows"
 
 #: tazinst:1610
-msgid "Installing grub on:"
-msgstr "Установка GRUB на:"
+msgid "Installing GRUB on: %s"
+msgstr "Установка GRUB на %s"
+
+#: tazinst:1611
+msgid "GRUB not found"
+msgstr "GRUB не обнаружен"
 
 #: tazinst:1615
 msgid "Setting the boot flag"
@@ -560,15 +584,23 @@
 msgstr "Копирование изображения заставки"
 
 #: tazinst:1710
-msgid "Installing syslinux"
-msgstr "Установка syslinux"
+msgid "Installing Syslinux"
+msgstr "Установка Syslinux"
+
+#: tazinst:1720
+msgid "Syslinux not found"
+msgstr "Syslinux не обнаружен"
 
 #: tazinst:1724
 msgid "Setting the boot flag on"
 msgstr "Включение загрузочного флага"
 
+#: tazinst:1727
+msgid "mbr.bin not found"
+msgstr "Файл mbr.bin не обнаружен"
+
 #: tazinst:1728
-msgid "Installing mbr"
+msgid "Installing MBR"
 msgstr "Установка MBR"
 
 #: tazinst:1732
@@ -576,84 +608,88 @@
 msgstr "Включение флага legacy_boot"
 
 #: tazinst:1741
-msgid "Installing gptmbr"
+msgid "Installing GPTMBR"
 msgstr "Установка GPTMBR"
 
+#: tazinst:1742
+msgid "gptmbr.bin not found"
+msgstr "Файл gptmbr.bin не обнаружен"
+
 #: tazinst:1781
-msgid "Cleaning the root partition"
-msgstr "Очистка корневого раздела"
+msgid "Cleaning the root partition (%s)..."
+msgstr "Очистка корневого раздела (%s)…"
 
 #: tazinst:1790 tazinst:2063
-msgid "keeping /home found on:"
-msgstr "не будет удалена папка /home, найденная на:"
+msgid "keeping /home found on: %s"
+msgstr "не будет удалена папка /home, найденная на %s"
 
-#: tazinst:1795
-msgid "removing target:"
-msgstr "удаление цели:"
+#: tazinst:1795 tazinst:2077
+msgid "removing target: %s"
+msgstr "удаление цели %s"
 
 #: tazinst:1813
-msgid "Kernel name not found, falling back to:"
-msgstr "Название ядра не найдено, откат к:"
+msgid "Kernel name not found, falling back to: %s"
+msgstr "Название ядра не найдено, принимается название %s"
 
 #: tazinst:1819
-msgid "install_kernel:"
-msgstr "install_kernel:"
+msgid "install_kernel: %s"
+msgstr "install_kernel %s"
 
 #: tazinst:1905
 msgid "Restoring directory: /home..."
 msgstr "Восстановление папки /home…"
 
 #: tazinst:1911
-msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..."
-msgstr "Добавление корневого раздела и CHECK_FS в файл /etc/rcS.conf…"
+msgid "Adding / partition and CHECK_FS to file %s..."
+msgstr "Добавление корневого раздела и CHECK_FS в файл %s…"
 
 #: tazinst:1914
-msgid "Configuring host name:"
-msgstr "Настройка названия хоста:"
+msgid "Configuring host name: %s"
+msgstr "Настройка названия хоста: %s"
 
 #: tazinst:1977
-msgid "Configuring partition to be used as /home:"
-msgstr "Настройка раздела для использования как /home:"
+msgid "Configuring partition to be used as /home: %s"
+msgstr "Настройка раздела %s для использования как /home"
 
 #: tazinst:1996
-msgid "Installing SliTaz on:"
-msgstr "Установка SliTaz на:"
+msgid "Installing SliTaz on: %s"
+msgstr "Установка SliTaz на %s"
 
 #: tazinst:1997 tazinst:2176
-msgid "Checking settings"
-msgstr "Проверка настроек"
+msgid "Checking settings..."
+msgstr "Проверка настроек…"
 
 #: tazinst:2001 tazinst:2180
-msgid "Preparing source media"
-msgstr "Подготовка исходного носителя"
+msgid "Preparing source media..."
+msgstr "Подготовка исходного носителя…"
 
 #: tazinst:2004 tazinst:2183
-msgid "Preparing target disk"
-msgstr "Подготовка целевого диска"
+msgid "Preparing target disk..."
+msgstr "Подготовка целевого диска…"
 
 #: tazinst:2007
-msgid "Cleaning the root partition if necessary"
-msgstr "Очистка корневого раздела при необходимости"
+msgid "Cleaning the root partition if necessary..."
+msgstr "Очистка корневого раздела при необходимости…"
 
 #: tazinst:2010 tazinst:2192
-msgid "Extracting the root system"
-msgstr "Извлечение корневой системы"
+msgid "Extracting the root system..."
+msgstr "Извлечение корневой системы…"
 
 #: tazinst:2013 tazinst:2198
-msgid "Installing the kernel"
-msgstr "Установка ядра"
+msgid "Installing the Kernel..."
+msgstr "Установка ядра…"
 
 #: tazinst:2016
-msgid "Preconfiguring the system"
-msgstr "Перенастройка системы"
+msgid "Preconfiguring the system..."
+msgstr "Перенастройка системы…"
 
 #: tazinst:2019
-msgid "Configuring root and default user account"
-msgstr "Настройка учетных записей root и пользователя по умолчанию"
+msgid "Configuring root and default user account..."
+msgstr "Настройка учетных записей root и пользователя по умолчанию…"
 
 #: tazinst:2022
-msgid "Configuring /home"
-msgstr "Настройка /home"
+msgid "Configuring /home..."
+msgstr "Настройка /home…"
 
 #: tazinst:2025
 msgid "Checking bootloader installation..."
@@ -664,32 +700,32 @@
 msgstr "Установка файлов завершена"
 
 #: tazinst:2042
-msgid "Preparing upgrade of SliTaz release:"
-msgstr "Подготовка к обновлению выпуска SliTaz:"
+msgid "Preparing upgrade of SliTaz release: %s"
+msgstr "Подготовка к обновлению выпуска SliTaz %s"
 
 #: tazinst:2044
 msgid ""
-"This partition doesn't appear to contain a valid SliTaz system, the file: /"
-"etc/slitaz-release doesn't exist."
+"%s: This partition doesn't appear to contain a valid SliTaz system, the "
+"file: %s doesn't exist."
 msgstr ""
-"Похоже, что этот раздел не содержит допустимую систему SliTaz, отсутствует "
-"файл /etc/slitaz-release."
+"Похоже, что раздел %s не содержит допустимую систему SliTaz, отсутствует "
+"файл %s."
 
 #: tazinst:2067
-msgid "keeping /etc found on:"
-msgstr "не будет удалена папка /etc, найденная на:"
+msgid "keeping /etc found on: %s"
+msgstr "не будет удалена папка /etc, найденная на %s"
 
 #: tazinst:2071
-msgid "keeping /var/www found on:"
-msgstr "не будет удалена папка /var/www, найденная на:"
+msgid "keeping /var/www found on: %s"
+msgstr "не будет удалена папка /var/www, найденная на: %s"
 
 #: tazinst:2098
-msgid "backups restored:"
-msgstr "резервные копии восстановлены:"
+msgid "backups restored: %s"
+msgstr "резервные копии восстановлены %s"
 
 #: tazinst:2105
-msgid "backups saved in /var/lib/tazinst"
-msgstr "резервные копии сохранены в папке /var/lib/tazinst"
+msgid "backups saved in %s"
+msgstr "резервные копии сохранены в папке %s"
 
 #: tazinst:2112
 msgid "Checking the availability of packages..."
@@ -704,8 +740,8 @@
 msgstr "ничего не нужно устанавливать"
 
 #: tazinst:2132
-msgid "Installing:"
-msgstr "Установка:"
+msgid "Installing: %s..."
+msgstr "Установка %s…"
 
 #: tazinst:2141
 msgid "Installation of packages complete..."
@@ -715,46 +751,43 @@
 msgid "Creating package lists..."
 msgstr "Создание списка пакетов…"
 
-#: tazinst:2152
-msgid "packages-source.list: done"
-msgstr "packages-source.list: готово"
-
-#: tazinst:2156
-msgid "packages-selection.diff: done"
-msgstr "packages-selection.diff: готово"
+#: tazinst:2152 tazinst:2156
+msgid "%s: done"
+msgstr "%s: готово"
 
 #: tazinst:2163
 msgid ""
 "The list of available packages on the mirror could not be downloaded. No "
 "missing packages will be reinstalled now, but you can do so later by looking "
-"at the following list:\n"
-"/var/lib/tazinst/packages-selection.diff"
+"at the following list:"
 msgstr ""
 "Список пакетов, доступных на зеркале, не может быть загружен. Отсутствующие "
 "пакеты сейчас не будут переустановлены, но это можно сделать позже, "
-"просмотрев следующий список:\n"
-"/var/lib/tazinst/packages-selection.diff"
+"просмотрев следующий список:"
 
 #: tazinst:2175
-msgid "Upgrading SliTaz on:"
-msgstr "Обновление SliTaz на:"
+msgid "Upgrading SliTaz on: %s"
+msgstr "Обновление SliTaz на %s"
 
 #: tazinst:2186
-msgid "Searching for /etc/slitaz-release"
-msgstr "Поиск файла /etc/slitaz-release"
+msgid "Searching for %s..."
+msgstr "Поиск файла %s…"
 
 #: tazinst:2189
-msgid "Backup /etc, /home and the packages list"
-msgstr "Сохранение резервной копии /etc, /home и списка пакетов"
+msgid "Backup /etc, /home and the packages list..."
+msgstr "Сохранение резервной копии /etc, /home и списка пакетов…"
 
 #: tazinst:2195
-msgid "Restoring configuration files"
-msgstr "Восстановление конфигурационных файлов"
+msgid "Restoring configuration files..."
+msgstr "Восстановление конфигурационных файлов…"
 
 #: tazinst:2201
-msgid "Upgrading added packages"
-msgstr "Обновление добавленных пакетов"
+msgid "Upgrading added packages..."
+msgstr "Обновление добавленных пакетов…"
 
 #: tazinst:2204
-msgid "Bootloader"
-msgstr "Загрузчик"
+msgid "Bootloader..."
+msgstr "Загрузчик…"
+
+#~ msgid "Download failed."
+#~ msgstr "Ошибка загрузки."
diff -r fee6f859a768 -r 7877ddbcbdbe po/tazinst/tazinst.pot
--- a/po/tazinst/tazinst.pot	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/tazinst/tazinst.pot	Sat Apr 09 17:22:22 2016 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: TazInst \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 19:03+0100\n"
+"POT-Creation-Date: 2016-04-09 17:07+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"
@@ -78,7 +78,7 @@
 msgstr ""
 
 #: tazinst:83
-msgid "Grub legacy bootloader"
+msgid "GRUB legacy bootloader"
 msgstr ""
 
 #: tazinst:84
@@ -102,7 +102,7 @@
 msgstr ""
 
 #: tazinst:99
-msgid "Stable basic graphic version with only Gtk"
+msgid "Stable basic graphic version with only GTK"
 msgstr ""
 
 #: tazinst:101
@@ -114,87 +114,83 @@
 msgstr ""
 
 #: tazinst:114 tazinst:138 tazinst:150
-msgid "SliTaz GNU/Linux Installer - Version:"
+msgid "SliTaz GNU/Linux Installer - Version: %s"
+msgstr ""
+
+#: tazinst:115
+msgid "Usage:"
 msgstr ""
 
 #: tazinst:116
-msgid "Usage"
+msgid "%s [command] <setting> <value> <file>"
 msgstr ""
 
 #: tazinst:117
-msgid "tazinst [command] <setting> <value> <file>"
+msgid "Commands:"
 msgstr ""
 
 #: tazinst:119
-msgid "Commands"
+msgid "Create a new install file."
 msgstr ""
 
 #: tazinst:120
-msgid "Create a new install file."
+msgid "Change value of a setting."
 msgstr ""
 
 #: tazinst:121
-msgid "Change value of a setting."
+msgid "Clear a setting."
 msgstr ""
 
 #: tazinst:122
-msgid "Clear a setting."
+msgid "Get the value of a setting."
 msgstr ""
 
 #: tazinst:123
-msgid "Get the value of a setting."
+msgid "Check settings."
 msgstr ""
 
 #: tazinst:124
-msgid "Check settings."
+msgid "Print a short help on settings"
 msgstr ""
 
 #: tazinst:125
-msgid "Print a short help on settings"
+msgid "List system resources."
 msgstr ""
 
 #: tazinst:126
-msgid "List system resources."
+msgid "Execute a SliTaz installation."
 msgstr ""
 
 #: tazinst:127
-msgid "Execute a SliTaz installation."
+msgid "Display log file contents."
 msgstr ""
 
 #: tazinst:128
-msgid "Display log file contents."
+msgid "Clean install and log files."
 msgstr ""
 
 #: tazinst:129
-msgid "Clean install and log files."
+msgid "Print version and exit."
 msgstr ""
 
 #: tazinst:130
-msgid "Print version and exit."
-msgstr ""
-
-#: tazinst:131
 msgid "Print this short usage."
 msgstr ""
 
-#: tazinst:141
-msgid "Unknown command!"
+#: tazinst:140
+msgid "'%s': Unknown command!"
 msgstr ""
 
 #: tazinst:142
-msgid "Run"
+msgid "Run: '%s' to get a list of available commands."
 msgstr ""
 
-#: tazinst:143
-msgid "to get a list of available commands"
-msgstr ""
-
-#: tazinst:153
-msgid "Unknown option!"
+#: tazinst:152
+msgid "'%s': Unknown option!"
 msgstr ""
 
 #: tazinst:154
-msgid "Please select one of these options"
+msgid "Please select one of these options:"
 msgstr ""
 
 #: tazinst:173
@@ -206,19 +202,23 @@
 msgstr ""
 
 #: tazinst:278 tazinst:283
-msgid "Error: Unable to read install file"
+msgid "Error: Unable to read install file."
 msgstr ""
 
-#: tazinst:389
+#: tazinst:355
+msgid "Error: '%s' unknown setting."
+msgstr ""
+
+#: tazinst:383
 msgid "Error: Unable to write to install file."
 msgstr ""
 
 #: tazinst:443
-msgid "Deleting install file"
+msgid "Deleting install file: %s"
 msgstr ""
 
 #: tazinst:445
-msgid "Error: Unable to delete install file"
+msgid "Error: Unable to delete install file."
 msgstr ""
 
 #: tazinst:460
@@ -232,15 +232,11 @@
 msgstr ""
 
 #: tazinst:485
-msgid "Error:"
-msgstr ""
-
-#: tazinst:485
-msgid "Invalid keyword."
+msgid "Error: '%s' Invalid keyword."
 msgstr ""
 
 #: tazinst:486
-msgid "Select one of these options:"
+msgid "Select one of these options: %s."
 msgstr ""
 
 #: tazinst:487
@@ -248,30 +244,30 @@
 msgstr ""
 
 #: tazinst:502
-msgid "Error: Partition not found"
+msgid "Error: Partition not found."
 msgstr ""
 
 #: tazinst:503
-msgid "To see available partitions, run"
+msgid "To see available partitions, run '%s'."
 msgstr ""
 
 #: tazinst:518
-msgid "Error: Source file not found"
+msgid "Error: Source file not found."
 msgstr ""
 
 #: tazinst:533
-msgid "Error: invalid URL"
+msgid "Error: invalid URL."
 msgstr ""
 
-#: tazinst:549
+#: tazinst:548
 msgid "Error: multiple assignations for a disk."
 msgstr ""
 
 #: tazinst:562
-msgid "Error: password too long"
+msgid "Error: password too long."
 msgstr ""
 
-#: tazinst:568
+#: tazinst:567
 msgid "Error: Unallowed characters in password."
 msgstr ""
 
@@ -283,12 +279,16 @@
 msgid "Warning: no password!"
 msgstr ""
 
+#: tazinst:590
+msgid "%s Error: Too short."
+msgstr ""
+
 #: tazinst:594
-msgid "Error: Too long."
+msgid "%s Error: Too long."
 msgstr ""
 
 #: tazinst:599
-msgid "Error: Invalid chars."
+msgid "%s Error: Invalid chars."
 msgstr ""
 
 #: tazinst:611
@@ -296,7 +296,7 @@
 msgstr ""
 
 #: tazinst:625
-msgid "Error: Unsupported Partition Table"
+msgid "Error: Unsupported Partition Table."
 msgstr ""
 
 #: tazinst:630
@@ -312,75 +312,75 @@
 msgstr ""
 
 #: tazinst:753
-msgid "Type: tazinst help web"
+msgid "Type: %s"
 msgstr ""
 
 #: tazinst:758
+msgid "List of settings:"
+msgstr ""
+
+#: tazinst:760
 msgid "Mode of install"
 msgstr ""
 
-#: tazinst:759
+#: tazinst:761
 msgid "Media containing the SliTaz source files"
 msgstr ""
 
-#: tazinst:760
+#: tazinst:762
 msgid "Source file containing SliTaz"
 msgstr ""
 
-#: tazinst:761
+#: tazinst:763
 msgid "The name of the target partition"
 msgstr ""
 
-#: tazinst:762
+#: tazinst:764
 msgid "Format of the target partition"
 msgstr ""
 
-#: tazinst:763
+#: tazinst:765
 msgid "Separate home partition"
 msgstr ""
 
-#: tazinst:764
+#: tazinst:766
 msgid "Format of the root partition"
 msgstr ""
 
-#: tazinst:765 tazinst:811
+#: tazinst:767 tazinst:811
 msgid "Name of the system"
 msgstr ""
 
-#: tazinst:766 tazinst:813
+#: tazinst:768 tazinst:813
 msgid "Superuser password"
 msgstr ""
 
-#: tazinst:767 tazinst:815
+#: tazinst:769 tazinst:815
 msgid "First user name"
 msgstr ""
 
-#: tazinst:768 tazinst:817
+#: tazinst:770 tazinst:817
 msgid "First user password"
 msgstr ""
 
-#: tazinst:769
+#: tazinst:771
 msgid "Install a bootloader"
 msgstr ""
 
-#: tazinst:770
+#: tazinst:772
 msgid "Partition to dualboot Windows from"
 msgstr ""
 
-#: tazinst:771
-msgid "List of settings:"
-msgstr ""
-
 #: tazinst:790
 msgid "CD. Automatically set"
 msgstr ""
 
 #: tazinst:793
-msgid "USB partition. For a list, type: tazinst list usb"
+msgid "USB partition. For a list, type: %s"
 msgstr ""
 
 #: tazinst:796
-msgid "ISO file name. For a list, type: tazinst list iso"
+msgid "ISO file name. For a list, type: %s"
 msgstr ""
 
 #: tazinst:822
@@ -388,27 +388,31 @@
 msgstr ""
 
 #: tazinst:1127
-msgid "No mirror list found, run tazpkg recharge."
+msgid "No mirror list found, run %s."
 msgstr ""
 
 #: tazinst:1139
-msgid "Downloading:"
+msgid "Downloading: %s"
 msgstr ""
 
 #: tazinst:1146
 msgid "Download completed."
 msgstr ""
 
-#: tazinst:1148
-msgid "Download failed."
+#: tazinst:1157
+msgid "Installing package %s to the current system."
 msgstr ""
 
-#: tazinst:1157
-msgid "Installing package to the current system:"
+#: tazinst:1159
+msgid "Cannot install %s."
 msgstr ""
 
 #: tazinst:1167
-msgid "Adding package to the target system:"
+msgid "Adding package %s to the target system..."
+msgstr ""
+
+#: tazinst:1182
+msgid "=== Tazinst: started on %s ==="
 msgstr ""
 
 #: tazinst:1208
@@ -416,7 +420,11 @@
 msgstr ""
 
 #: tazinst:1209 tazinst:1213
-msgid "Error"
+msgid "Error: %s"
+msgstr ""
+
+#: tazinst:1216
+msgid "=== Tazinst error on %s ==="
 msgstr ""
 
 #: tazinst:1225
@@ -428,19 +436,23 @@
 msgstr ""
 
 #: tazinst:1251
-msgid "Using files from"
+msgid "Using files from %s."
 msgstr ""
 
 #: tazinst:1253
-msgid "Mount failed"
+msgid "%s: Mount failed."
 msgstr ""
 
-#: tazinst:1262 tazinst:1267
-msgid "Using files from USB device"
+#: tazinst:1262
+msgid "Using files from USB device..."
+msgstr ""
+
+#: tazinst:1267
+msgid "Using files from USB device %s."
 msgstr ""
 
 #: tazinst:1269
-msgid "Failed to mount USB device"
+msgid "%s: Failed to mount USB device."
 msgstr ""
 
 #: tazinst:1284
@@ -448,19 +460,19 @@
 msgstr ""
 
 #: tazinst:1287
-msgid "md5 file not found, cannot check integrity."
+msgid "%s: md5 file not found, cannot check integrity."
 msgstr ""
 
 #: tazinst:1292
-msgid "Using files from ISO"
+msgid "Using files from ISO %s."
 msgstr ""
 
 #: tazinst:1294
-msgid "Failed to mount ISO."
+msgid "%s: Failed to mount ISO."
 msgstr ""
 
 #: tazinst:1316 tazinst:1404
-msgid "Creating mount point:"
+msgid "Creating mount point: %s..."
 msgstr ""
 
 #: tazinst:1332
@@ -476,7 +488,11 @@
 msgstr ""
 
 #: tazinst:1349
-msgid "Format"
+msgid "Format %s (%s)"
+msgstr ""
+
+#: tazinst:1354 tazinst:1366
+msgid "Formatting has failed"
 msgstr ""
 
 #: tazinst:1373
@@ -492,43 +508,45 @@
 msgstr ""
 
 #: tazinst:1389
-msgid "The partition will be cleaned..."
+msgid "%s: The partition will be cleaned..."
 msgstr ""
 
 #: tazinst:1398
-msgid "The partition will be kept..."
+msgid "%s: The partition will be kept..."
 msgstr ""
 
 #: tazinst:1413
-msgid "Unable to mount partition"
+msgid "%s: Unable to mount partition"
 msgstr ""
 
 #: tazinst:1427
-msgid "Unmounting target partition:"
+msgid "Unmounting target partition: %s"
 msgstr ""
 
 #: tazinst:1433
-msgid "Unmounting:"
+msgid "Unmounting: %s"
 msgstr ""
 
 #: tazinst:1437
-msgid "Unlinking:"
+msgid "Unlinking: %s"
 msgstr ""
 
 #: tazinst:1443
-msgid "Ejecting cdrom..."
+msgid "Ejecting CD-ROM..."
 msgstr ""
 
 #: tazinst:1452
-msgid "Process completed. You can now restart (reboot)"
+msgid ""
+"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux "
+"system."
 msgstr ""
 
-#: tazinst:1453
-msgid "from your SliTaz GNU/Linux system."
+#: tazinst:1454
+msgid "=== Tazinst ended on %s ==="
 msgstr ""
 
 #: tazinst:1457
-msgid "Copying log to /var/log/tazinst.log"
+msgid "Copying log to %s"
 msgstr ""
 
 #: tazinst:1493
@@ -540,7 +558,11 @@
 msgstr ""
 
 #: tazinst:1610
-msgid "Installing grub on:"
+msgid "Installing GRUB on: %s"
+msgstr ""
+
+#: tazinst:1611
+msgid "GRUB not found"
 msgstr ""
 
 #: tazinst:1615
@@ -552,15 +574,23 @@
 msgstr ""
 
 #: tazinst:1710
-msgid "Installing syslinux"
+msgid "Installing Syslinux"
+msgstr ""
+
+#: tazinst:1720
+msgid "Syslinux not found"
 msgstr ""
 
 #: tazinst:1724
 msgid "Setting the boot flag on"
 msgstr ""
 
+#: tazinst:1727
+msgid "mbr.bin not found"
+msgstr ""
+
 #: tazinst:1728
-msgid "Installing mbr"
+msgid "Installing MBR"
 msgstr ""
 
 #: tazinst:1732
@@ -568,27 +598,31 @@
 msgstr ""
 
 #: tazinst:1741
-msgid "Installing gptmbr"
+msgid "Installing GPTMBR"
+msgstr ""
+
+#: tazinst:1742
+msgid "gptmbr.bin not found"
 msgstr ""
 
 #: tazinst:1781
-msgid "Cleaning the root partition"
+msgid "Cleaning the root partition (%s)..."
 msgstr ""
 
 #: tazinst:1790 tazinst:2063
-msgid "keeping /home found on:"
+msgid "keeping /home found on: %s"
 msgstr ""
 
-#: tazinst:1795
-msgid "removing target:"
+#: tazinst:1795 tazinst:2077
+msgid "removing target: %s"
 msgstr ""
 
 #: tazinst:1813
-msgid "Kernel name not found, falling back to:"
+msgid "Kernel name not found, falling back to: %s"
 msgstr ""
 
 #: tazinst:1819
-msgid "install_kernel:"
+msgid "install_kernel: %s"
 msgstr ""
 
 #: tazinst:1905
@@ -596,55 +630,55 @@
 msgstr ""
 
 #: tazinst:1911
-msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..."
+msgid "Adding / partition and CHECK_FS to file %s..."
 msgstr ""
 
 #: tazinst:1914
-msgid "Configuring host name:"
+msgid "Configuring host name: %s"
 msgstr ""
 
 #: tazinst:1977
-msgid "Configuring partition to be used as /home:"
+msgid "Configuring partition to be used as /home: %s"
 msgstr ""
 
 #: tazinst:1996
-msgid "Installing SliTaz on:"
+msgid "Installing SliTaz on: %s"
 msgstr ""
 
 #: tazinst:1997 tazinst:2176
-msgid "Checking settings"
+msgid "Checking settings..."
 msgstr ""
 
 #: tazinst:2001 tazinst:2180
-msgid "Preparing source media"
+msgid "Preparing source media..."
 msgstr ""
 
 #: tazinst:2004 tazinst:2183
-msgid "Preparing target disk"
+msgid "Preparing target disk..."
 msgstr ""
 
 #: tazinst:2007
-msgid "Cleaning the root partition if necessary"
+msgid "Cleaning the root partition if necessary..."
 msgstr ""
 
 #: tazinst:2010 tazinst:2192
-msgid "Extracting the root system"
+msgid "Extracting the root system..."
 msgstr ""
 
 #: tazinst:2013 tazinst:2198
-msgid "Installing the kernel"
+msgid "Installing the Kernel..."
 msgstr ""
 
 #: tazinst:2016
-msgid "Preconfiguring the system"
+msgid "Preconfiguring the system..."
 msgstr ""
 
 #: tazinst:2019
-msgid "Configuring root and default user account"
+msgid "Configuring root and default user account..."
 msgstr ""
 
 #: tazinst:2022
-msgid "Configuring /home"
+msgid "Configuring /home..."
 msgstr ""
 
 #: tazinst:2025
@@ -656,29 +690,29 @@
 msgstr ""
 
 #: tazinst:2042
-msgid "Preparing upgrade of SliTaz release:"
+msgid "Preparing upgrade of SliTaz release: %s"
 msgstr ""
 
 #: tazinst:2044
 msgid ""
-"This partition doesn't appear to contain a valid SliTaz system, the file: /"
-"etc/slitaz-release doesn't exist."
+"%s: This partition doesn't appear to contain a valid SliTaz system, the "
+"file: %s doesn't exist."
 msgstr ""
 
 #: tazinst:2067
-msgid "keeping /etc found on:"
+msgid "keeping /etc found on: %s"
 msgstr ""
 
 #: tazinst:2071
-msgid "keeping /var/www found on:"
+msgid "keeping /var/www found on: %s"
 msgstr ""
 
 #: tazinst:2098
-msgid "backups restored:"
+msgid "backups restored: %s"
 msgstr ""
 
 #: tazinst:2105
-msgid "backups saved in /var/lib/tazinst"
+msgid "backups saved in %s"
 msgstr ""
 
 #: tazinst:2112
@@ -694,7 +728,7 @@
 msgstr ""
 
 #: tazinst:2132
-msgid "Installing:"
+msgid "Installing: %s..."
 msgstr ""
 
 #: tazinst:2141
@@ -705,42 +739,37 @@
 msgid "Creating package lists..."
 msgstr ""
 
-#: tazinst:2152
-msgid "packages-source.list: done"
-msgstr ""
-
-#: tazinst:2156
-msgid "packages-selection.diff: done"
+#: tazinst:2152 tazinst:2156
+msgid "%s: done"
 msgstr ""
 
 #: tazinst:2163
 msgid ""
 "The list of available packages on the mirror could not be downloaded. No "
 "missing packages will be reinstalled now, but you can do so later by looking "
-"at the following list:\n"
-"/var/lib/tazinst/packages-selection.diff"
+"at the following list:"
 msgstr ""
 
 #: tazinst:2175
-msgid "Upgrading SliTaz on:"
+msgid "Upgrading SliTaz on: %s"
 msgstr ""
 
 #: tazinst:2186
-msgid "Searching for /etc/slitaz-release"
+msgid "Searching for %s..."
 msgstr ""
 
 #: tazinst:2189
-msgid "Backup /etc, /home and the packages list"
+msgid "Backup /etc, /home and the packages list..."
 msgstr ""
 
 #: tazinst:2195
-msgid "Restoring configuration files"
+msgid "Restoring configuration files..."
 msgstr ""
 
 #: tazinst:2201
-msgid "Upgrading added packages"
+msgid "Upgrading added packages..."
 msgstr ""
 
 #: tazinst:2204
-msgid "Bootloader"
+msgid "Bootloader..."
 msgstr ""
diff -r fee6f859a768 -r 7877ddbcbdbe po/tazinst/zh_CN.po
--- a/po/tazinst/zh_CN.po	Wed Apr 06 09:52:43 2016 +0300
+++ b/po/tazinst/zh_CN.po	Sat Apr 09 17:22:22 2016 +0300
@@ -79,8 +79,8 @@
 msgstr "自动选择"
 
 #: tazinst:84
-msgid "Grub legacy bootoader"
-msgstr "Grub 引导"
+msgid "GRUB legacy bootoader"
+msgstr "GRUB 引导"
 
 #: tazinst:85
 msgid "Lightweight bootloader"
@@ -103,7 +103,7 @@
 msgstr "无图形应用图形界面稳定版本"
 
 #: tazinst:100
-msgid "Stable basic graphic version with only Gtk"
+msgid "Stable basic graphic version with only GTK"
 msgstr "只有 GTK 基本图形稳定版本"
 
 #: tazinst:102
@@ -114,17 +114,17 @@
 msgid "Bleeding edge development version updated every day"
 msgstr "每日尝鲜开发版本"
 
-#: tazinst:121
-msgid "Usage"
-msgstr "用法"
+#: tazinst:115
+msgid "Usage:"
+msgstr "用法："
 
 #: tazinst:121
-msgid "tazinst [command] <setting> <value> <file>"
-msgstr "tazinst [command] <setting> <value> <file>"
+msgid "%s [command] <setting> <value> <file>"
+msgstr "%s [command] <setting> <value> <file>"
 
 #: tazinst:123
-msgid "Commands"
-msgstr "命令"
+msgid "Commands:"
+msgstr "命令："
 
 #: tazinst:124
 msgid "Create a new install file."
@@ -178,17 +178,13 @@
 msgid "Error: Missing parameter."
 msgstr "错误：参数丢失"
 
-#: tazinst:148
+#: tazinst:140
 msgid "Unknown command."
 msgstr "未知命令"
 
-#: tazinst:152
-msgid "Run"
-msgstr "运行"
-
-#: tazinst:152
-msgid "to get a list  of available commands"
-msgstr "获取可用命令列表"
+#: tazinst:142
+msgid "Run: '%s' to get a list  of available commands"
+msgstr "运行：%s 获取可用命令列表"
 
 #: tazinst:177
 msgid "Warning: file already exists."
@@ -199,7 +195,7 @@
 msgstr "错误：文件不能创建"
 
 #: tazinst:282 tazinst:287
-msgid "Error: Unable to read install file"
+msgid "Error: Unable to read install file."
 msgstr "错误：不能读取安装文件"
 
 #: tazinst:392
@@ -207,11 +203,11 @@
 msgstr "错误：不能写入安装文件"
 
 #: tazinst:446
-msgid "Deleting install file:"
-msgstr "删除安装文件："
+msgid "Deleting install file: %s"
+msgstr "删除安装文件：%s"
 
 #: tazinst:448
-msgid "Error: Unable to delete install file"
+msgid "Error: Unable to delete install file."
 msgstr "错误：不能删除安装文件"
 
 #: tazinst:463
@@ -227,35 +223,31 @@
 msgstr "另一个 tazinst 已在运行。"
 
 #: tazinst:488
-msgid "Error:"
-msgstr "错误："
-
-#: tazinst:488
-msgid "Invalid keyword."
-msgstr "无效的关键字"
+msgid "Error: '%s' Invalid keyword."
+msgstr "错误：%s 无效的关键字"
 
 #: tazinst:489
-msgid "Select one of these options:"
-msgstr "请选择一个选项："
+msgid "Select one of these options: %s."
+msgstr "请选择一个选项：%s"
 
 #: tazinst:490
 msgid "For more information, see tazinst Manual."
 msgstr "可以通过查看 tazinst 手册来获取更多信息。"
 
 #: tazinst:504
-msgid "Error: Partition not found"
+msgid "Error: Partition not found."
 msgstr "错误：未发现分区"
 
 #: tazinst:505
-msgid "To see available partitions, run"
-msgstr "运行，查看可用分区"
+msgid "To see available partitions, run '%s'."
+msgstr "运行，查看可用分区 %s"
 
 #: tazinst:519
-msgid "Error: Source file not found"
+msgid "Error: Source file not found."
 msgstr "错误：源文件未找到"
 
 #: tazinst:534
-msgid "Error: invalid URL"
+msgid "Error: invalid URL."
 msgstr "错误：无效的链接"
 
 #: tazinst:549
@@ -263,7 +255,7 @@
 msgstr "错误：多个磁盘分配，请检查你的设置。"
 
 #: tazinst:563
-msgid "Error: password too long"
+msgid "Error: password too long."
 msgstr "错误：密码过长"
 
 #: tazinst:568
@@ -278,24 +270,24 @@
 msgid "Warning: no password!"
 msgstr "注意：空密码！"
 
-#: tazinst:589
-msgid "Error: Too short."
-msgstr "错误：太短。"
+#: tazinst:590
+msgid "%s Error: Too short."
+msgstr "%s 错误：太短。"
 
-#: tazinst:593
-msgid "Error: Too long."
-msgstr "错误：太长。"
+#: tazinst:594
+msgid "%s Error: Too long."
+msgstr "%s 错误：太长。"
 
-#: tazinst:598
-msgid "Error: Invalid chars."
-msgstr "错误：无效字符"
+#: tazinst:599
+msgid "%s Error: Invalid chars."
+msgstr "%s 错误：无效字符"
 
 #: tazinst:609
 msgid "Error: Dualboot set with no bootloader."
 msgstr "错误：双引导设置缺少引导器"
 
 #: tazinst:623
-msgid "Error: Unsupported Partition Table"
+msgid "Error: Unsupported Partition Table."
 msgstr "错误：不支持的分区表"
 
 #: tazinst:627
@@ -306,9 +298,13 @@
 msgid "The Source setting depends on the type of media:"
 msgstr "源设置依赖于媒介类型："
 
-#: tazinst:749
-msgid "Name or URL of the image on the web. Type: tazinst help web"
-msgstr "网络镜像名字或链接。请输入： tazinst help web"
+#: tazinst:752
+msgid "Name or URL of the image on the web."
+msgstr "网络镜像名字或链接。"
+
+#: tazinst:753
+msgid "Type: %s"
+msgstr "请输入：%s"
 
 #: tazinst:755
 msgid "Mode of install"
@@ -371,24 +367,25 @@
 msgstr "自动设置"
 
 #: tazinst:788
-msgid "USB partition. For a list, type: tazinst list usb"
-msgstr "USB 分区。获取列表请输入： tazinst list usb"
+msgid "USB partition. For a list, type: %s"
+msgstr "USB 分区。获取列表请输入：%s"
 
 #: tazinst:790
-msgid "ISO file name. For a list, type: tazinst list iso"
-msgstr "镜像文件名字。获取列表请输入： tazinst list iso"
+msgid "ISO file name. For a list, type: %s"
+msgstr "镜像文件名字。获取列表请输入：%s"
 
 #: tazinst:816
 msgid "Partition containing Windows, or 'auto'"
 msgstr "含 Windows 分区或“auto”"
 
 #: tazinst:1120
-msgid "No mirror list found, run tazpkg recharge."
+#, fuzzy
+msgid "No mirror list found, run %s."
 msgstr "没有找到镜像列表，请运行  tazpkg 重新获取"
 
 #: tazinst:1132
-msgid "Downloading:"
-msgstr "下载中："
+msgid "Downloading: %s"
+msgstr "下载中：%s"
 
 #: tazinst:1139
 msgid "Download completed."
@@ -399,20 +396,26 @@
 msgstr "下载失败"
 
 #: tazinst:1150
-msgid "Installing package to the current system:"
-msgstr "安装软件包到现在的系统"
+#, fuzzy
+msgid "Installing package %s to the current system."
+msgstr "安装软件包到现在的系统%s"
+
+#: tazinst:1159
+msgid "Cannot install %s."
+msgstr ""
 
 #: tazinst:1160
-msgid "Adding package to the target system:"
-msgstr "添加软件包到目的系统"
+#, fuzzy
+msgid "Adding package %s to the target system..."
+msgstr "添加软件包到目的系统%s"
 
 #: tazinst:1201
 msgid "Process not completed"
 msgstr "过程未完成"
 
 #: tazinst:1202 tazinst:1206
-msgid "Error"
-msgstr "错误"
+msgid "Error: %s"
+msgstr "错误：%s"
 
 #: tazinst:1218
 msgid "Internal error"
@@ -423,44 +426,44 @@
 msgstr "用户取消"
 
 #: tazinst:1244
-msgid "Using files from"
-msgstr "使用的文件来自"
+msgid "Using files from %s."
+msgstr "使用的文件来自%s"
 
 #: tazinst:1246
-msgid "Mount failed"
-msgstr "挂载失败"
+msgid "%s: Mount failed"
+msgstr "%s：挂载失败"
 
 #: tazinst:1255
 msgid "Using files from USB device..."
 msgstr "使用 USB 设备的文件……"
 
 #: tazinst:1260
-msgid "Using files from USB device"
-msgstr "使用 USB 设备的文件"
+msgid "Using files from USB device %s."
+msgstr "使用 USB 设备的文件%s"
 
 #: tazinst:1262
-msgid "Failed to mount USB device"
-msgstr "挂载 USB 设备失败"
+msgid "%s: Failed to mount USB device."
+msgstr "%s：挂载 USB 设备失败"
 
 #: tazinst:1277
 msgid "md5sum error, file corrupted."
 msgstr "md5sum 验证错误，文件已损坏"
 
 #: tazinst:1280
-msgid "md5 file not found, can't check integrity."
-msgstr "md5 文件未发现，不能验证完整性"
+msgid "%s: md5 file not found, cannot check integrity."
+msgstr "%s：md5 文件未发现，不能验证完整性"
 
 #: tazinst:1285
-msgid "Using files from ISO"
-msgstr "使用 ISO 镜像文件"
+msgid "Using files from ISO %s."
+msgstr "使用 ISO 镜像文件 %s"
 
 #: tazinst:1287
-msgid "Failed to mount ISO."
-msgstr "加载镜像文件失败"
+msgid "%s: Failed to mount ISO."
+msgstr "%s：加载镜像文件失败"
 
 #: tazinst:1309 tazinst:1393
-msgid "Creating mount point:"
-msgstr "创建挂载点："
+msgid "Creating mount point: %s..."
+msgstr "创建挂载点：%s"
 
 #: tazinst:1325
 msgid "Checking installation media..."
@@ -475,56 +478,54 @@
 msgstr "安装媒介检查正常"
 
 #: tazinst:1342
-msgid "Format"
-msgstr "格式化"
+msgid "Format %s (%s)"
+msgstr "格式化 %s （%s）"
 
 #: tazinst:1366
 msgid "Preparing target partition..."
-msgstr "准备目的分区"
+msgstr "准备目的分区……"
 
 #: tazinst:1370
 msgid "Partition is already in use."
 msgstr "分区已使用"
 
 #: tazinst:1378
-msgid "The partition will be cleaned..."
-msgstr "分区即将被清理……"
+msgid "%s: The partition will be cleaned..."
+msgstr "%s：分区即将被清理……"
 
 #: tazinst:1387
-msgid "The partition will be kept..."
-msgstr "分区保持……"
+msgid "%s: The partition will be kept..."
+msgstr "%s：分区保持……"
 
 #: tazinst:1402
-msgid "Unable to mount partition"
-msgstr "无法挂载分区"
+msgid "%s: Unable to mount partition"
+msgstr "%s：无法挂载分区"
 
 #: tazinst:1416
-msgid "Unmounting target partition:"
-msgstr "卸载目的分区："
+msgid "Unmounting target partition: %s"
+msgstr "卸载目的分区：%s"
 
 #: tazinst:1422
-msgid "Unmounting:"
-msgstr "卸载："
+msgid "Unmounting: %s"
+msgstr "卸载：%s"
 
 #: tazinst:1426
-msgid "Unlinking:"
-msgstr "解开："
+msgid "Unlinking: %s"
+msgstr "解开：%s"
 
 #: tazinst:1432
-msgid "Ejecting cdrom..."
+msgid "Ejecting CD-ROM..."
 msgstr "弹出光驱……"
 
 #: tazinst:1441
-msgid "Process completed. You can now restart (reboot)"
-msgstr "过程完成。可以重启系统了。"
-
-#: tazinst:1442
-msgid "from your SliTaz GNU/Linux system."
-msgstr "来自你的 SliTaz 系统"
+msgid ""
+"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux "
+"system."
+msgstr "过程完成。可以重启系统了。来自你的 SliTaz 系统"
 
 #: tazinst:1446
-msgid "Copying log to /var/log/tazinst.log"
-msgstr "复制日志到  /var/log/tazinst.log"
+msgid "Copying log to %s"
+msgstr "复制日志到 %s"
 
 #: tazinst:1482
 msgid "No bootloader to install."
@@ -535,8 +536,8 @@
 msgstr "开启 Windows 双引导"
 
 #: tazinst:1599
-msgid "Installing grub on:"
-msgstr "安装 grub 到："
+msgid "Installing GRUB on: %s"
+msgstr "安装 grub 到：%s"
 
 #: tazinst:1604
 msgid "Setting the boot flag"
@@ -547,7 +548,7 @@
 msgstr "复制 splash 镜像"
 
 #: tazinst:1699
-msgid "Installing syslinux"
+msgid "Installing Syslinux"
 msgstr "安装 syslinux"
 
 #: tazinst:1713
@@ -555,7 +556,7 @@
 msgstr "设置启动标示"
 
 #: tazinst:1717
-msgid "Installing mbr"
+msgid "Installing MBR"
 msgstr "安装 mbr"
 
 #: tazinst:1721
@@ -563,84 +564,84 @@
 msgstr "设置启动标示"
 
 #: tazinst:1730
-msgid "Installing gptmbr"
+msgid "Installing GPTMBR"
 msgstr "安装 gptmbr"
 
 #: tazinst:1770
-msgid "Cleaning the root partition"
-msgstr "清除根分区"
+msgid "Cleaning the root partition (%s)..."
+msgstr "清除根分区（%s）……"
 
 #: tazinst:1779 tazinst:2051
-msgid "keeping /home found on:"
-msgstr "：保留 /home 到"
+msgid "keeping /home found on: %s"
+msgstr "：保留 /home 到：%s"
 
-#: tazinst:1784
-msgid "removing target:"
-msgstr "移除目标："
+#: tazinst:1784 tazinst:2077
+msgid "removing target: %s"
+msgstr "移除目标：%s"
 
 #: tazinst:1803
-msgid "Kernel name not found, falling back to:"
-msgstr "找不到内核，回滚到："
+msgid "Kernel name not found, falling back to: %s"
+msgstr "找不到内核，回滚到：%s"
 
 #: tazinst:1807
-msgid "install_kernel:"
-msgstr "安装内核："
+msgid "install_kernel: %s"
+msgstr "安装内核：%s"
 
 #: tazinst:1893
 msgid "Restoring directory: /home..."
 msgstr "恢复 /home 目录……"
 
 #: tazinst:1899
-msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..."
-msgstr "添加 /  分区并检查  /etc/rcS.conf……"
+msgid "Adding / partition and CHECK_FS to file %s..."
+msgstr "添加 / 分区并检查 %s……"
 
 #: tazinst:1902
-msgid "Configuring host name:"
-msgstr "设置主机名："
+msgid "Configuring host name: %s"
+msgstr "设置主机名：%s"
 
 #: tazinst:1965
-msgid "Configuring partition to be used as /home:"
-msgstr "设置 /home 分区"
+msgid "Configuring partition to be used as /home: %s"
+msgstr "设置 /home 分区：%s"
 
 #: tazinst:1984
-msgid "Installing SliTaz on:"
-msgstr "安装 SliTaz 到："
+msgid "Installing SliTaz on: %s"
+msgstr "安装 SliTaz 到：%s"
 
 #: tazinst:1985 tazinst:2164
-msgid "Checking settings"
-msgstr "检查设置"
+msgid "Checking settings..."
+msgstr "检查设置……"
 
 #: tazinst:1989 tazinst:2168
-msgid "Preparing source media"
-msgstr "准备源媒介"
+msgid "Preparing source media..."
+msgstr "准备源媒介……"
 
 #: tazinst:1992 tazinst:2171
-msgid "Preparing target disk"
-msgstr "准备安装目的磁盘"
+msgid "Preparing target disk..."
+msgstr "准备安装目的磁盘……"
 
 #: tazinst:1995
-msgid "Cleaning the root partition if necessary"
-msgstr "如有必要，清除根分区"
+msgid "Cleaning the root partition if necessary..."
+msgstr "如有必要，清除根分区……"
 
 #: tazinst:1998 tazinst:2180
-msgid "Extracting the root system"
-msgstr "解压根系统"
+msgid "Extracting the root system..."
+msgstr "解压根系统……"
 
 #: tazinst:2001 tazinst:2186
-msgid "Installing the kernel"
-msgstr "安装内核"
+msgid "Installing the Kernel..."
+msgstr "安装内核……"
 
 #: tazinst:2004
-msgid "Preconfiguring the system"
-msgstr "重设系统"
+msgid "Preconfiguring the system..."
+msgstr "重设系统……"
 
 #: tazinst:2007
-msgid "Configuring root and default user account"
-msgstr "设置根用户和默认用户"
+msgid "Configuring root and default user account..."
+msgstr "设置根用户和默认用户……"
 
 #: tazinst:2010
-msgid "Configuring /home"
-msgstr "设置 /home"
+msgid "Configuring /home..."
+msgstr "设置 /home……"
 
 #: tazinst:2013
 msgid "Checking bootloader installation..."
@@ -651,30 +652,30 @@
 msgstr "文件安装完成"
 
 #: tazinst:2030
-msgid "Preparing upgrade of SliTaz release:"
-msgstr "准备升级 SliTaz ："
+msgid "Preparing upgrade of SliTaz release: %s"
+msgstr "准备升级 SliTaz ：%s"
 
 #: tazinst:2032
 msgid ""
-"This partition doesn't appear to contain a valid SliTaz system, the file: /"
-"etc/slitaz-release doesn't exist."
-msgstr "这个分区没有安装有效地 SliTaz 系统，/etc/slitaz-release 不存在"
+"%s: This partition doesn't appear to contain a valid SliTaz system, the "
+"file: %s doesn't exist."
+msgstr "%s：这个分区没有安装有效地 SliTaz 系统，%s 不存在"
 
 #: tazinst:2055
-msgid "keeping /etc found on:"
-msgstr "保留  /etc 到："
+msgid "keeping /etc found on: %s"
+msgstr "保留  /etc 到：%s"
 
 #: tazinst:2059
-msgid "keeping /var/www found on:"
-msgstr "保留 /var/www  到："
+msgid "keeping /var/www found on: %s"
+msgstr "保留 /var/www  到：%s"
 
 #: tazinst:2086
-msgid "backups restored:"
-msgstr "备份恢复到："
+msgid "backups restored: %s"
+msgstr "备份恢复到：%s"
 
 #: tazinst:2093
-msgid "backups saved in /var/lib/tazinst"
-msgstr "备份保存在 /var/lib/tazinst "
+msgid "backups saved in %s"
+msgstr "备份保存在 %s"
 
 #: tazinst:2100
 msgid "Checking the availability of packages..."
@@ -689,8 +690,8 @@
 msgstr "已安装软件：0"
 
 #: tazinst:2120
-msgid "Installing:"
-msgstr "安装："
+msgid "Installing: %s..."
+msgstr "安装：%s……"
 
 #: tazinst:2129
 msgid "Installation of packages complete..."
@@ -700,44 +701,39 @@
 msgid "Creating package lists..."
 msgstr "创建软件包列表……"
 
-#: tazinst:2140
-msgid "packages-source.list: done"
-msgstr "软件包源列表 ; 完成"
-
-#: tazinst:2144
-msgid "packages-selection.diff: done"
-msgstr "软件包差异：完成"
+#: tazinst:2152 tazinst:2156
+msgid "%s: done"
+msgstr "%s：完成"
 
 #: tazinst:2151
 msgid ""
 "The list of available packages on the mirror could not be downloaded. No "
 "missing packages will be reinstalled now, but you can do so later by looking "
-"at the following list:\n"
-"/var/lib/tazinst/packages-selection.diff"
+"at the following list:"
 msgstr ""
-"镜像上的软件包列表无法下载。现在不能安装丢失的软件，但你可以稍后通过检查 /"
-"var/lib/tazinst/packages-selection.diff 来完成。"
+"镜像上的软件包列表无法下载。现在不能安装丢失的软件，但你可以稍后通过检查来完"
+"成："
 
 #: tazinst:2163
-msgid "Upgrading SliTaz on:"
-msgstr "升级 SliTaz ："
+msgid "Upgrading SliTaz on: %s"
+msgstr "升级 SliTaz ：%s"
 
 #: tazinst:2174
-msgid "Searching for /etc/slitaz-release"
-msgstr "搜索 /etc/slitaz-release"
+msgid "Searching for %s..."
+msgstr "搜索 %s……"
 
 #: tazinst:2177
-msgid "Backup /etc, /home and the packages list"
-msgstr "备份  /etc, /home 和软件宝列表"
+msgid "Backup /etc, /home and the packages list..."
+msgstr "备份  /etc, /home 和软件宝列表……"
 
 #: tazinst:2183
-msgid "Restoring configuration files"
-msgstr "恢复配置文件"
+msgid "Restoring configuration files..."
+msgstr "恢复配置文件……"
 
 #: tazinst:2189
-msgid "Upgrading added packages"
-msgstr "升级额外的软件包"
+msgid "Upgrading added packages..."
+msgstr "升级额外的软件包……"
 
 #: tazinst:2192
-msgid "Bootloader"
-msgstr "引导"
+msgid "Bootloader..."
+msgstr "引导……"
diff -r fee6f859a768 -r 7877ddbcbdbe slitaz-installer
--- a/slitaz-installer	Wed Apr 06 09:52:43 2016 +0300
+++ b/slitaz-installer	Sat Apr 09 17:22:22 2016 +0300
@@ -17,107 +17,107 @@
 #--------------
 # msgs section
 #--------------
-
+. /lib/libtaz.sh
 # info msgs
 
-MODE_MSG="\n$(gettext "Welcome to the slitaz-installer").\n
-\Z2$(gettext "Which type of installation do you want to start?")\Zn\n"
+MODE_MSG="\n$(_ 'Welcome to the slitaz-installer.')\n
+\Z2$(_ 'Which type of installation do you want to start?')\Zn\n"
 
-MEDIA_MSG="\n$(gettext "SliTaz can be installed from different media.")\n\n\
-\Z2$(gettext "Select a media from the following list:")\Zn\n"
+MEDIA_MSG="\n$(_ 'SliTaz can be installed from different media.')\n
+\Z2$(_ 'Select a media from the following list:')\Zn\n"
 
-SOURCE_USB_MSG="\n$(gettext "You have selected the option to install SliTaz \
-from an USB Key")\n\n\
-\Z2$(gettext "Enter the partition where SliTaz Live is located:"):\Zn\n"
+SOURCE_USB_MSG="\n$(_ 'You have selected the option to install SliTaz from an USB Key.')\n
+\Z2$(_ 'Enter the partition where SliTaz Live is located:')\Zn\n"
 
-SOURCE_ISO_MSG="\n$(gettext "You have selected the option to install SliTaz \
-from an ISO file located on a local disk.")\n\n\
-\Z2$(gettext "Please, select a file below:")\Zn\n"
+SOURCE_ISO_MSG="\n$(_ "You have selected the option to install SliTaz \
+from an ISO file located on a local disk.")\n
+\Z2$(_ 'Please, select a file below:')\Zn\n"
 
-SOURCE_WEB_MSG="\n$(gettext "You have selected the option to install SliTaz \
-from the web")\n\n\\Z2$(gettext "Please, select a version:")\Zn\n"
+SOURCE_WEB_MSG="\n$(_ 'You have selected the option to install SliTaz from the web.')\n
+\\Z2$(_ 'Please, select a version:')\Zn\n"
 
-SOURCE_DEF_MSG="\n$(gettext "Select the source"):\n"
+SOURCE_DEF_MSG="\n$(_ 'Select the source:')\n"
 
-ROOT_UUID_DEFAULT_MSG="$(gettext "\nDrive selection")\n\n\Z2$(gettext "Please specify the partition where to install SliTaz:")\Zn\n"
+ROOT_UUID_DEFAULT_MSG="\n$(_ 'Drive selection')\n
+\Z2$(_ 'Please specify the partition where to install SliTaz:')\Zn\n"
 
-ROOT_UUID_UPGRADE_MSG="$(gettext "The installer will upgrade the existing \
+ROOT_UUID_UPGRADE_MSG="$(_ "The installer will upgrade the existing \
 SliTaz system by saving all configuration files and the list of installed \
 packages. Then, it will clean the partition and install the new version \
 of SliTaz, restore the configuration files and reinstall any packages which \
-are not present on the cdrom.
-You will need an active internet connection before upgrading.")\n \
-\Z2$(gettext "Partition containing the system to upgrade:")\Zn\n"
+are not present on the CD-ROM.")
+$(_ 'You will need an active internet connection before upgrading.')
+\Z2$(_ 'Partition containing the system to upgrade:')\Zn\n"
 
-ROOT_FORMAT_MSG="\n$(gettext "Only the filesystems actually installed on your \
+ROOT_FORMAT_MSG="\n$(_ "Only the filesystems actually installed on your \
 system are listed. If you intend to use another filesystem, you have to \
-install it before. \
-Unless you know what you are doing, it is safe to use ext2, ext3 or ext4.\n\n\
-\Z2To format this partition, please select a filesystem below:")\Zn\n"
+install it before. Unless you know what you are doing, it is safe to use ext2, \
+ext3 or ext4.")\n
+\Z2$(_ 'To format this partition, please select a filesystem below:')\Zn\n"
 
-HOME_UUID_MSG="\n$(gettext "Separate /home partition")\n\n\
-\Z2$(gettext "Please, select the partition to use:")\Zn\n"
+HOME_UUID_MSG="\n$(_ 'Separate /home partition')\n
+\Z2$(_ 'Please, select the partition to use:')\Zn\n"
 
-HOSTNAME_MSG="\n$(gettext "Hostname configuration allows you to specify the \
+HOSTNAME_MSG="\n$(_ "Hostname configuration allows you to specify the \
 machine name. The hostname is used internally to identify the host on the \
-network. This value can be changed after the system is installed.\n\n\
-\Z2Enter a hostname:\Zn\n")"
+network. This value can be changed after the system is installed.")\n
+\Z2$(_ 'Enter a hostname:')\Zn\n)"
 
-ROOT_PWD_MSG="\n$(gettext "The root administrator privilege lets you manage \
+ROOT_PWD_MSG="\n$(_ "The root administrator privilege lets you manage \
 and configure the full system. A root user can damage your system so you \
-should always setup a strong password with special characters and/or numbers.\
-")\n\n\
-\Z2$(gettext "Enter the password for root:")\Zn\n"
+should always setup a strong password with special characters and/or numbers.")\n
+\Z2$(_ 'Enter the password for root:')\Zn\n"
 
-USER_LOGIN_MSG="\n$(gettext "The default user for the system will have their \
+USER_LOGIN_MSG="\n$(_ "The default user for the system will have their \
 personal files stored in /home/*user* (and will be automatically added to the \
-audio group)")\n\n\Z2$(gettext "Enter the name of the first user:")\Zn\n"
+audio group)")\n
+\Z2$(_ 'Enter the name of the first user:')\Zn\n"
 
-USER_PWD_MSG="\n$(gettext "The password for default user").
-$(gettext "It may be a security risk if too weak and should always be strong \
+USER_PWD_MSG="\n$(_ 'The password for default user.')
+$(_ "It may be a security risk if too weak and should always be strong \
 if you use a SSH connection through the web.")\n
-\Z2$(gettext "Enter the password for the default user:")\Zn\n"
+\Z2$(_ 'Enter the password for the default user:')\Zn\n"
 
-END_OF_INSTALL_MSG="\n$(gettext "Installation is now finished, you can exit \
-the installer or reboot on your new SliTaz GNU/Linux operating system")."
+END_OF_INSTALL_MSG="\n$(_ "Installation is now finished, you can exit \
+the installer or reboot on your new SliTaz GNU/Linux operating system.")"
 
 
 # questions msgs
 
-ASK_ROOT_FORMAT="\n$(gettext "The next step lets you format the target \
+ASK_ROOT_FORMAT="\n$(_ "The next step lets you format the target \
 partition. Choose between robust, stable and/or journaled filesystem. If the \
-partition is already formated you can skip this stage, if not just accept.\n
-Warning! formating a partition will destroy all current data.\n
-\Z2Do you wish to format the partition ?\Zn")"
+partition is already formated you can skip this stage, if not just accept.")\n
+$(_ 'Warning! formating a partition will destroy all current data.')\n
+\Z2$(_ 'Do you wish to format the partition?')\Zn)"
 
-ASK_HOME_UUID="\n$(gettext "On most GNU/Linux systems users personal \
+ASK_HOME_UUID="\n$(_ "On most GNU/Linux systems users personal \
 files are stored in the directory /home. Home can be on a separate partition \
-or another hard disk.\n
-\Z2DO you want to use a separate Home partition ?\Zn")"
+or another hard disk.")\n
+\Z2$(_ 'Do you want to use a separate Home partition?')\Zn)"
 
-ASK_HOME_FORMAT="\n$(gettext "/home will be installed on a separate partition. \
+ASK_HOME_FORMAT="\n$(_ "/home will be installed on a separate partition. \
 The next step lets you format the /home partition. If the partition \
-is already formated you can skip this stage, if not just accept. Warning \
-formating a partition will destroy all current data.\n
-\Z2Do you wish to format the /home partition ?\Zn")"
+is already formated you can skip this stage, if not just accept.")
+$(_ 'Warning! formating a partition will destroy all current data.')\n
+\Z2$(_ 'Do you wish to format the /home partition?')\Zn)"
 
-ASK_BOOTLOADER="\n$(gettext "You have now the option to install a \
-bootloader which is capable of booting almost any kind of operating system.\n\n\
-If you want to use an existing bootloader installation, skip this step \
+ASK_BOOTLOADER="\n$(_ "You have now the option to install a \
+bootloader which is capable of booting almost any kind of operating system.")\n
+$(_ "If you want to use an existing bootloader installation, skip this step \
 and configure your bootloader to boot SliTaz (refer to your bootloader \
-documentation on how to do this)").\n\n\
-\Z2$(gettext "Install a bootloader?")\Zn\n"
+documentation on how to do this).")\n
+\Z2$(_ 'Install a bootloader?')\Zn\n"
 
-ASK_WINBOOT="\n$(gettext "Do you want to implement a dual-boot with \
+ASK_WINBOOT="\n$(_ "Do you want to implement a dual-boot with \
 Windows? At start-up, you will be asked whether you want to boot into \
-Windows or SliTaz GNU/Linux.\n
-\Z2Install a dual-boot with Windows ?")\n"
+Windows or SliTaz GNU/Linux.")\n
+\Z2$(_ 'Install a dual-boot with Windows?')\n"
 
-ASK_SUMMARY="$(gettext "Installation settings summary and last chance to \
+ASK_SUMMARY="$(_ "Installation settings summary and last chance to \
 cancel or restart all installation steps.")\n
-\Z2Go and install SliTaz?\Zn\n\n"
+\Z2$(_ 'Go and install SliTaz?')\Zn\n\n"
 
-EMPTY_MENU_MSG="\n$(gettext "Sorry, no device, nor file found or available.")"
+EMPTY_MENU_MSG="\n$(_ 'Sorry, no device, nor file found or available.')"
 
 #---------------"
 # check section
@@ -128,20 +128,20 @@
 	local version
 	# search for tazinst
 	if ! [ -x /usr/sbin/tazinst ] ; then
-		printf "$(gettext "Error 2: ")
-$(gettext "The lightweight SliTaz HDD installer 'tazinst' is missing.
-Check permissions, or reinstall the slitaz-tools package.")\n"
-		exit 2
+		_ 'Error 2:'
+		_ "The lightweight SliTaz HDD installer '%s' is missing." 'tazinst'
+		_ 'Check permissions, or reinstall the %s package.' 'slitaz-installer'
+		newline; exit 2
 	fi
 	# check version
 	version=$(tazinst version | tr -d '[:alpha:]')
 	if ! (echo "$version" | awk -v req="$TAZINST_REQUIRED_VERSION" '
 		{ver=$0+0}{ if (ver < req) exit 1}') ; then
-		printf "$(gettext "Error 2: ")
-$(gettext "The lightweight SliTaz HDD installer tazinst ($version) is not
-at the required version ($TAZINST_REQUIRED_VERSION), use tazinst in an xterm or
-reinstall the slitaz-tools package.")\n"
-		exit 2
+		_ 'Error 2:'
+		_ 'The lightweight SliTaz HDD installer tazinst (%s) is not at the required version (%s).' \
+			"$version" "$TAZINST_REQUIRED_VERSION"
+		_ 'Use %s in an xterm or reinstall the %s package.' 'tazinst' 'slitaz-installer'
+		newline; exit 2
 	fi
 }
 
@@ -157,7 +157,7 @@
 	mode)
 		printf "$MODE_MSG" ;;
 	media)
-		printf "$MEDIA_MSG"	;;
+		printf "$MEDIA_MSG" ;;
 	source)
 		local media="$(tazinst get media)"
 		case "$media" in
@@ -172,8 +172,8 @@
 		esac ;;
 	root_uuid)
 		local mode="$(tazinst get mode)"
-		[ "$mode" = "upgrade" ] && printf "$ROOT_UUID_UPGRADE_MSG" \
-								|| printf "$ROOT_UUID_DEFAULT_MSG" ;;
+		if [ "$mode" == 'upgrade' ]; then printf "$ROOT_UUID_UPGRADE_MSG";
+			else printf "$ROOT_UUID_DEFAULT_MSG"; fi ;;
 	root_format|home_format)
 		printf "$ROOT_FORMAT_MSG" ;;
 	home_uuid)
@@ -265,44 +265,44 @@
 		case "$option" in
 		mode)
 			local mode="$(tazinst get mode)"
-			printf "\n\n$(gettext "Mode"): "
-			printf "$(tazinst help mode | grep "$mode")" ;;
+			printf "\n\n$(_ 'Mode: %s')" \
+				"$(tazinst help mode | grep "$mode")" ;;
 		media)
-			printf "\n$(gettext "From media"): $(tazinst get media)" ;;
+			printf "\n$(_ 'From media: %s')" "$(tazinst get media)" ;;
 		source)
 			local source="$(tazinst get source)"
 			[ -n "$source" ] && printf " ($source)" ;;
 		root_uuid)
-			printf "\n$(gettext "To the disk"): $(tazinst get root_uuid)" ;;
+			printf "\n$(_ 'To the disk: %s')" "$(tazinst get root_uuid)" ;;
 		root_format)
 			local root_format="$(tazinst get root_format)"
-			[ -n "$root_format" ] \
-				&& printf " $(gettext "(Formatting as"): $root_format)" \
-				|| printf " $(gettext "(No formatting)")" ;;
+			if [ -n "$root_format" ];
+				then printf " $(_ '(Formatting as %s)' "$root_format")";
+				else printf " $(_ '(No formatting)')"; fi ;;
 		home_uuid)
 			local home_uuid="$(tazinst get home_uuid)"
-			[ -n "$home_uuid" ] \
-				&& printf "\n$(gettext "Separate /home is"): $home_uuid" \
-				|| printf "\n$(gettext "No separate /home partition")" ;;
+			if [ -n "$home_uuid" ];
+				then printf "\n$(_ 'Separate /home is: %s' "$home_uuid")";
+				else printf "\n$(_ 'No separate /home partition')"; fi ;;
 		home_format)
 			local home_format="$(tazinst get home_format)"
-			[ -n "$home_uuid" ] && ([ -n "$home_format" ] \
-				&& printf " $(gettext "(Formatting as"): $home_format)" \
-				|| printf " $(gettext "(No /home formatting)")";) ;;
+			if [ -n "$home_uuid" ]; then if [ -n "$home_format" ];
+					then printf " $(_ '(Formatting as %s)' "$home_format")";
+					else printf " $(_ '(No /home formatting)')"; fi; fi ;;
 		hostname)
-			printf "\nHostname: $(tazinst get hostname)" ;;
+			printf "\n$(_ 'Hostname: %s' "$(tazinst get hostname)")" ;;
 		user_login)
-			printf "\n$(gettext "User login"): $(tazinst get user_login)" ;;
+			printf "\n$(_ 'User login: %s' "$(tazinst get user_login)")" ;;
 		bootloader)
 			local bootloader="$(tazinst get bootloader)"
-			[ -n "$bootloader" ] \
-				&& printf "\n$(gettext "Bootloader: installed")" \
-				|| printf "\n$(gettext "No bootloader installed")" ;;
+			if [ -n "$bootloader" ];
+				then printf "\n$(_ 'Bootloader: installed')";
+				else printf "\n$(_ 'No bootloader installed')"; fi ;;
 		winboot)
 			local winboot="$(tazinst get winboot)"
-			[ -n "$winboot" ] \
-				&& printf "$(gettext ", with Windows dual-boot")" \
-				|| printf "$(gettext ", no dual-boot")" ;;
+			if [ -n "$winboot" ];
+				then printf "$(_ ", with Windows dual-boot")";
+				else printf "$(_ ", no dual-boot")"; fi ;;
 		esac
 	done
 }
@@ -319,11 +319,11 @@
 	trap "rm -f $tempfile ; exit 1" $sighup $sigint $sigquit
 	"$DIALOG" \
 		--clear --colors \
-		--title " Select $option " \
+		--title " $(_ 'Select %s' "$option") " \
 		--backtitle "$BACKLIST" \
 		--default-item "$(tazinst get "$option")" \
-		--ok-label "$(gettext "Next")" \
-		--cancel-label "$(gettext "Back")" \
+		--ok-label "$(_ 'Next')" \
+		--cancel-label "$(_ 'Back')" \
 		--menu "$(msg $option)" 18 70 6 $items 2> "$tempfile"
 	retval="$?"
 	choice=$(cat "$tempfile")
@@ -333,7 +333,7 @@
 			# a '$choice' was selected
 			tazinst set "$option" "$choice" && move up || \
 			"$DIALOG" \
-				--title " Select $option " --clear \
+				--title " $(_ 'Select %s' "$option") " --clear \
     	    	--msgbox "\n$(tazinst check "$option" 2>&1)" 10 41 ;;
 		 1|255)
 			# voluntary exit or ESC pressed
@@ -347,11 +347,11 @@
 	local option="$1"
 	"$DIALOG" \
 		--clear --colors \
-		--title " Select $option " \
+		--title " $(_ 'Select %s' "$option") " \
 		--backtitle "$BACKLIST" \
-		--ok-label "$(gettext "Yes")" \
-		--cancel-label "$(gettext "Back")" \
-		--extra-button --extra-label "$(gettext "No")" \
+		--ok-label "$(_ 'Yes')" \
+		--cancel-label "$(_ 'Back')" \
+		--extra-button --extra-label "$(_ 'No')" \
 		--yesno "$(ask $option)" 18 70
 	retval="$?"
 	case "$retval" in
@@ -375,9 +375,9 @@
 	trap "rm -f $tempfile; exit 1" $sighup $sigint $sigquit
 	$DIALOG \
 		--clear --colors \
-		--title " Select $option " \
-		--ok-label "$(gettext "Next")" \
-		--cancel-label "$(gettext "Back")" \
+		--title " $(_ 'Select %s' "$option") " \
+		--ok-label "$(_ 'Next')" \
+		--cancel-label "$(_ 'Back')" \
         --inputbox "$(msg $option)" 16 51 "$value"  2> "$tempfile"
 	retval="$?"
 	choice="$(cat $tempfile)"
@@ -388,7 +388,7 @@
 			retcode=$?
 			[ "$retcode" -gt "0" ] && \
 				"$DIALOG" \
-					--title " Select $option " --clear \
+					--title " $(_ 'Select %s' "$option") " --clear \
     		    	--msgbox "\n$(tazinst check "$option" 2>&1)" 10 41
 			# continue if no error (0) or only warning (>127)
 			[ "$retcode" -le "0" ] && move up
@@ -406,17 +406,17 @@
 {
 	"$DIALOG" \
 		--clear --colors \
-		--title " Summary " \
+		--title " $(_ 'Summary') " \
 		--backtitle "$BACKLIST" \
-		--yes-label "$(gettext "Yes")" \
-		--no-label "$(gettext "No")" \
+		--yes-label "$(_ 'Yes')" \
+		--no-label "$(_ 'No')" \
 		--yesno "$(ask summary)$(summary_list)" 18 70
 	retval="$?"
 	case "$retval" in
 		0)	# yes
 			move up ;;
 		1)	# Cancel
-			gettext "SliTaz install cancelled."; echo
+			_ 'SliTaz install cancelled.'; echo
 			exit 1 ;;
 		3)	# no
 			return 3 ;;
@@ -564,16 +564,16 @@
 	}
 	END{
 		print "XXX"
-	}' | $DIALOG --title "SliTaz-Installer" --gauge "Installing.." 20 70 0
+	}' | $DIALOG --title " $(_ 'SliTaz Installer') " --gauge "$(_ 'Installing...')" 20 70 0
 
 
 # end_of_install
 if tazinst log | grep -q "x-x-" ; then
 	tazinst clean
-	$DIALOG --title " Installation complete " \
+	$DIALOG --title " $(_ 'Installation complete') " \
 		--backtitle "$BACKLIST" \
-		--yes-label "Exit" \
-		--no-label "Reboot" \
+		--yes-label "$(_ 'Exit')" \
+		--no-label "$(_ 'Reboot')" \
 		--clear --colors --yesno "$END_OF_INSTALL_MSG" 18 70
 	retval=$?
 	case $retval in
@@ -582,10 +582,10 @@
 		1)
 			reboot || reboot -f ;;
 		255)
-			echo -e "ESC pressed.\n" && exit 0 ;;
+			_ 'ESC pressed.'; newline; exit 0 ;;
 	esac
 else
-	$DIALOG --title " Process not completed " \
+	$DIALOG --title " $(_ 'Process not completed') " \
 		--backtitle "$BACKLIST" \
 		--clear --msgbox \
 		"$(tazinst log | awk '$1 == "-x-x-",$1 == "x-x-x"')" 18 70
@@ -594,6 +594,6 @@
 		0)
 			exit 0 ;;
 		255)
-			echo -e "ESC pressed.\n" && exit 0 ;;
+			_ 'ESC pressed.'; newline; exit 0 ;;
 	esac
 fi
diff -r fee6f859a768 -r 7877ddbcbdbe tazinst
--- a/tazinst	Wed Apr 06 09:52:43 2016 +0300
+++ b/tazinst	Sat Apr 09 17:22:22 2016 +0300
@@ -36,9 +36,9 @@
 readonly VERSION=3.95
 
 # i18n
-. /usr/bin/gettext.sh
-TEXTDOMAIN='tazinst'
-export TEXTDOMAIN
+. /lib/libtaz.sh
+export TEXTDOMAIN='tazinst'
+
 
 # files
 readonly DEFAULT_INSTALL_FILE=./tazinst.rc
@@ -56,51 +56,51 @@
 
 # modes (key:help)
 readonly LST_MODE="
-install:$(gettext 'Fresh install on a HDD')
-upgrade:$(gettext 'Upgrade an existing system')"
+install:$(_ 'Fresh install on a HDD')
+upgrade:$(_ 'Upgrade an existing system')"
 
 # media (key:help)
 readonly LST_MEDIA="
-cdrom:$(gettext 'LiveCD')
-usb:$(gettext 'LiveUSB')
-iso:$(gettext 'ISO image on a local drive')
-web:$(gettext 'ISO image on the Internet')"
+cdrom:$(_ 'LiveCD')
+usb:$(_ 'LiveUSB')
+iso:$(_ 'ISO image on a local drive')
+web:$(_ 'ISO image on the Internet')"
 
 # formats (key:help)
 readonly LST_FORMAT="
-btrfs:$(gettext 'B-tree file system (Oracle)')
-ext2:$(gettext 'Second extended filesystem (Linux)')
-ext3:$(gettext 'Third extended filesystem (Linux)')
-ext4:$(gettext 'Fourth extended file system (Linux)')
-jfs:$(gettext 'Journaled File System (IBM)')
-minix:$(gettext 'File system of the MINIX operating system')
-reiser4:$(gettext 'Journaled computer file system (Namesys)')
-xfs:$(gettext 'Journaling file system (Silicon Graphics, Inc.)')"
+btrfs:$(_ 'B-tree file system (Oracle)')
+ext2:$(_ 'Second extended filesystem (Linux)')
+ext3:$(_ 'Third extended filesystem (Linux)')
+ext4:$(_ 'Fourth extended file system (Linux)')
+jfs:$(_ 'Journaled File System (IBM)')
+minix:$(_ 'File system of the MINIX operating system')
+reiser4:$(_ 'Journaled computer file system (Namesys)')
+xfs:$(_ 'Journaling file system (Silicon Graphics, Inc.)')"
 
 # bootloaders (key:help)
 readonly LST_BOOTLOADER="
-auto:$(gettext 'Automatic selection')
-grub:$(gettext 'Grub legacy bootloader')
-syslinux:$(gettext 'Lightweight bootloader')"
+auto:$(_ 'Automatic selection')
+grub:$(_ 'GRUB legacy bootloader')
+syslinux:$(_ 'Lightweight bootloader')"
 
 # predefined iso (key:url:help)
 SLITAZ_VERSION="${SLITAZ_VERSION:-cooking}"
-[ "$SLITAZ_VERSION" = "cooking" ] && SLITAZ_VERSION="$(($(date "+%y")-8)).0"
+[ "$SLITAZ_VERSION" == 'cooking' ] && SLITAZ_VERSION="$(($(date "+%y")-8)).0"
 [ -n "$URL_ISO" ] && readonly LST_WEB="$URL_ISO" || readonly LST_WEB="
 stable:iso/stable/slitaz-$SLITAZ_VERSION.iso \
-:$(gettext 'Stable release') $SLITAZ_VERSION
+:$(_ 'Stable release') $SLITAZ_VERSION
 core:iso/stable/flavors/slitaz-$SLITAZ_VERSION-core.iso \
-:$(gettext 'Stable version without nested subsets')
+:$(_ 'Stable version without nested subsets')
 base:iso/stable/flavors/slitaz-$SLITAZ_VERSION-base.iso \
-:$(gettext 'Stable text-only version (8.1MB)')
+:$(_ 'Stable text-only version (8.1MB)')
 justx:iso/stable/flavors/slitaz-$SLITAZ_VERSION-justx.iso \
-:$(gettext 'Stable basic graphic version without graphic apps')
+:$(_ 'Stable basic graphic version without graphic apps')
 gtkonly:iso/stable/flavors/slitaz-$SLITAZ_VERSION-gtkonly.iso \
-:$(gettext 'Stable basic graphic version with only Gtk')
+:$(_ 'Stable basic graphic version with only GTK')
 cooking:iso/cooking/slitaz-cooking.iso \
-:$(gettext 'Development version for testing latest features')
+:$(_ 'Development version for testing latest features')
 rolling:iso/rolling/slitaz-rolling.iso \
-:$(gettext 'Bleeding edge development version updated every day')
+:$(_ 'Bleeding edge development version updated every day')
 "
 
 
@@ -111,48 +111,48 @@
 # print a short help
 usage()
 {
-	gettext "SliTaz GNU/Linux Installer - Version:"
-	printf ' %s\n' $VERSION
-	echo -e "\033[1m"; gettext 'Usage'; echo -e '\033[0m:'
-	echo -n '  '; gettext 'tazinst [command] <setting> <value> <file>'; echo
-
-	echo -e "\033[1m"; gettext 'Commands'; echo -e '\033[0m:'
-	printf "  %-12s" "new";		gettext "Create a new install file."; echo
-	printf "  %-12s" "set";   	gettext "Change value of a setting."; echo
- 	printf "  %-12s" "unset"; 	gettext "Clear a setting."; echo
-	printf "  %-12s" "get";   	gettext "Get the value of a setting."; echo
-	printf "  %-12s" "check"; 	gettext "Check settings."; echo
-	printf "  %-12s" "help";  	gettext "Print a short help on settings"; echo
-	printf "  %-12s" "list";  	gettext "List system resources."; echo
-	printf "  %-12s" "execute";	gettext "Execute a SliTaz installation."; echo
-	printf "  %-12s" "log";   	gettext "Display log file contents."; echo
-	printf "  %-12s" "clean"; 	gettext "Clean install and log files."; echo
-	printf "  %-12s" "version";	gettext "Print version and exit."; echo
-	printf "  %-12s" "usage";  	gettext "Print this short usage."; echo
+	_ 'SliTaz GNU/Linux Installer - Version: %s' "$VERSION"
+	newline; boldify "$(_ 'Usage:')"
+	echo -n '  '; _ '%s [command] <setting> <value> <file>' 'tazinst'
+	newline; boldify "$(_ 'Commands:')"
+	optlist "\
+new		$(_ 'Create a new install file.')
+set		$(_ 'Change value of a setting.')
+unset	$(_ 'Clear a setting.')
+get		$(_ 'Get the value of a setting.')
+check	$(_ 'Check settings.')
+help	$(_ 'Print a short help on settings')
+list	$(_ 'List system resources.')
+execute	$(_ 'Execute a SliTaz installation.')
+log		$(_ 'Display log file contents.')
+clean	$(_ 'Clean install and log files.')
+version	$(_ 'Print version and exit.')
+usage	$(_ 'Print this short usage.')
+"
 	exit 0
 }
 
 usage_error()
 {
 	local cmd="$1" script="$(basename $0)"
-	gettext "SliTaz GNU/Linux Installer - Version:"
-	printf ' %s\n' $VERSION
-	printf "\n'%s': " "$cmd"
-	gettext 'Unknown command!'; echo
-	gettext 'Run'; printf ": '%s' " "$script help"
-	gettext "to get a list of available commands"; echo -e ".\n"
+	_ 'SliTaz GNU/Linux Installer - Version: %s' "$VERSION"
+	newline
+	_ "'%s': Unknown command!" "$cmd"
+
+	_ "Run: '%s' to get a list of available commands." "$script help"
 	exit 1
 }
 
+
 option_error()
 {
 	local option="$1" list="$2"
-	gettext "SliTaz GNU/Linux Installer - Version:"
-	printf ' %s\n' $VERSION
-	printf "\n'%s': " "$option"
-	gettext 'Unknown option!'; echo
-	gettext "Please select one of these options"
-	printf ":\n  %s\n\n" "$list"
+	_ 'SliTaz GNU/Linux Installer - Version: %s' "$VERSION"
+	newline
+	_ "'%s': Unknown option!" "$option"
+
+	_ 'Please select one of these options:'
+	printf "  %s\n\n" "$list"
 	exit 1
 }
 
@@ -170,14 +170,14 @@
 	local install_file=$1
 	[ -z "$install_file" ] && install_file="$DEFAULT_INSTALL_FILE"
 	if [ -e "$install_file" ]; then
-		printf "%s\n" "$(gettext "Warning: file already exists.")" 1>&2
+		_ 'Warning: file already exists.' 1>&2
 		exit 0
 	fi
 	[ -n "$install_file" ] && touch "$install_file"
 	if [ -w "$install_file" ]; then
 		write_file "$install_file"
 	else
-		printf "%s\n" "$(gettext "Error: Cannot create file.")" 1>&2
+		_ 'Error: Cannot create file.' 1>&2
 		exit 2
 	fi
 }
@@ -186,7 +186,7 @@
 write_file()
 {
 	local install_file="$1"
-	cat > "$install_file" << EOT
+	cat > "$install_file" <<EOT
 # SliTaz GNU/Linux Installer - Version: $VERSION
 #
 # Install file.
@@ -275,12 +275,12 @@
 	local install_file="$1"
 	[ -z "$install_file" ] && install_file="$DEFAULT_INSTALL_FILE"
 	if ! [ -r "$install_file" ]; then
-		printf "%s\n" "$(gettext "Error: Unable to read install file")" 1>&2
+		_ 'Error: Unable to read install file.' 1>&2
 		exit 2
 	fi
 	#
 	if ! CONTENTS="$(cat "$install_file")"; then
-		printf "%s\n" "$(gettext "Error: Unable to read install file")" 1>&2
+		_ 'Error: Unable to read install file.' 1>&2
 		exit 2
 	fi
 }
@@ -328,25 +328,20 @@
 		egrep -q "$(regex "$SETTINGS")"; then
 			get_value "$setting"
 	else
-		if [ "$setting" = "all" ]; then
-			printf "%-15s: %s\n" "mode" "$(get_value mode)"
-			printf "%-15s: %s\n" "media" "$(get_value media)"
-			printf "%-15s: %s\n" "source" "$(get_value source)"
-			printf "%-15s: %s\n" "root_uuid" "$(get_value root_uuid)"
-			printf "%-15s: %s\n" "root_format" "$(get_value root_format)"
-			printf "%-15s: %s\n" "home_uuid"   "$(get_value home_uuid)"
-			printf "%-15s: %s\n" "home_format" "$(get_value home_format)"
-			printf "%-15s: %s\n" "hostname" "$(get_value hostname)"
-			printf "%-15s: %s\n" "root_pwd" "$(get_value root_pwd)"
-			printf "%-15s: %s\n" "user_login" "$(get_value user_login)"
-			printf "%-15s: %s\n" "user_pwd" "$(get_value user_pwd)"
-			printf "%-15s: %s\n" "bootloader" "$(get_value bootloader)"
-			printf "%-15s: %s\n" "winboot" "$(get_value winboot)"
-		elif [ "$setting" = "settings" ]; then
-			get_settings
-		else
-			option_error "$1" "$SETTINGS"
-		fi
+		case "$setting" in
+			all)
+				for i in mode media source root_uuid root_format home_uuid home_format \
+					hostname root_pwd user_login user_pwd bootloader winboot; do
+					printf "%-15s: %s\n" "$i" "$(get_value $i)"
+				done
+				;;
+			settings)
+				get_settings
+				;;
+			*)
+				option_error "$1" "$SETTINGS"
+				;;
+		esac
 	fi
 }
 
@@ -357,7 +352,7 @@
 	# validate setting
 	if ! printf "%s" "$setting" | \
 			egrep -q "$(regex "$SETTINGS")"; then
-		printf "%s\n" "$(gettext "Error: '$setting' unknown setting.")" 1>&2
+		_ "Error: '%s' unknown setting." "$setting" 1>&2
 		exit 1
 	fi
 	# and file
@@ -385,8 +380,7 @@
 		read_file "$install_file"
 		check "$setting"
 	else
-		printf "%s\n" \
-			"$(gettext "Error: Unable to write to install file.")" 1>&2
+		_ 'Error: Unable to write to install file.' 1>&2
 		exit 2
 	fi
 }
@@ -430,6 +424,12 @@
 		|| unset WINBOOT
 }
 
+
+
+
+
+
+
 # clean command
 clean()
 {
@@ -440,9 +440,9 @@
 	# rm install file
 	local install_file="$1"
 	[ -z "$install_file" ] && install_file="$DEFAULT_INSTALL_FILE"
-	printf "%s: %s\n" "$(gettext "Deleting install file")" "$install_file"
+	_ 'Deleting install file: %s' "$install_file"
 	if ! [ -w "$install_file" ]; then
-		printf "%s\n" "$(gettext "Error: Unable to delete install file")" 1>&2
+		_ 'Error: Unable to delete install file.' 1>&2
 		exit 2
 	else
 		rm -f "$install_file"
@@ -456,10 +456,10 @@
 # exit if user is not root.
 check_root()
 {
-	if test $(id -u) != 0 ; then
-		echo $(gettext "You must be the root user (system administrator) \
+	if [ $(id -u) -ne 0 ]; then
+		_ "You must be the root user (system administrator) \
 to install SliTaz, please use 'su' to get a root SHell and restart \
-installation.") 1>&2
+installation." 1>&2
 		exit 1
 	fi
 }
@@ -468,7 +468,7 @@
 check_instance()
 {
 	if [ -e "$LOCK" ]; then
-		printf "%s\n" $(gettext "Another instance of tazinst is running.") 1>&2
+		_ 'Another instance of tazinst is running.' 1>&2
 		exit 7
 	else
 		printf "%s" "$$" > $LOCK
@@ -482,9 +482,9 @@
 	if ! printf "%s" "$keyword" | \
 			egrep -q "$(regex "$keylist")"; then
 		msg="$setting=$keyword
-$(gettext 'Error:') '$keyword' $(gettext 'Invalid keyword.')
-$(gettext 'Select one of these options:') $keylist
-$(gettext 'For more information, see tazinst Manual.')"
+$(_ "Error: '%s' Invalid keyword." "$keyword")
+$(_ 'Select one of these options: %s.' "$keylist")
+$(_ 'For more information, see tazinst Manual.')"
 		printf "%s\n" "$msg" 1>&2
 		exit 1
 	fi
@@ -499,8 +499,8 @@
 	done
 	if [ "$found" != "1" ]; then
 		msg="$(gettext "$setting")=$value
-$(gettext 'Error: Partition not found')
-$(gettext 'To see available partitions, run') 'tazinst list uuid'."
+$(_ 'Error: Partition not found.')
+$(_ "To see available partitions, run '%s'." 'tazinst list uuid')"
 		printf "%s\n" "$msg" 1>&2
 		exit 1
 	fi
@@ -515,7 +515,7 @@
 			check_uuid source ;;
 		iso)
 			if [ ! -r "$source" ]; then
-				printf "%s.\n" "$(gettext "Error: Source file not found")" 1>&2
+				_ 'Error: Source file not found.' 1>&2
 				exit 1
 			fi ;;
 		web)
@@ -530,7 +530,7 @@
 			printf "%s" "$source" | \
 				egrep -q "$regexp" && valid=$(($valid+1))
 			if [ "$valid" -le "0" ]; then
-				printf "%s.\n" "$(gettext "Error: invalid URL")" 1>&2
+				_ 'Error: invalid URL.' 1>&2
 				exit 1
 			fi
 	esac
@@ -545,12 +545,12 @@
 	nodup="$(printf "%s" "$list" | /bin/busybox awk 'BEGIN{RS=" "}{print $0}' \
 		| sort | uniq | wc -w)"
 	if [ "$all" != "$nodup" ]; then
-		printf "%s\n" \
-			"$(gettext "Error: multiple assignations for a disk.")" 1>&2
+		_ 'Error: multiple assignations for a disk.' 1>&2
 		exit 1
 	fi
 }
 
+
 # exit if a password is invalid
 check_password()
 {
@@ -559,13 +559,13 @@
 	local errcode=0
 	# too long
 	if [ "${#pass}" -ge 40 ]; then
-		printf "%s\n" "$(gettext "Error: password too long")" 1>&2
+		_ 'Error: password too long.' 1>&2
 		exit 1
 	fi
 	# bad chars
 	if ! (printf "%s" "$pass" | egrep -q "$invalid"); then
-		printf "%s\n" \
-			"$(gettext "Error: Unallowed characters in password.")" 1>&2
+		_ 'Error: Unallowed characters in password.' 1>&2
+
 		exit 1
 	fi
 	# short pwd
@@ -574,9 +574,9 @@
 	[ -z "$pass" ] && errcode=129
 	case "$errcode" in
 		128)
-			printf "%s\n" "$(gettext "Warning: short password!")" 1>&2 ;;
+			_ 'Warning: short password!' 1>&2 ;;
 		129)
-			printf "%s\n" "$(gettext "Warning: no password!")" 1>&2 ;;
+			_ 'Warning: no password!' 1>&2 ;;
 	esac
 	return "$errcode"
 }
@@ -586,17 +586,17 @@
 {
 	local name="$1" value="$(get "$1")" msg
 	msg="$name=$value"
- 	if [ "${#value}" -lt 2 ]; then
-		printf "%s %s\n" "$msg"	"(gettext "Error: Too short.")\n" 1>&2
+	if [ "${#value}" -lt 2 ]; then
+		_ '%s Error: Too short.' "$msg" 1>&2
 		exit 1
 	fi
 	if [ "${#value}" -gt 32 ]; then
-		printf "%s %s\n" "$msg" "$(gettext "Error: Too long.")\n" 1>&2
+		_ '%s Error: Too long.' "$msg" 1>&2
 		exit 1
 	fi
 	if printf "%s" "$value" | \
 			grep -q "[[:space:]\&\"\'\(\)\|\*\\#\`\+\:/;<>]"; then
-		printf "%s %s\n" "$msg" "$(gettext "Error: Invalid chars.")\n" 1>&2
+		_ '%s Error: Invalid chars.' "$msg" 1>&2
 		exit 1
 	fi
 }
@@ -607,8 +607,8 @@
 	local bootloader=$(get bootloader)
 	local winboot=$(get winboot)
 	if [ -z "$bootloader" ] && [ -n "$winboot" ]; then
-		printf "%s\n" \
-			"$(gettext "Error: Dualboot set with no bootloader.")" 1>&2
+
+		_ 'Error: Dualboot set with no bootloader.' 1>&2
 		exit 1
 	fi
 }
@@ -622,12 +622,12 @@
 	if [ "$(/sbin/blkid | grep -c "$uuid")" == "1" ]; then
 		if ! printf "%s" "$(p_table $uuid)" | \
 				egrep -q "$(regex "$pt_list")"; then
-			printf "%s\n" "$(gettext "Error: Unsupported Partition Table")" 1>&2
+			_ 'Error: Unsupported Partition Table.' 1>&2
 			exit 1
 		fi
 	else
-		printf "%s\n" \
-	"$(gettext "Error: No disk selected, cannot install any bootloader.")" 1>&2
+
+		_ 'Error: No disk selected, cannot install any bootloader.' 1>&2
 		exit 1
 	fi
 }
@@ -744,33 +744,33 @@
 
 help_source()
 {
-	printf "%s\n" \
-		"$(gettext "The Source setting depends on the type of media:")"
+
+	_ 'The Source setting depends on the type of media:'
 	printf "%-12s%s\n" "cdrom" "$(help cdrom)"
 	printf "%-12s%s\n" "usb" "$(help usb)"
 	printf "%-12s%s\n" "iso" "$(help iso)"
-	printf "%-12s%s" "web" "$(gettext "Name or URL of the image on the web.")"
-	printf "%s\n" "$(gettext "Type: tazinst help web")"
+	printf "%-12s%s" "web" "$(_ 'Name or URL of the image on the web.')"
+	printf "%s\n" "$(_ 'Type: %s' 'tazinst help web')"
 }
 
 help_all()
 {
-	local text="mode:$(gettext "Mode of install")
-media:$(gettext "Media containing the SliTaz source files")
-source:$(gettext "Source file containing SliTaz")
-root_uuid:$(gettext "The name of the target partition")
-root_format:$(gettext "Format of the target partition")
-home_uuid:$(gettext "Separate home partition")
-home_format:$(gettext "Format of the root partition")
-hostname:$(gettext "Name of the system")
-root_pwd:$(gettext "Superuser password")
-user_login:$(gettext "First user name")
-user_pwd:$(gettext "First user password")
-bootloader:$(gettext "Install a bootloader")
-winboot:$(gettext "Partition to dualboot Windows from")"
-	printf "%s\n" "$(gettext "List of settings:")"
-	printf "%s" "$text" | \
-		/bin/busybox awk -F: '/..*/{printf "%-12s%s\n", $1, $2}'
+	_ 'List of settings:'
+	optlist "\
+mode		$(_ 'Mode of install')
+media		$(_ 'Media containing the SliTaz source files')
+source		$(_ 'Source file containing SliTaz')
+root_uuid	$(_ 'The name of the target partition')
+root_format	$(_ 'Format of the target partition')
+home_uuid	$(_ 'Separate home partition')
+home_format	$(_ 'Format of the root partition')
+hostname	$(_ 'Name of the system')
+root_pwd	$(_ 'Superuser password')
+user_login	$(_ 'First user name')
+user_pwd	$(_ 'First user password')
+bootloader	$(_ 'Install a bootloader')
+winboot		$(_ 'Partition to dualboot Windows from')
+"
 }
 
 # help command
@@ -787,13 +787,13 @@
 	source)
 		help_source ;;
 	cdrom)
-		printf "%s\n" "$(gettext "CD. Automatically set")" ;;
+		_ 'CD. Automatically set' ;;
 	usb)
-		printf "%s\n" \
-			"$(gettext "USB partition. For a list, type: tazinst list usb")" ;;
+
+		_ 'USB partition. For a list, type: %s' 'tazinst list usb' ;;
 	iso)
-		printf "%s\n" \
-			"$(gettext "ISO file name. For a list, type: tazinst list iso")" ;;
+
+		_ 'ISO file name. For a list, type: %s' 'tazinst list iso' ;;
 	web)
 		printf "%s" "$LST_WEB" | \
 			/bin/busybox awk -F: '/..*/{printf "%-12s%s\n", $1, $3}' ;;
@@ -808,20 +808,20 @@
 		printf "%s" "$LST_FORMAT" | \
 				/bin/busybox awk -F: '/..*/{printf "%-12s%s\n", $1, $2}' ;;
 	hostname)
-		printf "%s\n" "$(gettext "Name of the system")" ;;
+		_ 'Name of the system' ;;
 	root_pwd)
-		printf "%s\n" "$(gettext "Superuser password")" ;;
+		_ 'Superuser password' ;;
 	user_login)
-		printf "%s\n" "$(gettext "First user name")" ;;
+		_ 'First user name' ;;
 	user_pwd)
-		printf "%s\n" "$(gettext "First user password")" ;;
+		_ 'First user password' ;;
 	bootloader)
 		printf "%s" "$LST_BOOTLOADER" | \
 			/bin/busybox awk -F: '/..*/{printf "%-12s%s\n",$1,$2}' ;;
 	winboot)
-		printf "%s\n" "$(gettext "Partition containing Windows, or 'auto'")" ;;
+		_ "Partition containing Windows, or 'auto'" ;;
 	""|all)
-	help_all ;;
+		help_all ;;
 	*)
 		option_error "$setting" "$SETTINGS" ;;
 	esac
@@ -883,14 +883,14 @@
 list_format()
 {
 	local fs
-	type mkfs.btrfs > /dev/null && fs="btrfs"
-	type mkfs.ext2  > /dev/null && fs="$fs ext2"
-	type mkfs.ext3  > /dev/null && fs="$fs ext3"
-	type mkfs.ext4  > /dev/null && fs="$fs ext4"
-	type mkfs.jfs > /dev/null && fs="$fs jfs"
-	type mkfs.minix > /dev/null && fs="$fs minix"
+	type mkfs.btrfs   > /dev/null && fs="btrfs"
+	type mkfs.ext2    > /dev/null && fs="$fs ext2"
+	type mkfs.ext3    > /dev/null && fs="$fs ext3"
+	type mkfs.ext4    > /dev/null && fs="$fs ext4"
+	type mkfs.jfs     > /dev/null && fs="$fs jfs"
+	type mkfs.minix   > /dev/null && fs="$fs minix"
 	type mkfs.reiser4 > /dev/null && fs="$fs reiser4"
-	type mkfs.xfs > /dev/null && fs="$fs xfs"
+	type mkfs.xfs     > /dev/null && fs="$fs xfs"
 	printf "%s" "$fs" | sed 's/^\s//'
 }
 
@@ -1124,7 +1124,7 @@
 				printf "%05.0f %s \n",rand()*99999, $0;
 			}' | sort -n | sed 's/^[0-9]* //' )"
 	else
-		log "$(gettext "No mirror list found, run tazpkg recharge.")"
+		log "$(_ 'No mirror list found, run %s.' 'tazpkg recharge')"
 		list_mirrors="http://mirror.slitaz.org/"
 	fi
 	MIRRORS="$list_mirrors"
@@ -1136,16 +1136,16 @@
 	local file="$1" mirror transfer=0 oldfile
 	mkdir -p /tmp/tazinst
 	for mirror in $MIRRORS; do
-		log "$(gettext "Downloading:") $mirror$file"
+		log "$(_ 'Downloading: %s' "$mirror$file")"
 		oldfile="$(printf "%s" $file | \
 			/bin/busybox awk 'BEGIN{RS="/"}{text=$1}END{print text}')"
 		[ -e "/tmp/tazinst/$oldfile" ] && rm -f "/tmp/tazinst/$oldfile"
 		/bin/busybox wget $mirror$file -P /tmp/tazinst && transfer=1 && break
 	done
 	if [ "$transfer" -gt "0" ];then
-		log "$(gettext "Download completed.")"
+		log "$(_ 'Download completed.')"
 	else
-		error 5 "$file: $(gettext "Download failed.")"
+		error 5 "(_ '%s: Download failed.' "$file")"
 	fi
 }
 
@@ -1154,9 +1154,9 @@
 {
 	local pkg="$1"
 	if [ ! -d /var/lib/tazpkg/installed/$pkg ]; then
-		log "$(gettext "Installing package to the current system:") $pkg"
+		log "$(_ 'Installing package %s to the current system.' "$pkg")"
 		[ -z "$RECHARGE" ] && RECHARGE=true && /usr/bin/tazpkg recharge
-		/usr/bin/tazpkg get-install "$pkg" || error 5 "Cannot install $pkg"
+		/usr/bin/tazpkg get-install "$pkg" || error 5 "$(_ 'Cannot install %s.' "$pkg")"
 	fi
 }
 
@@ -1164,7 +1164,7 @@
 add_pkg()
 {
 	local pkg="$1"
-	log "$(gettext "Adding package to the target system:") $pkg..."
+	log "$(_ 'Adding package %s to the target system...' "$pkg")"
 	[ -z "$RECHARGE" ] && RECHARGE=true && /usr/bin/tazpkg recharge
 	/usr/bin/tazpkg get "$pkg" >> "$LOG"  2>> "$LOG"
 	yes "" | /usr/bin/tazpkg install $pkg.tazpkg \
@@ -1179,7 +1179,7 @@
 # start log
 log_open()
 {
-	printf "%s\n" "=== Tazinst: started on $(date "+%x %X") ===" > "$LOG"
+	_ '=== Tazinst: started on %s ===' "$(date "+%x %X")" > "$LOG"
 	LOGGING="true"
 }
 
@@ -1205,15 +1205,15 @@
 # print an error msg & exit
 error()
 {
-	local error="$1" msg="$2" cancel="$(gettext "Process not completed")"
-	printf "%s: %s\n%s\n" "$(gettext "Error")" "$msg" "$cancel" 1>&2
+	local error="$1" msg="$2" cancel="$(_ 'Process not completed')"
+	_ 'Error: %s' "$msg" >&2; echo "$cancel" >&2
 	if [ -n "$LOGGING" ]; then
 		# 1st pattern
 		echo "-x-x- " >> "$LOG"
-		printf "%s: %s\n%s\n" "$(gettext "Error")" "$msg" "$cancel" >> "$LOG"
+		_ 'Error: %s' "$msg" >> "$LOG"; echo "$cancel" >> "$LOG"
 		# 2nd pattern
 		echo "x-x-x " >> "$LOG"
-		printf "=== Tazinst error on $(date "+%x %X") ===\n" >> "$LOG"
+		_ '=== Tazinst error on %s ===' "$(date "+%x %X")" >> "$LOG"
 	fi
 	unset LOGGING
 	umount_devices
@@ -1222,12 +1222,12 @@
 
 error8()
 {
-	error 8 "$(gettext "Internal error")"
+	error 8 "$(_ 'Internal error')"
 }
 
 error9()
 {
-	error 9 "$(gettext "Cancelled by user")"
+	error 9 "$(_ 'Cancelled by user')"
 }
 
 #------------------
@@ -1248,9 +1248,9 @@
 	local cdrom=/dev/$drive
 	# mount cdrom
 	if mount -t iso9660 "$cdrom" "$SOURCE_ROOT" 2>>"$LOG"; then
-		log "$(gettext "Using files from") $cdrom."
+		log "$(_ 'Using files from %s.' "$cdrom")"
 	else
-		error 3 "$cdrom: $(gettext "Mount failed")."
+		error 3 "$(_ '%s: Mount failed.' "$cdrom")"
 	fi
 }
 
@@ -1259,14 +1259,14 @@
 {
 	# /home is on LiveUSB
 	if [ -d /home/boot ]; then
-		log "$(gettext "Using files from USB device")..."
+		log "$(_ 'Using files from USB device...')"
 		ln -s /home/boot $SOURCE_ROOT/boot
 	else
 		# mount LiveUSB
 		if mount "$SOURCE" "$SOURCE_ROOT" 2>>"$LOG"; then
-			log "$(gettext "Using files from USB device") $SOURCE."
+			log "$(_ 'Using files from USB device %s.' "$SOURCE")"
 		else
-			error 3 "$SOURCE: $(gettext "Failed to mount USB device")."
+			error 3 "$(_ '%s: Failed to mount USB device.' "$SOURCE")"
 		fi
 	fi
 }
@@ -1281,17 +1281,17 @@
 		local md5calc="$(md5sum $SOURCE | cut -d' ' -f1)"
 		if [ ! "$md5calc" = "$md5ref" ]; then
 			log "md5sum iso=$md5ref md5sum tazinst=$md5calc"
-			error 3 "$(gettext "md5sum error, file corrupted.")"
+			error 3 "$(_ 'md5sum error, file corrupted.')"
 		fi
 	else
-		log "$SOURCE: $(gettext "md5 file not found, cannot check integrity.")"
+		log "$(_ '%s: md5 file not found, cannot check integrity.' "$SOURCE")"
 	fi
 	# mount ISO
 	if mount -o loop -t iso9660 "$SOURCE" \
 			"$SOURCE_ROOT" 2>>"$LOG"; then
-		log "$(gettext "Using files from ISO") $SOURCE."
+		log "$(_ 'Using files from ISO %s.' "$SOURCE")"
 	else
-		error 3 "$SOURCE: $(gettext "Failed to mount ISO.")"
+		error 3 "$(_ '%s: Failed to mount ISO.' "$SOURCE")"
 	fi
 }
 
@@ -1313,7 +1313,7 @@
 # set up source and check SliTaz' content
 mount_source()
 {
-	log "$(gettext "Creating mount point:") $SOURCE_ROOT..."
+	log "$(_ 'Creating mount point: %s...' "$SOURCE_ROOT")"
 	mkdir -p "$SOURCE_ROOT"
 	case "$MEDIA" in
 	cdrom)
@@ -1329,12 +1329,12 @@
 	esac
 
 	#  exit if no rootfs.gz found.
-	log "$(gettext "Checking installation media...")"
+	log "$(_ 'Checking installation media...')"
 	if [ ! -f $SOURCE_ROOT/boot/rootfs.gz -a \
 		 ! -f $SOURCE_ROOT/boot/rootfs1.gz ]; then
-		error 3 $(gettext "Invalid source")
+		error 3 "$(_ 'Invalid source')"
 	else
-		log "$(gettext "Installation media checked ok")"
+		log "$(_ 'Installation media checked ok')"
 	fi
 }
 
@@ -1346,12 +1346,12 @@
 format()
 {
 	local uuid="$1" fmt="$2" dest="$3" dev format
-	log "$(gettext "Format") $uuid ($fmt)"
+	log "$(_ 'Format %s (%s)' "$uuid" "$fmt")"
 	format="mkfs.$fmt"
 	if (printf "%s" "$uuid" | grep -q "UUID="); then
 		# case UUID=
 		dev="$(uuid2dev $uuid)"
-		"$format" "$dev" >>"$LOG" 2>>"$LOG" || error 4 "Formatting has failed"
+		"$format" "$dev" >>"$LOG" 2>>"$LOG" || error 4 "$(_ 'Formatting has failed')"
 		# uuid has changed
 		case "$dest" in
 		root_uuid)
@@ -1363,22 +1363,22 @@
 		esac
 	else
 		# case /dev/xxxx
-		"$format" $uuid >>"$LOG" 2>>"$LOG" || error 4 "Formatting has failed"
+		"$format" $uuid >>"$LOG" 2>>"$LOG" || error 4 "$(_ 'Formatting has failed')"
 	fi
 }
 
 # prepare partitions
 prepare_uuid()
 {
-	log "$(gettext "Preparing target partition...")"
+	log "$(_ 'Preparing target partition...')"
 	local uuid
 	# target may be in use
 	if mount | grep -q "$ROOT_UUID" ;then
-		log "$(gettext "Partition is already mounted, unmounting.")"
+		log "$(_ 'Partition is already mounted, unmounting.')"
 		umount "$ROOT_UUID"
 	fi
 	mount | grep -q "$ROOT_UUID" && \
-		error 4 "$ROOT_UUID: $(gettext "Partition is already in use.")"
+		error 4 "$ROOT_UUID: $(_ 'Partition is already in use.')"
 	# Mount point can be already used.
 	mount | grep -q "$TARGET_ROOT" && \
 		umount "$TARGET_ROOT" 2>>"$LOG"
@@ -1386,7 +1386,7 @@
 	# Formatting root partition
 	case "$ROOT_FORMAT" in
 		"")
-			log "$ROOT_UUID: $(gettext "The partition will be cleaned...")" ;;
+			log "$(_ '%s: The partition will be cleaned...' "$ROOT_UUID")" ;;
 		*)
 			format "$ROOT_UUID" "$ROOT_FORMAT" root_uuid
 	esac
@@ -1395,13 +1395,13 @@
 	if [ -n "$HOME_UUID" ]; then
 		case "$HOME_FORMAT" in
 			"")
-				log "$HOME_UUID $(gettext "The partition will be kept...")" ;;
+				log "$(_ '%s: The partition will be kept...' "$HOME_UUID")" ;;
 			*)
 				format "$HOME_UUID" "$HOME_FORMAT" home_uuid
 		esac
 	fi
 
-	log "$(gettext "Creating mount point:") $TARGET_ROOT"
+	log "$(_ 'Creating mount point: %s...' "$TARGET_ROOT")"
 	mkdir -p "$TARGET_ROOT" >> "$LOG" || error8
 	# Mount target.
 	local mount_fs="$ROOT_FORMAT"
@@ -1410,7 +1410,7 @@
 			"$TARGET_ROOT" >>"$LOG" 2>>"$LOG"
 	if [ $(mount | \
 			grep -c "mnt/target") == "0" ]; then
-		error 4 "$ROOT_UUID: $(gettext "Unable to mount partition")"
+		error 4 "$(_ '%s: Unable to mount partition' "$ROOT_UUID")"
 	fi
 }
 
@@ -1424,23 +1424,23 @@
 {
 	# umount target
 	if mount | grep -q "$TARGET_ROOT"; then
-		log "$(gettext "Unmounting target partition:") $ROOT_UUID"
+		log "$(_ 'Unmounting target partition: %s' "$ROOT_UUID")"
 		umount -l "$TARGET_ROOT" 2>>$LOG
 	fi
 
 	# umount source
 	if mount | grep -q "$SOURCE_ROOT"; then
-		log "$(gettext "Unmounting:") $SOURCE_ROOT"
+		log "$(_ 'Unmounting: %s' "$SOURCE_ROOT")"
 		umount -l "$SOURCE_ROOT"
 	fi
 	if [ -h $SOURCE_ROOT/boot ]; then
-		log "$(gettext "Unlinking:") $SOURCE_ROOT"
+		log "$(_ 'Unlinking: %s' "$SOURCE_ROOT")"
 		rm -f $SOURCE_ROOT/boot
 	fi
 
 	# eject cd
 	if [ "$SOURCE" == "cdrom" ]; then
-		gettext "Ejecting cdrom..."
+		_ 'Ejecting CD-ROM...'
 		eject
 	fi
 	# remove lock file
@@ -1449,12 +1449,12 @@
 
 end_of_install()
 {
-	log "$(gettext "Process completed. You can now restart (reboot)")"
-	log "$(gettext "from your SliTaz GNU/Linux system.")"
-	printf "%s\n" "=== Tazinst ended on $(date "+%x %X") ===" >> "$LOG"
+	log "$(_ 'Process completed. You can now restart (reboot) from your SliTaz GNU/Linux system.' |\
+		fold -s)"
+	_ '=== Tazinst ended on %s ===' "$(date "+%x %X")" >> "$LOG"
 	unset LOGGING
 	# saving log
-	log "$(gettext "Copying log to /var/log/tazinst.log")"
+	log "$(_ 'Copying log to %s' '/var/log/tazinst.log')"
 	cp -a "$LOG" $TARGET_ROOT/var/log
 	umount_devices
 }
@@ -1490,7 +1490,7 @@
 			syslinux_install ;;
 		*)
 			syslinux_config
-			log "$(gettext "No bootloader to install.")" ;;
+			log "$(_ 'No bootloader to install.')" ;;
 	esac
 }
 
@@ -1558,7 +1558,7 @@
 			$TARGET_ROOT/boot/grub/menu.bak
 	# create the target GRUB configuration.
 	mkdir -p $TARGET_ROOT/boot/grub || error8
-	cat > $TARGET_ROOT/boot/grub/menu.lst << _EOF_
+	cat > $TARGET_ROOT/boot/grub/menu.lst <<_EOF_
 # /boot/grub/menu.lst: GRUB boot loader configuration.
 #
 
@@ -1584,8 +1584,8 @@
 
 	local winpart="$(winboot_uuid)"
 	if [ -n "$winpart" ]; then
-		log "$(gettext "Enabling Windows dual-boot")"
-		cat >> $TARGET_ROOT/boot/grub/menu.lst << _EOF_
+		log "$(_ 'Enabling Windows dual-boot')"
+		cat >> $TARGET_ROOT/boot/grub/menu.lst <<_EOF_
 # For booting Windows :
 #
 title Microsoft Windows
@@ -1607,17 +1607,17 @@
 {
 	# install grub
 	local target_disk="$(uuid2disk $ROOT_UUID)"
-	log "$(gettext "Installing grub on:") $target_disk"
-	/usr/sbin/grub-install --version >> "$LOG" || error 5 "grub not found"
+	log "$(_ 'Installing GRUB on: %s' "$target_disk")"
+	/usr/sbin/grub-install --version >> "$LOG" || error 5 "$(_ 'GRUB not found')"
 	/usr/sbin/grub-install --no-floppy \
 			--root-directory=$TARGET_ROOT $target_disk >>"$LOG" 2>>"$LOG"
 	# set boot flag
-	log "$(gettext "Setting the boot flag")"
+	log "$(_ 'Setting the boot flag')"
 	/usr/sbin/parted "$(uuid2disk $ROOT_UUID)" \
 		set "$(($(partnum $ROOT_UUID)+1))" boot on 2>> "$LOG"
 	# splash image
 	if [ -f "$SOURCE_ROOT/boot/grub/splash.xpm.gz" ]; then
-		log "$(gettext "Copying splash image")"
+		log "$(_ 'Copying splash image')"
 		mkdir -p $TARGET_ROOT/boot/grub
 		cp $SOURCE_ROOT/boot/grub/splash.xpm.gz \
 			$TARGET_ROOT/boot/grub
@@ -1640,7 +1640,7 @@
 			$TARGET_ROOT/boot/syslinux/syslinux.bak
 	# create the target syslinux configuration.
 	mkdir -p $TARGET_ROOT/boot/syslinux || error8
-	cat > $TARGET_ROOT/boot/syslinux/syslinux.cfg << EOF
+	cat > $TARGET_ROOT/boot/syslinux/syslinux.cfg <<EOF
 # use a boot menu
 UI vesamenu.c32
 
@@ -1666,10 +1666,10 @@
 
 # Menu colors
 MENU COLOR border       *       #00000000 #00000000 none
-MENU COLOR title	    *       #ffffffff #00000000 *
+MENU COLOR title        *       #ffffffff #00000000 *
 MENU COLOR sel          0       #ffffffff #00000000 none
 MENU COLOR unsel        0       #50ffffff #00000000 none
-MENU COLOR help 	    *       #ffffffff #00000000 *
+MENU COLOR help         *       #ffffffff #00000000 *
 MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std
 MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std
 MENU COLOR msg07        37;40   #90ffffff #a0000000 std
@@ -1688,8 +1688,8 @@
 EOF
 	local winpart="$(winboot_uuid)"
 	if [ -n "$winpart" ]; then
-		log "$(gettext "Enabling Windows dual-boot")"
-		cat >> $TARGET_ROOT/boot/syslinux/syslinux.cfg << EOF
+		log "$(_ 'Enabling Windows dual-boot')"
+		cat >> $TARGET_ROOT/boot/syslinux/syslinux.cfg <<EOF
 LABEL windows
 	MENU LABEL Windows
 	COM32 chain.c32
@@ -1707,7 +1707,7 @@
 # install syslinux
 syslinux_install()
 {
-	log "$(gettext "Installing syslinux")"
+	log "$(_ 'Installing Syslinux')"
 	# needed tools
 	local dir disk="$(uuid2disk $ROOT_UUID)"
 	for dir in /home/boot/extlinux /home/boot/syslinux /boot/syslinux; do
@@ -1717,19 +1717,19 @@
 	/usr/bin/lzma d /usr/share/boot/chain.c32.lzma \
 		$TARGET_ROOT/boot/syslinux/chain.c32 2>> "$LOG"
 	# install syslinux
-	/bin/syslinux -version >> "$LOG" || error 5 "syslinux not found"
+	/bin/syslinux -version >> "$LOG" || error 5 "$(_ 'Syslinux not found')"
 	/bin/extlinux --install $TARGET_ROOT/boot/syslinux >> "$LOG" 2>> "$LOG"
 	case "$(p_table $ROOT_UUID)" in
 		msdos)
-			log "$(gettext "Setting the boot flag on")"
+			log "$(_ 'Setting the boot flag on')"
 			/usr/sbin/parted "$disk" \
 				set "$(($(partnum $ROOT_UUID)+1))" boot on 2>> "$LOG"
-			[ -r /usr/share/boot/mbr.bin ] || error 5 "mbr.bin not found"
-			log "$(gettext "Installing mbr")"
+			[ -r /usr/share/boot/mbr.bin ] || error 5 "$(_ 'mbr.bin not found')"
+			log "$(_ 'Installing MBR')"
 			dd bs=440 count=1 conv=notrunc \
 				if=/usr/share/boot/mbr.bin 	of=$disk >> "$LOG" ;;
 		gpt)
-			log "$(gettext "Setting the legacy_boot flag on")"
+			log "$(_ 'Setting the legacy_boot flag on')"
 			# remove old boot flag
 			local oldboot="$(parted $disk print \
 				| grep boot | /bin/busybox awk '{print $1}')"
@@ -1738,14 +1738,14 @@
 			# set boot flag
 			/usr/sbin/parted "$disk" \
 				set "$(($(partnum $ROOT_UUID)+1))" legacy_boot on 2>> "$LOG"
-			log "$(gettext "Installing gptmbr")"
-			[ -r /usr/share/boot/gptmbr.bin ] || error 5 "gptmbr.bin not found"
+			log "$(_ 'Installing GPTMBR')"
+			[ -r /usr/share/boot/gptmbr.bin ] || error 5 "$(_ 'gptmbr.bin not found')"
 			dd bs=440 conv=notrunc count=1 \
 				if=/usr/share/boot/gptmbr.bin of=$disk >> "$LOG" ;;
 	esac
 	# splash image
 	if [ -f "$SOURCE_ROOT/boot/isolinux/splash.jpg" ]; then
-		log "$(gettext "Copying splash image")"
+		log "$(_ 'Copying splash image')"
 		cp -a $SOURCE_ROOT/boot/isolinux/splash.jpg \
 			$TARGET_ROOT/boot/syslinux
 	fi
@@ -1778,7 +1778,7 @@
 {
 	if [ -z "$ROOT_FORMAT" ]; then
 		# partition was not formatted
-		log "$(gettext "Cleaning the root partition") ($ROOT_UUID)..."
+		log "$(_ 'Cleaning the root partition (%s)...' "$ROOT_UUID")"
 		# keep /home in case of reinstall.
 		local path="$(pwd)"
 		cd "$TARGET_ROOT" || error8
@@ -1787,12 +1787,12 @@
 		do
 			case "$dir" in
 				home)
-					log "$(gettext "keeping /home found on:") $ROOT_UUID"
+					log "$(_ 'keeping /home found on: %s' "$ROOT_UUID")"
 					mv home home.bak ;;
 				lost+found)
 					continue ;;
 				*)
-					log "$(gettext "removing target:") $dir"
+					log "$(_ 'removing target: %s' "$dir")"
 					rm -rf "$dir" 2>>"$LOG" ;;
 			esac
 		done
@@ -1810,13 +1810,13 @@
 		KERNEL="vmlinuz-$(ls /$TARGET_ROOT/lib/modules | tail -1)"
 	else
 		KERNEL="vmlinuz-$(uname -r)"
-		log "$(gettext "Kernel name not found, falling back to:") $(uname -r)"
+		log "$(_ 'Kernel name not found, falling back to: %s' "$(uname -r)")"
 	fi
 	mkdir -p $TARGET_ROOT/boot || error8
 	for i in $SOURCE_ROOT/boot/bzImage* ; do
 		cp $i $TARGET_ROOT/boot/${KERNEL%slitaz*}slitaz${i#*bzImage}
 	done
-	log "$(gettext "install_kernel:") $KERNEL"
+	log "$(_ 'install_kernel: %s' "$KERNEL")"
 }
 
 # extract packed rootfs: squashfs or cromfs
@@ -1902,16 +1902,16 @@
 	# restore backup of existing /home if exists.
 	# (created by prepare_target_dev)
 	if [ -d home.bak ]; then
-		log "$(gettext "Restoring directory: /home...")"
+		log "$(_ 'Restoring directory: /home...')"
 		rm -rf home
 		mv home.bak home
 	fi
 	# add root device to CHECK_FS in rcS.conf to check filesystem
 	# on each boot.
-	log "$(gettext "Adding / partition and CHECK_FS to file /etc/rcS.conf...")"
+	log "$(_ 'Adding / partition and CHECK_FS to file %s...' '/etc/rcS.conf')"
 	sed	-i s#'CHECK_FS=\"\"'#"CHECK_FS=\"$(dev2uuid $ROOT_UUID)\""# etc/rcS.conf
 	# set hostname.
-	log "$(gettext "Configuring host name:") $HOSTNAME"
+	log "$(_ 'Configuring host name: %s' "$HOSTNAME")"
 	printf "%s\n" "$HOSTNAME" > etc/hostname
 	printf "%s\n" "127.0.0.1	localhost $HOSTNAME tazpanel" > etc/hosts
 	cd "$path" || error8
@@ -1974,7 +1974,7 @@
 		local home_fs="$HOME_FORMAT"
 		[ -z "$home_fs" ] && home_fs="$(filesys $HOME_UUID)"
 		# manage /home
-		log "$(gettext "Configuring partition to be used as /home:") $HOME_UUID"
+		log "$(_ 'Configuring partition to be used as /home: %s' "$HOME_UUID")"
 		mv home/$USER_LOGIN tmp
 		mount -t "$home_fs" "$HOME_UUID" home >> "$LOG" 2>> "$LOG"
 		if [ -d $TARGET_ROOT/home/$USER_LOGIN ]; then
@@ -1993,39 +1993,39 @@
 install()
 {
 	log_open
-	log "1 $(gettext "Installing SliTaz on:") $(get root_uuid)"
-	log "5 $(gettext "Checking settings")..."
+	log "1 $(_ 'Installing SliTaz on: %s' "$(get root_uuid)")"
+	log "5 $(_ 'Checking settings...')"
 	check all >> "$LOG" 2>> "$LOG"
 	load_settings
 
-	log "10 $(gettext "Preparing source media")..."
+	log "10 $(_ 'Preparing source media...')"
 	mount_source
 
-	log "20 $(gettext "Preparing target disk")..."
+	log "20 $(_ 'Preparing target disk...')"
 	prepare_uuid
 
-	log "30 $(gettext "Cleaning the root partition if necessary")..."
+	log "30 $(_ 'Cleaning the root partition if necessary...')"
 	clean_target
 
-	log "40 $(gettext "Extracting the root system")..."
+	log "40 $(_ 'Extracting the root system...')"
 	extract_rootfs $SOURCE_ROOT/boot
 
-	log "50 $(gettext "Installing the kernel")..."
+	log "50 $(_ 'Installing the Kernel...')"
 	install_kernel
 
-	log "60 $(gettext "Preconfiguring the system")..."
+	log "60 $(_ 'Preconfiguring the system...')"
 	pre_config_system
 
-	log "70 $(gettext "Configuring root and default user account")..."
+	log "70 $(_ 'Configuring root and default user account...')"
 	users_settings
 
-	log "80 $(gettext "Configuring /home")..."
+	log "80 $(_ 'Configuring /home...')"
 	home_config
 
-	log "90 $(gettext "Checking bootloader installation...")"
+	log "90 $(_ 'Checking bootloader installation...')"
 	bootloader
 
-	log "100 $(gettext "Files installation completed")"
+	log "100 $(_ 'Files installation completed')"
 	end_of_install
 }
 
@@ -2039,10 +2039,10 @@
 {
 	if [ -f $TARGET_ROOT/etc/slitaz-release ]; then
 		local release="$(cat $TARGET_ROOT/etc/slitaz-release)"
-		log "$(gettext "Preparing upgrade of SliTaz release:") $release"
+		log "$(_ 'Preparing upgrade of SliTaz release: %s' "$release")"
 	else
-		error 6 "$ROOT_UUID: $(gettext "This partition doesn't appear to \
-contain a valid SliTaz system, the file: /etc/slitaz-release doesn't exist.")"
+		error 6 "$(_ "%s: This partition doesn't appear to contain a valid \
+SliTaz system, the file: %s doesn't exist." "$ROOT_UUID" '/etc/slitaz-release')"
 	fi
 }
 
@@ -2060,21 +2060,21 @@
 				rm -rf boot/vmlinuz-* ;;
 			home)
 				mv home home.bak
-				log "$(gettext "keeping /home found on:") $ROOT_UUID" ;;
+				log "$(_ 'keeping /home found on: %s' "$ROOT_UUID")" ;;
 			etc)
 				/bin/busybox tar czf etc.tar.gz etc
 				mv etc etc.bak
-				log "$(gettext "keeping /etc found on:") $ROOT_UUID" ;;
+				log "$(_ 'keeping /etc found on: %s' "$ROOT_UUID")" ;;
 			var)
 				if [ -d var/www ]; then
 					mv var/www www.bak
-					log "$(gettext "keeping /var/www found on:") $ROOT_UUID"
+					log "$(_ 'keeping /var/www found on: %s' "$ROOT_UUID")"
 				fi
 				rm -rf var 2>>"$LOG" ;;
 			lost+found)
 				continue ;;
 			*)
-				log "$(gettext "removing target: $dir")"
+				log "$(_ 'removing target: %s' "$dir")"
 				rm -rf "$dir" 2>>"$LOG" ;;
 		esac
 	done
@@ -2095,21 +2095,21 @@
 		rm -rf $TARGET_ROOT/var/www
 		mv $TARGET_ROOT/www.bak $TARGET_ROOT/var/www
 	fi
-	log "$(gettext "backups restored:") $(date)"
+	log "$(_ 'backups restored: %s' "$(date)")"
 
 	# /var/lib/slitaz-installer
 	mkdir -p $TARGET_ROOT/var/lib/tazinst && \
 	mv $TARGET_ROOT/etc.tar.gz $TARGET_ROOT/var/lib/tazinst && \
 	mv $TARGET_ROOT/home/packages-selection.list \
 		$TARGET_ROOT/var/lib/tazinst \
-		&& log "$(gettext "backups saved in /var/lib/tazinst")"
+		&& log "$(_ 'backups saved in %s' '/var/lib/tazinst')"
 }
 
 # upgrade added pkgs
 install_pkgs()
 {
 	# check if the pkg is on the mirror.
-	log "$(gettext "Checking the availability of packages...")"
+	log "$(_ 'Checking the availability of packages...')"
 	touch packages-to-install.list
 	packages=0
 	diff="$(cat packages-selection.diff | sort)"
@@ -2122,14 +2122,14 @@
 	done
 
 	# install packages.
-	log "$(gettext "Installing packages...")"
+	log "$(_ 'Installing packages...')"
 	if [ "$packages" == "0" ]; then
-		log "$(gettext "packages to install: 0")"
+		log "$(_ 'packages to install: 0')"
 	else
 		# get-install all missing pkgs.
 		for pkg in $(cat packages-to-install.list)
 		do
-			log "$(gettext "Installing:") $pkg..."
+			log "$(_ 'Installing: %s...' "$pkg")"
 			# get install package and answer yes in case of dependencies.
 			pkgname="$(grep ^$pkg /var/lib/tazpkg/packages.list)"
 			/usr/bin/tazpkg get "$pkg" >/dev/null 2>/dev/null
@@ -2138,7 +2138,7 @@
 			rm -f $pkgname.tazpkg
 		done
 	fi
-	log "$(gettext "Installation of packages complete...")"
+	log "$(_ 'Installation of packages complete...')"
 }
 
 # search for added pkgs
@@ -2147,23 +2147,23 @@
 	local path="$(pwd)"
 	cd $TARGET_ROOT/var/lib/tazinst || error8
 	# LiveCD packages list.
-	log "$(gettext "Creating package lists...")"
+	log "$(_ 'Creating package lists...')"
 	ls -1 $TARGET_ROOT/var/lib/tazpkg/installed > packages-source.list || error8
-	log "$(gettext "packages-source.list: done")"
+	log "$(_ '%s: done' 'packages-source.list')"
 	# diff
 	/bin/busybox diff packages-source.list packages-selection.list | \
 		grep ^+[a-z] | sed s/^+// > packages-selection.diff
-	log "$(gettext "packages-selection.diff: done")"
+	log "$(_ '%s: done' 'packages-selection.diff')"
 	# get mirror list.
 	/usr/bin/tazpkg recharge >>$LOG 2>>$LOG
 	if [ -f /var/lib/tazpkg/packages.list ]; then
 		install_pkgs
 	else
 		touch packages-to-install.list
-		printf "%s\n" "$(gettext "The list of available packages on the mirror \
-could not be downloaded. No missing packages will be reinstalled now, but you \
-can do so later by looking at the following list:
-/var/lib/tazinst/packages-selection.diff")"
+		longline "$(_ "The list of available packages on the mirror could not \
+be downloaded. No missing packages will be reinstalled now, but you can do so \
+later by looking at the following list:")"
+		echo '/var/lib/tazinst/packages-selection.diff'
 	fi
 	cd "$path" || error8
 }
@@ -2172,39 +2172,39 @@
 upgrade()
 {
 	log_open
-	log "1 $(gettext "Upgrading SliTaz on:") $(get root_uuid)"
-	log "5 $(gettext "Checking settings")..."
+	log "1 $(_ 'Upgrading SliTaz on: %s' "$(get root_uuid)")"
+	log "5 $(_ 'Checking settings...')"
 	check all >> "$LOG"
 	load_settings
 
-	log "10 $(gettext "Preparing source media")..."
+	log "10 $(_ 'Preparing source media...')"
 	mount_source
 
-	log "20 $(gettext "Preparing target disk")..."
+	log "20 $(_ 'Preparing target disk...')"
 	prepare_uuid
 
-	log "30 $(gettext "Searching for /etc/slitaz-release")..."
+	log "30 $(_ 'Searching for %s...' '/etc/slitaz-release')"
 	check_release
 
-	log "40 $(gettext "Backup /etc, /home and the packages list")..."
+	log "40 $(_ 'Backup /etc, /home and the packages list...')"
 	backup_files
 
-	log "50 $(gettext "Extracting the root system")..."
+	log "50 $(_ 'Extracting the root system...')"
 	extract_rootfs $SOURCE_ROOT/boot
 
-	log "60 $(gettext "Restoring configuration files")..."
+	log "60 $(_ 'Restoring configuration files...')"
 	restore_files
 
-	log "70 $(gettext "Installing the kernel")..."
+	log "70 $(_ 'Installing the Kernel...')"
 	install_kernel
 
-	log "80 $(gettext "Upgrading added packages")..."
+	log "80 $(_ 'Upgrading added packages...')"
 	update_pkgs
 
-	log "90 $(gettext "Bootloader")..."
+	log "90 $(_ 'Bootloader...')"
 	bootloader
 
-	log "100 $(gettext "Files installation completed")"
+	log "100 $(_ 'Files installation completed')"
 	end_of_install
 }