# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1336125643 -10800
# Node ID fdfc6b49453949948f6c050c1b29197a2d949471
# Parent  5312e3716b0158e904b26879b03797d616785c3f
3 weeks forging ;) Some bugs fixed, maybe all i18n improved (please, recheck 'po's!), couple of new features added... Enjoy!

diff -r 5312e3716b01 -r fdfc6b494539 AUTHORS
--- a/AUTHORS	Fri May 04 12:57:53 2012 +0300
+++ b/AUTHORS	Fri May 04 13:00:43 2012 +0300
@@ -3,3 +3,4 @@
 Paul Issot <paul@slitaz.org>
 Dominique Corbex <domcox@slitaz.org>
 Christian Mesh <meshca@clarkson.edu>
+Aleksej Bobylev <al.bobylev@gmail.com>
diff -r 5312e3716b01 -r fdfc6b494539 Makefile
--- a/Makefile	Fri May 04 12:57:53 2012 +0300
+++ b/Makefile	Fri May 04 13:00:43 2012 +0300
@@ -3,7 +3,7 @@
 PREFIX?=/usr
 SYSCONFDIR?=/etc/slitaz
 DESTDIR?=
-LINGUAS?=fr pt_BR
+LINGUAS?=es fr pt_BR ru
 PANEL?=/var/www/tazpanel
 
 VERSION:=$(shell grep ^VERSION tazpanel | cut -d '=' -f 2)
@@ -16,10 +16,9 @@
 	xgettext -o po/tazpanel.pot -L Shell \
 		--package-name="TazPanel" \
 		--package-version="$(VERSION)" \
-		./tazpanel ./index.cgi ./pkgs.cgi ./live.cgi \
-		./network.cgi ./boot.cgi ./hardware.cgi \
-		./settings.cgi ./lib/libtazpanel ./installer.cgi \
-		./styles/default/header.sh ./styles/default/footer.sh
+		./tazpanel ./index.cgi ./pkgs.cgi ./live.cgi ./network.cgi ./boot.cgi \
+		./hardware.cgi ./settings.cgi ./lib/libtazpanel ./installer.cgi \
+		./help.cgi ./styles/default/header.sh ./styles/default/footer.sh
 
 msgmerge:
 	@for l in $(LINGUAS); do \
@@ -59,3 +58,9 @@
 	rm -f po/*.mo
 	rm -f po/*.*~
 
+help:
+	@echo "$$ pot          - remake pot"
+	@echo "$$ msgmerge     - update *.po from *.pot"
+	@echo "$$ msgfmt | all - compile *.mo"
+	@echo "# install      - install files to system"
+	@echo "$$ clean        - remove *.mo"
diff -r 5312e3716b01 -r fdfc6b494539 README.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.html	Fri May 04 13:00:43 2012 +0300
@@ -0,0 +1,90 @@
+<h2>SliTaz Web Control Panel</h2>
+
+<p>Tazpanel is the SliTaz Control Panel, a web interface which lets you manage the
+full system in a radically simple way. The output xHTML code is valid xHTML 5
+and all theming is done with standard CSS 3. TazPanel is published under a
+BSD License.</p>
+
+
+<h3>Use it!</h3>
+
+<p>You can clone the tazpanel repo into /var/www/tazpanel and work on this
+copy or clone it somewhere else and 'make install'. After, add tazpanel to
+your /etc/hosts, type './tazpanel start' to start the server and go to the
+URL: http://tazpanel:82. Panel user and password are defined in the 
+httpd.conf and default is root:root</p>
+
+
+<h3>i18n</h3>
+
+<p>TazPanel has been coded from the beginning with gettext support. Please
+forget 'echo' and use gettext, but remember that gettext "" is equivalent
+to echo -n. All scripts use the same TEXTDOMAIN and the same pot files, and 
+all translations go in the po/ folder. To start a new translation please
+use msginit from the pot file directory. Example for French/France
+locale (fr_FR):</p>
+
+<pre>$ msginit -l fr_FR -o fr.po -i tazpanel.pot</pre>
+
+<p>To update all translations from a newly updated pot file:</p>
+
+<pre>$ make msgmerge</pre>
+
+
+<h3>User interface</h3>
+
+<p>If you develop an official SliTaz GUI for TazPanel, please follow the default 
+style. If you need more CSS markup and you are not a coder, please ask an 
+official developer for the best way to implement your idea. TazPanel is fully 
+themable and more than one theme can be installed, this will allow us to make 
+packages in a TazPanel style! All the GUI is done with xHTML 5 and CSS 3, some
+javascript can be used, but with precautions... one more time, it's better
+to check with a main contributor before adding too much stuff, the goal is,
+as for all the SliTaz projects: KISS</p>
+
+
+<h3>CGI template and files</h3>
+
+<p>To start or test a new function with TazPanel you will find a file in
+utils/template.cgi that needs to be in the $PANEL root to work, all TazPanel
+CGI scripts are in that location. If you think your code is too big to fit
+in another script you can eventually create a new CGI page and update all
+links, but please to talk to the AUTHORS beforehand.</p>
+
+<dl>
+	<dt>index.cgi</dt>
+		<dd>Main Tazpanel CGI script</dd>
+	<dt>boot.cgi</dt>
+		<dd>All what happens before login</dd>
+	<dt>network.cgi</dt>
+		<dd>All related stuff to networking (eth, wifi, services)</dd>
+	<dt>pkgs.cgi</dt>
+		<dd>Tazpkg packages CGI interface</dd>
+	<dt>settings.cgi</dt>
+		<dd>System settings and services such as time, users accounts,
+		locales or daemons management</dd>
+	<dt>live.cgi</dt>
+		<dd>All tools related to Live systems (CD, USB, Frugal)</dd>
+	<dt>hardware.cgi</dt>
+		<dd>Devices drivers, firmware, printing</dd>
+	<dt>help.cgi</dt>
+		<dd>Cat the html doc and this README file</dd>
+</ul>
+
+<p>For common functions have a look to lib/libtazpanel, you may found functions
+you need already coded such as a xhtml_header to get the style header.html
+in your CGI script. For the loading message you can use loading_msg. When
+cat is used: `gettext "Text to translate"`</p>
+
+
+<h3>Web server</h3>
+
+<p>Tazpanel can run with the Busybox httpd applet or LightTPD and probably Apache.
+Start the webserver with a custom config to listen only on a local port for
+security reasons since we run as root to perform system actions, example:</p>
+
+<pre># httpd -p 82 u root -c /etc/slitaz/httpd.conf</pre>
+
+<p>Or use a tazpanel cmdline:</p>
+
+<pre># ./tazpanel start</pre>
diff -r 5312e3716b01 -r fdfc6b494539 boot.cgi
--- a/boot.cgi	Fri May 04 12:57:53 2012 +0300
+++ b/boot.cgi	Fri May 04 13:00:43 2012 +0300
@@ -22,29 +22,29 @@
 		xhtml_header
 		cat << EOT
 <div id="wrapper">
-	<h2>`gettext "Boot log files"`</h2>
+	<h2>$(gettext 'Boot log files')</h2>
 </div>
 <div>
 	<a class="button" href="#kernel">
-		<img src="$IMAGES/tux.png" />$(gettext "Kernel messages")</a>
-	<a class="button" href="#boot">$(gettext "Boot scripts")</a>
-	<a class="button" href="#slim">$(gettext "X server")</a>
+		<img src="$IMAGES/tux.png" />$(gettext 'Kernel messages')</a>
+	<a class="button" href="#boot">$(gettext 'Boot scripts')</a>
+	<a class="button" href="#slim">$(gettext 'X server')</a>
 </div>
-	<a name="kernel"></a>
-	<h3>$(gettext "Kernel messages")</h3>
+
+	<h3 id="kernel">$(gettext 'Kernel messages')</h3>
+
+	<pre>$(cat /var/log/dmesg.log | syntax_highlighter kernel)</pre>
+
+	<h3 id="boot">$(gettext 'Boot scripts')</h3>
+
+	<pre>$(cat /var/log/boot.log | filter_taztools_msgs)</pre>
+
+	<h3 id="slim">$(gettext 'X server')</h3>
+
 	<pre>
-$(cat /var/log/dmesg.log)
-	</pre>
-	<a name="boot"></a>
-	<h3>$(gettext "Boot scripts")</h3>
-	<pre>
-$(cat /var/log/boot.log | filter_taztools_msgs)
-	</pre>
-	<a name="slim"></a>
-	<h3>$(gettext "X server")</h3>
-	<pre>
-$(tail -n 40 /var/log/slim.log)
-	</pre>
+$(tail -n 40 /var/log/slim.log | htmlize)
+<hr /><a href="/index.cgi?file=/var/log/slim.log">$(gettext 'Show more...')</a>
+</pre>
 EOT
 		;;
 	*\ daemons\ *)
@@ -58,10 +58,8 @@
 
 		cat << EOT
 <div id="wrapper">
-	<h2>`gettext "Manage daemons"`</h2>
-	<p>
-		`gettext "Check, start and stop daemons on SliTaz"`
-	</p>
+	<h2>$(gettext 'Manage daemons')</h2>
+	<p>$(gettext 'Check, start and stop daemons on SliTaz')</p>
 </div>
 EOT
 		daemon=$(GET daemons)
@@ -81,11 +79,11 @@
 		cat << EOT
 <thead>
 	<tr>
-		<td>`gettext "Name"`</td>
-		<td>`gettext "Description"`</td>
-		<td>`gettext "Status"`</td>
-		<td>`gettext "Action"`</td>
-		<td>`gettext "PID"`</td>
+		<td>$(gettext 'Name')</td>
+		<td>$(gettext 'Description')</td>
+		<td>$(gettext 'Status')</td>
+		<td>$(gettext 'Action')</td>
+		<td>$(gettext 'PID')</td>
 	</tr>
 </thead>
 EOT
@@ -104,29 +102,30 @@
 			# First check if daemon is started at bootime
 			[ echo "RUN_DAEMONS" | fgrep $name ] && boot="on boot"
 			# Standard SliTaz busybox daemons and firewall
+			echo -n "<td>"
 			case "$name" in
 				firewall)
-					gettext "<td>SliTaz Firewall with iptable rules</td>" ;;
+					gettext 'SliTaz Firewall with iptable rules' ;;
 				httpd)
-					gettext "<td>Small and fast web server with CGI support</td>" ;;
+					gettext 'Small and fast web server with CGI support' ;;
 				ntpd)
-					gettext "<td>Network time protocol daemon</td>" ;;
+					gettext 'Network time protocol daemon' ;;
 				ftpd)
-					gettext "<td>Anonymous FTP server</td>" ;;
+					gettext 'Anonymous FTP server' ;;
 				udhcpd)
-					gettext "<td>Busybox DHCP server</td>" ;;
+					gettext 'Busybox DHCP server' ;;
 				syslogd|klogd)
-					gettext "<td>Linux Kernel log daemon</td>" ;;
+					gettext 'Linux Kernel log daemon' ;;
 				crond)
-					gettext "<td>Execute scheduled commands</td>" ;;
+					gettext 'Execute scheduled commands' ;;
 				dnsd)
-					gettext "<td>Small static DNS server daemon</td>" ;;
+					gettext 'Small static DNS server daemon' ;;
 				tftpd)
-					gettext "<td>Transfer a file on tftp request</td>" ;;
+					gettext 'Transfer a file on tftp request' ;;
 				inetd)
-					gettext "<td>Listen for network connections and launch programs</td>" ;;
+					gettext 'Listen for network connections and launch programs' ;;
 				zcip)
-					gettext "<td>Manage a ZeroConf IPv4 link-local address</td>" ;;
+					gettext 'Manage a ZeroConf IPv4 link-local address' ;;
 				*)
 					# Description from receipt
 					[ -d "$LOCALSTATE/installed/$name" ] && pkg=$name
@@ -134,25 +133,26 @@
 					[ -d "$LOCALSTATE/installed/${name}-pam" ] && pkg=${name}-pam
 					if [ "$pkg" ]; then
 						. $LOCALSTATE/installed/$pkg/receipt
-						echo "<td>$SHORT_DESC</td>"
+						echo -n "$SHORT_DESC"
 					else
-						echo "<td>----</td>"
+						echo -n "----"
 					fi ;;
 			esac
+			echo "</td>"
 			# Attempt to get daemon status
-			pidfile=`find /var/run -name *$name*.pid`
-			[ "$pidfile" ] && pid=`cat $pidfile`
+			pidfile=$(find /var/run -name *$name*.pid)
+			[ "$pidfile" ] && pid=$(cat $pidfile)
 			# dbus
-			[ -f /var/run/${name}/pid ] && pid=`cat /var/run/${name}/pid`
+			[ -f /var/run/${name}/pid ] && pid=$(cat /var/run/${name}/pid)
 			# apache
-			[ "$name" = "apache" ] && pid=`cat /var/run/$name/httpd.pid`
+			[ "$name" = "apache" ] && pid=$(cat /var/run/$name/httpd.pid)
 			# Pidof works for many daemons
-			[ "$pid" ] || pid=`pidof $name`
+			[ "$pid" ] || pid=$(pidof $name)
 			if [ "$pid" ]; then
 				cat << EOT
-<td><img src="$IMAGES/started.png" /></td>
+<td><img src="$IMAGES/started.png" alt="Started" title="$(gettext 'Started')" /></td>
 <td><a href="$SCRIPT_NAME?daemons=stop=$name">
-    <img src="$IMAGES/stop.png" /></a></td>
+	<img src="$IMAGES/stop.png" alt="Stop" title="$(gettext 'Stop')" /></a></td>
 <td>
 EOT
 				for i in $pid; do
@@ -162,67 +162,77 @@
 				done
 			else
 				cat << EOT
-<td>-</td>
+<td><img src="$IMAGES/stopped.png" alt="Stopped" title="$(gettext 'Stopped')" /></td>
 <td><a href="$SCRIPT_NAME?daemons=start=$name">
-    <img src="$IMAGES/start.png" /></a></td>
+    <img src="$IMAGES/start.png" alt="Start" title="$(gettext 'Start')" /></a></td>
 <td>-----
 EOT
 			fi
 			echo '</td></tr>'
 		done
 		table_end ;;
+
 	*\ grub\ *)
+		GRUBMENU="/boot/grub/menu.lst"
 		if [ "$(GET splash)" ]; then
 			default=$(GET default)
 			timeout=$(GET timeout)
 			splash=$(GET splash)
 			sed -i \
-				-e s"/default .*/default $default/" \
-				-e s"/timeout .*/timeout $timeout/" \
-				-e s"#splashimage=.*#splashimage=$splash#" \
-				/boot/grub/menu.lst
+				-e s"|default .*|default $default # new|" \
+				-e s"|timeout .*|timeout $timeout|" \
+				-e s"|splashimage=.*|splashimage=$splash|" \
+				$GRUBMENU
 		fi
-		default=$(cat /boot/grub/menu.lst | grep ^default | cut -d " " -f 2)
-		timeout=$(cat /boot/grub/menu.lst | grep ^timeout | cut -d " " -f 2)
-		splash=$(cat /boot/grub/menu.lst | grep ^splashimage | cut -d "=" -f 2)
+		default=$(cat $GRUBMENU | grep ^default | cut -d " " -f 2)
+		timeout=$(cat $GRUBMENU | grep ^timeout | cut -d " " -f 2)
+		splash=$(cat $GRUBMENU | grep ^splashimage | cut -d "=" -f 2)
 		xhtml_header
 				cat << EOT
 <div id="wrapper">
-	<h2>$(gettext "GRUB Boot loader")</h2>
-	<p>
-		$(gettext "The first application started when the computer powers on")
-	</p>
+	<h2>$(gettext 'GRUB Boot loader')</h2>
+
+	<p>$(gettext 'The first application started when the computer powers on')</p>
 </div>
 
 <form method="get" action="$SCRIPT_NAME">
 	<input type="hidden" name="grub" />
-<pre>
-Default entry : <input type="text" name="default" value="$default" />
-
-Timeout       : <input type="text" name="timeout" value="$timeout" />
-
-Splash image  : <input type="text" name="splash" value="$splash" size="40" />
-</pre>
-	<input type="submit" value="$(gettext "Change")" />
-	<a class="button" href="index.cgi?file=/boot/grub/menu.lst">
-		<img src="$IMAGES/text.png" />View or edit menu.lst</a>
+<table>
+<tr><td>$(gettext 'Default entry:')</td>
+	<td><input type="text" name="default" value="$default" /></td></tr>
+<tr><td>$(gettext 'Timeout:')</td>
+	<td><input type="text" name="timeout" value="$timeout" /></td></tr>
+<tr><td>$(gettext 'Splash image:')</td>
+	<td><input type="text" name="splash" value="$splash" size="40" /></td></tr>
+</table>
+	<input type="submit" value="$(gettext 'Change')" />
+	<a class="button" href="index.cgi?file=$GRUBMENU">
+		<img src="$IMAGES/text.png" />$(gettext 'View or edit menu.lst')</a>
 </form>
 
-<h3>$(gettext "Boot entries")</h3>
+<h3>$(gettext 'Boot entries')</h3>
 EOT
+
+
+menu=$(tail -q -n +$(grep -n ^title $GRUBMENU | head -n1 | cut -d: -f1) $GRUBMENU \
+	| sed -e "s|^$||g" \
+	| sed -e "s|^title|</pre></li>\n<p><strong>$(gettext 'Entry') #</strong></p>\n<pre>\0|g" \
+	| sed '/^[ \t]*$/d' \
+	| tail -q -n +2)"</pre>"
+
 	entry='-1'
-	grep ^title /boot/grub/menu.lst | while read title
+	echo "$menu" | while read line
 	do
-		entry=$(($entry + 1))
-		echo "<strong>$(gettext "Entry") $entry</strong>"
-		echo '<pre>'
-		grep -A 2 "$title" /boot/grub/menu.lst
-		echo '</pre>'
+		if [ -n "$(echo $line | grep '#</strong>')" ]; then
+			entry=$(($entry + 1))
+		fi
+		echo $line | sed "s|#</strong>|$entry</strong>|"
 	done
+
 	# Here we could check if an entry for gpxe is present if not
 	# display a form to add it.
 	[ -f "/boot/gpxe" ] && echo "<h3>gPXE</h3>" && \
-		gettext "Web boot is available with gPXE"
+		gettext 'Web boot is available with gPXE'
 	;;
 	*)
 		#
@@ -232,37 +242,35 @@
 		xhtml_header
 		cat << EOT
 <div id="wrapper">
-	<h2>$(gettext "Boot &amp; Start services")</h2>
-	<p>
-		$(gettext "Everything that happens before user login")
-	</p>
+	<h2>$(gettext 'Boot &amp; Start services')</h2>
+	<p>$(gettext 'Everything that happens before user login')</p>
 </div>
 <div>
 	<a class="button" href="$SCRIPT_NAME?log">
-		<img src="$IMAGES/text.png" />$(gettext "Boot logs")</a>
+		<img src="$IMAGES/text.png" />$(gettext 'Boot logs')</a>
 	<a class="button" href="$SCRIPT_NAME?daemons">
-		<img src="$IMAGES/recharge.png" />$(gettext "Manage daemons")</a>
-	<a class="button" href="$SCRIPT_NAME?grub">$(gettext "Boot loader")</a>
+		<img src="$IMAGES/recharge.png" />$(gettext 'Manage daemons')</a>
+	<a class="button" href="$SCRIPT_NAME?grub">$(gettext 'Boot loader')</a>
 </div>
 
-<h3>`gettext "Configuration files"`</h3>
+<h3>$(gettext 'Configuration files')</h3>
 <ul>
-	<li>`gettext "Main configuration file:"`
+	<li>$(gettext 'Main configuration file:')
 		<a href="index.cgi?file=/etc/rcS.conf">rcS.conf</a></li>
-	<li>`gettext "Login manager settings:"`
+	<li>$(gettext 'Login manager settings:')
 		<a href="index.cgi?file=/etc/slim.conf">slim.conf</a></li>
 </ul>
 
-<h3>`gettext "Kernel cmdline"`</h3>
-<pre>
-`cat /proc/cmdline`
-</pre>
-<h3>`gettext "Local startup commands"`</h3>
-<pre>
-$(cat /etc/init.d/local.sh | syntax_highlighter sh)
-</pre>
+<h3>$(gettext 'Kernel cmdline')</h3>
+
+<pre>$(cat /proc/cmdline)</pre>
+
+<h3>$(gettext 'Local startup commands')</h3>
+
+<pre>$(cat /etc/init.d/local.sh | syntax_highlighter sh)</pre>
+
 <a class="button" href="index.cgi?file=/etc/init.d/local.sh&amp;action=edit">
-<img src="$IMAGES/edit.png" />$(gettext "Edit script")</a>
+<img src="$IMAGES/edit.png" />$(gettext 'Edit script')</a>
 EOT
 		;;
 esac
diff -r 5312e3716b01 -r fdfc6b494539 data/tazpanel.conf
--- a/data/tazpanel.conf	Fri May 04 12:57:53 2012 +0300
+++ b/data/tazpanel.conf	Fri May 04 13:00:43 2012 +0300
@@ -1,6 +1,6 @@
 # tazpanel.conf: SliTaz Web Control Panel configuration
 #
-# Copyright (C) 2011-2012 SliTaz GNU/Linux - BSD License
+# Copyright (C) 2011-12 SliTaz GNU/Linux - BSD License
 #
 
 # Panel location and theme
@@ -32,3 +32,7 @@
 # Shared Tazpkg paths
 LOCALSTATE="/var/lib/tazpkg"
 INSTALLED="$LOCALSTATE/installed"
+
+# Disk usage warnings in percents
+DU_WARN="70"
+DU_CRIT="90"
diff -r 5312e3716b01 -r fdfc6b494539 doc/tazpanel.ru.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/tazpanel.ru.html	Fri May 04 13:00:43 2012 +0300
@@ -0,0 +1,62 @@
+<div id="help">
+
+<h2>Русская справка</h2>
+
+<p>TazPanel — это центр управления и настроек, из которого вы можете
+	контролировать всю систему — управлять пакетами, добавлять и удалять
+	пользователей, создавать «живые» системы и многое другое. Навигация
+	осуществляется при помощи панели инструментов в верхней части окна
+	приложения, а в некоторых случаях, как в интерфейсе пакетного менеджера, —
+	при помощи меню и боковой панели.</p>
+<p>В большинстве случаев вы получите описание и полезную информацию по
+	соответствующему разделу. TazPanel использует новейшие технологии — xHTML 5
+	и CSS 3 для того, чтобы предоставить чистый и простой в использовании
+	интерфейс для всех задач управления, которые можно выполнить на SliTaz.
+	С самого начала TazPanel создавалась с расчетом на скорость, качество и
+	полную поддержку интернационализации.</p>
+<p>TazPanel работает как веб-сервер на порту 82 (по умолчанию), ее можно
+	использовать только в локальной системе. Если вы хотите управлять вашей
+	системой с удаленной машины, вы можете изменить файл конфигурации сервера,
+	чтобы разрешить соединения из локальной сети, или даже из всего интернета,
+	но в последнем случае убедитесь, что вы установили надежный пароль для
+	панели. Файл конфигурации сервера — /etc/slitaz/httpd.conf.</p>
+
+<h3>Terminal</h3>
+
+<p>TazPanel содержит небольшой эмулятор терминала, который позволяет выполнять
+	команды от имени администратора на удаленной или локальной системе.
+	Использоваться могут не все команды, и в большинстве случаев вы должны
+	использовать соединение SSH. Тем не менее, несколько команд, имеющиеся в
+	веб-интерфейсе, могут оказаться полезными, например, Wget поддерживает
+	загрузку файлов на удаленную машину. Папка загрузки по умолчанию —
+	/var/www/downloads. Все команды могут использовать параметры, такие как
+	-R -l и т.д.</p>
+
+<h3>Поддержка</h3>
+
+<p>Вы можете получить поддержку на <a href="http://forum.slitaz.org/">форуме</a>
+	SliTaz, в рассылке или на канале IRC. Официальный IRC-канал SliTaz
+	находится на Freenode; обратите внимание, что вы можете использовать в
+	SliTaz программы LostIRC, Xchat или Pidgin. Freenode также поддерживает
+	хороший <a href="http://webchat.freenode.net/">веб-интерфейс</a>.</p>
+
+<h3>Присоединяйтесь</h3>
+
+<p>Если вы хотите помочь и присоединиться к SliTaz, вы можете заняться TazPanel!
+	Нам нужна помощь в переводе, дизайне, написании документации и кода. Если
+	вам нужна дополнительная информация, или вы хотите опубликовать новый
+	дизайн, заходите в <a href="http://scn.slitaz.org/">сообщество</a>, а там
+	оставьте сообщение на форуме Devel, или личное сообщение одному из
+	разработчиков SliTaz, чтобы мы могли связаться с вами и включить вашу работу
+	в TazPanel или в дополнительный пакет стилей.</p>
+
+<h3>Баги и особенности</h3>
+
+<p>TazPanel — всё еще молодое приложение, которое со временем будет
+	совершенствоваться и отшлифовываться. Если вы нашли ошибку, пожалуйста,
+	сообщите на баг-трекер SliTaz:
+	<a href="http://bugs.slitaz.org/">bugs.slitaz.org</a>. Tazpanel имеет режим
+	отладки, который можно включить в файле конфигурации tazpanel.conf; также
+	имеется <a href="/index.cgi?debug">отладочная страница</a>.</p>
+
+</div>
diff -r 5312e3716b01 -r fdfc6b494539 hardware.cgi
--- a/hardware.cgi	Fri May 04 12:57:53 2012 +0300
+++ b/hardware.cgi	Fri May 04 13:00:43 2012 +0300
@@ -18,73 +18,72 @@
 
 case " $(GET) " in
 	*\ print\ *)
-		echo "TODO" ;;
+		xhtml_header
+		echo "<h2>TODO</h2>" ;;
 	*\ detect\ *)
 		# Front end for Tazhw
 		# TODO: Add button to detect webcam, etc. Like in tazhw box.
 		xhtml_header
-				cat << EOT
+		cat << EOT
 <div id="wrapper">
-	<h2>$(gettext "Detect hardware")</h2>
-	<p>$(gettext "Detect PCI and USB hardware")</p>
+	<h2>$(gettext 'Detect hardware')</h2>
+	<p>$(gettext 'Detect PCI and USB hardware')</p>
 </div>
+
+<pre>$(tazhw detect-pci | syntax_highlighter sh)</pre>
+
+<pre>$(tazhw detect-usb | syntax_highlighter sh)</pre>
 EOT
-		echo '<pre>'
-		tazhw detect-pci
-		echo '</pre>'
-		echo '<pre>'
-		tazhw detect-usb
-		echo '</pre>' ;;
+		;;
 	*\ modules\ *|*\ modinfo\ *)
 		xhtml_header
 		cat << EOT
 <div id="wrapper">
-	<h2>`gettext "Kernel modules"`</h2>
-<div class="float-right">
-	<form method="get" action="$SCRIPT_NAME">
-		<input type="hidden" name="modules" />
-		<input type="text" name="search" />
-	</form>
-</div>
-	<p>$(gettext "Manage, search or get information about the Linux kernel modules")</p>
+	<h2>$(gettext 'Kernel modules')</h2>
+	<div class="float-right">
+		<form method="get" action="$SCRIPT_NAME">
+			<input type="hidden" name="modules" />
+			<input type="search" placeholder="$(gettext 'Modules search')" name="search" />
+		</form>
+	</div>
+	<p>$(gettext 'Manage, search or get information about the Linux kernel modules')</p>
 </div>
 EOT
 		# Request may be modinfo output that we want in the page itself
-		if [ -n "$(GET modinfo)" ]; then
-			echo '<strong>'
-			gettext "Detailed information for module: "; echo "$(GET modinfo)"
-			echo '</strong>'
-			echo '<pre>'
-			modinfo $(GET modinfo)
-			echo '</pre>'
+		get_modinfo="$(GET modinfo)"
+		if [ -n "$get_modinfo" ]; then
+			cat << EOT
+<strong>$(eval_gettext 'Detailed information for module: $get_modinfo')</strong>
+
+<pre>$(modinfo $get_modinfo)</pre>
+EOT
 		fi
 		if [ -n "$(GET modprobe)" ]; then
-			echo '<pre>'
-			modprobe -v $(GET modprobe)
-			echo '</pre>'
+			echo "<pre>$(modprobe -v $(GET modprobe))</pre>"
 		fi
 		if [ -n "$(GET rmmod)" ]; then
 			echo "Removing"
 			rmmod -w $(GET rmmod)
 		fi
-		if [ -n "$(GET search)" ]; then
-			gettext "Matching result(s) for: "; echo "$(GET search)"
+		get_search="$(GET search)"
+		if [ -n "$get_search" ]; then
+			eval_gettext 'Matching result(s) for: $get_search'
 			echo '<pre>'
 			modprobe -l | grep "$(GET search)" | while read line
 			do
 				name=$(basename $line)
 				mod=${name%.ko.gz}
-				echo "Module    : <a href='$SCRIPT_NAME?modinfo=$mod'>$mod</a> "
+				echo "$(gettext 'Module:') <a href='$SCRIPT_NAME?modinfo=$mod'>$mod</a>"
 			done
 			echo '</pre>'
 		fi
 		cat << EOT
-	`table_start`
+	$(table_start)
 		<tr class="thead">
-			<td>`gettext "Module"`</td>
-			<td>`gettext "Size"`</td>
-			<td>`gettext "Used"`</td>
-			<td>`gettext "by"`</td>
+			<td>$(gettext 'Module')</td>
+			<td>$(gettext 'Size')</td>
+			<td>$(gettext 'Used')</td>
+			<td>$(gettext 'by')</td>
 		</tr>
 EOT
 		# Get the list of modules and link to modinfo
@@ -95,7 +94,7 @@
 			<td><a href="$SCRIPT_NAME?modinfo=$MOD">$MOD</a></td>
 			<td>$SIZE</td>
 			<td>$USED</td>
-			<td>`echo $BY | sed s/","/" "/g`</td>
+			<td>$(echo $BY | sed s/","/" "/g)</td>
 		</tr>
 EOT
 		done
@@ -110,14 +109,14 @@
 		xhtml_header
 		cat << EOT
 <div id="wrapper">
-	<h2>`gettext "Drivers &amp; Devices"`</h2>
-	<p>`gettext "Manage your computer hardware`</p>
+	<h2>$(gettext 'Drivers &amp; Devices')</h2>
+	<p>$(gettext 'Manage your computer hardware')</p>
 </div>
 <div>
 	<a class="button" href="$SCRIPT_NAME?modules">
-		<img src="$IMAGES/tux.png" />Kernel modules</a>
+		<img src="$IMAGES/tux.png" />$(gettext 'Kernel modules')</a>
 	<a class="button" href="$SCRIPT_NAME?detect">
-		<img src="$IMAGES/monitor.png" />Detect PCI/USB</a>
+		<img src="$IMAGES/monitor.png" />$(gettext 'Detect PCI/USB')</a>
 </div>
 
 <div id="wrapper">
@@ -130,36 +129,46 @@
 				remain=$(sed '/remaining capacity/!d;s/[^0-9]*\([0-9]*\).*/\1/' < $dev/state)
 				rate=$(sed '/present rate/!d;s/[^0-9]*\([0-9]*\).*/\1/' < $dev/state)
 				full=$(sed '/last full capacity/!d;s/[^0-9]*\([0-9]*\).*/\1/' < $dev/info)
-				# FIXME
-				#remtime=$(( ($remain * 60) / $rate ))
-				#rempct=$(( ($remain * 100) / $full ))
+				warning=$(sed '/design capacity warning/!d;s/[^0-9]*\([0-9]*\).*/\1/' < $dev/info)
+				low=$(sed '/design capacity low/!d;s/[^0-9]*\([0-9]*\).*/\1/' < $dev/info)
+				state=$(sed '/charging state/!d;s/\([^:]*:[ ]\+\)\([a-z]\+\)/\2/' < $dev/state)
+
+				rempct=$(( $remain * 100 / $full ))
 				cat << EOT
 <tr>
 	<td><img src="$IMAGES/battery.png" />
-		Battery $(grep "^battery type" $dev/info | sed 's/.*: *//')
+		$(gettext 'Battery') $(grep "^battery type" $dev/info | sed 's/.*: *//')
 		$(grep "^design capacity:" $dev/info | sed 's/.*: *//') </td>
-	<td>health  $(( (100*$full)/$design))%</td>
+	<td>$(gettext 'health') $(( (100*$full)/$design))%</td>
+	<td class="meter"><meter min="0" max="$full" value="$remain" low="$low"
+		high="$warning" optimum="$full"></meter>
+		<span>
 EOT
-				if grep -qis discharging $dev/state; then
-					cat <<EOT
-	<td class="pct"><div class="pct"
-		style="width: $rempct%;">charge&nbsp;$rempct%&nbsp;-&nbsp;$(printf "%d:%02d" $(($remtime/60)) $(($remtime%60)))</div></td>
-EOT
-				else
-					cat <<EOT
-	<td class="pct"><div class="pct"
-		style="width: $rempct%;">recharging&nbsp;$rempct%</div></td>
-EOT
-				fi
+				case "$state" in
+				"discharging")
+					remtime=$(( $remain * 60 / $rate ))
+					remtimef=$(printf "%d:%02d" $(($remtime/60)) $(($remtime%60)))
+					eval_gettext 'Discharging $rempct% - $remtimef' ;;
+				"charging")
+					remtime=$(( ($full - $remain) * 60 / $rate ))
+					remtimef=$(printf "%d:%02d" $(($remtime/60)) $(($remtime%60)))
+					eval_gettext 'Charging $rempct% - $remtimef' ;;
+				"charged")
+					gettext 'Charged 100%' ;;
+				esac
+				echo '</span></td></tr>'
 			done
 			echo "</table>"
 		fi
+
 		if [ -n "$(ls /sys/devices/virtual/thermal/*/temp 2> /dev/null)" ]; then
-			echo "Temperature: "
+			echo -n '<p>'; gettext 'Temperature:'
 			for temp in /sys/devices/virtual/thermal/*/temp; do
 				awk '{ print $1/1000 }' < $temp
 			done
+			echo '</p>'
 		fi
+
 		if [ -n "$(ls /sys/devices/virtual/backlight/*/brightness 2> /dev/null)" ]; then
 			cat <<EOT
 <form method="get" action="$SCRIPT_NAME">
@@ -168,7 +177,7 @@
 				name=$(echo $dev | sed 's|.*/backlight/\([^/]*\).*|\1|')
 				cat <<EOT
 <input type="hidden" name="dev" value="$name" />
-$(gettext "Brightness") \
+$(gettext 'Brightness') \
 $(sed 's/.*\.//;s/_*$//' < /sys/devices/virtual/backlight/$name/device/path):
 <select name="brightness" onchange="submit();">
 EOT
@@ -190,46 +199,67 @@
 		cat << EOT
 </div>
 
-<h3>$(gettext "Filesystem usage statistics")</h3>
+<h3>$(gettext 'Filesystem usage statistics')</h3>
 <pre>
 EOT
 		fdisk -l | fgrep Disk
 		echo '</pre>'
+
+
 		#
-		# Disk stats and management (mount, umount, heck)
+		# Disk stats and management (mount, umount, check)
 		#
-		table_start
+		cat << EOT
+<table class="zebra">
+EOT
 		df_thead
+		echo '<tbody>'
 		df -h | grep ^/dev | while read fs size used av pct mp
 		do
 				cat << EOT
 <tr>
 	<td><img src="$IMAGES/harddisk.png" />${fs#/dev/}</td>
+	<td>$(blkid -o value $fs | head -n1)</td>
+	<td>$(blkid -o value $fs | tail -n1)</td>
 	<td>$size</td>
 	<td>$av</td>
-	<td class="pct"><div class="pct"
-		style="width: $pct;">$used&nbsp;-&nbsp;$pct</div></td>
+	<td class="meter"><meter min="0" max="100" value="${pct%%%}" low="70"
+	high="90" optimum="10"></meter>
+		<span>$used - $pct</span>
+	</td>
 	<td>$mp</td>
 </tr>
 EOT
 		done
-		table_end
-		echo "<h3>$(gettext "System memory")</h3>"
-		echo '<pre>'
+		cat << EOT
+</tbody>
+</table>
+
+EOT
+
+
+		cat << EOT
+<h3>$(gettext 'System memory')</h3>
+<pre>
+EOT
 		free -m | sed \
 			-e s"#total.*\([^']\)#<span class='top'>\0</span>#"g \
 			-e s"#^[A-Z-].*:\([^']\)#<span class='sh-comment'>\0</span>#"g
-		echo '</pre>'
-		echo '<h3>lspci</h3>'
-		echo '<pre>'
+		cat << EOT
+</pre>
+
+<h3>lspci</h3>
+<pre>
+EOT
 			lspci -k | sed \
 			 -e s"#^[0-9].*\([^']\)#<span class='diff-at'>\0</span>#" \
 			 -e s"#use: \(.*\)#use: <span class='diff-rm'>\1</span>#"
-		echo '</pre>'
-		echo '<h3>lsusb</h3>'
-		echo '<pre>'
-			lsusb
-		echo '</pre>'
+		cat << EOT
+</pre>
+
+<h3>lsusb</h3>
+<pre>$(lsusb)</pre>
+EOT
 		;;
 esac
 
diff -r 5312e3716b01 -r fdfc6b494539 help.cgi
--- a/help.cgi	Fri May 04 12:57:53 2012 +0300
+++ b/help.cgi	Fri May 04 13:00:43 2012 +0300
@@ -17,7 +17,7 @@
 	<form method="get" action="$SCRIPT_NAME">
 		<p>
 			<input type="text" name="manual" size="20">
-			<input type="submit" class="radius" value="$(gettext "Manual")">
+			<input type="submit" class="radius" value="$(gettext 'Manual')">
 		</p>
 	</form>
 </div>
@@ -25,7 +25,7 @@
 }
 
 # Cat translated help content
-TITLE=$(gettext 'TazPanel - Help \&amp; Doc')
+TITLE=$(gettext 'TazPanel - Help &amp; Doc')
 
 xhtml_header
 search_form
@@ -41,10 +41,11 @@
 		cat /usr/share/doc/tazpanel/tazpanel.html
 	fi
 
-	echo '<h3>README</h3>'
-	echo '<pre>'
-	cat $PANEL/README
-	echo '</pre>'
+#	cat << EOT
+#<h3>README</h3>
+#<pre>$(cat $PANEL/README)</pre>
+#EOT
+	cat $PANEL/README.html
 
 fi
 
diff -r 5312e3716b01 -r fdfc6b494539 index.cgi
--- a/index.cgi	Fri May 04 12:57:53 2012 +0300
+++ b/index.cgi	Fri May 04 13:00:43 2012 +0300
@@ -35,12 +35,18 @@
 		button)
 			cat <<EOT
 	<a class="button" href='$SCRIPT_NAME?file=$1&action=diff'>
-		<img src="$IMAGES/help.png" />`gettext "Differences"`</a>
+		<img src="$IMAGES/help.png" />$(gettext 'Differences')</a>
 EOT
 		esac
 		break
 	done
 }
+# OK status in table
+ok_status_t() {
+	echo "	<td>[<span class='diff-add'> OK </span>]</td></tr>"
+}
+
+
 
 #
 # Things to do before displaying the page
@@ -67,16 +73,17 @@
 				xhtml_header
 				echo "<h2>$file</h2>" ;;
 		esac
+
 		if [ "$(GET action)" == "edit" ]; then
 			cat <<EOT
 <form method="post" action="$SCRIPT_NAME?file=$file">
-<img src="$IMAGES/edit.png" />
-<input type="submit" value="`gettext "Save"`">
-<a class="button" href='$SCRIPT_NAME?file=$file&action=diff'>
-	<img src="$IMAGES/help.png" />`gettext "Differences"`</a>
-<textarea name="content" rows="30" style="width: 100%;">
-$(cat $file)
- </textarea>
+	<img src="$IMAGES/edit.png" />
+	<input type="submit" value="$(gettext 'Save')">
+		<a class="button" href='$SCRIPT_NAME?file=$file&action=diff'>
+			<img src="$IMAGES/help.png" />$(gettext 'Differences')</a>
+		<textarea name="content" rows="30" style="width: 100%;">
+$(cat $file | htmlize)
+</textarea>
 </form>
 EOT
 #The space before textarea gets muddled when the form is submitted.
@@ -93,10 +100,13 @@
 			cat <<EOT
 <div id="actions">
 	<a class="button" href='$SCRIPT_NAME?file=$file&action=edit'>
-		<img src="$IMAGES/edit.png" />`gettext "Edit"`</a>
+		<img src="$IMAGES/edit.png" />$(gettext 'Edit')</a>
 EOT
 			file_is_modified $file button
-			echo -e "</div>\n<pre>"
+			cat << EOT
+</div>
+<pre>
+EOT
 			# Handle file type by extension as a Web Server does it.
 			case "$file" in
 				*.conf|*.lst)
@@ -104,10 +114,11 @@
 				*.sh|*.cgi)
 					syntax_highlighter sh ;;
 				*)
-					cat ;;
+					cat | htmlize ;;
 			esac < $file
 			echo '</pre>'
 		fi ;;
+
 	*\ terminal\ *|*\ cmd\ *)
 		# Cmdline terminal.
 		commands='cat du help ls ping pwd who wget'
@@ -117,7 +128,7 @@
 		cat << EOT
 <form method="get" action="$SCRIPT_NAME">
 	<div class="box">
-		root@$(hostname):~# <input type="text" name="cmd" style="width: 80%;" />
+		root@$(hostname):~# <input autofocus type="text" name="cmd" style="width: 80%;" />
 	</div>
 </form>
 EOT
@@ -125,70 +136,84 @@
 	# Allow only a few commands for the moment.
 	case "$cmd" in
 		usage|help)
-			gettext "Small terminal emulator, commands options are supported."
+			gettext 'Small terminal emulator, commands options are supported.'
 			echo ""
-			gettext "Commands:"; echo " $commands" ;;
+			eval_gettext 'Commands: $commands'
+			echo ;;
 		wget*)
 			dl=/var/cache/downloads
 			[ ! -d "$dl" ] && mkdir -p $dl
-			gettext "Downloading to:"; echo " $dl"
+			eval_gettext 'Downloading to: $dl' && echo
 			cd $dl && $cmd ;;
 		du*|ls*|ping*|pwd|who)
 			$cmd ;;
 		cat*)
 			# Cmd must be used with an arg.
 			arg=$(echo $cmd | awk '{print $2}')
-			[ "$arg" == "" ] && echo -n "$cmd " && \
-				gettext "needs an argument $arg" && exit 0
+			[ "$arg" == "" ] && eval_gettext '$cmd needs an argument' && break
 			$cmd ;;
 		*)
 			[ "$cmd" == "" ] || \
-				gettext "Unknown command: $cmd"
-			gettext "Commands:"; echo " $commands" ;;
+				eval_gettext 'Unknown command: $cmd' && echo
+			eval_gettext 'Commands: $commands' ;;
 	esac
 	echo '</pre>' ;;
 	*\ top\ *)
 		TITLE=$(gettext 'TazPanel - Process activity')
 		xhtml_header
-		echo `gettext "Refresh: "` $(GET refresh)
-		echo '<br/>
+		echo $(gettext 'Refresh:') $(GET refresh)
+		cat << EOT
+<br/>
 <form method="get">
 	<input type="hidden" name="top"/>
-	<input type="submit" name="refresh" value="1s"/>
-	<input type="submit" name="refresh" value="5s"/>
-	<input type="submit" name="refresh" value="10s"/>
-	<input type="submit" value="none"/>
-</form>	'
-		[ -n $(GET refresh) ] &&
-		echo '<meta http-equiv="refresh" content="' $(GET refresh) '">' | sed "s/s //"
+	<input type="submit" name="refresh" value="$(gettext '1s')"/>
+	<input type="submit" name="refresh" value="$(gettext '5s')"/>
+	<input type="submit" name="refresh" value="$(gettext '10s')"/>
+	<input type="submit" value="$(gettext 'none')"/>
+</form>
+EOT
+		if [ -n "$(GET refresh)" ]; then
+			echo -n '<meta http-equiv="refresh" content="'
+			echo -n "$(GET refresh)" | sed 's|\([^0-9]*\)\([0-9]\+\).*|\2|'
+			echo '">'
+		fi
 
 		echo '<pre>'
-		top -n1 -b | sed \
+		top -n1 -b | htmlize | sed \
 			-e s"#^[A-Z].*:\([^']\)#<span class='sh-comment'>\0</span>#"g \
 			-e s"#PID.*\([^']\)#<span class='top'>\0</span>#"g
 		echo '</pre>' ;;
+
 	*\ debug\ *)
 		TITLE=$(gettext 'TazPanel - Debug')
 		xhtml_header
-		echo '<h2>HTTP Environment</h2>'
-		echo '<pre>'
-		httpinfo
-		echo '</pre>' ;;
+		cat << EOT
+<h2>$(gettext 'HTTP Environment')</h2>
+
+<pre>$(httpinfo)</pre>
+EOT
+		;;
+
 	*\ report\ *)
 		TITLE=$(gettext 'TazPanel - System report')
 		[ -d /var/cache/slitaz ] || mkdir -p /var/cache/slitaz
 		output=/var/cache/slitaz/sys-report.html
 		xhtml_header
-		echo "<h2>$(gettext "Reporting to:") $output</h2>"
-		echo '<pre>'
-		gettext "Creating report header...  "
+		cat << EOT
+<h2>$(eval_gettext 'Reporting to: $output')</h2>
+<table class="zebra">
+<tbody>
+	<tr><td>$(gettext 'Creating report header...')</td>
+EOT
 		cat > $output << EOT
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>SliTaz system report</title>
+	<meta charset="utf-8" />
+	<title>$(gettext 'SliTaz system report')</title>
 	<style type="text/css">
-		body { padding: 20px 60px; font-size: 13px; } h1, h2 { color: #444; }
+		body { padding: 20px 60px; font-size: 13px; }
+		h1, h2 { color: #444; }
 		pre { background: #f1f1f1; border: 1px solid #ddd;
 			padding: 10px; border-radius: 4px; }
 		span.diff-rm { color: red; }
@@ -197,11 +222,13 @@
 </head>
 <body>
 EOT
-		ok_status
-		gettext "Creating system summary... "
+		cat << EOT
+	$(ok_status_t)
+	<tr><td>$(gettext 'Creating system summary...')</td>
+EOT
 		cat >> $output << EOT
-<h1>SliTaz system report</h1>
-Date: $(date)
+<h1>$(gettext 'SliTaz system report')</h1>
+$(gettext 'Date:') $(date)
 <pre>
 uptime   : $(uptime)
 cmdline  : $(cat /proc/cmdline)
@@ -210,94 +237,88 @@
 kernel   : $(uname -r)
 </pre>
 EOT
-		ok_status
-		gettext "Getting hardware info...   "
+		cat << EOT
+	$(ok_status_t)
+	<tr><td>$(gettext 'Getting hardware info...')</td>
+EOT
 		cat >> $output << EOT
 <h2>free</h2>
-<pre>
-$(free)
-</pre>
+<pre>$(free)</pre>
 
 <h2>lspci -k</h2>
-<pre>
-$(lspci -k)
-</pre>
+<pre>$(lspci -k)</pre>
 
 <h2>lsusb</h2>
-<pre>
-$(lsusb)
-</pre>
+<pre>$(lsusb)</pre>
 
 <h2>lsmod</h2>
-<pre>
-$(lsmod)
-</pre>
+<pre>$(lsmod)</pre>
 
 EOT
-		ok_status
-		gettext "Getting networking info... "
+		cat << EOT
+	$(ok_status_t)
+	<tr><td>$(gettext 'Getting networking info...')</td>
+EOT
 		cat >> $output << EOT
 <h2>ifconfig -a</h2>
-<pre>
-$(ifconfig -a)
-</pre>
+<pre>$(ifconfig -a)</pre>
+
 <h2>route -n</h2>
-<pre>
-$(route -n)
-</pre>
+<pre>$(route -n)</pre>
+
 <h2>/etc/resolv.conf</h2>
-<pre>
-$(cat /etc/resolv.conf)
-</pre>
+<pre>$(cat /etc/resolv.conf)</pre>
 EOT
-		ok_status
-		gettext "Getting filesystems info..."
+		cat << EOT
+	$(ok_status_t)
+	<tr><td>$(gettext 'Getting filesystems info...')</td>
+EOT
 		cat >> $output << EOT
 <h2>blkid</h2>
-<pre>
-$(blkid)
-</pre>
+<pre>$(blkid)</pre>
+
 <h2>fdisk -l</h2>
-<pre>
-$(fdisk -l)
-</pre>
+<pre>$(fdisk -l)</pre>
+
 <h2>mount</h2>
-<pre>
-$(mount)
-</pre>
+<pre>$(mount)</pre>
+
 <h2>df -h</h2>
-<pre>
-$(df -h)
-</pre>
+<pre>$(df -h)</pre>
+
 <h2>df -i</h2>
-<pre>
-$(df -i)
-</pre>
+<pre>$(df -i)</pre>
 EOT
-		ok_status
-		gettext "Getting boot logs...       "
+		cat << EOT
+	$(ok_status_t)
+	<tr><td>$(gettext 'Getting boot logs...')</td>
+EOT
 		cat >> $output << EOT
-<h2>$(gettext "Kernel messages")</h2>
-<pre>
-$(cat /var/log/dmesg.log)
-</pre>
-<h2>$(gettext "Boot scripts")</h2>
-<pre>
-$(cat /var/log/boot.log | filter_taztools_msgs)
-</pre>
+<h2>$(gettext 'Kernel messages')</h2>
+<pre>$(cat /var/log/dmesg.log)</pre>
+
+<h2>$(gettext 'Boot scripts')</h2>
+<pre>$(cat /var/log/boot.log | filter_taztools_msgs)</pre>
 EOT
-		ok_status
-		gettext "Creating report footer...  "
+		cat << EOT
+	$(ok_status_t)
+	<tr><td>$(gettext 'Creating report footer...')</td>
+EOT
 		cat cat >> $output << EOT
 </body>
 </html>
 EOT
-		ok_status
-		echo '</pre>'
-		echo "<p><a class='button' href='$SCRIPT_NAME?file=$output'>
-			$(gettext "View report")</a>"
-		gettext "This report can be attached with a bug report on: "
-		echo '<a href="http://bugs.slitaz.org/">bugs.slitaz.org</a></p>' ;;
+		cat << EOT
+	$(ok_status_t)
+</tbody>
+</table>
+<p><a class="button" href="$SCRIPT_NAME?file=$output">
+	<img src="/styles/default/images/browser.png" />
+	$(gettext 'View report')</a>
+	$(gettext 'This report can be attached with a bug report on:')
+	<a href="http://bugs.slitaz.org/">bugs.slitaz.org</a></p>
+EOT
+		;;
 	*)
 		#
 		# Default xHTML content
@@ -305,56 +326,81 @@
 		xhtml_header
 		[ -n "$(GET gen_locale)" ] && new_locale=$(GET gen_locale)
 		[ -n "$(GET rdate)" ] && echo ""
+		hostname=$(hostname)
 		cat << EOT
 <div id="wrapper">
-	<h2>$(gettext "Host:") $(hostname)</h2>
-	<p>$(gettext "SliTaz administration and configuration Panel")<p>
+	<h2>$(eval_gettext 'Host: $hostname')</h2>
+	<p>$(gettext 'SliTaz administration and configuration Panel')<p>
 </div>
 <div id="actions">
 	<a class="button" href="$SCRIPT_NAME?terminal">
-		<img src="$IMAGES/terminal.png" />$(gettext "Terminal")</a>
+		<img src="$IMAGES/terminal.png" />$(gettext 'Terminal')</a>
 	<a class="button" href="$SCRIPT_NAME?top">
-		<img src="$IMAGES/monitor.png" />$(gettext "Process activity")</a>
+		<img src="$IMAGES/monitor.png" />$(gettext 'Process activity')</a>
 	<a class="button" href="$SCRIPT_NAME?report">
-		<img src="$IMAGES/text.png" />$(gettext "Create a report")</a>
+		<img src="$IMAGES/text.png" />$(gettext 'Create a report')</a>
 </div>
 
-<h3>$(gettext "Summary")</h3>
+<h3>$(gettext 'Summary')</h3>
 <div id="summary">
-<pre>
-$(gettext "Uptime       :")$(uptime)
-$(gettext "Memory in Mb :") $(free -m | grep Mem: | awk \
-	'{print "Total:", $2, "Used:", $3, "Free:", $4}')
-$(gettext "Linux kernel :") $(uname -r)
-</pre>
+<table>
+	<tr><td>$(gettext 'Uptime:')</td>
+		<td>$(uptime)</td>
+	</tr>
+	<tr><td>$(gettext 'Memory in Mb:')</td>
+EOT
+		free -m | grep Mem: | awk '{print $2, $3, $4}' | while read memtotal memused memfree
+		do
+			cat << EOT
+		<td>$(eval_gettext 'Total: $memtotal, Used: $memused, Free: $memfree')</td>
+EOT
+		done
+		cat << EOT
+	</tr>
+	<tr><td>$(gettext 'Linux kernel:')</td>
+		<td>$(uname -r)</td>
+	</tr>
+</table>
 <!-- Close summary -->
 </div>
 
-<h4>$(gettext "Network status")</h4>
+<h4>$(gettext 'Network status')</h4>
 $(list_network_interfaces)
 
-<h4>$(gettext "Filesystem usage statistics")</h4>
+<h4>$(gettext 'Filesystem usage statistics')</h4>
 EOT
 		# Disk stats (management is done as hardware.cgi)
-		table_start
+		cat << EOT
+<table class="zebra">
+EOT
 		df_thead
+		echo '<tbody>'
 		df -h | grep ^/dev | while read fs size used av pct mp
 		do
 				cat << EOT
 <tr>
 	<td><a href="hardware.cgi">
 		<img src="$IMAGES/harddisk.png" />${fs#/dev/}</a></td>
+	<td>$(blkid -o value $fs | head -n1)</td>
+	<td>$(blkid -o value $fs | tail -n1)</td>
 	<td>$size</td>
 	<td>$av</td>
-	<td class="pct"><div class="pct"
-		style="width: $pct;">$used - $pct</div></td>
+	<td class="meter"><meter min="0" max="100" value="$(echo $pct | cut -d% -f1)"
+		low="$DU_WARN" high="$DU_CRIT" optimum="10"></meter>
+		<span>$used - $pct</span>
+	</td>
 	<td>$mp</td>
 </tr>
 EOT
 		done
-		table_end
 		cat << EOT
-<h3>$(gettext "Panel Activity")</h3>
+</tbody>
+</table>
+EOT
+
+
+		cat << EOT
+<h3>$(gettext 'Panel Activity')</h3>
 <pre id="panel-activity">
 $(cat $LOG_FILE | tail -n 8 | sort -r | syntax_highlighter activity)
 </pre>
diff -r 5312e3716b01 -r fdfc6b494539 installer.cgi
--- a/installer.cgi	Fri May 04 12:57:53 2012 +0300
+++ b/installer.cgi	Fri May 04 13:00:43 2012 +0300
@@ -18,8 +18,8 @@
 . /usr/bin/gettext.sh
 
 # Export package name for gettext.
-TEXTDOMAIN='installer'
-export TEXTDOMAIN
+#TEXTDOMAIN='installer'
+#export TEXTDOMAIN
 
 TITLE=$(gettext 'TazPanel - Installer')
 
@@ -113,21 +113,22 @@
 }'
 	else
 		# no setup file found: creating
-		gettext "Creating setup file $INSTFILE."
+		eval_gettext 'Creating setup file $INSTFILE.'
 		tazinst new $INSTFILE
 		if [ ! -e "$INSTFILE" ]; then
 			cat <<EOT
-<span class="msg-nok">$(gettext "Setup File Error")<br />
-$(gettext "The setup file <strong>$INSTFILE</strong> doesn't exist.")</span><br />
+<span class="msg-nok">$(gettext 'Setup File Error')<br />
+$(eval_gettext "The setup file <strong>\$INSTFILE</strong> doesn't \
+exist.")</span><br />
 EOT
 		else
 			if [ ! -r $INSTFILE ]; then
 				cat <<EOT
-<span class="msg-nok">$(gettext "Setup File Error")<br />
-$(gettext "The setup file <strong>$INSTFILE</strong> is not readable. 
+<span class="msg-nok">$(gettext 'Setup File Error')<br />
+$(eval_gettext "The setup file <strong>$INSTFILE</strong> is not readable. \
 Check permissions and ownership.")</span><br />
 EOT
-			fi	
+			fi
 		fi
 	fi
 	# read setup file
@@ -138,12 +139,11 @@
 {
 	cat <<EOT
 <div id="wrapper">
-	<h2>$(gettext "SliTaz Installer")</h2>
-<p>
-	$(gettext "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>
+	<h2>$(gettext 'SliTaz Installer')</h2>
+
+<p>$(gettext "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>
 </div>
 EOT
 }
@@ -152,21 +152,19 @@
 {
 	cat <<EOT
 <div class="box">
-	<h4>$(gettext "Install")</h4>
-<p>
-	$(gettext "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 partitions
-	on your hard disk drive in order to make space for SliTaz GNU/Linux.
-	You can graphically manage your partitions with Gparted")
-</p>
+	<h4>$(gettext 'Install')</h4>
+
+<p>$(gettext "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 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>
-<p>
-<a class="button" href="$SCRIPT_NAME?page=partitioning">$(gettext "Install SliTaz")</a>
+<p><a class="button" href="$SCRIPT_NAME?page=partitioning">$(gettext "Install \
+SliTaz")</a>
 EOT
 }
 
@@ -174,69 +172,66 @@
 {
 	cat <<EOT
 <div class="box">
-	<h4>$(gettext "Upgrade")</h4>
-<p>
-	$(gettext "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>
+	<h4>$(gettext 'Upgrade')</h4>
+
+<p>$(gettext "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>
 </div>
-<p>
-	<a class="button" href="$SCRIPT_NAME?page=upgrade">$(gettext "Upgrade SliTaz")</a>
-</p>
+<p><a class="button" href="$SCRIPT_NAME?page=upgrade">$(gettext "Upgrade \
+SliTaz")</a></p>
 EOT
 }
 
 select_gparted()
 {
 	cat <<EOT
-<h4>$(gettext "Partitioning")</h4>
+<h4>$(gettext 'Partitioning')</h4>
 <div class="box">
-<p>
-	$(gettext "On most used systems, the hard drive is already dedicated to 
-	partitions for Windows<sup>&copy;</sup>, 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 
-	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>
-	$(gettext "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>
-</p>
+
+<p>$(gettext "On most used systems, the hard drive is already dedicated to \
+partitions for Windows<sup>&trade;</sup>, 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 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 as \
+Linux swap space may be created if needed. Slitaz detects and uses swap \
+partitions automatically.")</p>
+
 </div>
+
 <div class="box">
-<p>
-	$(gettext "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 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 and so on.")
-</p>
+
+<p>$(gettext "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 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 \
+and so on.")</p>
 </div>
-<a class="button" href="$SCRIPT_NAME?page=gparted">$(gettext "Execute Gparted")</a>
-<h5>$(gettext "Continue installation")</h5>
-	$(gettext "Once you've made room for SliTaz on your drive,	you
-	should be able to continue installation.")
+
+<a class="button" href="$SCRIPT_NAME?page=gparted">$(gettext 'Execute Gparted')</a>
+
+<h5>$(gettext 'Continue installation')</h5>
+
+<p>$(gettext "Once you've made room for SliTaz on your drive, you should be \
+able to continue installation.")
 
 <hr />
 <a class="button" value="$1" href="$SCRIPT_NAME?page=home" >
-	$(gettext "Back to Installer Start Page")</a>
+	$(gettext 'Back to Installer Start Page')</a>
 <a class="button" value="$2" href="$SCRIPT_NAME?page=install">
-	$(gettext "Continue Installation")</a>
+	$(gettext 'Continue Installation')</a>
 EOT
 }
 
@@ -246,11 +241,12 @@
 		install)
 			cat << EOT
 <div id="wrapper">
-<h3>$(gettext "Install SliTaz")</h3>
-<p>$(gettext "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>
+<h3>$(gettext 'Install SliTaz')</h3>
+
+<p>$(gettext "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>
 </div>
 <input type="hidden" name="INST_ACTION" value="$1">
 EOT
@@ -258,11 +254,12 @@
 		upgrade)
 			cat << EOT
 <div id="wrapper">
-<h2>$(gettext "Upgrade SliTaz")</h2>
-<p>$(gettext "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 have an active internet connection.")<p>
+<h2>$(gettext 'Upgrade SliTaz')</h2>
+
+<p>$(gettext "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 have an active internet connection.")<p>
 </div>
 <input type="hidden" name="INST_ACTION" value="$1">
 EOT
@@ -273,14 +270,14 @@
 select_source()
 {
 	cat <<EOT
-<a name="source"></a>
-<h4>$(gettext "Slitaz source media")</h4>
+<h4 id="source">$(gettext 'Slitaz source media')</h4>
+
 <div class="box">
 <input type="radio" name="INST_TYPE" value="cdrom" $([ "$INST_TYPE" == "cdrom" ] && echo "checked") id="cdrom" />
-<label for="cdrom">$(gettext "LiveCD")</td></label>
+<label for="cdrom">$(gettext 'LiveCD')</label>
 <br />
 <input type="radio" name="INST_TYPE" value="usb" $([ "$INST_TYPE" == "usb" ] && echo "checked") id="usb" />
-<label for="usb">$(gettext "LiveUSB"):
+<label for="usb">$(gettext 'LiveUSB:')
 <select name="SRC_USB">
 EOT
 	# List disks if plugged USB device
@@ -291,7 +288,7 @@
 				DEV=$(basename $DEV)
 				if [ -d /sys/block/${DEV}/${DEV}1 ]; then
 					for i in $(fdisk -l /dev/$DEV | awk '/^\/dev/ {printf "%s ", $1}') ; do
-						echo "<option value='$i' $([ "$i" == "$SRC_FILE" ] && echo "selected") >$i</option>"
+						echo "<option value='$i' $([ "$i" == "$SRC_FILE" ] && echo 'selected') >$i</option>"
 						usb=$usb+1
 					done
 				fi
@@ -299,22 +296,23 @@
 		done
 	fi
 	if [ $usb -lt 1 ]; then
-		echo "<option value="">$(gettext "Not found")</option>"
+		echo "<option value="">$(gettext 'Not found')</option>"
 	fi
 	cat << EOT
 </select>
 </label>
 <br />
 <input type="radio" name="INST_TYPE" value="iso" $([ "$INST_TYPE" == "iso" ] && echo "checked") id="iso" />
-<label for="iso">$(gettext "ISO file"):</label>
-<input type="url" size="50" name="SRC_ISO" $([ "$INST_TYPE" == "iso" ] && echo -e "value=\"$SRC_FILE\"") placeholder="$(gettext "Full path to the ISO image file")" />
+<label for="iso">$(gettext 'ISO file:')</label>
+<input type="url" size="50" name="SRC_ISO" $([ "$INST_TYPE" == "iso" ] && echo -e "value=\"$SRC_FILE\"") placeholder="$(gettext 'Full path to the ISO image file')" />
 <br />
 <input type="radio" name="INST_TYPE" value="web" $([ "$INST_TYPE" == "web" ] && echo "checked") id="web" />
-<label for="web">$(gettext "Web"):
-<a class="button" onclick="document.forms['ConfigForm'].url.value = '$(tazinst showurl stable)'; return true;">$(gettext "Stable")</a>
-<a class="button" onclick="document.forms['ConfigForm'].url.value = '$(tazinst showurl cooking)'; return true;">$(gettext "Cooking")</a>
-$(gettext "URL:")
-<input id="url" type="url" size="55" name="SRC_WEB" $([ "$INST_TYPE" == "web" ] && echo -e "value=\"$SRC_FILE\"") placeholder="$(gettext "Full url to an ISO image file")" />
+<label for="web">$(gettext 'Web:')
+	<a class="button" onclick="document.forms['ConfigForm'].url.value = '$(tazinst showurl stable)'; return true;">$(gettext 'Stable')</a>
+	<a class="button" onclick="document.forms['ConfigForm'].url.value = '$(tazinst showurl cooking)'; return true;">$(gettext 'Cooking')</a>
+
+	$(gettext 'URL:')
+	<input id="url" type="url" size="55" name="SRC_WEB" $([ "$INST_TYPE" == "web" ] && echo -e "value=\"$SRC_FILE\"") placeholder="$(gettext 'Full url to an ISO image file')" />
 </label>
 </div>
 EOT
@@ -323,8 +321,7 @@
 select_hdd()
 {
 cat <<EOT
-	<a name="hdd"></a>
-	<h4></span>$(gettext "Hard Disk Drive")</h4>
+	<h4 id="hdd">$(gettext 'Hard Disk Drive')</h4>
 EOT
 }
 
@@ -333,29 +330,29 @@
 	cat <<EOT
 <div class="box">
 <a name="partition"></a>
-$(gettext "Install Slitaz to partition:")
+$(gettext 'Install Slitaz to partition:')
 <select name="TGT_PARTITION">
 EOT
 	# List partitions
 	if fdisk -l | grep -q ^/dev/ ; then
-		echo "<option value="">$(gettext "None")</option>"
+		echo "<option value="">$(gettext 'None')</option>"
 		for i in $(fdisk -l | awk '/^\/dev/ {printf "%s " $1}'); do
-			echo "<option value='$i' $([ "$i" == "$TGT_PARTITION" ] && echo "selected")>$i</option>"
+			echo "<option value='$i' $([ "$i" == "$TGT_PARTITION" ] && echo 'selected')>$i</option>"
 		done
 	else
-		echo "<option value="">$(gettext "Not found")</option>"
+		echo "<option value="">$(gettext 'Not found')</option>"
 	fi
 	cat << EOT
 </select>
 <br />
 <input type="checkbox" name="MAIN_FMT" value="yes" $([ -n "$TGT_FS" ] && echo "checked") id="mainfs" />
-<label for="mainfs">$(gettext "Format partition as"):</label>
+<label for="mainfs">$(gettext 'Format partition as:')</label>
 <select name="MAIN_FS">
 EOT
 	scan_mkfs
 	for i in $FS
 	do
-		echo  "<option value='$i' $([ "$i" == "$TGT_FS" ] && echo "selected")>$i</option>"
+		echo "<option value='$i' $([ "$i" == "$TGT_FS" ] && echo 'selected')>$i</option>"
 	done
 	cat <<EOT
 </select>
@@ -368,17 +365,17 @@
 	cat <<EOT
 <div class="box">
 <a name="partition"></a>
-$(gettext "Existing SliTaz partition to upgrade:")
+$(gettext 'Existing SliTaz partition to upgrade:')
 <select name="TGT_PARTITION">
 EOT
 	# List partitions
 	if fdisk -l | grep -q ^/dev/ ; then
-		echo "<option value="">$(gettext "None")</option>"
-		for i in `blkid | cut -d ":" -f 1`; do
-			echo "<option value='$i' $([ "$i" == "$TGT_PARTITION" ] && echo "selected")>$i</option>"
+		echo "<option value="">$(gettext 'None')</option>"
+		for i in $(blkid | cut -d ":" -f 1); do
+			echo "<option value='$i' $([ "$i" == "$TGT_PARTITION" ] && echo 'selected')>$i</option>"
 		done
 	else
-		echo "<option value="">$(gettext "Not found")</option>"
+		echo "<option value="">$(gettext 'Not found')</option>"
 	fi
 	cat <<EOT
 </select>
@@ -389,8 +386,7 @@
 select_options()
 {
 	cat <<EOT
-<a name="options"></a>
-<h4></span>$(gettext "Options")</h4>
+<h4 id="options">$(gettext 'Options')</h4>
 EOT
 }
 
@@ -398,31 +394,31 @@
 {
 	cat <<EOT
 <div>
-<a name="home"></a>
-<h5>$(gettext "home partition")</h5>
+<h5 id="home">$(gettext 'home partition')</h5>
+
 <input type="checkbox" name="HOME_SELECT" value="yes" $([ -n "$TGT_HOME" ] && echo "checked") id="homepart" />
-<label for="homepart">$(gettext "Use a separate partition for /home:")</label>
+<label for="homepart">$(gettext 'Use a separate partition for /home:')</label>
 <select name="TGT_HOME">
 EOT
 	# List disk if plugged USB device
 	if fdisk -l | grep -q ^/dev/ ; then
-		echo "<option value="">$(gettext "None")</option>"
+		echo "<option value="">$(gettext 'None')</option>"
 		for i in $(fdisk -l | awk '/^\/dev/ {printf "%s " $1}'); do
-			echo "<option value='$i' $([ "$i" == "$TGT_HOME" ] && echo "selected")>$i</option>"
+			echo "<option value='$i' $([ "$i" == "$TGT_HOME" ] && echo 'selected')>$i</option>"
 		done
 	else
-		echo "<option value="">$(gettext "Not found")</option>"
+		echo "<option value="">$(gettext 'Not found')</option>"
 	fi
 cat <<EOT
 </select>
-	
+
 <input type="checkbox" name="HOME_FMT" value="yes" $([ -n "$TGT_HOME_FS" ] && echo "checked") id="homefs" />
-<label for="homefs">$(gettext "Format partition as:")</label>
+<label for="homefs">$(gettext 'Format partition as:')</label>
 <select name="HOME_FS">"
 EOT
 	for i in $FS
 	do
-		echo  "<option value='$i' $([ "$i" == "$TGT_HOME_FS" ] && echo "selected")>$i</option>"
+		echo  "<option value='$i' $([ "$i" == "$TGT_HOME_FS" ] && echo 'selected')>$i</option>"
 	done
 	cat <<EOT
 </select>
@@ -434,11 +430,11 @@
 {
 cat << EOT
 <div>
-<a name="hostname"></a>
-<h5>$(gettext "Hostname")</h5>
-$(gettext "Set Hostname to:")
-<input type="text" id="hostname" name="TGT_HOSTNAME" value="$TGT_HOSTNAME" placeholder="$(gettext "Name of your system")" onkeyup="checkLogin('hostname','msgHostname'); return false;" />
-<span id="msgHostname"></span>
+	<h5 id="hostname">$(gettext 'Hostname')</h5>
+
+	$(gettext 'Set Hostname to:')
+	<input type="text" id="hostname" name="TGT_HOSTNAME" value="$TGT_HOSTNAME" placeholder="$(gettext 'Name of your system')" onkeyup="checkLogin('hostname','msgHostname'); return false;" />
+	<span id="msgHostname"></span>
 </div>
 EOT
 }
@@ -447,13 +443,15 @@
 {
 cat << EOT
 <div class="box2">
-<a name="root"></a>
-<h5>$(gettext "Root")</h5>
-$(gettext "Root passwd:")
-<input type="password" id="rootPwd1" name="TGT_ROOT_PWD" value="$TGT_ROOT_PWD" placeholder="$(gettext "Password of root")" onkeyup="checkPwd('rootPwd1','rootPwd2','msgRootPwd'); return false;" />
-$(gettext "Confirm password:")
-<input type="password" id="rootPwd2" value="$TGT_ROOT_PWD" placeholder="$(gettext "Password of root")" onkeyup="checkPwd('rootPwd1','rootPwd2','msgRootPwd'); return false;" />
-<span id="msgRootPwd"></span>
+	<h5 id="root">$(gettext 'Root')</h5>
+
+	$(gettext 'Root passwd:')
+	<input type="password" id="rootPwd1" name="TGT_ROOT_PWD" value="$TGT_ROOT_PWD" placeholder="$(gettext 'Password of root')" onkeyup="checkPwd('rootPwd1','rootPwd2','msgRootPwd'); return false;" />
+
+	$(gettext 'Confirm password:')
+	<input type="password" id="rootPwd2" value="$TGT_ROOT_PWD" placeholder="$(gettext 'Password of root')" onkeyup="checkPwd('rootPwd1','rootPwd2','msgRootPwd'); return false;" />
+
+	<span id="msgRootPwd"></span>
 </div>
 EOT
 }
@@ -462,17 +460,19 @@
 {
 cat << EOT
 <div class="box2">
-<a name="user"></a>
-<h5>$(gettext "User")</h5>
-$(gettext "User login:")
-<input type="text" id="user" name="TGT_USER" value="$TGT_USER" placeholder="$(gettext "Name of the first user")" onkeyup="checkLogin('user','msgUser'); return false;" />
-<span id="msgUser"></span>
-<br /><br />
-$(gettext "User passwd:")
-<input type="password" id="userPwd1" name="TGT_USER_PWD" value="$TGT_USER_PWD" placeholder="$(gettext "Password of the first user")" onkeyup="checkPwd('userPwd1','userPwd2','msgUserPwd'); return false;" />
-$(gettext "Confirm password:")
-<input class="confirm" type="password" id="userPwd2" value="$TGT_USER_PWD" placeholder="$(gettext "Password of the first user")" onkeyup="checkPwd('userPwd1','userPwd2','msgUserPwd'); return false;" />
-<span id="msgUserPwd"></span>
+	<h5 id="user">$(gettext 'User')</h5>
+
+	$(gettext 'User login:')
+	<input type="text" id="user" name="TGT_USER" value="$TGT_USER" placeholder="$(gettext 'Name of the first user')" onkeyup="checkLogin('user','msgUser'); return false;" />
+	<span id="msgUser"></span>
+	<br /><br />
+
+	$(gettext 'User passwd:')
+	<input type="password" id="userPwd1" name="TGT_USER_PWD" value="$TGT_USER_PWD" placeholder="$(gettext 'Password of the first user')" onkeyup="checkPwd('userPwd1','userPwd2','msgUserPwd'); return false;" />
+
+	$(gettext 'Confirm password:')
+	<input class="confirm" type="password" id="userPwd2" value="$TGT_USER_PWD" placeholder="$(gettext 'Password of the first user')" onkeyup="checkPwd('userPwd1','userPwd2','msgUserPwd'); return false;" />
+	<span id="msgUserPwd"></span>
 </div>
 EOT
 }
@@ -481,12 +481,13 @@
 {
 cat << EOT
 <div>
-<a name="grub"></a>
-<h5>$(gettext "Grub")</h5>
-<input type="checkbox" name="TGT_GRUB" value="yes" $([ "$TGT_GRUB" == "yes" ] && echo "checked") id="grub" />
-<label for="grub">$(gettext "Install Grub bootloader. Usually you should answer yes, unless you want to install grub by hand yourself.")<br /></label>
-<input type="checkbox" name="TGT_WINBOOT" value="auto" $([ -n "$TGT_WINBOOT" ] && echo "checked") id="dualboot" />
-<label for="dualboot">$(gettext "Enable Windows Dual-Boot.")</label>
+	<h5 id="grub">$(gettext 'Grub')</h5>
+
+	<input type="checkbox" name="TGT_GRUB" value="yes" $([ "$TGT_GRUB" == "yes" ] && echo "checked") id="grub" />
+	<label for="grub">$(gettext "Install Grub bootloader. Usually you should \
+answer yes, unless you want to install grub by hand yourself.")<br /></label>
+	<input type="checkbox" name="TGT_WINBOOT" value="auto" $([ -n "$TGT_WINBOOT" ] && echo "checked") id="dualboot" />
+	<label for="dualboot">$(gettext 'Enable Windows Dual-Boot.')</label>
 </div>
 EOT
 }
@@ -495,21 +496,21 @@
 {
 	case $1 in
 		partitioning)
-			title1=$(gettext "Back to partitioning") ;;
+			title1=$(gettext 'Back to partitioning') ;;
 		*)
 			page=home
-			title1=$(gettext "Back to Installer Start Page") ;;
+			title1=$(gettext 'Back to Installer Start Page') ;;
 	esac
 	case $2 in
 		write|run)
-			title2=$(gettext "Proceed to SliTaz installation") ;;
+			title2=$(gettext 'Proceed to SliTaz installation') ;;
 		reboot)
-			title2=$(gettext "Installation complete. You can now restart (reboot)") ;;
+			title2=$(gettext 'Installation complete. You can now restart (reboot)') ;;
 		failed)
-			title2=$(gettext "Installation failed. See log") ;;
+			title2=$(gettext 'Installation failed. See log') ;;
 		*)
 			page=home
-			title2=$(gettext "Back to Installer Start Page") ;;
+			title2=$(gettext 'Back to Installer Start Page') ;;
 	esac
 	cat <<EOT
 <hr />
@@ -522,16 +523,19 @@
 page_redirection()
 {
 	cat <<EOT
+<!DOCTYPE html>
 <html>
 <head>
-<title>$(gettext "A web page that points a browser to a different page after 2 seconds")</title>
+<meta charset="utf-8">
+<title>$(gettext "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>
-$(gettext "If your browser doesn't automatically redirect within a few seconds, 
-you may want to go there manually")
-<a href="$SCRIPT_NAME?page=$1">$1</a> 
+<p>$(gettext "If your browser doesn't automatically redirect within a few \
+seconds, you may want to go there manually")</p>
+<p><a href="$SCRIPT_NAME?page=$1">$1</a></p>
 </body>
 </html>
 EOT
@@ -539,15 +543,17 @@
 
 check_ressources()
 {
-	local code 
+	local code
 	code=0
 	# Check tazinst
 	if ! [ -x /usr/sbin/tazinst ] ; then
 		cat <<EOT
-<h3>$(gettext "Tazinst Error")</h3>
-<p><strong>tazinst</strong>, $(gettext "the lightweight SliTaz HDD installer
+<h3>$(gettext 'Tazinst Error')</h3>
+<p>$(gettext "<strong>tazinst</strong>, the lightweight SliTaz HDD installer \
 is missing. Any installation can not be done without tazinst.")</p>
-<p>$(gettext "Check tazinst' permissions, or reinstall the slitaz-tools package:")</p>
+
+<p>$(gettext "Check tazinst' permissions, or reinstall the slitaz-tools \
+package:")</p>
 <code># tazpkg get-install slitaz-tools --forced</code>
 EOT
 		code=1
@@ -557,9 +563,10 @@
 		r=$TAZINST_REQUIRED_VERSION
 		if ! (echo "$v" | awk -v r=$r '{v=$v+0}{ if (v < r) exit 1}') ; then
 			cat <<EOT
-<h3>$(gettext "Tazinst Error")</h3>
-<p><strong>tazinst</strong> ($v) $(gettext "is not at the required version ($r),
-use tazinst in a xterm or reinstall the slitaz-tools package:")</p>
+<h3>$(gettext 'Tazinst Error')</h3>
+
+<p>$(eval_gettext "<strong>tazinst</strong> ($v) is not at the required \
+version ($r), use tazinst in a xterm or reinstall the slitaz-tools package:")</p>
 <code># tazpkg get-install slitaz-tools --forced</code>
 EOT
 			code=1
@@ -570,21 +577,21 @@
 
 run_tazinst()
 {
-	echo "<h4>$(gettext "Proceeding: ()")</h4>"
-	gettext "Please wait until processing is complete"
+	cat << EOT
+<h4>$(gettext 'Proceeding: ()')</h4>
+<p>$(gettext 'Please wait until processing is complete')</p>
+EOT
 	table_start
 	tazinst $(GET INST_ACTION) $INSTFILE | \
 		awk '{print "<tr><td><tt>" $0 "</tt></td></tr>"}'
 	table_end
-	gettext "Completed."
+	echo "<p>$(gettext 'Completed.')</p>"
 	return $(grep -c "cancelled on error" $INSTFILE)
 }
 
 tazinst_log()
 {
-	echo "<pre>"
-	tazinst log
-	echo "</pre>"
+	echo "<pre>$(tazinst log)</pre>"
 }
 
 scan_mkfs()
@@ -612,22 +619,22 @@
 		if (page == "install") {
 			// hostname
 			if (false == checkLogin('hostname','msgHostname')) {
-				alert("Hostname error");
+				alert("$(gettext 'Hostname error')");
 				return false;
 			// root pwd
 			} else if (false == checkPwd('rootPwd1','rootPwd2','msgRootPwd')) {
-				alert("Root password error");
+				alert("$(gettext 'Root password error')");
 				return false;
 			// user
 			} else if (false == checkLogin('user','msgUser')) {
-				alert("User login error");
+				alert("$(gettext 'User login error')");
 				return false;
 			// user pwd
 			} else if (false == checkPwd('userPwd1','userPwd2','msgUserPwd')) {
-				alert("User password error");
+				alert("$(gettext 'User password error')");
 				return false;
 			} else {
-				var r=confirm("$(gettext "Do you really want to continue?")");
+				var r=confirm("$(gettext 'Do you really want to continue?')");
 				if (r==true)
 				{
 					document.ConfigForm.submit();
@@ -638,7 +645,7 @@
 		} else if (page == "write") {
 			return true;
 		} else {
-			var r=confirm("$(gettext "Do you really want to continue?")");
+			var r=confirm("$(gettext 'Do you really want to continue?')");
 			if (r==true)
 			{
 				document.ConfigForm.submit();
diff -r 5312e3716b01 -r fdfc6b494539 lib/libtazpanel
--- a/lib/libtazpanel	Fri May 04 12:57:53 2012 +0300
+++ b/lib/libtazpanel	Fri May 04 13:00:43 2012 +0300
@@ -22,27 +22,37 @@
 		exit 1
 }
 
+# Display < > &
+htmlize() {
+	sed -e 's|\&|\&amp;|g; s|<|\&lt;|g; s|>|\&gt;|g'
+}
+
 # Syntax highlighting for config file and SHell scripts
-# HTML entities: -e 's|&|\&amp;|g' -e 's|<|\&lt;|g' -e 's|>|\&gt;|g'
 syntax_highlighter() {
 	case $1 in
 		conf)
-			sed -e 's|&|\&amp;|g' -e 's|<|\&lt;|g' -e 's|>|\&gt;|g' \
+			htmlize | sed \
 				-e s"#^\#\([^']*\)#<span class='conf-comment'>\0</span>#"g \
 				-e s"#^[A-Z]\([^']*\)=#<span class='conf-var'>\0</span>#"g \
 				-e s"#^[a-z]\([^']*\)#<span class='conf-var'>\0</span>#"g \
 				-e s"#\"\([^']*\)\"#<span class='conf-val'>\0</span>#"g ;;
 		sh)
-			sed -e 's|&|\&amp;|g' -e 's|<|\&lt;|g' -e 's|>|\&gt;|g' \
+			htmlize | sed \
 				-e s"#^\#\([^']*\)#<span class='sh-comment'>\0</span>#"g \
 				-e s"#\"\([^']*\)\"#<span class='sh-val'>\0</span>#"g ;;
 		diff)
-			sed -e 's|&|\&amp;|g' -e 's|<|\&lt;|g' -e 's|>|\&gt;|g' \
+			htmlize | sed \
 				-e s"#^-\(.*\).#<span class='diff-rm'>\0</span>#"g \
 				-e s"#^+\(.*\).#<span class='diff-add'>\0</span>#"g \
 				-e s"#@@\(.*\)@@#<span class='diff-at'>@@\1@@</span>#"g ;;
 		activity)
-			sed s"#^\([^']*:\)#<span class='activity-log''>\0</span>#"g ;;
+			sed -e s"#^\([^']*:\)#<span class='activity-log'>\0</span>#"g ;;
+		kernel)
+			htmlize | sed \
+				-e "s|\([^0-9]\)\(0x[0-9a-f]\+\)|\1<span class='kernel-hex'>\2</span>|g" \
+				-e "s|^\([^(,\[]\+: \)|<span class='kernel-id'>\0</span>|g" \
+				-e "s|\(\[[^ ]\+\]\)|<span class='kernel-id2'>\0</span>|g" ;;
+
 	esac
 }
 
@@ -70,7 +80,7 @@
 	if 	ifconfig | grep -A 1 $i | grep -q inet; then
 		ip=`ifconfig | grep -A 1 $i | grep inet | \
 			awk '{ print $2 }' | cut -d ":" -f 2`
-		echo "<td>connected</td><td>$ip</td>"
+		echo "<td>$(gettext 'connected')</td><td>$ip</td>"
 		echo "<td><a href='/network.cgi?scan=$ip'>"
 		echo "<img src='$IMAGES/recharge.png' /></a></td>"
 	else
@@ -80,35 +90,41 @@
 
 # Catch network interface (used in summary and network main page)
 list_network_interfaces() {
-	table_start
 	cat << EOT
-<tr id="thead">
-	<td>`gettext "Interface"`</td>
-	<td>`gettext "Name"`</td>
-	<td>`gettext "Status"`</td>
-	<td>`gettext "IP Address"`</td>
-	<td>`gettext "Scan ports"`</td>
-</tr>
+<table class="zebra">
+	<thead>
+		<tr>
+			<td>$(gettext 'Interface')</td>
+			<td>$(gettext 'Name')</td>
+			<td>$(gettext 'Status')</td>
+			<td>$(gettext 'IP Address')</td>
+			<td>$(gettext 'Scan ports')</td>
+		</tr>
+	</thead>
+	<tbody>
 EOT
 	for i in `ls /sys/class/net`
 	do
 		case $i in
 			eth*)
-				echo "<tr><td><a href='/network.cgi?eth'>
+				echo "		<tr><td><a href='/network.cgi?eth'>
 					<img src='$IMAGES/ethernet.png' />$i</a></td>
 					<td>Ethernet</td> $(interface_status)</tr>" ;;
 			wlan*|ath*|ra*)
-				echo "<tr><td><a href='/network.cgi?wifi'>
+				echo "		<tr><td><a href='/network.cgi?wifi'>
 					<img src='$IMAGES/wireless.png' />$i</a></td>
 					<td>Wireless</td> $(interface_status)</tr>" ;;
 			lo)
-				echo "<tr><td><img src='$IMAGES/loopback.png' />$i</td>
+				echo "		<tr><td><img src='$IMAGES/loopback.png' />$i</td>
 				<td>Loopback</td> $(interface_status)</tr>" ;;
 			*)
 				continue ;;
 		esac
 	done
-	table_end
+	cat << EOT
+	</tbody>
+</table>
+EOT
 }
 
 # Get the list of panel styles
@@ -184,29 +200,24 @@
 }
 
 table_start() {
-	cat << EOT
-<table>
-	<tbody>
-EOT
+	echo '<table>'
 }
 
 table_end() {
-	cat << EOT
-	</tbody>
-</table>
-EOT
-
+	echo '</table>'
 }
 
 df_thead() {
 	cat << EOT
 <thead>
 	<tr>
-		<td>$(gettext "Disk")</td>
-		<td>$(gettext "Size")</td>
-		<td>$(gettext "Available")</td>
-		<td>$(gettext "Used")</td>
-		<td>$(gettext "Mount point")</td>
+		<td>$(gettext 'Disk')</td>
+		<td>$(gettext 'Label')</td>
+		<td>$(gettext 'Type')</td>
+		<td>$(gettext 'Size')</td>
+		<td>$(gettext 'Available')</td>
+		<td>$(gettext 'Used')</td>
+		<td>$(gettext 'Mount point')</td>
 	</tr>
 </thead>
 EOT
diff -r 5312e3716b01 -r fdfc6b494539 live.cgi
--- a/live.cgi	Fri May 04 12:57:53 2012 +0300
+++ b/live.cgi	Fri May 04 13:00:43 2012 +0300
@@ -66,7 +66,7 @@
 		$TERMINAL $TERM_OPTS \
 			-T "build meta iso" \
 			-e "tazlito merge $(merge_args $tmp); \
-				gettext \"ENTER to quit\"; read i; \
+				gettext 'ENTER to quit'; read i; \
 				$cleanup" & ;;
 esac
 
@@ -80,23 +80,21 @@
 		# Create a flavor file and ISO in options with all settings
 		# Step by step interface and store files in cache.
 		#
-		gettext "TODO" ;;
+		gettext 'TODO' ;;
 	*\ liveusb\ *)
 		xhtml_header
 		cat << EOT
 <div id="wrapper">
-	<h2>$(gettext "SliTaz LiveUSB")</h2>
-	<p>$(gettext "Create Live USB SliTaz systems")<p>
+	<h2>$(gettext 'SliTaz LiveUSB')</h2>
+	<p>$(gettext 'Create Live USB SliTaz systems')<p>
 </div>
 
-<p>
-	$(gettext "Generate SliTaz LiveUSB media and boot in RAM! Insert a
-	LiveCD into the cdrom drive, select the correct device and press
-	Generate.")
-</p>
+<p>$(gettext "Generate SliTaz LiveUSB media and boot in RAM! Insert a LiveCD \
+into the cdrom drive, select the correct device and press Generate.")</p>
+
 <form method="get" action="$SCRIPT_NAME">
 	<input type="hidden" name="liveusb" />
-	$(gettext "USB Media to use:")
+	$(gettext 'USB Media to use:')
 	<select name="gen">
 EOT
 		# List disk if there is a plugged USB device
@@ -105,16 +103,18 @@
 				echo "<option value='$i'>$i</option>"
 			done
 		else
-			echo "<option value="">"`gettext "Not found"`"</option>"
+			echo "<option value="">$(gettext 'Not found')</option>"
 		fi
 		cat << EOT
 	</select>
-	<input type="submit" value="`gettext "Generate"`" />
+	<input type="submit" value="$(gettext 'Generate')" />
 </form>
 EOT
 		if [ "$(GET gen)" ]; then
-			echo "<h3>tazusb gen-liveusb $(GET gen)</h3>"
-			echo '<pre>'
+			cat << EOT
+<h3>tazusb gen-liveusb $(GET gen)</h3>
+<pre>
+EOT
 			# No pipe here so output is displayed in realtime
 			yes | tazusb gen-liveusb $(GET gen)
 			echo '</pre>'
@@ -126,70 +126,78 @@
 		xhtml_header
 		cat << EOT
 <div id="wrapper">
-	<h2>`gettext "SliTaz Live Systems"`</h2>
-	<p>`gettext "Create and manage Live CD or USB SliTaz systems"`<p>
+	<h2>$(gettext 'SliTaz Live Systems')</h2>
+	<p>$(gettext 'Create and manage Live CD or USB SliTaz systems')<p>
 </div>
 
 <div id="actions">
 	<a class="button" href="$SCRIPT_NAME?liveusb">
-		<img src="$IMAGES/harddisk.png" />$(gettext "Create LiveUSB")</a>
+		<img src="$IMAGES/harddisk.png" />$(gettext 'Create LiveUSB')</a>
 </div>
 
-<!--<a name="livecd"></a>
-<h3>`gettext "Write a Live CD"`</h3>
-<p>
-	`gettext "The command writeiso will generate an ISO image of the
-	current filesystem as is, including all files in the /home directory.
-	It is an easy way to remaster a SliTaz Live system, you just have
-	to: boot, modify, writeiso."`
-</p>
+
+<!--
+<h3 id="livecd">$(gettext 'Write a Live CD')</h3>
+
+<p>$(gettext "The command writeiso will generate an ISO image of the current \
+filesystem as is, including all files in the /home directory. It is an easy \
+way to remaster a SliTaz Live system, you just have to: boot, modify, \
+writeiso.")</p>
+
 <form method="get" action="$SCRIPT_NAME">
-	`gettext "Compression type:"`
+	$(gettext 'Compression type:')
 	<select name="write_iso">
 		<option value="gzip">gzip</option>
 		<option value="lzma">lzma</option>
-		<option value="none">none</option>
+		<option value="none">$(gettext 'none')</option>
 	</select>
-	<input type="submit" value="`gettext "Write ISO"`" />
+	<input type="submit" value="$(gettext 'Write ISO')" />
 </form> -->
 
-<h3>`gettext "Live CD tools"`</h3>
-<a name="loram"></a>
-<h4>`gettext "Convert ISO to loram"`</h4>
-<p>
-	`gettext "This command will convert an ISO image of a SliTaz Live CD
-	to a new ISO image requiring less RAM to run."`
-</p>
+
+<h3>$(gettext 'Live CD tools')</h3>
+
+<h4 id="loram">$(gettext 'Convert ISO to loram')</h4>
+
+<p>$(gettext "This command will convert an ISO image of a SliTaz Live CD to a \
+new ISO image requiring less RAM to run.")</p>
+
 <form method="get" action="$SCRIPT_NAME#loram">
 	<table>
-	<tr>
-	<td>`gettext "ISO to convert"`
-	<input type="text" name="input" value="/root/" /></td>
-	</tr>
-	<tr>
-	<td><input type="radio" name="type" value="ram" checked />`gettext "The filesystem is always in RAM"`.</td>
-	</tr>
-	<tr>
-	<td><input type="radio" name="type" value="smallcdrom" />`gettext "The filesystem may be on a small CDROM"`.</td>
-	</tr>
-	<tr>
-	<td><input type="radio" name="type" value="cdrom" />`gettext "The filesystem may be on a large CDROM"`.</td>
-	</tr>
-	<tr>
-	<td>`gettext "ISO to create"`
-	<input type="text" name="loramoutput" value="/root/loram.iso" /></td>
-	</tr>
+		<tr>
+			<td>$(gettext 'ISO to convert')
+				<input type="text" accept=".iso" name="input" value="/root/" /></td>
+		</tr>
+		<tr>
+			<td><input type="radio" name="type" value="ram" id="type1" checked />
+				<label for="type1">$(gettext 'The filesystem is always in RAM')</label>
+			</td>
+		</tr>
+		<tr>
+			<td><input type="radio" name="type" value="smallcdrom" id="type2" />
+				<label for="type2">$(gettext 'The filesystem may be on a small CDROM')</label>
+			</td>
+		</tr>
+		<tr>
+			<td><input type="radio" name="type" value="cdrom" id="type3" />
+				<label for="type3">$(gettext 'The filesystem may be on a large CDROM')</label>
+			</td>
+		</tr>
+		<tr>
+			<td>$(gettext 'ISO to create')
+				<input type="text" accept=".iso" name="loramoutput" value="/root/loram.iso" />
+			</td>
+		</tr>
 	</table>
-	<input type="submit" value="`gettext "Convert ISO to loram"`" />
+	<input type="submit" value="$(gettext 'Convert ISO to loram')" />
 </form>
 
-<a name="meta"></a>
-<h4>`gettext "Build a meta ISO"`</h4>
-<p>
-	`gettext "Combines several ISO flavors like nested Russian dolls.
-	The amount of RAM available at startup will be used to select the
-	utmost one."`
-</p>
+
+<h4 id="meta">$(gettext 'Build a meta ISO')</h4>
+
+<p>$(gettext "Combines several ISO flavors like nested Russian dolls. The \
+amount of RAM available at startup will be used to select the utmost one.")</p>
+
 <form method="get" action="$SCRIPT_NAME#meta">
 	<table>
 EOT
@@ -198,12 +206,14 @@
 			[ -n "$(GET input$i)" ] || break
 			j=$(($i + 1))
 			cat << EOT
-	<tr>
-	<td>`gettext "ISO number"` $j: $(GET input$i)
-	<input type="hidden" name="input$j" value="$(GET input$i)" /></td>
-	<td>`gettext "Minimum RAM"`: $(GET ram$i)
-	<input type="hidden" name="ram$j" value="$(GET ram$i)" /></td>
-	</tr>
+		<tr>
+			<td>$(gettext 'ISO number') $j: $(GET input$i)
+				<input type="hidden" name="input$j" value="$(GET input$i)" />
+			</td>
+			<td>$(gettext 'Minimum RAM'): $(GET ram$i)
+				<input type="hidden" name="ram$j" value="$(GET ram$i)" />
+			</td>
+		</tr>
 EOT
 			i=$j
 		done
@@ -211,19 +221,22 @@
 		[ -n "$metaoutput" ] || metaoutput="/root/meta.iso"
 
 		cat << EOT
-	<tr>
-	<td>`gettext "ISO to add"`
-	<input type="text" name="input" value="/root/" /></td>
-	<td>`gettext "Minimum RAM"`
-	<input type="text" name="ram" value="128M" />
-	<input type="submit" name="addmeta" value="`gettext "Add to the list"`" /></td>
-	</tr>
-	<tr>
-	<td>`gettext "ISO to create"`
-	<input type="text" name="metaoutput" value="$metaoutput" /></td>
-	</tr>
+		<tr>
+			<td>$(gettext 'ISO to add')
+				<input type="text" name="input" value="/root/" />
+			</td>
+			<td>$(gettext 'Minimum RAM')
+				<input type="text" name="ram" value="128M" />
+				<input type="submit" name="addmeta" value="$(gettext 'Add to the list')" />
+			</td>
+		</tr>
+		<tr>
+			<td>$(gettext 'ISO to create')
+				<input type="text" name="metaoutput" value="$metaoutput" />
+			</td>
+		</tr>
 	</table>
-	<input type="submit" name="meta" value="`gettext "Build a meta ISO"`" />
+	<input type="submit" name="meta" value="$(gettext 'Build a meta ISO')" />
 </form>
 
 EOT
diff -r 5312e3716b01 -r fdfc6b494539 network.cgi
--- a/network.cgi	Fri May 04 12:57:53 2012 +0300
+++ b/network.cgi	Fri May 04 13:00:43 2012 +0300
@@ -16,16 +16,17 @@
 # networks by Cell and without spaces.
 detect_wifi_networks()
 {
-	table_start
 	cat << EOT
-<thead>
-	<tr>
-		<td>$(gettext "Name")</td>
-		<td>$(gettext "Quality")</td>
-		<td>$(gettext "Encryption")</td>
-		<td>$(gettext "Status")</td>
-	</tr>
-</thead>
+<table class="zebra">
+	<thead>
+		<tr>
+			<td>$(gettext 'Name')</td>
+			<td>$(gettext 'Quality')</td>
+			<td>$(gettext 'Encryption')</td>
+			<td>$(gettext 'Status')</td>
+		</tr>
+	</thead>
+	<tbody>
 EOT
 	if [ -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then
 		ifconfig $WIFI_INTERFACE up
@@ -49,7 +50,7 @@
 			if ifconfig | grep -A 1 $WIFI_INTERFACE | \
 				fgrep -q inet && iwconfig $WIFI_INTERFACE | \
 				grep ESSID | fgrep -q -w "$ESSID"; then
-				status=$(gettext "Connected")
+				status=$(gettext 'Connected')
 			else
 				status="---"
 			fi
@@ -60,7 +61,10 @@
 			echo '</tr>'
 		done
 	fi
-	table_end
+	cat << EOT
+	</tbody>
+</table>
+EOT
 }
 
 # Start a wifi connection
@@ -88,8 +92,9 @@
 		/etc/init.d/network.sh restart | log ;;
 	*\ start-wifi\ *) start_wifi ;;
 	*\ hostname\ *)
-		echo $(gettext "Changed hostname:") $(GET hostname) | log
-		echo "$(GET hostname)" > /etc/hostname ;;
+		get_hostname="$(GET hostname)"
+		echo $(eval_gettext 'Changed hostname: $get_hostname') | log
+		echo "$get_hostname" > /etc/hostname ;;
 esac
 
 # Get values only now since they could have been modified by actions.
@@ -104,15 +109,15 @@
 		# Scan open ports
 		scan=$(GET scan)
 		xhtml_header
-		LOADING_MSG=$(gettext "Scanning open ports...")
+		LOADING_MSG=$(gettext 'Scanning open ports...')
 		loading_msg
 		cat << EOT
-<h2>$(gettext "Port scanning for") $scan</h2>
-<pre>
-$(pscan -b $scan)
-</pre>
+<h2>$(eval_gettext 'Port scanning for $scan')</h2>
+
+<pre>$(pscan -b $scan)</pre>
 EOT
 		;;
+
 	*\ eth\ *)
 		# Wired connections settings
 		xhtml_header
@@ -121,7 +126,7 @@
 			STATIC=no
 			[ -n "$(GET dhcp)" ] && DHCP=yes
 			[ -n "$(GET static)" ] && STATIC=yes
-			LOADING_MSG=$(gettext "Setting up IP...")
+			LOADING_MSG=$(gettext 'Setting up IP...')
 			loading_msg
 			sed -i \
 				-e s"/^INTERFACE=.*/INTERFACE=\"$(GET iface)\""/ \
@@ -137,74 +142,75 @@
 			. /etc/network.conf
 		fi
 		cat << EOT
-<h2>$(gettext "Ethernet connection")</h2>
-<p>
-$(gettext "Here you can configure a wired connection using DHCP to
-automatically get a random IP or configure a static/fixed IP")
-</p>
-<h3>$(gettext "Configuration")</h3>
+<h2>$(gettext 'Ethernet connection')</h2>
+
+<p>$(gettext "Here you can configure a wired connection using DHCP to \
+automatically get a random IP or configure a static/fixed IP")</p>
+
+<h3>$(gettext 'Configuration')</h3>
 <form method="get" action="$SCRIPT_NAME">
 	<input type="hidden" name="eth" />
-	$(table_start)
+	<table>
 	<thead>
 		<tr>
-			<td>$(gettext "Name")</td>
-			<td>$(gettext "Value")</td>
+			<td>$(gettext 'Name')</td>
+			<td>$(gettext 'Value')</td>
 		</tr>
 	</thead>
+	<tbody>
 	<tr>
-		<td>$(gettext "Interface")</td>
+		<td>$(gettext 'Interface')</td>
 		<td><input type="text" name="iface" size="20" value="$INTERFACE" /></td>
 	</tr>
 	<tr>
-		<td>$(gettext "IP address")</td>
+		<td>$(gettext 'IP address')</td>
 		<td><input type="text" name="ip" size="20" value="$IP" /></td>
 	</tr>
 	<tr>
-		<td>$(gettext "Netmask")</td>
+		<td>$(gettext 'Netmask')</td>
 		<td><input type="text" name="netmask" size="20" value="$NETMASK" /></td>
 	</tr>
 	<tr>
-		<td>$(gettext "Gateway")</td>
+		<td>$(gettext 'Gateway')</td>
 		<td><input type="text" name="gateway" size="20" value="$GATEWAY" /></td>
 	</tr>
 	<tr>
-		<td>$(gettext "DNS server")</td>
+		<td>$(gettext 'DNS server')</td>
 		<td><input type="text" name="dns" size="20" value="$DNS_SERVER" /></td>
 	</tr>
-	$(table_end)
-		<input type="submit" name="static" value="`gettext "Activate (static)"`">
-		<input type="submit" name="dhcp" value="`gettext "Activate (DHCP)"`">
-		<input type="submit" name="disable" value="`gettext "Disable"`">
+	</tbody>
+	</table>
+		<input type="submit" name="static" value="$(gettext 'Activate (static)')">
+		<input type="submit" name="dhcp" value="$(gettext 'Activate (DHCP)')">
+		<input type="submit" name="disable" value="$(gettext 'Disable')">
 </form>
 
-<h3>$(gettext "Configuration file")</h3>
-<p>
-$(gettext "These values are the ethernet settings in the main
-/etc/network.conf configuration file")
-</p>
+<h3>$(gettext 'Configuration file')</h3>
+
+<p>$(gettext "These values are the ethernet settings in the main \
+/etc/network.conf configuration file")</p>
 <pre>
 $(grep ^[A-V] /etc/network.conf | syntax_highlighter conf)
 </pre>
 <a class="button" href="index.cgi?file=/etc/network.conf&action=edit">
-	<img src="$IMAGES/edit.png" />$(gettext "Manual Edit")</a>
+	<img src="$IMAGES/edit.png" />$(gettext 'Manual Edit')</a>
 EOT
 		;;
 	*\ wifi\ *)
 		# Wireless connections settings
 		xhtml_header
-		LOADING_MSG=$(gettext "Scanning wireless interface...")
+		LOADING_MSG=$(gettext 'Scanning wireless interface...')
 		loading_msg
 		. /etc/network.conf
 		cat << EOT
-<h2>$(gettext "Wireless connection")</h2>
+<h2>$(gettext 'Wireless connection')</h2>
 <div id="actions">
 	<a class="button" href="$SCRIPT_NAME?wifi&start-wifi=start-wifi">
-		<img src="$IMAGES/start.png" />$(gettext "Start")</a>
+		<img src="$IMAGES/start.png" />$(gettext 'Start')</a>
 	<a class="button" href="$SCRIPT_NAME?wifi&stop=stop">
-		<img src="$IMAGES/stop.png" />$(gettext "Stop")</a>
+		<img src="$IMAGES/stop.png" />$(gettext 'Stop')</a>
 	<a class="button" href="$SCRIPT_NAME?wifi=scan">
-		<img src="$IMAGES/recharge.png" />$(gettext "Scan")</a>
+		<img src="$IMAGES/recharge.png" />$(gettext 'Scan')</a>
 </div>
 $(detect_wifi_networks)
 EOT
@@ -231,47 +237,45 @@
 			WIFI_KEY_TYPE="$(GET keytype)"
 		fi
 	cat << EOT
-<h3>$(gettext "Connection")</h3>
+<h3>$(gettext 'Connection')</h3>
 <form method="get" action="$SCRIPT_NAME">
 	<input type="hidden" name="connect-wifi" />
 	$(table_start)
 	<thead>
 		<tr>
-			<td>$(gettext "Name")</td>
-			<td>$(gettext "Value")</td>
+			<td>$(gettext 'Name')</td>
+			<td>$(gettext 'Value')</td>
 		</tr>
 	</thead>
 	<tr>
-		<td>$(gettext "Wifi name (ESSID)")</td>
+		<td>$(gettext 'Wifi name (ESSID)')</td>
 		<td><input type="text" name="essid" size="30" value="$WIFI_ESSID" /></td>
 	</tr>
 	<tr>
-		<td>$(gettext "Password (Wifi key)")</td>
+		<td>$(gettext 'Password (Wifi key)')</td>
 		<td><input type="password" name="key" size="30" value="$WIFI_KEY" /></td>
 	</tr>
 	<tr>
-		<td>$(gettext "Encryption type")</td>
+		<td>$(gettext 'Encryption type')</td>
 		<td><input type="text" name="keytype" size="30" value="$WIFI_KEY_TYPE" /></td>
 	</tr>
 	$(table_end)
-		<input type="submit" name="wifi" value="$(gettext "Configure")" />
+		<input type="submit" name="wifi" value="$(gettext 'Configure')" />
 </form>
 
-<h3>$(gettext "Configuration file")</h3>
-<p>
-$(gettext "These values are the wifi settings in the main
-/etc/network.conf configuration file")
-</p>
-<pre>
-$(grep ^WIFI /etc/network.conf | syntax_highlighter conf)
-</pre>
+<h3>$(gettext 'Configuration file')</h3>
+
+<p>$(gettext "These values are the wifi settings in the main /etc/network.conf \
+configuration file")</p>
+
+<pre>$(grep ^WIFI /etc/network.conf | syntax_highlighter conf)</pre>
+
 <a class="button" href="index.cgi?file=/etc/network.conf&action=edit">
-	<img src="$IMAGES/edit.png" />$(gettext "Manual Edit")</a>
+	<img src="$IMAGES/edit.png" />$(gettext 'Manual Edit')</a>
 
-<h3>$(gettext "Output of") iwconfig</h3>
-<pre>
-$(iwconfig)
-</pre>
+<h3>$(gettext 'Output of iwconfig')</h3>
+
+<pre>$(iwconfig)</pre>
 EOT
 		;;
 	*)
@@ -279,21 +283,21 @@
 		xhtml_header
 		hostname=$(cat /etc/hostname)
 		cat << EOT
-<h2>`gettext "Networking"`</h2>
-<p>
-	`gettext "Manage network connections and services"`
-</p>
+<h2>$(gettext 'Networking')</h2>
+
+<p>$(gettext 'Manage network connections and services')</p>
+
 <div id="actions">
 	<div class="float-left">
 		<a class="button" href="$SCRIPT_NAME?start">
-			<img src="$IMAGES/start.png" />$(gettext "Start")</a>
+			<img src="$IMAGES/start.png" />$(gettext 'Start')</a>
 		<a class="button" href="$SCRIPT_NAME?stop">
-			<img src="$IMAGES/stop.png" />$(gettext "Stop")</a>
+			<img src="$IMAGES/stop.png" />$(gettext 'Stop')</a>
 		<a class="button" href="$SCRIPT_NAME?restart">
-			<img src="$IMAGES/recharge.png" />$(gettext "Restart")</a>
+			<img src="$IMAGES/recharge.png" />$(gettext 'Restart')</a>
 	</div>
 	<div class="float-right">
-		`gettext "Configuration:"`
+		$(gettext 'Configuration:')
 		<a class="button" href="index.cgi?file=/etc/network.conf">network.conf</a>
 		<a class="button" href="$SCRIPT_NAME?eth">Ethernet</a>
 		<a class="button" href="$SCRIPT_NAME?wifi">Wireless</a>
@@ -302,47 +306,39 @@
 
 $(list_network_interfaces)
 
-<a name="hosts"></a>
-<h3>$(gettext "Hosts")</h3>
-<pre>
-$(cat /etc/hosts)
-</pre>
+<h3 id="hosts">$(gettext 'Hosts')</h3>
+
+<pre>$(cat /etc/hosts)</pre>
+
 <a class="button" href="index.cgi?file=/etc/hosts&action=edit">
-	<img src="$IMAGES/edit.png" />$(gettext "Edit hosts")</a>
+	<img src="$IMAGES/edit.png" />$(gettext 'Edit hosts')</a>
 
-<h3>$(gettext "Hostname")</h3>
-<form method="get" name="$SCRIPT_NAME"
+<h3>$(gettext 'Hostname')</h3>
+
+<form method="get" name="$SCRIPT_NAME">
 	<input type="text" name="hostname" value="$hostname" />
-	<input type="submit" value="$(gettext "Change hostname")"
+	<input type="submit" value="$(gettext 'Change hostname')" />
 </form>
 
 
-<a name="ifconfig"></a>
-<h3>$(gettext "Output of ") ifconfig</h3>
-<pre>
-$(ifconfig)
-</pre>
+<h3 id="ifconfig">$(gettext 'Output of ifconfig')</h3>
 
-<a name="routing"></a>
-<h3>`gettext "Routing table"`</h3>
-<pre>
-$(route -n)
-</pre>
+<pre>$(ifconfig)</pre>
 
-<a name="dns"></a>
-<h3>`gettext "Domain name resolution"`</h3>
-<pre>
-$(cat /etc/resolv.conf)
-</pre>
+<h3 id="routing">$(gettext 'Routing table')</h3>
 
-<a name="arp"></a>
-<h3>`gettext "ARP table"`</h3>
-<pre>
-$(arp)
-</pre>
+<pre>$(route -n)</pre>
 
-<a name="connections"></a>
-<h3>`gettext "IP Connections"`</h3>
+<h3 id="dns">$(gettext 'Domain name resolution')</h3>
+
+<pre>$(cat /etc/resolv.conf)</pre>
+
+<h3 id="arp">$(gettext 'ARP table')</h3>
+
+<pre>$(arp)</pre>
+
+<h3 id="connections">$(gettext 'IP Connections')</h3>
+
 <pre>
 $(netstat -anp 2> /dev/null | sed -e '/UNIX domain sockets/,$d' \
 -e 's#\([0-9]*\)/#<a href="boot.cgi?daemons=pid=\1">\1</a>/#')
diff -r 5312e3716b01 -r fdfc6b494539 pkgs.cgi
--- a/pkgs.cgi	Fri May 04 12:57:53 2012 +0300
+++ b/pkgs.cgi	Fri May 04 13:00:43 2012 +0300
@@ -27,46 +27,53 @@
 	IFS="|"
 	cut -f 1,2,3,5 -d "|" | while read PACKAGE VERSION SHORT_DESC WEB_SITE
 	do
-		echo '<tr>'
-		if [ -d $INSTALLED/${PACKAGE% } ]; then
-			echo -e "<td><input type='checkbox' name='pkg' value='$PACKAGE'>\n
-				<a href='$(pkg_info_link $PACKAGE)'>
-				<img src='$IMAGES/tazpkg-installed.png'/>$PACKAGE</a></td>"
-		else
-			echo -e "<td><input type='checkbox' name='pkg' value='$PACKAGE'>\n
-				<a href='$(pkg_info_link $PACKAGE)'>
-				<img src='$IMAGES/tazpkg.png'/>$PACKAGE</a></td>"
-		fi
-		echo "<td>$VERSION</td>"
-		echo "<td class='desc'>$SHORT_DESC</td>"
-		echo "<td><a href='$WEB_SITE'><img src='$IMAGES/browser.png'/></a></td>"
-		echo '</tr>'
+		image=tazpkg-installed.png
+		[ -d $INSTALLED/${PACKAGE% } ] || image=tazpkg.png
+		cat << EOT
+<tr>
+<td><input type="checkbox" name="pkg" value="$PACKAGE">
+	<a href="$(pkg_info_link $PACKAGE)"><img
+		src="$IMAGES/$image"/>$PACKAGE</a></td>
+<td>$VERSION</td>
+<td class="desc">$SHORT_DESC</td>
+<td><a href="$WEB_SITE"><img src="$IMAGES/browser.png"/></a></td>
+</tr>
+EOT
 	done
 	unset IFS
 }
 
 # Display a full summary of packages stats
 packages_summary() {
-	gettext "Last recharge        : "
-	stat=`stat -c %y $LOCALSTATE/packages.list | \
-		sed 's/\(:..\):.*/\1/' | awk '{print $1}'`
-	mtime=`find $LOCALSTATE/packages.list -mtime +10`
-	echo -n "$stat "
+	cat << EOT
+<table class="zebra">
+<tbody>
+<tr><td>$(gettext 'Last recharge:')</td>
+EOT
+	stat=$(stat -c %y $LOCALSTATE/packages.list | \
+		sed 's/\(:..\):.*/\1/' | awk '{print $1}')
+	mtime=$(find $LOCALSTATE/packages.list -mtime +10)
+	echo -n "<td>$stat "
 	if [ "$mtime" ]; then
-		echo "(Older than 10 days)"
+		gettext '(Older than 10 days)'; echo
 	else
-		echo "(Not older than 10 days)"
+		gettext '(Not older than 10 days)'; echo
 	fi
-	gettext "Installed packages   : "
-	ls $INSTALLED | wc -l
-	gettext "Mirrored packages    : "
-	cat $LOCALSTATE/packages.list | wc -l
-	gettext "Upgradeable packages : "
-	cat $LOCALSTATE/packages.up | wc -l
-	#gettext "Installed files      : "
-	#cat $INSTALLED/*/files.list | wc -l
-	gettext "Blocked packages     : "
-	cat $LOCALSTATE/blocked-packages.list | wc -l
+	cat << EOT
+</td></tr>
+<tr><td>$(gettext 'Installed packages:')</td>
+	<td>$(ls $INSTALLED | wc -l)</td></tr>
+<tr><td>$(gettext 'Mirrored packages:')</td>
+	<td>$(cat $LOCALSTATE/packages.list | wc -l)</td></tr>
+<tr><td>$(gettext 'Upgradeable packages:')</td>
+	<td>$(cat $LOCALSTATE/packages.up | wc -l)</td></tr>
+<tr><td>$(gettext 'Installed files:')</td>
+	<td>$(cat $INSTALLED/*/files.list | wc -l)</td></tr>
+<tr><td>$(gettext 'Blocked packages:')</td>
+	<td>$(cat $LOCALSTATE/blocked-packages.list | wc -l)</td></tr>
+</tbody>
+</table>
+EOT
 }
 
 # Parse mirrors list to be able to have an icon and remove link
@@ -76,10 +83,10 @@
 		cat << EOT
 <li>
 	<a href="$SCRIPT_NAME?admin=rm-mirror=$line&amp;file=$(httpd -e $1)">
-		<img src="$IMAGES/clear.png" />
+		<img src="$IMAGES/clear.png" title="$(gettext 'Delete')" />
 	</a>
 	<a href="$SCRIPT_NAME?admin=select-mirror&amp;mirror=$line">
-		<img src="$IMAGES/start.png" />
+		<img src="$IMAGES/start.png" title="$(gettext 'Use as default')" />
 	</a>
 	<a href="$line">$line</a>
 </li>
@@ -110,9 +117,9 @@
 	<form method="get" action="$SCRIPT_NAME">
 		<p>
 			<input type="text" name="search" size="20">
-			<input type="submit" value="`gettext "Search"`">
+			<input type="submit" value="$(gettext 'Search')">
 			<input class="radius" type="submit" name="files"
-				value="`gettext "Files"`">
+				value="$(gettext 'Files')">
 			<input type="hidden" name="repo" value="$repo" />
 		</p>
 	</form>
@@ -122,12 +129,14 @@
 
 table_head() {
 	cat << EOT
-		<tr id="thead">
-			<td>`gettext "Name"`</td>
-			<td>`gettext "Version"`</td>
-			<td>`gettext "Description"`</td>
-			<td>`gettext "Web"`</td>
+		<thead>
+		<tr>
+			<td>$(gettext 'Name')</td>
+			<td>$(gettext 'Version')</td>
+			<td>$(gettext 'Description')</td>
+			<td>$(gettext 'Web')</td>
 		</tr>
+		</thead>
 EOT
 }
 
@@ -135,30 +144,29 @@
 	[ -n "$repo" ] || repo=Public
 	cat << EOT
 <div id="sidebar">
-	<h4>Categories</h4>
-	<a class="active_base-system" href="$SCRIPT_NAME?cat=base-system&repo=$repo">Base-system</a>
-	<a class="active_x-window" href="$SCRIPT_NAME?cat=x-window&repo=$repo">X window</a>
-	<a class="active_utilities" href="$SCRIPT_NAME?cat=utilities&repo=$repo">Utilities</a>
-	<a class="active_network" href="$SCRIPT_NAME?cat=network&repo=$repo">Network</a>
-	<a class="active_games" href="$SCRIPT_NAME?cat=games&repo=$repo">Games</a>
-	<a class="active_graphics" href="$SCRIPT_NAME?cat=graphics&repo=$repo">Graphics</a>
-	<a class="active_office" href="$SCRIPT_NAME?cat=office&repo=$repo">Office</a>
-	<a class="active_multimedia" href="$SCRIPT_NAME?cat=multimedia&repo=$repo">Multimedia</a>
-	<a class="active_development" href="$SCRIPT_NAME?cat=development&repo=$repo">Development</a>
-	<a class="active_system-tools" href="$SCRIPT_NAME?cat=system-tools&repo=$repo">System tools</a>
-	<a class="active_security" href="$SCRIPT_NAME?cat=security&repo=$repo">Security</a>
-	<a class="active_misc" href="$SCRIPT_NAME?cat=misc&repo=$repo">Misc</a>
-	<a class="active_meta" href="$SCRIPT_NAME?cat=meta&repo=$repo">Meta</a>
-	<a class="active_non-free" href="$SCRIPT_NAME?cat=non-free&repo=$repo">Non free</a>
-	<a class="active_all" href="$SCRIPT_NAME?cat=all&repo=$repo">All</a>
+	<h4>$(gettext 'Categories')</h4>
+	<a class="active_base-system" href="$SCRIPT_NAME?cat=base-system&repo=$repo">$(gettext 'Base-system')</a>
+	<a class="active_x-window" href="$SCRIPT_NAME?cat=x-window&repo=$repo">$(gettext 'X window')</a>
+	<a class="active_utilities" href="$SCRIPT_NAME?cat=utilities&repo=$repo">$(gettext 'Utilities')</a>
+	<a class="active_network" href="$SCRIPT_NAME?cat=network&repo=$repo">$(gettext 'Network')</a>
+	<a class="active_games" href="$SCRIPT_NAME?cat=games&repo=$repo">$(gettext 'Games')</a>
+	<a class="active_graphics" href="$SCRIPT_NAME?cat=graphics&repo=$repo">$(gettext 'Graphics')</a>
+	<a class="active_office" href="$SCRIPT_NAME?cat=office&repo=$repo">$(gettext 'Office')</a>
+	<a class="active_multimedia" href="$SCRIPT_NAME?cat=multimedia&repo=$repo">$(gettext 'Multimedia')</a>
+	<a class="active_development" href="$SCRIPT_NAME?cat=development&repo=$repo">$(gettext 'Development')</a>
+	<a class="active_system-tools" href="$SCRIPT_NAME?cat=system-tools&repo=$repo">$(gettext 'System tools')</a>
+	<a class="active_security" href="$SCRIPT_NAME?cat=security&repo=$repo">$(gettext 'Security')</a>
+	<a class="active_misc" href="$SCRIPT_NAME?cat=misc&repo=$repo">$(gettext 'Misc')</a>
+	<a class="active_meta" href="$SCRIPT_NAME?cat=meta&repo=$repo">$(gettext 'Meta')</a>
+	<a class="active_non-free" href="$SCRIPT_NAME?cat=non-free&repo=$repo">$(gettext 'Non free')</a>
+	<a class="active_all" href="$SCRIPT_NAME?cat=all&repo=$repo">$(gettext 'All')</a>
 EOT
 
 	if [ -d $LOCALSTATE/undigest ]; then
 		[ -n "$category" ] || category="base-system"
 		cat << EOT
-	<p></p>
-	<h4>Repositories</h4>
-	<a class="repo_Public" href="$SCRIPT_NAME?repo=Public&cat=$category">Public</a>
+	<h4>$(gettext 'Repositories')</h4>
+	<a class="repo_Public" href="$SCRIPT_NAME?repo=Public&cat=$category">$(gettext 'Public')</a>
 EOT
 		for i in $(ls $LOCALSTATE/undigest); do
 			cat << EOT
@@ -166,7 +174,7 @@
 EOT
 		done
 		cat << EOT
-	<a class="repo_Any" href="$SCRIPT_NAME?repo=Any&cat=$category">Any</a>
+	<a class="repo_Any" href="$SCRIPT_NAME?repo=Any&cat=$category">$(gettext 'Any')</a>
 EOT
 	fi
 	echo "</div>"
@@ -206,25 +214,30 @@
 		cd $INSTALLED
 		search_form
 		sidebar
-		LOADING_MSG="Listing packages..."
+		LOADING_MSG="$(gettext 'Listing packages...')"
 		loading_msg
 		cat << EOT
-<h2>`gettext "My packages"`</h2>
+<h2>$(gettext 'My packages')</h2>
 <form method='get' action='$SCRIPT_NAME'>
+	<input type="hidden" name="do" value="Remove" />
 <div id="actions">
 	<div class="float-left">
-		`gettext "Selection:"`
-		<input type="submit" name="do" value="Remove" />
+		$(gettext 'Selection:')
+		<input type="submit" value="$(gettext 'Remove')" />
 	</div>
 	<div class="float-right">
-		`gettext "List:"`
-		<input type="submit" name="recharge" value="Recharge" />
-		<input type="submit" name="up" value="Upgrade" />
+		<a class="button" href="$SCRIPT_NAME?recharge">
+			<img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a>
+		<a class="button" href='$SCRIPT_NAME?up'>
+			<img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a>
 	</div>
 </div>
 EOT
-		table_start
-		table_head
+		cat << EOT
+<table class="zebra">
+$(table_head)
+<tbody>
+EOT
 		for pkg in *
 		do
 			. $pkg/receipt
@@ -234,17 +247,24 @@
 			colorpkg=$pkg
 			grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list &&
 				colorpkg="<span style='color: red;'>$pkg</span>"
-			echo "<td class='pkg'>
-				<input type='checkbox' name='pkg' value=\"$pkg\" />
-				<a href='$(pkg_info_link $pkg)'><img
-					src='$IMAGES/tazpkg-installed.png'/>$colorpkg</a></td>"
-			echo "<td>$VERSION</td>"
-			echo "<td class='desc'>$SHORT_DESC</td>"
-			echo "<td><a href='$WEB_SITE'><img src='$IMAGES/browser.png'/></a></td>"
-			echo '</tr>'
+			cat << EOT
+<td class="pkg">
+	<input type="checkbox" name="pkg" value="$pkg" />
+		<a href="$(pkg_info_link $pkg)"><img
+			src="$IMAGES/tazpkg-installed.png"/>$colorpkg</a></td>
+<td>$VERSION</td>
+<td class="desc">$SHORT_DESC</td>
+<td><a href="$WEB_SITE"><img src="$IMAGES/browser.png"/></a></td>
+</tr>
+EOT
 		done
-		table_end
-		echo '</form>' ;;
+		cat << EOT
+</tbody>
+</table>
+</form>
+EOT
+		;;
+
 	*\ linkable\ *)
 		#
 		# List linkable packages.
@@ -252,42 +272,57 @@
 		cd $INSTALLED
 		search_form
 		sidebar
-		LOADING_MSG="Listing linkable packages..."
+		LOADING_MSG=$(gettext 'Listing linkable packages...')
 		loading_msg
 		cat << EOT
-<h2>`gettext "Linkable packages"`</h2>
+<h2>$(gettext 'Linkable packages')</h2>
+
 <form method='get' action='$SCRIPT_NAME'>
+	<input type="hidden" name="do" value="Link" />
 <div id="actions">
 	<div class="float-left">
-		`gettext "Selection:"`
-		<input type="submit" name="do" value="Link" />
+		$(gettext 'Selection:')
+		<input type="submit" value="$(gettext 'Link')" />
 	</div>
 	<div class="float-right">
-		`gettext "List:"`
-		<input type="submit" name="recharge" value="Recharge" />
-		<input type="submit" name="up" value="Upgrade" />
+		<a class="button" href="$SCRIPT_NAME?recharge">
+			<img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a>
+		<a class="button" href="$SCRIPT_NAME?up">
+			<img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a>
 	</div>
 </div>
 EOT
-		table_start
-		table_head
+		cat << EOT
+<table class="zebra">
+$(table_head)
+<tbody>
+EOT
 		target=$(readlink $LOCALSTATE/fslink)
 		for pkg in $(ls $target/$INSTALLED)
 		do
 			[ -s $pkg/receipt ] && continue
 			. $target/$INSTALLED/$pkg/receipt
-			echo '<tr>'
-			echo "<td class='pkg'>
-				<input type='checkbox' name='pkg' value=\"$pkg\" />
-				<a href='$(pkg_info_link $pkg)'><img
-					src='$IMAGES/tazpkg.png'/>$pkg</a></td>"
-			echo "<td>$VERSION</td>"
-			echo "<td class='desc'>$SHORT_DESC</td>"
-			echo "<td><a href='$WEB_SITE'><img src='$IMAGES/browser.png'/></a></td>"
-			echo '</tr>'
+			cat << EOT
+<tr>
+	<td class="pkg">
+		<input type="checkbox" name="pkg" value="$pkg" />
+			<a href="$(pkg_info_link $pkg)"><img
+				src="$IMAGES/tazpkg.png"/>$pkg</a>
+	</td>
+	<td>$VERSION</td>
+	<td class="desc">$SHORT_DESC</td>
+	<td><a href="$WEB_SITE"><img src="$IMAGES/browser.png"/></a></td>
+</tr>
+EOT
 		done
-		table_end
-		echo '</form>' ;;
+		cat << EOT
+</tbody>
+</table>
+</form>
+EOT
+		;;
+
+
 	*\ cat\ *)
 		#
 		# List all available packages by category on mirror. Listing all
@@ -301,37 +336,51 @@
 		[ "$grep_category" == "all" ] && grep_category=".*"
 		search_form
 		sidebar | sed "s/active_$category/active/;s/repo_$repo/active/"
-		LOADING_MSG="Listing packages..."
+		LOADING_MSG="$(gettext 'Listing packages...')"
 		loading_msg
 		cat << EOT
-<h2>`gettext "Category:"` $category</h2>
+<h2>$(eval_gettext 'Category: $category')</h2>
+
 <form method='get' action='$SCRIPT_NAME'>
 <div id="actions">
 <div class="float-left">
-	`gettext "Selection:"`
+	$(gettext 'Selection:')
 	<input type="submit" name="do" value="Install" />
 	<input type="submit" name="do" value="Remove" />
 	<input type="hidden" name="repo" value="$repo" />
 </div>
 <div class="float-right">
-	`gettext "List:"`
-	<input type="submit" name="recharge" value="Recharge" />
-	<input type="submit" name="up" value="Upgrade" />
+	<a class="button" href="$SCRIPT_NAME?recharge">
+		<img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a>
+	<a class="button" href="$SCRIPT_NAME?up">
+		<img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a>
 	<a class="button" href='$SCRIPT_NAME?list'>
-		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+		<img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a>
 </div>
 </div>
 EOT
 		for i in $(repo_list ""); do
-			[ "$repo" != "Public" ] &&
-				echo "<h3>Repository: $(repo_name $i)</h3>"
-			table_start
-			table_head
+			if [ "$repo" != "Public" ]; then
+				Repo_Name="$(repo_name $i)"
+				cat << EOT
+<h3>$(eval_gettext "Repository: \$Repo_Name")</h3>
+EOT
+			fi
+			cat << EOT
+<table class="zebra">
+$(table_head)
+<tbody>
+EOT
 			grep "| $grep_category |" $i/packages.desc | \
 				parse_packages_desc
-			table_end
+			cat << EOT
+</tbody>
+</table>
+EOT
 		done
 		echo '</form>' ;;
+
+
 	*\ search\ *)
 		#
 		# Search for packages. Here default is to search in packages.desc
@@ -342,92 +391,108 @@
 		cd  $LOCALSTATE
 		search_form
 		sidebar | sed "s/repo_$repo/active/"
-		LOADING_MSG="Searching packages..."
+		LOADING_MSG="$(gettext 'Searching packages...')"
 		loading_msg
 		cat << EOT
-<h2>`gettext "Search packages"`</h2>
+<h2>$(gettext 'Search packages')</h2>
 <form method="get" action="$SCRIPT_NAME">
 <div id="actions">
 <div class="float-left">
-	`gettext "Selection:"`
+	$(gettext 'Selection:')
 	<input type="submit" name="do" value="Install" />
 	<input type="submit" name="do" value="Remove" />
-	<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
+	<a href="`cat $PANEL/lib/checkbox.js`">$(gettext 'Toogle all')</a>
 </div>
 <div class="float-right">
-	`gettext "List:"`
-	<input type="submit" name="recharge" value="Recharge" />
-	<input type="submit" name="up" value="Upgrade" />
+	<a class="button" href="$SCRIPT_NAME?recharge">
+		<img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a>
+	<a class="button" href="$SCRIPT_NAME?up">
+		<img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a>
 	<a class="button" href='$SCRIPT_NAME?list'>
-		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+		<img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a>
 </div>
 </div>
 	<input type="hidden" name="repo" value="$repo" />
+
+	<table class="zebra">
 EOT
-		table_start
 		if [ "$(GET files)" ]; then
 			cat <<EOT
-		<tr id="thead">
-			<td>`gettext "Package"`</td>
-			<td>`gettext "File"`</td>
+	<thead>
+		<tr>
+			<td>$(gettext 'Package')</td>
+			<td>$(gettext 'File')</td>
 		</tr>
-		$(unlzma -c $(repo_list /files.list.lzma) \
-		  | grep -Ei ": .*$(GET search)" | \
-		  while read PACKAGE FILE; do
-		  	PACKAGE=${PACKAGE%:}
-		  	image=tazpkg-installed.png
-		  	[ -d $INSTALLED/$PACKAGE ] || image=tazpkg.png
-		  	echo "<tr>
-	<td><input type='checkbox' name='pkg' value='$PACKAGE'>
-	    <a href='$(pkg_info_link $PACKAGE)'><img src='$IMAGES/$image' />$PACKAGE</a></td>
+	<thead>
+	<tbody>
+EOT
+			unlzma -c $(repo_list /files.list.lzma) \
+				| grep -Ei ": .*$(GET search)" | \
+				while read PACKAGE FILE; do
+					PACKAGE=${PACKAGE%:}
+					image=tazpkg-installed.png
+					[ -d $INSTALLED/$PACKAGE ] || image=tazpkg.png
+					cat << EOT
+<tr>
+	<td><input type="checkbox" name="pkg" value="$PACKAGE">
+		<a href="$(pkg_info_link $PACKAGE)"><img src="$IMAGES/$image" />$PACKAGE</a></td>
 	<td>$FILE</td>
-</tr>"
-		 done)
+</tr>
 EOT
+				done
 		else
-			table_head
+			cat << EOT
+$(table_head)
+	<tbody>
+EOT
 			grep -ih $pkg $(repo_list /packages.desc) | \
 				parse_packages_desc
 		fi
-		table_end
-		echo '</form>' ;;
+		cat << EOT
+	</tbody>
+	</table>
+</form>
+EOT
+		;;
+
+
 	*\ recharge\ *)
 		#
 		# Lets recharge the packages list
 		#
 		search_form
 		sidebar
-		LOADING_MSG="Recharging lists..."
+		LOADING_MSG="$(gettext 'Recharging lists...')"
 		loading_msg
 		cat << EOT
-<h2>`gettext "Recharge"`</h2>
+<h2>$(gettext 'Recharge')</h2>
+
 <form method='get' action='$SCRIPT_NAME'>
 <div id="actions">
 	<div class="float-left">
-		<p>
-			`gettext "Recharge checks for new or updated packages"`
-		</p>
+		<p>$(gettext 'Recharge checks for new or updated packages')</p>
 	</div>
 	<div class="float-right">
-		<p>
-			<a class="button" href='$SCRIPT_NAME?up'>
-				<img src="$IMAGES/update.png" />`gettext "Check upgrades"`</a>
-			<a class="button" href='$SCRIPT_NAME?list'>
-				<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
-		</p>
+		<a class="button" href='$SCRIPT_NAME?up'>
+			<img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a>
+		<a class="button" href='$SCRIPT_NAME?list'>
+			<img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a>
 	</div>
 </div>
+<div class="wrapper">
 <pre>
 EOT
-		gettext "Recharging packages list" | log
+		echo $(gettext 'Recharging packages list') | log
 		tazpkg recharge | filter_taztools_msgs
 		cat << EOT
 </pre>
-<p>
-	`gettext "Packages lists are up-to-date. You should check for upgrades now."`
-</p>
+</div>
+<p>$(gettext "Packages lists are up-to-date. You should check for upgrades \
+now.")</p>
 EOT
 		;;
+
+
 	*\ up\ *)
 		#
 		# Upgrade packages
@@ -435,37 +500,47 @@
 		cd $LOCALSTATE
 		search_form
 		sidebar
-		LOADING_MSG="Checking for upgrades..."
+		LOADING_MSG="$(gettext 'Checking for upgrades...')"
 		loading_msg
 		cat << EOT
-<h2>`gettext "Up packages"`</h2>
+<h2>$(gettext 'Up packages')</h2>
+
 <form method="get" action="$SCRIPT_NAME">
 <div id="actions">
 	<div class="float-left">
-		`gettext "Selection:"`
+		$(gettext 'Selection:')
 		<input type="submit" name="do" value="Install" />
 		<input type="submit" name="do" value="Remove" />
-		<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
+		<a href="$(cat $PANEL/lib/checkbox.js)">$(gettext 'Toogle all')</a>
 	</div>
 	<div class="float-right">
-		`gettext "List:"`
-		<input type="submit" name="recharge" value="Recharge" />
-		<a class="button" href='$SCRIPT_NAME?list'>
-			<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+		<a class="button" href="$SCRIPT_NAME?recharge">
+			<img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a>
+		<a class="button" href="$SCRIPT_NAME?list">
+			<img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a>
 	</div>
 </div>
 EOT
 		tazpkg up --check >/dev/null
-		table_start
-		table_head
+		cat << EOT
+<table class="zebra">
+$(table_head)
+<tbody>
+EOT
 		for pkg in `cat packages.up`
 		do
 			grep -hs "^$pkg |" $LOCALSTATE/packages.desc \
 				$LOCALSTATE/undigest/*/packages.desc | \
 				parse_packages_desc
 		done
-		table_end
-		echo '</form>' ;;
+		cat << EOT
+</tbody>
+</table>
+</form>
+EOT
+		;;
+
+
 	*\ do\ *)
 		#
 		# Do an action on one or some packages
@@ -480,40 +555,44 @@
 		cmd=$(echo $cmd | tr [:upper:] [:lower:])
 		case $cmd in
 			install)
-				cmd=get-install opt=--forced ;;
+				cmd=get-install opt=--forced
+				LOADING_MSG="get-installing packages..."
+				;;
 			link)
-				opt=$(readlink $LOCALSTATE/fslink) ;;
+				opt=$(readlink $LOCALSTATE/fslink)
+				LOADING_MSG="linking packages..."
+				;;
 		esac
 		search_form
 		sidebar
-		LOADING_MSG="${cmd}ing packages..."
 		loading_msg
 		cat << EOT
 <h2>Tazpkg: $cmd</h2>
+
 <form method="get" action="$SCRIPT_NAME">
 <div id="actions">
 	<div class="float-left">
-		<p>
-			`gettext "Performing tasks on packages"`
-		</p>
+		<p>$(gettext 'Performing tasks on packages')</p>
 	</div>
 	<div class="float-right">
 		<p>
-			<a class="button" href='$SCRIPT_NAME?list'>
-				<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+			<a class="button" href="$SCRIPT_NAME?list">
+				<img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a>
 		</p>
 	</div>
 </div>
+<div class="box">
+$(eval_gettext 'Executing $cmd for: $pkgs')
+</div>
 EOT
-		echo '<div class="box">'
-		gettext "Executing $cmd for:$pkgs"
-		echo '</div>'
 		for pkg in $pkgs
 		do
 			echo '<pre>'
 			echo 'y' | tazpkg $cmd $pkg $opt 2>/dev/null | filter_taztools_msgs
 			echo '</pre>'
 		done ;;
+
+
 	*\ info\ *)
 		#
 		# Packages info
@@ -524,10 +603,11 @@
 		if [ -d $INSTALLED/$pkg ]; then
 			. $INSTALLED/$pkg/receipt
 			files=`cat $INSTALLED/$pkg/files.list | wc -l`
-			action=$(gettext "Remove")
+			action="Remove"
+			action_i18n=$(gettext 'Remove')
 		else
 			cd  $LOCALSTATE
-			LOADING_MSG=$(gettext "Getting package info...")
+			LOADING_MSG=$(gettext 'Getting package info...')
 			loading_msg
 			IFS='|'
 			set -- $(grep -hs "^$pkg |" packages.desc \
@@ -538,32 +618,36 @@
 			SHORT_DESC="$(echo $3)"
 			CATEGORY="$(echo $4)"
 			WEB_SITE="$(echo $5)"
-			action=$(gettext "Install")
+			action="Install"
+			action_i18n=$(gettext 'Install')
 			temp="$(echo $pkg | sed 's/get-//g')"
 		fi
 		cat << EOT
-<h2>`gettext "Package"` $PACKAGE</h2>
+<h2>$(eval_gettext 'Package $PACKAGE')</h2>
+
 <div id="actions">
 	<div class="float-left">
 		<p>
 EOT
-		if [ "$temp" != "$pkg" -a "$action" == $(gettext "Install") ]; then
+		if [ "$temp" != "$pkg" -a "$action" == "Install" ]; then
 			temp="$(echo $pkg | sed 's/get-//g')"
-			echo "<a class='button' href='$SCRIPT_NAME?do=$action&$temp'>$action (Non Free)</a>"
+			echo "<a class='button' href='$SCRIPT_NAME?do=Install&$temp'>$(gettext 'Install (Non Free)')</a>"
 		else
-
-			echo "<a class='button' href='$SCRIPT_NAME?do=$action&$pkg'>$action</a>"
+			echo "<a class='button' href='$SCRIPT_NAME?do=$action&$pkg'>$action_i18n</a>"
 		fi
 
 		if [ -d $INSTALLED/$pkg ]; then
 			if grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list; then
-				block=$(gettext "Unblock")
+				cat << EOT
+			<a class="button" href="$SCRIPT_NAME?do=Unblock&$pkg">$(gettext 'Unblock')</a>
+EOT
 			else
-				block=$(gettext "Block")
+				cat << EOT
+			<a class="button" href='$SCRIPT_NAME?do=Block&$pkg'>$(gettext 'Block')</a>
+EOT
 			fi
 			cat << EOT
-			<a class="button" href='$SCRIPT_NAME?do=$block&$pkg'>$block</a>
-			<a class="button" href='$SCRIPT_NAME?do=Repack&$pkg'>Repack</a>
+			<a class="button" href='$SCRIPT_NAME?do=Repack&$pkg'>$(gettext 'Repack')</a>
 EOT
 		fi
 		cat << EOT
@@ -572,53 +656,56 @@
 	<div class="float-right">
 		<p>
 			<a class="button" href='$SCRIPT_NAME?list'>
-				<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+				<img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a>
 		</p>
 	</div>
 </div>
-<pre>
-Name        : $PACKAGE
-Version     : $VERSION
-Description : $SHORT_DESC
-Category    : $CATEGORY
+<table class="zebra">
+<tbody>
+	<tr><td>$(gettext 'Name:')</td><td>$PACKAGE</td></tr>
+	<tr><td>$(gettext 'Version:')</td><td>$VERSION</td></tr>
+	<tr><td>$(gettext 'Description:')</td><td>$SHORT_DESC</td></tr>
+	<tr><td>$(gettext 'Category:')</td><td>$CATEGORY</td></tr>
 EOT
 		if [ -d $INSTALLED/$pkg ]; then
 			cat << EOT
-Maintainer  : $MAINTAINER
-Website     : <a href="$WEB_SITE">$WEB_SITE</a>
-Sizes       : $PACKED_SIZE/$UNPACKED_SIZE
+	<tr><td>$(gettext 'Maintainer:')</td><td>$MAINTAINER</td></tr>
+	<tr><td>$(gettext 'Website:')</td><td><a href="$WEB_SITE">$WEB_SITE</a></td></tr>
+	<tr><td>$(gettext 'Sizes:')</td><td>$PACKED_SIZE/$UNPACKED_SIZE</td></tr>
 EOT
 			if [ -n "$DEPENDS" ]; then
-				echo -n "Depends     : "
+				echo "<tr><td>$(gettext 'Depends:')</td><td>"
 				for i in $DEPENDS; do
 					echo -n "<a href="$(pkg_info_link $i)">$i</a> "
 				done
-				echo ""
+				echo "</td></tr>"
 			fi
 			if [ -n "$SUGGESTED" ]; then
-				echo -n "Suggested   : "
+				echo "<tr><td>$(gettext 'Suggested:')</td><td>"
 				for i in $SUGGESTED; do
 					echo -n "<a href="$(pkg_info_link $i)">$i</a> "
 				done
-				echo ""
+				echo "</td></tr>"
 			fi
-			[ -n "$TAGS" ] && echo "Tags        : $TAGS"
+			[ -n "$TAGS" ] && echo "<tr><td>$(gettext 'Tags:')</td><td>$TAGS</td></tr>"
+			I_FILES=$(cat $INSTALLED/$pkg/files.list | wc -l)
 			cat << EOT
-</pre>
+</tbody>
+</table>
 
-<p>`gettext "Installed files:"` `cat $INSTALLED/$pkg/files.list | wc -l`</p>
-<pre>
-`cat $INSTALLED/$pkg/files.list`
-</pre>
+<p>$(eval_gettext 'Installed files: $I_FILES')</p>
+
+<pre>$(cat $INSTALLED/$pkg/files.list)</pre>
 EOT
 		else
 			cat << EOT
-Website     : <a href="$WEB_SITE">$WEB_SITE</a>
-Sizes       : `grep -hsA 3 ^$pkg$ packages.txt undigest/*/packages.txt | \
-		tail -n 1 | sed 's/ *//'`
-</pre>
+<tr><td>$(gettext 'Website:')</td><td><a href="$WEB_SITE">$WEB_SITE</a></td></tr>
+<tr><td>$(gettext 'Sizes:')</td><td>$(grep -hsA 3 ^$pkg$ packages.txt undigest/*/packages.txt | \
+		tail -n 1 | sed 's/ *//')</td></tr>
+</table>
 
-<p>`gettext "Installed files:"`</p>
+<p>$(gettext 'Installed files:')</p>
+
 <pre>
 `unlzma -c files.list.lzma undigest/*/files.list.lzma 2> /dev/null | \
  sed "/^$pkg: /!d;s/^$pkg: //"`
@@ -626,6 +713,8 @@
 EOT
 		fi
 		;;
+
+
 	*\ admin\ * )
 		#
 		# Tazpkg configuration page
@@ -663,41 +752,41 @@
 				repository=${cmd#rm-repo=}
 				rm -rf $LOCALSTATE/undigest/$repository ;;
 		esac
-		[ "$cmd" == "$(gettext "Set link")" ] &&
+		[ "$cmd" == "$(gettext 'Set link')" ] &&
 			[ -d "$(GET link)/$INSTALLED" ] &&
 			ln -fs $(GET link) $LOCALSTATE/fslink
-		[ "$cmd" == "$(gettext "Remove link")" ] &&
+		[ "$cmd" == "$(gettext 'Remove link')" ] &&
 			rm -f $LOCALSTATE/fslink
 		cache_files=`find /var/cache/tazpkg -name *.tazpkg | wc -l`
 		cache_size=`du -sh /var/cache/tazpkg`
 		sidebar
 		cat << EOT
-<h2>$(gettext "Administration")</h2>
+<h2>$(gettext 'Administration')</h2>
 <div>
-	<p>$(gettext "Tazpkg administration and settings")</p>
+	<p>$(gettext 'Tazpkg administration and settings')</p>
 </div>
 <div id="actions">
 	<a class="button" href='$SCRIPT_NAME?admin=&action=saveconf'>
-		<img src="$IMAGES/tazpkg.png" />`gettext "Save configuration"`</a>
+		<img src="$IMAGES/tazpkg.png" />$(gettext 'Save configuration')</a>
 	<a class="button" href='$SCRIPT_NAME?admin=&action=listconf'>
-		<img src="$IMAGES/edit.png" />`gettext "List configuration files"`</a>
+		<img src="$IMAGES/edit.png" />$(gettext 'List configuration files')</a>
 	<a class="button" href='$SCRIPT_NAME?admin=&action=quickcheck'>
-		<img src="$IMAGES/recharge.png" />`gettext "Quick check"`</a>
+		<img src="$IMAGES/recharge.png" />$(gettext 'Quick check')</a>
 	<a class="button" href='$SCRIPT_NAME?admin=&action=fullcheck'>
-		<img src="$IMAGES/recharge.png" />`gettext "Full check"`</a>
+		<img src="$IMAGES/recharge.png" />$(gettext 'Full check')</a>
 </div>
 EOT
 		case "$(GET action)" in
 				saveconf)
-					LOADING_MSG=$(gettext "Creating the package...")
+					LOADING_MSG=$(gettext 'Creating the package...')
 					loading_msg
 					echo "<pre>"
 					cd $HOME
 					tazpkg repack-config | filter_taztools_msgs
-					gettext "Path : " && ls $HOME/config-*.tazpkg
+					echo -n "$(gettext 'Path:') " && ls $HOME/config-*.tazpkg
 					echo "</pre>" ;;
 				listconf)
-					echo "<h4>`gettext "Configuration files"`</h4>"
+					echo "<h4>$(gettext 'Configuration files')</h4>"
 					echo "<ul>"
 					tazpkg list-config | while read file; do
 						[ "${file:0:1}" == "/" ] || continue
@@ -710,38 +799,44 @@
 					echo "</ul>"
 					echo "</pre>" ;;
 				quickcheck)
-					LOADING_MSG=$(gettext "Checking packages consistency...")
+					LOADING_MSG=$(gettext 'Checking packages consistency...')
 					loading_msg
 					echo "<pre>"
 					tazpkg check
 					echo "</pre>" ;;
 				fullcheck)
-					LOADING_MSG=$(gettext "Full packages check...")
+					LOADING_MSG=$(gettext 'Full packages check...')
 					loading_msg
 					echo "<pre>"
 					tazpkg check --full
 					echo "</pre>" ;;
 				esac
 		cat << EOT
-<h3>$(gettext "Packages cache")</h3>
+<h3>$(gettext 'Packages cache')</h3>
+
 <div>
 	<form method="get" action="$SCRIPT_NAME">
 		<p>
-			`gettext "Packages in the cache:"` $cache_files ($cache_size)
+			$(eval_gettext 'Packages in the cache: $cache_files ($cache_size)')
 			<input type="hidden" name="admin" value="clean" />
 			<input type="submit" value="Clean" />
 		</p>
 	</form>
 </div>
-<h3>`gettext "Default mirror"`</h3>
-	`cat /var/lib/tazpkg/mirror`
-<h3>`gettext "Current mirror list"`</h3>
+
+<h3>$(gettext 'Default mirror')</h3>
+
+<pre>$(cat /var/lib/tazpkg/mirror)</pre>
+
+<h3>$(gettext 'Current mirror list')</h3>
 EOT
 		for i in $LOCALSTATE/mirrors $LOCALSTATE/undigest/*/mirrors; do
 			[ -s $i ] || continue
 			echo '<div class="box">'
-			[ $i != $LOCALSTATE/mirrors ] &&
-				echo "<h4>Repository: $(repo_name $(dirname $i))</h4>"
+			if [ $i != $LOCALSTATE/mirrors ]; then
+				Repo_Name="$(repo_name $(dirname $i))"
+				echo "<h4>$(eval_gettext 'Repository: $Repo_Name')</h4>"
+			fi
 			echo "<ul>"
 			list_mirrors $i
 			echo "</ul>"
@@ -757,9 +852,7 @@
 </form>
 EOT
 		done
-		echo "<h3>"
-		gettext "Private repositories"
-		echo "</h3>"
+		echo "<h3>$(gettext 'Private repositories')</h3>"
 		[ -n "$(ls $LOCALSTATE/undigest 2> /dev/null)" ] && cat << EOT
 <div class="box">
 	<ul>
@@ -771,49 +864,49 @@
 <form method="get" action="$SCRIPT_NAME">
 	<p>
 		<input type="hidden" name="admin" value="add-repo" />
-		Name <input type="text" name="repository" size="10">
-		mirror
+		$(gettext 'Name') <input type="text" name="repository" size="10">
+		$(gettext 'mirror')
 		<input type="text" name="mirror" value="http://" size="50">
 		<input type="submit" value="Add repository" />
 	</p>
 </form>
-<h3>`gettext "Link to another SliTaz installation"`</h3>
-<p>
-$(gettext "This link points to the root of another SliTaz installation. \
-You will be able to install packages using soft links to it.")
-</p>
+
+<h3>$(gettext 'Link to another SliTaz installation')</h3>
+
+<p>$(gettext "This link points to the root of another SliTaz installation. \
+You will be able to install packages using soft links to it.")</p>
+
 <form method="get" action="$SCRIPT_NAME">
 <p>
 	<input type="hidden" name="admin" value="add-link" />
 	<input type="text" name="link"
 	 value="$(readlink $LOCALSTATE/fslink 2> /dev/null)" size="50">
-	<input type="submit" name="admin" value="$(gettext "Set link")" />
-	<input type="submit" name="admin" value="$(gettext "Remove link")" />
+	<input type="submit" name="admin" value="$(gettext 'Set link')" />
+	<input type="submit" name="admin" value="$(gettext 'Remove link')" />
 </p>
 </form>
 EOT
 		version=$(cat /etc/slitaz-release)
 		cat << EOT
 
-<a name="dvd"></a>
-<h3>`gettext "SliTaz packages DVD"`</h3>
-<p>
-$(gettext "A bootable DVD image of all available packages for \
-the $version version is generated every day. It also contains a copy of \
-the website and can be used without an internet connection. This image can be \
-installed on a DVD or an USB key.")
-</p>
+<h3 id="dvd">$(gettext 'SliTaz packages DVD')</h3>
+
+<p>$(eval_gettext "A bootable DVD image of all available packages for the \
+\$version version is generated every day. It also contains a copy of the \
+website and can be used without an internet connection. This image can be \
+installed on a DVD or an USB key.")</p>
+
 <div>
 	<form method="post" action='$SCRIPT_NAME?admin&action=dvdimage#dvd'>
 	<p>
 		<a class="button"
 			href='http://mirror.slitaz.org/iso/$version/packages-$version.iso'>
-			<img src="$IMAGES/tazpkg.png" />$(gettext "Download DVD image")</a>
+			<img src="$IMAGES/tazpkg.png" />$(gettext 'Download DVD image')</a>
 		<a class="button" href='$SCRIPT_NAME?admin&action=dvdusbkey#dvd'>
-			<img src="$IMAGES/tazpkg.png" />$(gettext "Install from DVD/USB key")</a>
+			<img src="$IMAGES/tazpkg.png" />$(gettext 'Install from DVD/USB key')</a>
 	</p>
 	<div class="box">
-		$(gettext "Install from ISO image: ")
+		$(gettext 'Install from ISO image:')
 		<input type="text" name="dvdimage" size="40" value="/root/packages-$version.iso">
 	</div>
 	</form>
@@ -852,30 +945,32 @@
 		[ -n "$(GET block)" ] && tazpkg block $(GET block)
 		[ -n "$(GET unblock)" ] && tazpkg unblock $(GET unblock)
 		cat << EOT
-<h2>`gettext "Summary"`</h2>
+<h2>$(gettext 'Summary')</h2>
+
 <div id="actions">
-	<a class="button" href='$SCRIPT_NAME?list'>
-		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+	<a class="button" href="$SCRIPT_NAME?list">
+		<img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a>
 EOT
 		fslink=$(readlink $LOCALSTATE/fslink)
 		[ -n "$fslink" -a -d "$fslink/$INSTALLED" ] &&
 			cat << EOT
-	<a class="button" href='$SCRIPT_NAME?linkable'>
-		<img src="$IMAGES/tazpkg.png" />`gettext "Linkable packages"`</a>
+	<a class="button" href="$SCRIPT_NAME?linkable">
+		<img src="$IMAGES/tazpkg.png" />$(gettext 'Linkable packages')</a>
 EOT
 		cat << EOT
-	<a class="button" href='$SCRIPT_NAME?recharge'>
-		<img src="$IMAGES/recharge.png" />`gettext "Recharge list"`</a>
-	<a class="button" href='$SCRIPT_NAME?up'>
-		<img src="$IMAGES/update.png" />`gettext "Check upgrades"`</a>
-	<a class="button" href='$SCRIPT_NAME?admin'>
-		<img src="$IMAGES/edit.png" />`gettext "Administration"`</a>
+	<a class="button" href="$SCRIPT_NAME?recharge">
+		<img src="$IMAGES/recharge.png" />$(gettext 'Recharge list')</a>
+	<a class="button" href="$SCRIPT_NAME?up">
+		<img src="$IMAGES/update.png" />$(gettext 'Check upgrades')</a>
+	<a class="button" href="$SCRIPT_NAME?admin">
+		<img src="$IMAGES/edit.png" />$(gettext 'Administration')</a>
 </div>
-<pre class="pre-main">
-`packages_summary`
-</pre>
 
-<h3>`gettext "Latest log entries"`</h3>
+$(packages_summary)
+
+
+<h3>$(gettext 'Latest log entries')</h3>
+
 <pre>
 `tail -n 5 /var/log/tazpkg.log | fgrep "-" | \
 	awk '{print $1, $2, $3, $4, $5, $6, $7}'`
diff -r 5312e3716b01 -r fdfc6b494539 po/es.po
--- a/po/es.po	Fri May 04 12:57:53 2012 +0300
+++ b/po/es.po	Fri May 04 13:00:43 2012 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazPanel 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-10 22:37+0200\n"
+"POT-Creation-Date: 2012-05-04 02:44+0000\n"
 "PO-Revision-Date: 2011-08-05 15:03-0300\n"
 "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n"
 "Language-Team: \n"
@@ -16,6 +16,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: tazpanel:35
+#, fuzzy, sh-format
+msgid "Starting TazPanel web server on port $HTTPD_PORT..."
+msgstr "Parar el servidor web TazPanel..."
+
 #: tazpanel:37
 msgid "TazPanel Authentication - Default: root:root"
 msgstr "Autenticación TazPanel - Por defecto: root:root"
@@ -36,527 +41,796 @@
 msgid "Password changed successfully"
 msgstr "aContraseña exitosamente cambiada"
 
-#: tazpanel:53
-msgid "Usage:"
+#: tazpanel:54
+#, sh-format
+msgid "Usage: $program_name [start|stop|passwd]"
 msgstr ""
 
-#: index.cgi:36
+#: index.cgi:38 index.cgi:83
 msgid "Differences"
 msgstr "Diferencias"
 
 #: index.cgi:72
+msgid "TazPanel - File"
+msgstr ""
+
+#: index.cgi:81
 msgid "Save"
 msgstr "Guardar"
 
-#: index.cgi:90
-#: settings.cgi:283
+#: index.cgi:103 settings.cgi:261
 msgid "Edit"
 msgstr "Editar"
 
-#: index.cgi:109
-#: index.cgi:297
+#: index.cgi:126
+msgid "TazPanel - Terminal"
+msgstr ""
+
+#: index.cgi:139
+msgid "Small terminal emulator, commands options are supported."
+msgstr "Pequeño emulador del terminal, opciónes de comandos están soportadas."
+
+#: index.cgi:141 index.cgi:158
+#, sh-format
+msgid "Commands: $commands"
+msgstr "Comandos: $commands"
+
+#: index.cgi:146
+#, sh-format
+msgid "Downloading to: $dl"
+msgstr "Descargando a: $dl"
+
+#: index.cgi:153
+#, sh-format
+msgid "$cmd needs an argument"
+msgstr ""
+
+#: index.cgi:157
+#, sh-format
+msgid "Unknown command: $cmd"
+msgstr ""
+
+#: index.cgi:162
+msgid "TazPanel - Process activity"
+msgstr ""
+
+#: index.cgi:164
+msgid "Refresh:"
+msgstr ""
+
+#: index.cgi:169
+msgid "1s"
+msgstr ""
+
+#: index.cgi:170
+msgid "5s"
+msgstr ""
+
+#: index.cgi:171
+msgid "10s"
+msgstr ""
+
+#: index.cgi:172 live.cgi:152
+msgid "none"
+msgstr ""
+
+#: index.cgi:188
+msgid "TazPanel - Debug"
+msgstr ""
+
+#: index.cgi:191
+msgid "HTTP Environment"
+msgstr ""
+
+#: index.cgi:198
+msgid "TazPanel - System report"
+msgstr "TazPanel - Reportar sistema"
+
+#: index.cgi:203
+#, sh-format
+msgid "Reporting to: $output"
+msgstr "Reportando a: $output"
+
+#: index.cgi:206
+msgid "Creating report header..."
+msgstr "Creando el paquete..."
+
+#: index.cgi:213 index.cgi:230
+msgid "SliTaz system report"
+msgstr "Reportar sistema"
+
+#: index.cgi:227
+msgid "Creating system summary..."
+msgstr "Creando el paquete..."
+
+#: index.cgi:231
+msgid "Date:"
+msgstr ""
+
+#: index.cgi:242
+msgid "Getting hardware info..."
+msgstr "Obteniendo información del paquete..."
+
+#: index.cgi:260
+msgid "Getting networking info..."
+msgstr "Obteniendo información del paquete..."
+
+#: index.cgi:274
+msgid "Getting filesystems info..."
+msgstr ""
+
+#: index.cgi:294
+msgid "Getting boot logs..."
+msgstr "Obteniendo información del paquete..."
+
+#: index.cgi:297 boot.cgi:29 boot.cgi:34
+msgid "Kernel messages"
+msgstr "Mensajes del núcleo"
+
+#: index.cgi:300 boot.cgi:30 boot.cgi:38
+msgid "Boot scripts"
+msgstr "Scripts del boot"
+
+#: index.cgi:305
+msgid "Creating report footer..."
+msgstr "Creando el paquete..."
+
+#: index.cgi:317
+msgid "View report"
+msgstr "Ver reporte"
+
+#: index.cgi:318
+msgid "This report can be attached with a bug report on:"
+msgstr "Este reporte puede ser agregado con uno de bugs en:"
+
+#: index.cgi:332
+#, sh-format
+msgid "Host: $hostname"
+msgstr "Cambiar nombre del $hostname"
+
+#: index.cgi:333
+msgid "SliTaz administration and configuration Panel"
+msgstr "SliTaz Administración y configuración del Panel"
+
+#: index.cgi:337 styles/default/header.sh:27
 msgid "Terminal"
 msgstr "Terminal"
 
-#: index.cgi:122
-msgid "Small terminal emulator, commands options are supported."
-msgstr "Pequeño emulador del terminal, opciónes de comandos están soportadas."
-
-#: index.cgi:124
-#: index.cgi:141
-msgid "Commands:"
-msgstr "Comandos:"
-
-#: index.cgi:128
-msgid "Downloading to:"
-msgstr "Descargando a:"
-
-#: index.cgi:145
-#: index.cgi:299
+#: index.cgi:339
 msgid "Process activity"
 msgstr ""
 
-#: index.cgi:160
-msgid "System report"
-msgstr "Reportar sistema"
-
-#: index.cgi:164
-msgid "Reporting to:"
-msgstr "Reportando a:"
-
-#: index.cgi:166
-msgid "Creating report header...  "
-msgstr ""
-
-#: index.cgi:183
-msgid "Creating system summary... "
-msgstr ""
-
-#: index.cgi:196
-msgid "Getting hardware info...   "
-msgstr ""
-
-#: index.cgi:220
-msgid "Getting networking info... "
-msgstr ""
-
-#: index.cgi:236
-msgid "Getting filesystems info..."
-msgstr ""
-
-#: index.cgi:260
-msgid "Getting boot logs...       "
-msgstr ""
-
-#: index.cgi:262
-#: boot.cgi:29
-#: boot.cgi:34
-msgid "Kernel messages"
-msgstr "Mensajes del núcleo"
-
-#: index.cgi:266
-#: boot.cgi:30
-#: boot.cgi:39
-msgid "Boot scripts"
-msgstr "Scripts del boot"
-
-#: index.cgi:272
-msgid "Creating report footer...  "
-msgstr ""
-
-#: index.cgi:280
-msgid "View report"
-msgstr "Ver reporte"
-
-#: index.cgi:281
-msgid "This report can be attached with a bug report on: "
-msgstr "Este reporte puede ser agregado con uno de bugs en:"
-
-#: index.cgi:292
-msgid "Host:"
-msgstr "Host:"
-
-#: index.cgi:293
-msgid "SliTaz administration and configuration Panel"
-msgstr "SliTaz Administración y configuración del Panel"
-
-#: index.cgi:301
+#: index.cgi:341
 msgid "Create a report"
 msgstr "Crear un reporte"
 
-#: index.cgi:304
-#: pkgs.cgi:829
+#: index.cgi:344 pkgs.cgi:948
 msgid "Summary"
 msgstr "Sumario"
 
-#: index.cgi:307
-msgid "Uptime       :"
+#: index.cgi:347
+msgid "Uptime:"
 msgstr ""
 
-#: index.cgi:308
-msgid "Memory in Mb :"
+#: index.cgi:350
+msgid "Memory in Mb:"
 msgstr "Memoria en Mb : "
 
-#: index.cgi:310
-msgid "Linux kernel :"
+#: index.cgi:355
+#, sh-format
+msgid "Total: $memtotal, Used: $memused, Free: $memfree"
+msgstr ""
+
+#: index.cgi:360
+msgid "Linux kernel:"
 msgstr "Kernel Linux :"
 
-#: index.cgi:315
+#: index.cgi:367
 msgid "Network status"
 msgstr "Estado de red"
 
-#: index.cgi:318
-#: hardware.cgi:109
+#: index.cgi:370 hardware.cgi:202
 msgid "Filesystem usage statistics"
 msgstr ""
 
-#: index.cgi:339
+#: index.cgi:403
 msgid "Panel Activity"
 msgstr ""
 
-#: pkgs.cgi:46
-msgid "Last recharge        : "
+#: pkgs.cgi:17
+msgid "TazPanel - Packages"
+msgstr ""
+
+#: pkgs.cgi:51
+#, fuzzy
+msgid "Last recharge:"
 msgstr "Última recarga        :"
 
-#: pkgs.cgi:56
-msgid "Installed packages   : "
-msgstr "Paquetes instalados  :"
-
 #: pkgs.cgi:58
-msgid "Mirrored packages    : "
+msgid "(Older than 10 days)"
 msgstr ""
 
 #: pkgs.cgi:60
-msgid "Upgradeable packages : "
+msgid "(Not older than 10 days)"
+msgstr ""
+
+#: pkgs.cgi:64
+#, fuzzy
+msgid "Installed packages:"
+msgstr "Paquetes instalados  :"
+
+#: pkgs.cgi:66
+#, fuzzy
+msgid "Mirrored packages:"
+msgstr "Mis paquetes"
+
+#: pkgs.cgi:68
+#, fuzzy
+msgid "Upgradeable packages:"
 msgstr "Paquetes actualizables :"
 
-#: pkgs.cgi:64
-msgid "Blocked packages     : "
+#: pkgs.cgi:70 pkgs.cgi:707
+msgid "Installed files:"
+msgstr "Filas instaladas:"
+
+#: pkgs.cgi:72
+#, fuzzy
+msgid "Blocked packages:"
 msgstr "Paquetes bloqueadso     : "
 
-#: pkgs.cgi:102
+#: pkgs.cgi:86
+#, fuzzy
+msgid "Delete"
+msgstr "Borrar usuario"
+
+#: pkgs.cgi:89
+msgid "Use as default"
+msgstr ""
+
+#: pkgs.cgi:120
 msgid "Search"
 msgstr "Buscar"
 
-#: pkgs.cgi:104
+#: pkgs.cgi:122
 msgid "Files"
 msgstr "Filas"
 
-#: pkgs.cgi:115
-#: network.cgi:23
-#: network.cgi:142
-#: boot.cgi:84
-#: settings.cgi:131
-#: lib/libtazpanel:86
+#: pkgs.cgi:134 pkgs.cgi:867 network.cgi:23 network.cgi:156 network.cgi:246
+#: boot.cgi:82 settings.cgi:104 lib/libtazpanel:98
 msgid "Name"
 msgstr "Nombre"
 
-#: pkgs.cgi:116
+#: pkgs.cgi:135
 msgid "Version"
 msgstr "Versión"
 
-#: pkgs.cgi:117
-#: boot.cgi:85
+#: pkgs.cgi:136 boot.cgi:83
 msgid "Description"
 msgstr "Descripción"
 
-#: pkgs.cgi:118
+#: pkgs.cgi:137
 msgid "Web"
 msgstr "Web"
 
-#: pkgs.cgi:201
-#: pkgs.cgi:310
-#: pkgs.cgi:351
-#: pkgs.cgi:405
-#: pkgs.cgi:443
-#: pkgs.cgi:491
-#: pkgs.cgi:555
-#: pkgs.cgi:832
+#: pkgs.cgi:147
+msgid "Categories"
+msgstr ""
+
+#: pkgs.cgi:148
+msgid "Base-system"
+msgstr ""
+
+#: pkgs.cgi:149
+msgid "X window"
+msgstr ""
+
+#: pkgs.cgi:150
+msgid "Utilities"
+msgstr ""
+
+#: pkgs.cgi:151 styles/default/header.sh:46
+#, fuzzy
+msgid "Network"
+msgstr "Estado de red"
+
+#: pkgs.cgi:152
+msgid "Games"
+msgstr ""
+
+#: pkgs.cgi:153
+msgid "Graphics"
+msgstr ""
+
+#: pkgs.cgi:154
+msgid "Office"
+msgstr ""
+
+#: pkgs.cgi:155
+msgid "Multimedia"
+msgstr ""
+
+#: pkgs.cgi:156
+msgid "Development"
+msgstr ""
+
+#: pkgs.cgi:157
+#, fuzzy
+msgid "System tools"
+msgstr "Hora del sistema"
+
+#: pkgs.cgi:158
+msgid "Security"
+msgstr ""
+
+#: pkgs.cgi:159
+msgid "Misc"
+msgstr ""
+
+#: pkgs.cgi:160
+msgid "Meta"
+msgstr ""
+
+#: pkgs.cgi:161
+msgid "Non free"
+msgstr ""
+
+#: pkgs.cgi:162
+msgid "All"
+msgstr ""
+
+#: pkgs.cgi:168
+#, fuzzy
+msgid "Repositories"
+msgstr "Repositorios privados"
+
+#: pkgs.cgi:169
+msgid "Public"
+msgstr ""
+
+#: pkgs.cgi:177
+msgid "Any"
+msgstr ""
+
+#: pkgs.cgi:217 pkgs.cgi:339
+#, fuzzy
+msgid "Listing packages..."
+msgstr "Obteniendo información del paquete..."
+
+#: pkgs.cgi:220 pkgs.cgi:358 pkgs.cgi:412 pkgs.cgi:479 pkgs.cgi:520
+#: pkgs.cgi:580 pkgs.cgi:659 pkgs.cgi:952 styles/default/header.sh:37
 msgid "My packages"
 msgstr "Mis paquetes"
 
-#: pkgs.cgi:205
-#: pkgs.cgi:251
-#: pkgs.cgi:300
-#: pkgs.cgi:341
-#: pkgs.cgi:434
-#: settings.cgi:119
+#: pkgs.cgi:225 pkgs.cgi:284 pkgs.cgi:347 pkgs.cgi:401 pkgs.cgi:511
+#: settings.cgi:92
 msgid "Selection:"
 msgstr "Selección"
 
-#: pkgs.cgi:209
-#: pkgs.cgi:255
-#: pkgs.cgi:306
-#: pkgs.cgi:347
-#: pkgs.cgi:440
-msgid "List:"
-msgstr "Lista:"
+#: pkgs.cgi:226 pkgs.cgi:607
+msgid "Remove"
+msgstr "Remover"
 
-#: pkgs.cgi:247
-#: pkgs.cgi:838
+#: pkgs.cgi:230 pkgs.cgi:289 pkgs.cgi:354 pkgs.cgi:408 pkgs.cgi:518
+#: pkgs.cgi:962 styles/default/header.sh:39
+msgid "Recharge list"
+msgstr "Recargar lista"
+
+#: pkgs.cgi:232 pkgs.cgi:291 pkgs.cgi:356 pkgs.cgi:410 pkgs.cgi:477
+#: pkgs.cgi:964
+msgid "Check upgrades"
+msgstr "Comprobar actualizaciónes"
+
+#: pkgs.cgi:275
+#, fuzzy
+msgid "Listing linkable packages..."
+msgstr "Obteniendo información del paquete..."
+
+#: pkgs.cgi:278 pkgs.cgi:958
 msgid "Linkable packages"
 msgstr "Paquetes enlazables"
 
-#: pkgs.cgi:296
-msgid "Category:"
-msgstr "Categoría:"
+#: pkgs.cgi:285
+msgid "Link"
+msgstr ""
 
-#: pkgs.cgi:337
+#: pkgs.cgi:342
+#, sh-format
+msgid "Category: $category"
+msgstr "Categoría: $category"
+
+#: pkgs.cgi:366 pkgs.cgi:838
+#, sh-format
+msgid "Repository: $Repo_Name"
+msgstr ""
+
+#: pkgs.cgi:394
+#, fuzzy
+msgid "Searching packages..."
+msgstr "Buscar paquetes"
+
+#: pkgs.cgi:397
 msgid "Search packages"
 msgstr "Buscar paquetes"
 
-#: pkgs.cgi:344
-#: pkgs.cgi:437
+#: pkgs.cgi:404 pkgs.cgi:514
 msgid "Toogle all"
 msgstr ""
 
-#: pkgs.cgi:360
-#: pkgs.cgi:532
+#: pkgs.cgi:423
 msgid "Package"
 msgstr "Paquete"
 
-#: pkgs.cgi:361
+#: pkgs.cgi:424
 msgid "File"
 msgstr "Fila"
 
-#: pkgs.cgi:392
+#: pkgs.cgi:465
+#, fuzzy
+msgid "Recharging lists..."
+msgstr "Recargar lista"
+
+#: pkgs.cgi:468
 msgid "Recharge"
 msgstr "Recargar"
 
-#: pkgs.cgi:397
+#: pkgs.cgi:473
 msgid "Recharge checks for new or updated packages"
 msgstr ""
 
-#: pkgs.cgi:403
-#: pkgs.cgi:844
-msgid "Check upgrades"
-msgstr "Comprobar actualizaciónes"
-
-#: pkgs.cgi:411
+#: pkgs.cgi:485
 msgid "Recharging packages list"
 msgstr ""
 
-#: pkgs.cgi:416
+#: pkgs.cgi:490
 msgid "Packages lists are up-to-date. You should check for upgrades now."
 msgstr ""
 
-#: pkgs.cgi:430
+#: pkgs.cgi:503
+#, fuzzy
+msgid "Checking for upgrades..."
+msgstr "Comprobar actualizaciónes"
+
+#: pkgs.cgi:506
 msgid "Up packages"
 msgstr ""
 
-#: pkgs.cgi:485
+#: pkgs.cgi:575
 msgid "Performing tasks on packages"
 msgstr ""
 
-#: pkgs.cgi:515
-msgid "Remove"
-msgstr "Remover"
+#: pkgs.cgi:585
+#, sh-format
+msgid "Executing $cmd for: $pkgs"
+msgstr ""
 
-#: pkgs.cgi:518
+#: pkgs.cgi:610
 msgid "Getting package info..."
 msgstr "Obteniendo información del paquete..."
 
-#: pkgs.cgi:529
+#: pkgs.cgi:622 installer.cgi:155 styles/default/header.sh:88
 msgid "Install"
 msgstr "Instalar"
 
-#: pkgs.cgi:540
+#: pkgs.cgi:626
+#, fuzzy, sh-format
+msgid "Package $PACKAGE"
+msgstr "Paquete"
+
+#: pkgs.cgi:634
+msgid "Install (Non Free)"
+msgstr ""
+
+#: pkgs.cgi:642
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: pkgs.cgi:542
+#: pkgs.cgi:646
 msgid "Block"
 msgstr "Bloquear"
 
-#: pkgs.cgi:589
-#: pkgs.cgi:601
-msgid "Installed files:"
+#: pkgs.cgi:650
+msgid "Repack"
+msgstr ""
+
+#: pkgs.cgi:665
+#, fuzzy
+msgid "Name:"
+msgstr "Nombre"
+
+#: pkgs.cgi:666
+#, fuzzy
+msgid "Version:"
+msgstr "Versión"
+
+#: pkgs.cgi:667
+#, fuzzy
+msgid "Description:"
+msgstr "Descripción"
+
+#: pkgs.cgi:668
+#, fuzzy
+msgid "Category:"
+msgstr "Categoría: $category"
+
+#: pkgs.cgi:672
+msgid "Maintainer:"
+msgstr ""
+
+#: pkgs.cgi:673 pkgs.cgi:702
+msgid "Website:"
+msgstr ""
+
+#: pkgs.cgi:674 pkgs.cgi:703
+#, fuzzy
+msgid "Sizes:"
+msgstr "Tamaño"
+
+#: pkgs.cgi:677
+msgid "Depends:"
+msgstr ""
+
+#: pkgs.cgi:684
+msgid "Suggested:"
+msgstr ""
+
+#: pkgs.cgi:690
+msgid "Tags:"
+msgstr ""
+
+#: pkgs.cgi:696
+#, fuzzy, sh-format
+msgid "Installed files: $I_FILES"
 msgstr "Filas instaladas:"
 
-#: pkgs.cgi:641
-#: pkgs.cgi:764
+#: pkgs.cgi:755 pkgs.cgi:884
 msgid "Set link"
 msgstr ""
 
-#: pkgs.cgi:644
-#: pkgs.cgi:765
+#: pkgs.cgi:758 pkgs.cgi:885
 msgid "Remove link"
 msgstr ""
 
-#: pkgs.cgi:650
-#: pkgs.cgi:846
+#: pkgs.cgi:764 pkgs.cgi:966 styles/default/header.sh:43
 msgid "Administration"
 msgstr "Administración"
 
-#: pkgs.cgi:652
+#: pkgs.cgi:766
 msgid "Tazpkg administration and settings"
 msgstr "Administración y configuración TazPkg"
 
-#: pkgs.cgi:656
+#: pkgs.cgi:770
 msgid "Save configuration"
 msgstr "Guardar configuración"
 
-#: pkgs.cgi:658
+#: pkgs.cgi:772
 msgid "List configuration files"
 msgstr ""
 
-#: pkgs.cgi:660
+#: pkgs.cgi:774
 msgid "Quick check"
 msgstr "Comprobación rápida"
 
-#: pkgs.cgi:662
+#: pkgs.cgi:776
 msgid "Full check"
 msgstr "Comprobación total"
 
-#: pkgs.cgi:667
+#: pkgs.cgi:781
 msgid "Creating the package..."
 msgstr "Creando el paquete..."
 
-#: pkgs.cgi:672
-msgid "Path : "
+#: pkgs.cgi:786
+#, fuzzy
+msgid "Path:"
 msgstr "Ruta :"
 
-#: pkgs.cgi:675
-#: boot.cgi:248
+#: pkgs.cgi:789 boot.cgi:256
 msgid "Configuration files"
 msgstr "Filas de configuración"
 
-#: pkgs.cgi:688
+#: pkgs.cgi:802
 msgid "Checking packages consistency..."
 msgstr "Comprobando consistencia de los paquetes..."
 
-#: pkgs.cgi:694
+#: pkgs.cgi:808
 msgid "Full packages check..."
 msgstr "Comprobación total de paquetes..."
 
-#: pkgs.cgi:701
+#: pkgs.cgi:815
 msgid "Packages cache"
 msgstr ""
 
-#: pkgs.cgi:705
-msgid "Packages in the cache:"
+#: pkgs.cgi:820
+#, fuzzy, sh-format
+msgid "Packages in the cache: $cache_files ($cache_size)"
 msgstr "Paquetes en el caché:"
 
-#: pkgs.cgi:712
+#: pkgs.cgi:827
+msgid "Default mirror"
+msgstr ""
+
+#: pkgs.cgi:831
 msgid "Current mirror list"
 msgstr ""
 
-#: pkgs.cgi:735
+#: pkgs.cgi:855
 msgid "Private repositories"
 msgstr "Repositorios privados"
 
-#: pkgs.cgi:754
+#: pkgs.cgi:868
+msgid "mirror"
+msgstr ""
+
+#: pkgs.cgi:874
 msgid "Link to another SliTaz installation"
 msgstr "Enlazar a otra instalación SliTaz"
 
-#: pkgs.cgi:756
-msgid "This link points to the root of another SliTaz installation. You will be able to install packages using soft links to it."
+#: pkgs.cgi:876
+msgid ""
+"This link points to the root of another SliTaz installation. You will be "
+"able to install packages using soft links to it."
 msgstr ""
 
-#: pkgs.cgi:773
+#: pkgs.cgi:892
 msgid "SliTaz packages DVD"
 msgstr "Paquetes DVD SliTaz"
 
-#: pkgs.cgi:785
+#: pkgs.cgi:894
+#, sh-format
+msgid ""
+"A bootable DVD image of all available packages for the $version version is "
+"generated every day. It also contains a copy of the website and can be used "
+"without an internet connection. This image can be installed on a DVD or an "
+"USB key."
+msgstr ""
+
+#: pkgs.cgi:904
 msgid "Download DVD image"
 msgstr "Descargar la imágen DVD"
 
-#: pkgs.cgi:787
+#: pkgs.cgi:906
 msgid "Install from DVD/USB key"
 msgstr "Instalar desde disco DVD/USB"
 
-#: pkgs.cgi:790
-msgid "Install from ISO image: "
+#: pkgs.cgi:909
+#, fuzzy
+msgid "Install from ISO image:"
 msgstr "Instalar desde la imágen ISO:"
 
-#: pkgs.cgi:842
-msgid "Recharge list"
-msgstr "Recargar lista"
-
-#: pkgs.cgi:852
+#: pkgs.cgi:972
 msgid "Latest log entries"
 msgstr ""
 
-#: live.cgi:88
+#: live.cgi:25
+msgid "TazPanel - Live"
+msgstr ""
+
+#: live.cgi:83
 msgid "TODO"
 msgstr "TODO"
 
-#: live.cgi:96
+#: live.cgi:88
+msgid "SliTaz LiveUSB"
+msgstr "USB vivo"
+
+#: live.cgi:89
+msgid "Create Live USB SliTaz systems"
+msgstr "Crear y manejar sistemas SliTaZ CD vivo o USB"
+
+#: live.cgi:92
+msgid ""
+"Generate SliTaz LiveUSB media and boot in RAM! Insert a LiveCD into the "
+"cdrom drive, select the correct device and press Generate."
+msgstr ""
+
+#: live.cgi:97
+msgid "USB Media to use:"
+msgstr ""
+
+#: live.cgi:106 installer.cgi:299 installer.cgi:343 installer.cgi:378
+#: installer.cgi:410
+msgid "Not found"
+msgstr "No encontrado"
+
+#: live.cgi:110
+msgid "Generate"
+msgstr "Generar"
+
+#: live.cgi:129
 msgid "SliTaz Live Systems"
 msgstr ""
 
-#: live.cgi:97
+#: live.cgi:130
 msgid "Create and manage Live CD or USB SliTaz systems"
 msgstr "Crear y manejar sistemas SliTaZ CD vivo o USB"
 
-#: live.cgi:101
-msgid "Live USB"
-msgstr "USB vivo"
+#: live.cgi:135
+#, fuzzy
+msgid "Create LiveUSB"
+msgstr "Crear usuario"
 
-#: live.cgi:103
-msgid ""
-"Generate SliTaz LiveUSB media and boot in RAM! Insert a\n"
-"\tLiveCD into the cdrom drive, select the correct device and press\n"
-"\tGenerate."
-msgstr ""
-
-#: live.cgi:108
-msgid "USB Media to use:"
-msgstr ""
-
-#: live.cgi:117
-msgid "Not found"
-msgstr "No encontrado"
-
-#: live.cgi:121
-msgid "Generate"
-msgstr "Generar"
-
-#: live.cgi:125
+#: live.cgi:140
 msgid "Write a Live CD"
 msgstr "Escriba un Cd Vivo"
 
-#: live.cgi:127
+#: live.cgi:142
 msgid ""
-"The command writeiso will generate an ISO image of the\n"
-"\tcurrent filesystem as is, including all files in the /home directory.\n"
-"\tIt is an easy way to remaster a SliTaz Live system, you just have\n"
-"\tto: boot, modify, writeiso."
+"The command writeiso will generate an ISO image of the current filesystem as "
+"is, including all files in the /home directory. It is an easy way to "
+"remaster a SliTaz Live system, you just have to: boot, modify, writeiso."
 msgstr ""
 
-#: live.cgi:133
+#: live.cgi:148
 msgid "Compression type:"
 msgstr "Tipo de compresión:"
 
-#: live.cgi:139
+#: live.cgi:154
 msgid "Write ISO"
 msgstr "Escribir ISO"
 
-#: live.cgi:142
+#: live.cgi:158
 msgid "Live CD tools"
 msgstr "Herramientas CD vivo"
 
-#: live.cgi:144
-#: live.cgi:169
+#: live.cgi:160 live.cgi:192 styles/default/header.sh:84
 msgid "Convert ISO to loram"
 msgstr "Convertir ISO a loram"
 
-#: live.cgi:146
+#: live.cgi:162
 msgid ""
-"This command will convert an ISO image of a SliTaz Live CD\n"
-"\tto a new ISO image requiring less RAM to run."
+"This command will convert an ISO image of a SliTaz Live CD to a new ISO "
+"image requiring less RAM to run."
 msgstr ""
 
-#: live.cgi:152
+#: live.cgi:168
 msgid "ISO to convert"
 msgstr "ISO para convertir"
 
-#: live.cgi:156
+#: live.cgi:173
 msgid "The filesystem is always in RAM"
 msgstr ""
 
-#: live.cgi:159
+#: live.cgi:178
 msgid "The filesystem may be on a small CDROM"
 msgstr ""
 
-#: live.cgi:162
+#: live.cgi:183
 msgid "The filesystem may be on a large CDROM"
 msgstr ""
 
-#: live.cgi:165
-#: live.cgi:208
+#: live.cgi:187 live.cgi:234
 msgid "ISO to create"
 msgstr "ISO para crear"
 
-#: live.cgi:173
-#: live.cgi:212
+#: live.cgi:196 live.cgi:239 styles/default/header.sh:85
 msgid "Build a meta ISO"
 msgstr ""
 
-#: live.cgi:175
+#: live.cgi:198
 msgid ""
-"Combines several ISO flavors like nested Russian dolls.\n"
-"\tThe amount of RAM available at startup will be used to select the\n"
-"\tutmost one."
+"Combines several ISO flavors like nested Russian dolls. The amount of RAM "
+"available at startup will be used to select the utmost one."
 msgstr ""
 
-#: live.cgi:188
+#: live.cgi:210
 msgid "ISO number"
 msgstr "Número ISO"
 
-#: live.cgi:190
-#: live.cgi:203
+#: live.cgi:213 live.cgi:228
 msgid "Minimum RAM"
 msgstr "RAM mínimo"
 
-#: live.cgi:201
+#: live.cgi:225
 msgid "ISO to add"
 msgstr "ISO para agregar"
 
-#: live.cgi:205
+#: live.cgi:230
 msgid "Add to the list"
 msgstr "Agregar a la lista"
 
+#: network.cgi:13
+msgid "TazPanel - Network"
+msgstr ""
+
 #: network.cgi:24
 msgid "Quality"
 msgstr "Calidad"
@@ -565,543 +839,1123 @@
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: network.cgi:26
-#: boot.cgi:86
-#: lib/libtazpanel:87
+#: network.cgi:26 boot.cgi:84 lib/libtazpanel:99
 msgid "Status"
 msgstr "Estado"
 
-#: network.cgi:52
+#: network.cgi:53
 msgid "Connected"
 msgstr "Conectado"
 
-#: network.cgi:82
-msgid "Changed hostname:"
-msgstr ""
+#: network.cgi:96
+#, fuzzy, sh-format
+msgid "Changed hostname: $get_hostname"
+msgstr "Cambiar nombre del "
 
-#: network.cgi:98
+#: network.cgi:112
 msgid "Scanning open ports..."
 msgstr ""
 
-#: network.cgi:101
-msgid "Port scanning for"
+#: network.cgi:115
+#, fuzzy, sh-format
+msgid "Port scanning for $scan"
 msgstr "Escaneo de puertos para"
 
-#: network.cgi:115
+#: network.cgi:129
 msgid "Setting up IP..."
 msgstr ""
 
-#: network.cgi:131
+#: network.cgi:145
 msgid "Ethernet connection"
 msgstr "Conexión Ethernet"
 
-#: network.cgi:133
+#: network.cgi:147
 msgid ""
-"Here you can configure a wired connection using DHCP to\n"
-"automatically get a random IP or configure a static/fixed IP"
+"Here you can configure a wired connection using DHCP to automatically get a "
+"random IP or configure a static/fixed IP"
 msgstr ""
 
-#: network.cgi:136
+#: network.cgi:150
 msgid "Configuration"
 msgstr "Configuración"
 
-#: network.cgi:143
+#: network.cgi:157 network.cgi:247
 msgid "Value"
 msgstr ""
 
-#: network.cgi:147
-#: lib/libtazpanel:85
+#: network.cgi:162 lib/libtazpanel:97
 msgid "Interface"
 msgstr "Interface"
 
-#: network.cgi:151
+#: network.cgi:166
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: network.cgi:155
+#: network.cgi:170
 msgid "Netmask"
 msgstr "Máscara de red"
 
-#: network.cgi:159
+#: network.cgi:174
 msgid "Gateway"
 msgstr ""
 
-#: network.cgi:163
+#: network.cgi:178
 msgid "DNS server"
 msgstr "Servidor DNS"
 
-#: network.cgi:167
+#: network.cgi:183
 msgid "Activate (static)"
 msgstr "Activado (estático)"
 
-#: network.cgi:168
+#: network.cgi:184
 msgid "Activate (DHCP)"
 msgstr "Activar (DHCP)"
 
-#: network.cgi:169
+#: network.cgi:185
 msgid "Disable"
 msgstr "Desactivado"
 
-#: network.cgi:172
-#: network.cgi:202
+#: network.cgi:188 network.cgi:266
 msgid "Configuration file"
 msgstr "Fila de configuración"
 
-#: network.cgi:174
+#: network.cgi:190
 msgid ""
-"These values are the ethernet settings in the main\n"
-"/etc/network.conf configuration file"
+"These values are the ethernet settings in the main /etc/network.conf "
+"configuration file"
 msgstr ""
 
-#: network.cgi:181
-#: network.cgi:211
+#: network.cgi:196 network.cgi:274
 msgid "Manual Edit"
 msgstr "Editar manualmente"
 
-#: network.cgi:187
+#: network.cgi:202
 msgid "Scanning wireless interface..."
 msgstr ""
 
-#: network.cgi:190
+#: network.cgi:206
 msgid "Wireless connection"
 msgstr ""
 
-#: network.cgi:193
-#: network.cgi:232
+#: network.cgi:209 network.cgi:293 boot.cgi:167
 msgid "Start"
 msgstr "Comenzar"
 
-#: network.cgi:195
-#: network.cgi:234
+#: network.cgi:211 network.cgi:295 boot.cgi:155
 msgid "Stop"
 msgstr "Parar"
 
-#: network.cgi:197
+#: network.cgi:213
 msgid "Scan"
 msgstr "Escanear"
 
-#: network.cgi:204
-msgid ""
-"These values are the wifi settings in the main\n"
-"/etc/network.conf configuration file"
+#: network.cgi:240
+msgid "Connection"
+msgstr "Conexión:"
+
+#: network.cgi:251
+msgid "Wifi name (ESSID)"
 msgstr ""
 
-#: network.cgi:213
-msgid "Output of"
+#: network.cgi:255
+msgid "Password (Wifi key)"
+msgstr ""
+
+#: network.cgi:259
+msgid "Encryption type"
+msgstr "Encriptación"
+
+#: network.cgi:263
+msgid "Configure"
+msgstr "Configuración"
+
+#: network.cgi:268
+msgid ""
+"These values are the wifi settings in the main /etc/network.conf "
+"configuration file"
+msgstr ""
+
+#: network.cgi:276
+#, fuzzy
+msgid "Output of iwconfig"
 msgstr "Salida de"
 
-#: network.cgi:224
+#: network.cgi:286
 msgid "Networking"
 msgstr ""
 
-#: network.cgi:226
+#: network.cgi:288
 msgid "Manage network connections and services"
 msgstr ""
 
-#: network.cgi:230
-msgid "Connection:"
-msgstr "Conexión:"
+#: network.cgi:297
+msgid "Restart"
+msgstr "Comenzar"
 
-#: network.cgi:237
+#: network.cgi:300
 msgid "Configuration:"
 msgstr "Configuración:"
 
-#: network.cgi:247
+#: network.cgi:309
 msgid "Hosts"
 msgstr "Hosts"
 
-#: network.cgi:252
+#: network.cgi:314
 msgid "Edit hosts"
 msgstr "Editar hosts"
 
-#: network.cgi:254
+#: network.cgi:316 installer.cgi:433
 msgid "Hostname"
 msgstr ""
 
-#: network.cgi:257
+#: network.cgi:320
 msgid "Change hostname"
 msgstr "Cambiar nombre del "
 
-#: network.cgi:262
-msgid "Output of "
+#: network.cgi:324
+#, fuzzy
+msgid "Output of ifconfig"
 msgstr "Salida de"
 
-#: network.cgi:268
+#: network.cgi:328
 msgid "Routing table"
 msgstr "Tabla de enrutamiento"
 
-#: network.cgi:274
+#: network.cgi:332
 msgid "Domain name resolution"
 msgstr ""
 
-#: network.cgi:280
+#: network.cgi:336
 msgid "ARP table"
 msgstr "Tabla ARP"
 
-#: network.cgi:286
+#: network.cgi:340
 msgid "IP Connections"
 msgstr "Conexiónes IP"
 
+#: boot.cgi:14
+msgid "TazPanel - Boot"
+msgstr ""
+
 #: boot.cgi:25
 msgid "Boot log files"
 msgstr ""
 
-#: boot.cgi:31
-#: boot.cgi:44
+#: boot.cgi:31 boot.cgi:42
 msgid "X server"
 msgstr "Servidor X"
 
-#: boot.cgi:61
-#: boot.cgi:244
+#: boot.cgi:46
+msgid "Show more..."
+msgstr ""
+
+#: boot.cgi:61 boot.cgi:252 styles/default/header.sh:67
 msgid "Manage daemons"
 msgstr "Manejar demonios"
 
-#: boot.cgi:63
+#: boot.cgi:62
 msgid "Check, start and stop daemons on SliTaz"
 msgstr "Comprueba, comienza y finaliza demonios en SliTaz"
 
-#: boot.cgi:87
+#: boot.cgi:85
 msgid "Action"
 msgstr "Acción"
 
-#: boot.cgi:88
+#: boot.cgi:86
 msgid "PID"
 msgstr ""
 
-#: boot.cgi:109
-msgid "<td>SliTaz Firewall with iptable rules</td>"
+#: boot.cgi:108
+msgid "SliTaz Firewall with iptable rules"
 msgstr ""
 
-#: boot.cgi:111
-msgid "<td>Small and fast web server with CGI support</td>"
-msgstr "<td>Pequeño y rápido servidor web con soporte CGI</td>"
+#: boot.cgi:110
+msgid "Small and fast web server with CGI support"
+msgstr "Pequeño y rápido servidor web con soporte CGI"
 
-#: boot.cgi:113
-msgid "<td>Network time protocol daemon</td>"
+#: boot.cgi:112
+msgid "Network time protocol daemon"
 msgstr ""
 
-#: boot.cgi:115
-msgid "<td>Anonymous FTP server</td>"
+#: boot.cgi:114
+msgid "Anonymous FTP server"
 msgstr ""
 
-#: boot.cgi:117
-msgid "<td>Busybox DHCP server</td>"
+#: boot.cgi:116
+msgid "Busybox DHCP server"
 msgstr ""
 
-#: boot.cgi:119
-msgid "<td>Linux Kernel log daemon</td>"
+#: boot.cgi:118
+msgid "Linux Kernel log daemon"
 msgstr ""
 
-#: boot.cgi:121
-msgid "<td>Execute scheduled commands</td>"
+#: boot.cgi:120
+msgid "Execute scheduled commands"
 msgstr ""
 
-#: boot.cgi:123
-msgid "<td>Small static DNS server daemon</td>"
+#: boot.cgi:122
+msgid "Small static DNS server daemon"
 msgstr ""
 
-#: boot.cgi:125
-msgid "<td>Transfer a file on tftp request</td>"
+#: boot.cgi:124
+msgid "Transfer a file on tftp request"
 msgstr ""
 
-#: boot.cgi:127
-msgid "<td>Listen for network connections and launch programs</td>"
+#: boot.cgi:126
+msgid "Listen for network connections and launch programs"
 msgstr ""
 
-#: boot.cgi:129
-msgid "<td>Manage a ZeroConf IPv4 link-local address</td>"
+#: boot.cgi:128
+msgid "Manage a ZeroConf IPv4 link-local address"
 msgstr ""
 
-#: boot.cgi:191
+#: boot.cgi:153
+#, fuzzy
+msgid "Started"
+msgstr "Comenzar"
+
+#: boot.cgi:165
+#, fuzzy
+msgid "Stopped"
+msgstr "Parar"
+
+#: boot.cgi:193
 msgid "GRUB Boot loader"
 msgstr "Gestor de inicio GRUB"
 
-#: boot.cgi:193
+#: boot.cgi:195
 msgid "The first application started when the computer powers on"
 msgstr ""
 
-#: boot.cgi:206
-#: settings.cgi:310
+#: boot.cgi:201
+msgid "Default entry:"
+msgstr ""
+
+#: boot.cgi:203
+msgid "Timeout:"
+msgstr ""
+
+#: boot.cgi:205
+msgid "Splash image:"
+msgstr ""
+
+#: boot.cgi:208 settings.cgi:289
 msgid "Change"
 msgstr "Cambiar"
 
-#: boot.cgi:211
+#: boot.cgi:210
+msgid "View or edit menu.lst"
+msgstr ""
+
+#: boot.cgi:213
 msgid "Boot entries"
 msgstr ""
 
-#: boot.cgi:217
+#: boot.cgi:219
 msgid "Entry"
 msgstr ""
 
-#: boot.cgi:225
-msgid "Web boot is avalaible with gPXE"
+#: boot.cgi:235
+msgid "Web boot is available with gPXE"
 msgstr "Boot web es disponible con gPXE"
 
-#: boot.cgi:235
+#: boot.cgi:245
 msgid "Boot &amp; Start services"
 msgstr ""
 
-#: boot.cgi:237
+#: boot.cgi:246
 msgid "Everything that happens before user login"
 msgstr ""
 
-#: boot.cgi:242
+#: boot.cgi:250 styles/default/header.sh:65
 msgid "Boot logs"
 msgstr "Logs del boot"
 
-#: boot.cgi:245
+#: boot.cgi:253 styles/default/header.sh:69
 msgid "Boot loader"
 msgstr "Cargador boot"
 
-#: boot.cgi:250
+#: boot.cgi:258
 msgid "Main configuration file:"
 msgstr ""
 
-#: boot.cgi:252
+#: boot.cgi:260
 msgid "Login manager settings:"
 msgstr ""
 
-#: boot.cgi:256
+#: boot.cgi:264
 msgid "Kernel cmdline"
 msgstr "Líneas de comando del núcleo"
 
-#: boot.cgi:260
+#: boot.cgi:268
 msgid "Local startup commands"
 msgstr ""
 
-#: boot.cgi:265
+#: boot.cgi:273
 msgid "Edit script"
 msgstr "Editar scripts"
 
-#: hardware.cgi:33
+#: hardware.cgi:13
+msgid "TazPanel - Hardware"
+msgstr ""
+
+#: hardware.cgi:29
+#, fuzzy
+msgid "Detect hardware"
+msgstr "Configurar el reloj hardware"
+
+#: hardware.cgi:30
+msgid "Detect PCI and USB hardware"
+msgstr ""
+
+#: hardware.cgi:42 hardware.cgi:117 styles/default/header.sh:75
 msgid "Kernel modules"
 msgstr "Módulos del núcleo"
 
-#: hardware.cgi:40
+#: hardware.cgi:46
+#, fuzzy
+msgid "Modules search"
+msgstr "Módulo"
+
+#: hardware.cgi:49
 msgid "Manage, search or get information about the Linux kernel modules"
 msgstr ""
 
-#: hardware.cgi:46
-msgid "Detailed information for module: "
+#: hardware.cgi:56
+#, sh-format
+msgid "Detailed information for module: $get_modinfo"
 msgstr ""
 
-#: hardware.cgi:62
-msgid "Matching result(s) for: "
+#: hardware.cgi:70
+#, sh-format
+msgid "Matching result(s) for: $get_search"
 msgstr ""
 
-#: hardware.cgi:75
+#: hardware.cgi:76
+#, fuzzy
+msgid "Module:"
+msgstr "Módulo"
+
+#: hardware.cgi:83
 msgid "Module"
 msgstr "Módulo"
 
-#: hardware.cgi:76
-#: lib/libtazpanel:180
+#: hardware.cgi:84 lib/libtazpanel:217
 msgid "Size"
 msgstr "Tamaño"
 
-#: hardware.cgi:77
-#: lib/libtazpanel:182
+#: hardware.cgi:85 lib/libtazpanel:219
 msgid "Used"
 msgstr "Usado"
 
-#: hardware.cgi:78
+#: hardware.cgi:86
 msgid "by"
 msgstr "por"
 
-#: hardware.cgi:101
+#: hardware.cgi:112
 msgid "Drivers &amp; Devices"
 msgstr ""
 
-#: hardware.cgi:102
+#: hardware.cgi:113
 msgid "Manage your computer hardware"
 msgstr "Maneja tu hardware"
 
-#: hardware.cgi:133
+#: hardware.cgi:119 styles/default/header.sh:77
+msgid "Detect PCI/USB"
+msgstr ""
+
+#: hardware.cgi:140
+msgid "Battery"
+msgstr ""
+
+#: hardware.cgi:142
+msgid "health"
+msgstr ""
+
+#: hardware.cgi:151
+#, sh-format
+msgid "Discharging $rempct% - $remtimef"
+msgstr ""
+
+#: hardware.cgi:155
+#, sh-format
+msgid "Charging $rempct% - $remtimef"
+msgstr ""
+
+#: hardware.cgi:157
+msgid "Charged 100%"
+msgstr ""
+
+#: hardware.cgi:165
+#, fuzzy
+msgid "Temperature:"
+msgstr "Generar"
+
+#: hardware.cgi:180
+msgid "Brightness"
+msgstr ""
+
+#: hardware.cgi:242
 msgid "System memory"
 msgstr "Memoria del sistema"
 
-#: settings.cgi:115
-#: settings.cgi:203
+#: settings.cgi:15
+msgid "TazPanel - Settings"
+msgstr ""
+
+#: settings.cgi:87 settings.cgi:183
 msgid "Manage users"
 msgstr "Manejar usuarios"
 
-#: settings.cgi:120
+#: settings.cgi:93
 msgid "Delete user"
 msgstr "Borrar usuario"
 
-#: settings.cgi:121
+#: settings.cgi:94
 msgid "Lock user"
 msgstr "Bloquear usuario"
 
-#: settings.cgi:122
+#: settings.cgi:95
 msgid "Unlock user"
 msgstr "Desbloquear usuario"
 
-#: settings.cgi:129
+#: settings.cgi:102
 msgid "Login"
 msgstr ""
 
-#: settings.cgi:130
+#: settings.cgi:103
 msgid "User ID"
 msgstr "ID del usuario"
 
-#: settings.cgi:132
+#: settings.cgi:105
 msgid "Home"
 msgstr "Home"
 
-#: settings.cgi:133
+#: settings.cgi:106
 msgid "Shell"
 msgstr "Shell"
 
-#: settings.cgi:165
+#: settings.cgi:143
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: settings.cgi:167
+#: settings.cgi:145
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: settings.cgi:171
+#: settings.cgi:149
 msgid "Add a new user"
 msgstr "Agregar un nuevo usuario"
 
-#: settings.cgi:174
+#: settings.cgi:154 installer.cgi:465
 msgid "User login:"
 msgstr ""
 
-#: settings.cgi:176
+#: settings.cgi:156
 msgid "User password:"
 msgstr ""
 
-#: settings.cgi:178
+#: settings.cgi:159
 msgid "Create user"
 msgstr "Crear usuario"
 
-#: settings.cgi:181
+#: settings.cgi:163
 msgid "Current user sessions"
 msgstr ""
 
-#: settings.cgi:186
+#: settings.cgi:167
 msgid "Last user sessions"
 msgstr "Últimas sesiones de usuarios"
 
-#: settings.cgi:198
+#: settings.cgi:178
 msgid "System settings"
 msgstr "Configuraciónes del sistema"
 
-#: settings.cgi:199
+#: settings.cgi:179
 msgid "Manage system time, users or language settings"
 msgstr ""
 
-#: settings.cgi:206
+#: settings.cgi:186
 msgid "System time"
 msgstr "Hora del sistema"
 
-#: settings.cgi:208
-msgid "Time zome      :"
+#: settings.cgi:189
+msgid "Time zome:"
 msgstr ""
 
-#: settings.cgi:209
-msgid "System time    :"
-msgstr "Hora del sistema   :"
+#: settings.cgi:190
+#, fuzzy
+msgid "System time:"
+msgstr "Hora del sistema"
 
-#: settings.cgi:210
-msgid "Hardware clock :"
+#: settings.cgi:191
+#, fuzzy
+msgid "Hardware clock:"
 msgstr "Reloj hardware :"
 
-#: settings.cgi:212
+#: settings.cgi:193
 msgid "Sync online"
 msgstr "Sincronizar en línea"
 
-#: settings.cgi:213
+#: settings.cgi:194
 msgid "Set hardware clock"
 msgstr "Configurar el reloj hardware"
 
-#: settings.cgi:220
+#: settings.cgi:200
 msgid "System language"
 msgstr "Lenguaje del sistema"
 
-#: settings.cgi:231
+#: settings.cgi:211
 #, sh-format
 msgid ""
-"You must logout and login again to your current\n"
-"\t\t\t\tsession to use $new_locale locale."
+"You must logout and login again to your current session to use $new_locale "
+"locale."
 msgstr ""
 
-#: settings.cgi:234
-msgid "Current system locales: "
+#: settings.cgi:214
+msgid "Current system locales:"
 msgstr ""
 
-#: settings.cgi:240
+#: settings.cgi:220
 msgid "Available locales:"
 msgstr ""
 
-#: settings.cgi:245
-#: settings.cgi:293
-#: settings.cgi:303
+#: settings.cgi:225 settings.cgi:271 settings.cgi:282
 msgid "Activate"
 msgstr "Activado"
 
-#: settings.cgi:249
+#: settings.cgi:228
 msgid "Console keymap"
 msgstr ""
 
-#: settings.cgi:261
-msgid "Current console keymap: "
+#: settings.cgi:241
+#, sh-format
+msgid "Current console keymap: $keymap"
 msgstr ""
 
-#: settings.cgi:280
+#: settings.cgi:258
 msgid "Suggested keymap for Xorg:"
 msgstr ""
 
-#: settings.cgi:289
+#: settings.cgi:267
 msgid "Available keymaps:"
 msgstr ""
 
-#: settings.cgi:296
+#: settings.cgi:274
 msgid "Panel configuration"
 msgstr "Configuración del panel"
 
-#: settings.cgi:299
+#: settings.cgi:278
 msgid "Style:"
 msgstr "Estilo:"
 
-#: settings.cgi:308
+#: settings.cgi:287
 msgid "Panel password:"
 msgstr "Contraseña del Panel:"
 
-#: settings.cgi:314
-msgid "Configuration files: "
+#: settings.cgi:293
+#, fuzzy
+msgid "Configuration files:"
 msgstr "Filas de configuración:"
 
-#: settings.cgi:316
+#: settings.cgi:295 styles/default/header.sh:24
 msgid "Panel"
 msgstr "Panel"
 
-#: settings.cgi:318
+#: settings.cgi:297
 msgid "Server"
 msgstr "Servidor"
 
-#: settings.cgi:321
+#: settings.cgi:300
 msgid "TazPanel provides a debuging mode and page:"
 msgstr ""
 
-#: lib/libtazpanel:88
+#: lib/libtazpanel:83
+#, fuzzy
+msgid "connected"
+msgstr "Conectado"
+
+#: lib/libtazpanel:100
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: lib/libtazpanel:89
+#: lib/libtazpanel:101
 msgid "Scan ports"
 msgstr "Escanear puertos"
 
-#: lib/libtazpanel:179
+#: lib/libtazpanel:214
 msgid "Disk"
 msgstr "Disco"
 
-#: lib/libtazpanel:181
+#: lib/libtazpanel:215
+msgid "Label"
+msgstr ""
+
+#: lib/libtazpanel:216
+msgid "Type"
+msgstr ""
+
+#: lib/libtazpanel:218
 msgid "Available"
 msgstr "Disponible"
 
-#: lib/libtazpanel:183
+#: lib/libtazpanel:220
 msgid "Mount point"
 msgstr "Punto de montaje"
 
+#: installer.cgi:24
+msgid "TazPanel - Installer"
+msgstr ""
+
+#: installer.cgi:116
+#, sh-format
+msgid "Creating setup file $INSTFILE."
+msgstr ""
+
+#: installer.cgi:120 installer.cgi:127
+msgid "Setup File Error"
+msgstr ""
+
+#: installer.cgi:121
+#, sh-format
+msgid "The setup file <strong>$INSTFILE</strong> doesn't exist."
+msgstr ""
+
+#: installer.cgi:142
+#, fuzzy
+msgid "SliTaz Installer"
+msgstr "Instalar"
+
+#: installer.cgi:144
+msgid ""
+"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."
+msgstr ""
+
+#: installer.cgi:157
+msgid ""
+"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."
+msgstr ""
+
+#: installer.cgi:162
+msgid ""
+"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"
+msgstr ""
+
+#: installer.cgi:166 installer.cgi:244 styles/default/header.sh:90
+#, fuzzy
+msgid "Install SliTaz"
+msgstr "Instalar"
+
+#: installer.cgi:175
+msgid "Upgrade"
+msgstr ""
+
+#: installer.cgi:177
+msgid ""
+"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."
+msgstr ""
+
+#: installer.cgi:182 installer.cgi:257
+msgid "Upgrade SliTaz"
+msgstr ""
+
+#: installer.cgi:190
+msgid "Partitioning"
+msgstr ""
+
+#: installer.cgi:193
+msgid ""
+"On most used systems, the hard drive is already dedicated to partitions for "
+"Windows<sup>&trade;</sup>, 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."
+msgstr ""
+
+#: installer.cgi:199
+msgid ""
+"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."
+msgstr ""
+
+#: installer.cgi:204
+msgid ""
+"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."
+msgstr ""
+
+#: installer.cgi:212
+msgid ""
+"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."
+msgstr ""
+
+#: installer.cgi:216
+msgid ""
+"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 and so on."
+msgstr ""
+
+#: installer.cgi:223
+msgid "Execute Gparted"
+msgstr ""
+
+#: installer.cgi:225
+#, fuzzy
+msgid "Continue installation"
+msgstr "Enlazar a otra instalación SliTaz"
+
+#: installer.cgi:227
+msgid ""
+"Once you've made room for SliTaz on your drive, you should be able to "
+"continue installation."
+msgstr ""
+
+#: installer.cgi:232 installer.cgi:502 installer.cgi:513
+msgid "Back to Installer Start Page"
+msgstr ""
+
+#: installer.cgi:234
+#, fuzzy
+msgid "Continue Installation"
+msgstr "Enlazar a otra instalación SliTaz"
+
+#: installer.cgi:246
+msgid ""
+"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."
+msgstr ""
+
+#: installer.cgi:259
+msgid ""
+"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 have an active internet connection."
+msgstr ""
+
+#: installer.cgi:273
+msgid "Slitaz source media"
+msgstr ""
+
+#: installer.cgi:277
+#, fuzzy
+msgid "LiveCD"
+msgstr "Herramientas CD vivo"
+
+#: installer.cgi:280
+#, fuzzy
+msgid "LiveUSB:"
+msgstr "USB vivo"
+
+#: installer.cgi:306
+msgid "ISO file:"
+msgstr ""
+
+#: installer.cgi:307
+msgid "Full path to the ISO image file"
+msgstr ""
+
+#: installer.cgi:310
+msgid "Web:"
+msgstr ""
+
+#: installer.cgi:311
+#, fuzzy
+msgid "Stable"
+msgstr "Tabla ARP"
+
+#: installer.cgi:312
+msgid "Cooking"
+msgstr ""
+
+#: installer.cgi:314
+msgid "URL:"
+msgstr ""
+
+#: installer.cgi:315
+#, fuzzy
+msgid "Full url to an ISO image file"
+msgstr "Instalar desde la imágen ISO:"
+
+#: installer.cgi:324
+msgid "Hard Disk Drive"
+msgstr ""
+
+#: installer.cgi:333
+#, fuzzy
+msgid "Install Slitaz to partition:"
+msgstr "Instalar"
+
+#: installer.cgi:338 installer.cgi:373 installer.cgi:405
+msgid "None"
+msgstr ""
+
+#: installer.cgi:349 installer.cgi:416
+msgid "Format partition as:"
+msgstr ""
+
+#: installer.cgi:368
+msgid "Existing SliTaz partition to upgrade:"
+msgstr ""
+
+#: installer.cgi:389
+#, fuzzy
+msgid "Options"
+msgstr "Acción"
+
+#: installer.cgi:397
+msgid "home partition"
+msgstr ""
+
+#: installer.cgi:400
+msgid "Use a separate partition for /home:"
+msgstr ""
+
+#: installer.cgi:435
+msgid "Set Hostname to:"
+msgstr ""
+
+#: installer.cgi:436
+msgid "Name of your system"
+msgstr ""
+
+#: installer.cgi:446
+msgid "Root"
+msgstr ""
+
+#: installer.cgi:448
+#, fuzzy
+msgid "Root passwd:"
+msgstr "Nueva contraseña:"
+
+#: installer.cgi:449 installer.cgi:452
+#, fuzzy
+msgid "Password of root"
+msgstr "Contraseña:"
+
+#: installer.cgi:451 installer.cgi:473
+#, fuzzy
+msgid "Confirm password:"
+msgstr "Contraseña del Panel:"
+
+#: installer.cgi:463
+#, fuzzy
+msgid "User"
+msgstr "ID del usuario"
+
+#: installer.cgi:466
+msgid "Name of the first user"
+msgstr ""
+
+#: installer.cgi:470
+#, fuzzy
+msgid "User passwd:"
+msgstr "Nueva contraseña:"
+
+#: installer.cgi:471 installer.cgi:474
+msgid "Password of the first user"
+msgstr ""
+
+#: installer.cgi:484
+msgid "Grub"
+msgstr ""
+
+#: installer.cgi:487
+msgid ""
+"Install Grub bootloader. Usually you should answer yes, unless you want to "
+"install grub by hand yourself."
+msgstr ""
+
+#: installer.cgi:490
+msgid "Enable Windows Dual-Boot."
+msgstr ""
+
+#: installer.cgi:499
+msgid "Back to partitioning"
+msgstr ""
+
+#: installer.cgi:506
+#, fuzzy
+msgid "Proceed to SliTaz installation"
+msgstr "Enlazar a otra instalación SliTaz"
+
+#: installer.cgi:508
+msgid "Installation complete. You can now restart (reboot)"
+msgstr ""
+
+#: installer.cgi:510
+msgid "Installation failed. See log"
+msgstr ""
+
+#: installer.cgi:530
+msgid "A web page that points a browser to a different page after 2 seconds"
+msgstr ""
+
+#: installer.cgi:536
+msgid ""
+"If your browser doesn't automatically redirect within a few seconds, you may "
+"want to go there manually"
+msgstr ""
+
+#: installer.cgi:551 installer.cgi:566
+msgid "Tazinst Error"
+msgstr ""
+
+#: installer.cgi:552
+msgid ""
+"<strong>tazinst</strong>, the lightweight SliTaz HDD installer is missing. "
+"Any installation can not be done without tazinst."
+msgstr ""
+
+#: installer.cgi:555
+msgid "Check tazinst' permissions, or reinstall the slitaz-tools package:"
+msgstr ""
+
+#: installer.cgi:581
+msgid "Proceeding: ()"
+msgstr ""
+
+#: installer.cgi:582
+msgid "Please wait until processing is complete"
+msgstr ""
+
+#: installer.cgi:588
+msgid "Completed."
+msgstr ""
+
+#: installer.cgi:622
+msgid "Hostname error"
+msgstr ""
+
+#: installer.cgi:626
+#, fuzzy
+msgid "Root password error"
+msgstr "Nueva contraseña:"
+
+#: installer.cgi:630
+msgid "User login error"
+msgstr ""
+
+#: installer.cgi:634
+#, fuzzy
+msgid "User password error"
+msgstr "Nueva contraseña:"
+
+#: installer.cgi:637 installer.cgi:648
+msgid "Do you really want to continue?"
+msgstr ""
+
+#: help.cgi:20
+#, fuzzy
+msgid "Manual"
+msgstr "Editar manualmente"
+
+#: help.cgi:28
+msgid "TazPanel - Help &amp; Doc"
+msgstr ""
+
+#: styles/default/header.sh:29
+msgid "Processes"
+msgstr ""
+
+#: styles/default/header.sh:31
+#, fuzzy
+msgid "Create Report"
+msgstr "Crear un reporte"
+
+#: styles/default/header.sh:34
+#, fuzzy
+msgid "Packages"
+msgstr "Paquete"
+
+#: styles/default/header.sh:41
+#, fuzzy
+msgid "Check updates"
+msgstr "Comprobar actualizaciónes"
+
+#: styles/default/header.sh:49
+msgid "Ethernet"
+msgstr ""
+
+#: styles/default/header.sh:51
+msgid "Wireless"
+msgstr ""
+
+#: styles/default/header.sh:53
+#, fuzzy
+msgid "Config file"
+msgstr "Fila de configuración"
+
+#: styles/default/header.sh:56
+#, fuzzy
+msgid "Settings"
+msgstr "Configuraciónes del sistema"
+
+#: styles/default/header.sh:59
+#, fuzzy
+msgid "Users"
+msgstr "ID del usuario"
+
+#: styles/default/header.sh:62
+#, fuzzy
+msgid "Boot"
+msgstr "Logs del boot"
+
+#: styles/default/header.sh:72
+#, fuzzy
+msgid "Hardware"
+msgstr "Reloj hardware :"
+
+#: styles/default/header.sh:80
+#, fuzzy
+msgid "Live"
+msgstr "USB vivo"
+
+#: styles/default/header.sh:82
+msgid "Create a live USB key"
+msgstr ""
+
+#: styles/default/header.sh:83
+#, fuzzy
+msgid "Create a live CD-ROM"
+msgstr "Escriba un Cd Vivo"
+
+#: styles/default/header.sh:91
+msgid "Upgrade system"
+msgstr ""
+
+#: styles/default/footer.sh:6
+msgid "Copyright"
+msgstr ""
+
+#: styles/default/footer.sh:8
+msgid "BSD License"
+msgstr ""
+
+#~ msgid "List:"
+#~ msgstr "Lista:"
+
+#~ msgid "System time    :"
+#~ msgstr "Hora del sistema   :"
+
+#~ msgid "Output of"
+#~ msgstr "Salida de"
diff -r 5312e3716b01 -r fdfc6b494539 po/fr.po
--- a/po/fr.po	Fri May 04 12:57:53 2012 +0300
+++ b/po/fr.po	Fri May 04 13:00:43 2012 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: TazPanel 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-02 10:12+0200\n"
+"POT-Creation-Date: 2012-05-04 02:44+0000\n"
 "PO-Revision-Date: 2012-03-12 21:18+0100\n"
 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n"
 "Language-Team: French\n"
@@ -18,6 +18,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: tazpanel:35
+#, fuzzy, sh-format
+msgid "Starting TazPanel web server on port $HTTPD_PORT..."
+msgstr "Arrêt du server web TazPanel..."
+
 #: tazpanel:37
 msgid "TazPanel Authentication - Default: root:root"
 msgstr "TazPanel Authentification - Defaut: root:root"
@@ -38,353 +43,635 @@
 msgid "Password changed successfully"
 msgstr "Mot de passe changé avec succès"
 
-#: tazpanel:53
-msgid "Usage:"
-msgstr "Utilisation:"
+#: tazpanel:54
+#, sh-format
+msgid "Usage: $program_name [start|stop|passwd]"
+msgstr ""
 
-#: index.cgi:36 index.cgi:74
+#: index.cgi:38 index.cgi:83
 msgid "Differences"
 msgstr "Différences"
 
 #: index.cgi:72
+msgid "TazPanel - File"
+msgstr ""
+
+#: index.cgi:81
 msgid "Save"
 msgstr "Enregistrer"
 
-#: index.cgi:94 settings.cgi:256
+#: index.cgi:103 settings.cgi:261
 msgid "Edit"
 msgstr "Éditer"
 
-#: index.cgi:113 index.cgi:313
-msgid "Terminal"
-msgstr "Terminal"
+#: index.cgi:126
+msgid "TazPanel - Terminal"
+msgstr ""
 
-#: index.cgi:126
+#: index.cgi:139
 msgid "Small terminal emulator, commands options are supported."
 msgstr ""
 "Petit émulateur de terminal, les options des commandes sont supportées."
 
-#: index.cgi:128 index.cgi:145
-msgid "Commands:"
-msgstr "Commandes:"
+#: index.cgi:141 index.cgi:158
+#, sh-format
+msgid "Commands: $commands"
+msgstr "Commandes: $commands"
 
-#: index.cgi:132
-msgid "Downloading to:"
-msgstr "Téléchargement dans:"
+#: index.cgi:146
+#, sh-format
+msgid "Downloading to: $dl"
+msgstr "Téléchargement dans: $dl"
 
-#: index.cgi:149 index.cgi:315
+#: index.cgi:153
+#, sh-format
+msgid "$cmd needs an argument"
+msgstr ""
+
+#: index.cgi:157
+#, sh-format
+msgid "Unknown command: $cmd"
+msgstr ""
+
+#: index.cgi:162
+msgid "TazPanel - Process activity"
+msgstr "TazPanel - Activité des processus"
+
+#: index.cgi:164
+msgid "Refresh:"
+msgstr "Rafraîchir"
+
+#: index.cgi:169
+msgid "1s"
+msgstr ""
+
+#: index.cgi:170
+msgid "5s"
+msgstr ""
+
+#: index.cgi:171
+msgid "10s"
+msgstr ""
+
+#: index.cgi:172 live.cgi:152
+msgid "none"
+msgstr ""
+
+#: index.cgi:188
+msgid "TazPanel - Debug"
+msgstr ""
+
+#: index.cgi:191
+msgid "HTTP Environment"
+msgstr ""
+
+#: index.cgi:198
+msgid "TazPanel - System report"
+msgstr "TazPanel - Rapport système"
+
+#: index.cgi:203
+#, sh-format
+msgid "Reporting to: $output"
+msgstr "Création du rapport vers: $output"
+
+#: index.cgi:206
+msgid "Creating report header..."
+msgstr "Création de l'en-tête du rapport..."
+
+#: index.cgi:213 index.cgi:230
+msgid "SliTaz system report"
+msgstr "Rapport système"
+
+#: index.cgi:227
+msgid "Creating system summary..."
+msgstr "Création du résumé du système..."
+
+#: index.cgi:231
+msgid "Date:"
+msgstr ""
+
+#: index.cgi:242
+msgid "Getting hardware info..."
+msgstr "Obtention de l'information sur le matériel..."
+
+#: index.cgi:260
+msgid "Getting networking info..."
+msgstr "Obtention de l'information réseau..."
+
+#: index.cgi:274
+msgid "Getting filesystems info..."
+msgstr "Obtention de l'information des systèmes de fichiers..."
+
+#: index.cgi:294
+msgid "Getting boot logs..."
+msgstr "Obtention des journaux de démarrage..."
+
+#: index.cgi:297 boot.cgi:29 boot.cgi:34
+msgid "Kernel messages"
+msgstr "Messages du noyau"
+
+#: index.cgi:300 boot.cgi:30 boot.cgi:38
+msgid "Boot scripts"
+msgstr "Scripts de démarrage"
+
+#: index.cgi:305
+msgid "Creating report footer..."
+msgstr "Création du pied de page du rapport..."
+
+#: index.cgi:317
+msgid "View report"
+msgstr "Voir le rapport"
+
+#: index.cgi:318
+msgid "This report can be attached with a bug report on:"
+msgstr "Ce rapport peut être attaché avec un rapport de bogue sur:"
+
+#: index.cgi:332
+#, sh-format
+msgid "Host: $hostname"
+msgstr "Nom d'hôte: $hostname"
+
+#: index.cgi:333
+msgid "SliTaz administration and configuration Panel"
+msgstr "Panneau de Configuration et d'Administration de SliTaz"
+
+#: index.cgi:337 styles/default/header.sh:27
+msgid "Terminal"
+msgstr "Terminal"
+
+#: index.cgi:339
 msgid "Process activity"
 msgstr "Activité des processus"
 
-#: index.cgi:151
-msgid "Refresh: "
-msgstr "Rafraîchir"
-
-#: index.cgi:176
-msgid "System report"
-msgstr "Rapport système"
-
-#: index.cgi:180
-msgid "Reporting to:"
-msgstr "Création du rapport vers:"
-
-#: index.cgi:182
-msgid "Creating report header...  "
-msgstr "Création de l'en-tête du rapport..."
-
-#: index.cgi:199
-msgid "Creating system summary... "
-msgstr "Création du résumé du système..."
-
-#: index.cgi:212
-msgid "Getting hardware info...   "
-msgstr "Obtention de l'information sur le matériel..."
-
-#: index.cgi:236
-msgid "Getting networking info... "
-msgstr "Obtention de l'information réseau..."
-
-#: index.cgi:252
-msgid "Getting filesystems info..."
-msgstr "Obtention de l'information des systèmes de fichiers..."
-
-#: index.cgi:276
-msgid "Getting boot logs...       "
-msgstr "Obtention des journaux de démarrage..."
-
-#: index.cgi:278 boot.cgi:29 boot.cgi:34
-msgid "Kernel messages"
-msgstr "Messages du noyau"
-
-#: index.cgi:282 boot.cgi:30 boot.cgi:39
-msgid "Boot scripts"
-msgstr "Scripts de démarrage"
-
-#: index.cgi:288
-msgid "Creating report footer...  "
-msgstr "Création du pied de page du rapport..."
-
-#: index.cgi:296
-msgid "View report"
-msgstr "Voir le rapport"
-
-#: index.cgi:297
-msgid "This report can be attached with a bug report on: "
-msgstr "Ce rapport peut être attaché avec un rapport de bogue sur:"
-
-#: index.cgi:308
-msgid "Host:"
-msgstr "Hôte:"
-
-#: index.cgi:309
-msgid "SliTaz administration and configuration Panel"
-msgstr "Panneau de Configuration et d'Administration de SliTaz"
-
-#: index.cgi:317
+#: index.cgi:341
 msgid "Create a report"
 msgstr "Créer un rapport"
 
-#: index.cgi:320 pkgs.cgi:855
+#: index.cgi:344 pkgs.cgi:948
 msgid "Summary"
 msgstr "Résumé"
 
-#: index.cgi:323
-msgid "Uptime       :"
+#: index.cgi:347
+msgid "Uptime:"
 msgstr "Fonctionne depuis:"
 
-#: index.cgi:324
-msgid "Memory in Mb :"
+#: index.cgi:350
+msgid "Memory in Mb:"
 msgstr "Mémoires en Mb :"
 
-#: index.cgi:326
-msgid "Linux kernel :"
+#: index.cgi:355
+#, sh-format
+msgid "Total: $memtotal, Used: $memused, Free: $memfree"
+msgstr ""
+
+#: index.cgi:360
+msgid "Linux kernel:"
 msgstr "Noyau Linux:"
 
-#: index.cgi:331
+#: index.cgi:367
 msgid "Network status"
 msgstr "État du réseau"
 
-#: index.cgi:334 hardware.cgi:193
+#: index.cgi:370 hardware.cgi:202
 msgid "Filesystem usage statistics"
 msgstr "Statistiques d'utilisation du système de fichiers"
 
-#: index.cgi:355
+#: index.cgi:403
 msgid "Panel Activity"
 msgstr "Activité du panneau"
 
-#: pkgs.cgi:50
-msgid "Last recharge        : "
+#: pkgs.cgi:17
+msgid "TazPanel - Packages"
+msgstr ""
+
+#: pkgs.cgi:51
+#, fuzzy
+msgid "Last recharge:"
 msgstr "Dernière recharge :"
 
+#: pkgs.cgi:58
+msgid "(Older than 10 days)"
+msgstr ""
+
 #: pkgs.cgi:60
-msgid "Installed packages   : "
+msgid "(Not older than 10 days)"
+msgstr ""
+
+#: pkgs.cgi:64
+#, fuzzy
+msgid "Installed packages:"
 msgstr "Paquets installés      : "
 
-#: pkgs.cgi:62
-msgid "Mirrored packages    : "
+#: pkgs.cgi:66
+#, fuzzy
+msgid "Mirrored packages:"
 msgstr "Paquets du miroir      :"
 
-#: pkgs.cgi:64
-msgid "Upgradeable packages : "
+#: pkgs.cgi:68
+#, fuzzy
+msgid "Upgradeable packages:"
 msgstr "Mises à jour disponibles :"
 
-#: pkgs.cgi:68
-msgid "Blocked packages     : "
+#: pkgs.cgi:70 pkgs.cgi:707
+msgid "Installed files:"
+msgstr "Fichiers installés:"
+
+#: pkgs.cgi:72
+#, fuzzy
+msgid "Blocked packages:"
 msgstr "Paquets bloqués       : "
 
-#: pkgs.cgi:113
+#: pkgs.cgi:86
+#, fuzzy
+msgid "Delete"
+msgstr "Supprimer l'utilisateur"
+
+#: pkgs.cgi:89
+msgid "Use as default"
+msgstr ""
+
+#: pkgs.cgi:120
 msgid "Search"
 msgstr "Rechercher"
 
-#: pkgs.cgi:115
+#: pkgs.cgi:122
 msgid "Files"
 msgstr "Fichiers"
 
-#: pkgs.cgi:126 network.cgi:23 network.cgi:151 network.cgi:240 boot.cgi:84
-#: settings.cgi:104 lib/libtazpanel:87
+#: pkgs.cgi:134 pkgs.cgi:867 network.cgi:23 network.cgi:156 network.cgi:246
+#: boot.cgi:82 settings.cgi:104 lib/libtazpanel:98
 msgid "Name"
 msgstr "Nom"
 
-#: pkgs.cgi:127
+#: pkgs.cgi:135
 msgid "Version"
 msgstr "Version"
 
-#: pkgs.cgi:128 boot.cgi:85
+#: pkgs.cgi:136 boot.cgi:83
 msgid "Description"
 msgstr "Description"
 
-#: pkgs.cgi:129 installer.cgi:313
+#: pkgs.cgi:137
 msgid "Web"
 msgstr "Internet"
 
-#: pkgs.cgi:212 pkgs.cgi:321 pkgs.cgi:362 pkgs.cgi:416 pkgs.cgi:454
-#: pkgs.cgi:503 pkgs.cgi:575 pkgs.cgi:858
+#: pkgs.cgi:147
+msgid "Categories"
+msgstr ""
+
+#: pkgs.cgi:148
+#, fuzzy
+msgid "Base-system"
+msgstr "Système de fichier"
+
+#: pkgs.cgi:149
+msgid "X window"
+msgstr ""
+
+#: pkgs.cgi:150
+msgid "Utilities"
+msgstr ""
+
+#: pkgs.cgi:151 styles/default/header.sh:46
+#, fuzzy
+msgid "Network"
+msgstr "Gestion de réseau"
+
+#: pkgs.cgi:152
+msgid "Games"
+msgstr ""
+
+#: pkgs.cgi:153
+msgid "Graphics"
+msgstr ""
+
+#: pkgs.cgi:154
+msgid "Office"
+msgstr ""
+
+#: pkgs.cgi:155
+msgid "Multimedia"
+msgstr ""
+
+#: pkgs.cgi:156
+msgid "Development"
+msgstr ""
+
+#: pkgs.cgi:157
+#, fuzzy
+msgid "System tools"
+msgstr "Heure système"
+
+#: pkgs.cgi:158
+msgid "Security"
+msgstr ""
+
+#: pkgs.cgi:159
+msgid "Misc"
+msgstr ""
+
+#: pkgs.cgi:160
+msgid "Meta"
+msgstr ""
+
+#: pkgs.cgi:161
+msgid "Non free"
+msgstr ""
+
+#: pkgs.cgi:162
+msgid "All"
+msgstr ""
+
+#: pkgs.cgi:168
+#, fuzzy
+msgid "Repositories"
+msgstr "Dépôts privés"
+
+#: pkgs.cgi:169
+msgid "Public"
+msgstr ""
+
+#: pkgs.cgi:177
+msgid "Any"
+msgstr ""
+
+#: pkgs.cgi:217 pkgs.cgi:339
+#, fuzzy
+msgid "Listing packages..."
+msgstr "Obtention de l'information sur le paquet..."
+
+#: pkgs.cgi:220 pkgs.cgi:358 pkgs.cgi:412 pkgs.cgi:479 pkgs.cgi:520
+#: pkgs.cgi:580 pkgs.cgi:659 pkgs.cgi:952 styles/default/header.sh:37
 msgid "My packages"
 msgstr "Mes paquets"
 
-#: pkgs.cgi:216 pkgs.cgi:262 pkgs.cgi:311 pkgs.cgi:352 pkgs.cgi:445
+#: pkgs.cgi:225 pkgs.cgi:284 pkgs.cgi:347 pkgs.cgi:401 pkgs.cgi:511
 #: settings.cgi:92
 msgid "Selection:"
 msgstr "Sélection:"
 
-#: pkgs.cgi:220 pkgs.cgi:266 pkgs.cgi:317 pkgs.cgi:358 pkgs.cgi:451
-msgid "List:"
-msgstr "Liste:"
+#: pkgs.cgi:226 pkgs.cgi:607
+msgid "Remove"
+msgstr "Supprimer"
 
-#: pkgs.cgi:258 pkgs.cgi:864
+#: pkgs.cgi:230 pkgs.cgi:289 pkgs.cgi:354 pkgs.cgi:408 pkgs.cgi:518
+#: pkgs.cgi:962 styles/default/header.sh:39
+msgid "Recharge list"
+msgstr "Recharger la liste"
+
+#: pkgs.cgi:232 pkgs.cgi:291 pkgs.cgi:356 pkgs.cgi:410 pkgs.cgi:477
+#: pkgs.cgi:964
+msgid "Check upgrades"
+msgstr "Mettre à jour"
+
+#: pkgs.cgi:275
+#, fuzzy
+msgid "Listing linkable packages..."
+msgstr "Obtention de l'information sur le paquet..."
+
+#: pkgs.cgi:278 pkgs.cgi:958
 msgid "Linkable packages"
 msgstr "Paquets liables"
 
-#: pkgs.cgi:307
-msgid "Category:"
-msgstr "Catégorie:"
+#: pkgs.cgi:285
+msgid "Link"
+msgstr ""
 
-#: pkgs.cgi:348
+#: pkgs.cgi:342
+#, sh-format
+msgid "Category: $category"
+msgstr "Catégorie: $category"
+
+#: pkgs.cgi:366 pkgs.cgi:838
+#, sh-format
+msgid "Repository: $Repo_Name"
+msgstr ""
+
+#: pkgs.cgi:394
+#, fuzzy
+msgid "Searching packages..."
+msgstr "Recherche de paquets"
+
+#: pkgs.cgi:397
 msgid "Search packages"
 msgstr "Recherche de paquets"
 
-#: pkgs.cgi:355 pkgs.cgi:448
+#: pkgs.cgi:404 pkgs.cgi:514
 msgid "Toogle all"
 msgstr "Tout séléctionner"
 
-#: pkgs.cgi:371 pkgs.cgi:545
+#: pkgs.cgi:423
 msgid "Package"
 msgstr "Paquet"
 
-#: pkgs.cgi:372
+#: pkgs.cgi:424
 msgid "File"
 msgstr "Fichier"
 
-#: pkgs.cgi:403
+#: pkgs.cgi:465
+#, fuzzy
+msgid "Recharging lists..."
+msgstr "Recharger la liste"
+
+#: pkgs.cgi:468
 msgid "Recharge"
 msgstr "Recharger"
 
-#: pkgs.cgi:408
+#: pkgs.cgi:473
 msgid "Recharge checks for new or updated packages"
 msgstr "Recharge vérifie les nouveaux paquets ou mise à jour"
 
-#: pkgs.cgi:414 pkgs.cgi:870
-msgid "Check upgrades"
-msgstr "Mettre à jour"
-
-#: pkgs.cgi:422
+#: pkgs.cgi:485
 msgid "Recharging packages list"
 msgstr "Recharge des listes de paquets"
 
-#: pkgs.cgi:427
+#: pkgs.cgi:490
 msgid "Packages lists are up-to-date. You should check for upgrades now."
 msgstr ""
 "Les listes de paquets ont été actualisées. Vous devriez rechercher des mises "
 "à jour maintenant."
 
-#: pkgs.cgi:441
+#: pkgs.cgi:503
+#, fuzzy
+msgid "Checking for upgrades..."
+msgstr "Mettre à jour"
+
+#: pkgs.cgi:506
 msgid "Up packages"
 msgstr "Mettre à jour"
 
-#: pkgs.cgi:497
+#: pkgs.cgi:575
 msgid "Performing tasks on packages"
 msgstr "Opérations sur les paquets"
 
-#: pkgs.cgi:527
-msgid "Remove"
-msgstr "Supprimer"
+#: pkgs.cgi:585
+#, sh-format
+msgid "Executing $cmd for: $pkgs"
+msgstr ""
 
-#: pkgs.cgi:530
+#: pkgs.cgi:610
 msgid "Getting package info..."
 msgstr "Obtention de l'information sur le paquet..."
 
-#: pkgs.cgi:541 pkgs.cgi:550 installer.cgi:155
+#: pkgs.cgi:622 installer.cgi:155 styles/default/header.sh:88
 msgid "Install"
 msgstr "Installer"
 
-#: pkgs.cgi:560
+#: pkgs.cgi:626
+#, fuzzy, sh-format
+msgid "Package $PACKAGE"
+msgstr "Paquet"
+
+#: pkgs.cgi:634
+msgid "Install (Non Free)"
+msgstr ""
+
+#: pkgs.cgi:642
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: pkgs.cgi:562
+#: pkgs.cgi:646
 msgid "Block"
 msgstr "Bloquer"
 
-#: pkgs.cgi:609 pkgs.cgi:621
-msgid "Installed files:"
+#: pkgs.cgi:650
+msgid "Repack"
+msgstr ""
+
+#: pkgs.cgi:665
+#, fuzzy
+msgid "Name:"
+msgstr "Nom"
+
+#: pkgs.cgi:666
+#, fuzzy
+msgid "Version:"
+msgstr "Version"
+
+#: pkgs.cgi:667
+#, fuzzy
+msgid "Description:"
+msgstr "Description"
+
+#: pkgs.cgi:668
+#, fuzzy
+msgid "Category:"
+msgstr "Catégorie: $category"
+
+#: pkgs.cgi:672
+msgid "Maintainer:"
+msgstr ""
+
+#: pkgs.cgi:673 pkgs.cgi:702
+msgid "Website:"
+msgstr ""
+
+#: pkgs.cgi:674 pkgs.cgi:703
+#, fuzzy
+msgid "Sizes:"
+msgstr "Taille"
+
+#: pkgs.cgi:677
+msgid "Depends:"
+msgstr ""
+
+#: pkgs.cgi:684
+msgid "Suggested:"
+msgstr ""
+
+#: pkgs.cgi:690
+msgid "Tags:"
+msgstr ""
+
+#: pkgs.cgi:696
+#, fuzzy, sh-format
+msgid "Installed files: $I_FILES"
 msgstr "Fichiers installés:"
 
-#: pkgs.cgi:666 pkgs.cgi:790
+#: pkgs.cgi:755 pkgs.cgi:884
 msgid "Set link"
 msgstr "Créer un lien"
 
-#: pkgs.cgi:669 pkgs.cgi:791
+#: pkgs.cgi:758 pkgs.cgi:885
 msgid "Remove link"
 msgstr "Supprimer le lien"
 
-#: pkgs.cgi:675 pkgs.cgi:872
+#: pkgs.cgi:764 pkgs.cgi:966 styles/default/header.sh:43
 msgid "Administration"
 msgstr "Administration"
 
-#: pkgs.cgi:677
+#: pkgs.cgi:766
 msgid "Tazpkg administration and settings"
 msgstr "Administration et réglages de Tazpkg"
 
-#: pkgs.cgi:681
+#: pkgs.cgi:770
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: pkgs.cgi:683
+#: pkgs.cgi:772
 msgid "List configuration files"
 msgstr "Lister les fichiers de configuration"
 
-#: pkgs.cgi:685
+#: pkgs.cgi:774
 msgid "Quick check"
 msgstr "Contrôle rapide"
 
-#: pkgs.cgi:687
+#: pkgs.cgi:776
 msgid "Full check"
 msgstr "Vérifier tout"
 
-#: pkgs.cgi:692
+#: pkgs.cgi:781
 msgid "Creating the package..."
 msgstr "Création du paquet..."
 
-#: pkgs.cgi:697
-msgid "Path : "
+#: pkgs.cgi:786
+#, fuzzy
+msgid "Path:"
 msgstr "Chemin:"
 
-#: pkgs.cgi:700 boot.cgi:248
+#: pkgs.cgi:789 boot.cgi:256
 msgid "Configuration files"
 msgstr "Fichiers de configuration"
 
-#: pkgs.cgi:713
+#: pkgs.cgi:802
 msgid "Checking packages consistency..."
 msgstr "Vérification de la cohérence des paquets..."
 
-#: pkgs.cgi:719
+#: pkgs.cgi:808
 msgid "Full packages check..."
 msgstr "Vérifier tous les paquets..."
 
-#: pkgs.cgi:726
+#: pkgs.cgi:815
 msgid "Packages cache"
 msgstr "Cache des paquets"
 
-#: pkgs.cgi:730
-msgid "Packages in the cache:"
+#: pkgs.cgi:820
+#, fuzzy, sh-format
+msgid "Packages in the cache: $cache_files ($cache_size)"
 msgstr "Paquets dans le cache:"
 
-#: pkgs.cgi:736
+#: pkgs.cgi:827
 msgid "Default mirror"
 msgstr "Miroir par défaut"
 
-#: pkgs.cgi:738
+#: pkgs.cgi:831
 msgid "Current mirror list"
 msgstr "Liste des miroirs actuels"
 
-#: pkgs.cgi:761
+#: pkgs.cgi:855
 msgid "Private repositories"
 msgstr "Dépôts privés"
 
-#: pkgs.cgi:780
+#: pkgs.cgi:868
+#, fuzzy
+msgid "mirror"
+msgstr "Miroir par défaut"
+
+#: pkgs.cgi:874
 msgid "Link to another SliTaz installation"
 msgstr "Lien vers une autre installation de SliTaz"
 
-#: pkgs.cgi:782
+#: pkgs.cgi:876
 msgid ""
 "This link points to the root of another SliTaz installation. You will be "
 "able to install packages using soft links to it."
@@ -393,163 +680,185 @@
 "en mesure d'installer des paquets en utilisant des liens symboliques vers "
 "elle."
 
-#: pkgs.cgi:799
+#: pkgs.cgi:892
 msgid "SliTaz packages DVD"
 msgstr "DVD des paquets SliTaz"
 
-#: pkgs.cgi:811
+#: pkgs.cgi:894
+#, sh-format
+msgid ""
+"A bootable DVD image of all available packages for the $version version is "
+"generated every day. It also contains a copy of the website and can be used "
+"without an internet connection. This image can be installed on a DVD or an "
+"USB key."
+msgstr ""
+
+#: pkgs.cgi:904
 msgid "Download DVD image"
 msgstr "Télécharger l'image DVD"
 
-#: pkgs.cgi:813
+#: pkgs.cgi:906
 msgid "Install from DVD/USB key"
 msgstr "Installer à partir de DVD / clé USB"
 
-#: pkgs.cgi:816
-msgid "Install from ISO image: "
+#: pkgs.cgi:909
+#, fuzzy
+msgid "Install from ISO image:"
 msgstr "Installer à partir d'une image ISO:"
 
-#: pkgs.cgi:868
-msgid "Recharge list"
-msgstr "Recharger la liste"
-
-#: pkgs.cgi:878
+#: pkgs.cgi:972
 msgid "Latest log entries"
 msgstr "Dernières entrées de journal"
 
-#: live.cgi:88
+#: live.cgi:25
+msgid "TazPanel - Live"
+msgstr ""
+
+#: live.cgi:83
 msgid "TODO"
 msgstr "À Faire"
 
-#: live.cgi:96
+#: live.cgi:88
+msgid "SliTaz LiveUSB"
+msgstr "Systèmes Live SliTaz"
+
+#: live.cgi:89
+msgid "Create Live USB SliTaz systems"
+msgstr "Créer et gérer des systèmes SliTaz Live CD ou USB"
+
+#: live.cgi:92
+#, fuzzy
+msgid ""
+"Generate SliTaz LiveUSB media and boot in RAM! Insert a LiveCD into the "
+"cdrom drive, select the correct device and press Generate."
+msgstr ""
+"Générez un média SliTaz LiveUSB et démarrez en mémoire vive! Insérez un\n"
+"LiveCD dans le lecteur de cdrom, sélectionnez le bon périphérique et appuyez "
+"sur\n"
+"Generer."
+
+#: live.cgi:97
+msgid "USB Media to use:"
+msgstr "Média USB à utiliser:"
+
+#: live.cgi:106 installer.cgi:299 installer.cgi:343 installer.cgi:378
+#: installer.cgi:410
+msgid "Not found"
+msgstr "Non trouvé"
+
+#: live.cgi:110
+msgid "Generate"
+msgstr "Générer"
+
+#: live.cgi:129
 msgid "SliTaz Live Systems"
 msgstr "Systèmes Live SliTaz"
 
-#: live.cgi:97
+#: live.cgi:130
 msgid "Create and manage Live CD or USB SliTaz systems"
 msgstr "Créer et gérer des systèmes SliTaz Live CD ou USB"
 
-#: live.cgi:101
-msgid "Live USB"
-msgstr "Live USB"
+#: live.cgi:135
+msgid "Create LiveUSB"
+msgstr "LiveUSB"
 
-#: live.cgi:103
-msgid ""
-"Generate SliTaz LiveUSB media and boot in RAM! Insert a\n"
-"\tLiveCD into the cdrom drive, select the correct device and press\n"
-"\tGenerate."
-msgstr ""
-"Générez un média SliTaz LiveUSB et démarrez en mémoire vive! Insérez un\n"
-"\tLiveCD dans le lecteur de cdrom, sélectionnez le bon périphérique et "
-"appuyez sur\n"
-"\tGenerer."
-
-#: live.cgi:108
-msgid "USB Media to use:"
-msgstr "Média USB à utiliser:"
-
-#: live.cgi:117 installer.cgi:302 installer.cgi:346 installer.cgi:381
-#: installer.cgi:414
-msgid "Not found"
-msgstr "Non trouvé"
-
-#: live.cgi:121
-msgid "Generate"
-msgstr "Générer"
-
-#: live.cgi:125
+#: live.cgi:140
 msgid "Write a Live CD"
 msgstr "Écrire un LiveCD"
 
-#: live.cgi:127
+#: live.cgi:142
+#, fuzzy
 msgid ""
-"The command writeiso will generate an ISO image of the\n"
-"\tcurrent filesystem as is, including all files in the /home directory.\n"
-"\tIt is an easy way to remaster a SliTaz Live system, you just have\n"
-"\tto: boot, modify, writeiso."
+"The command writeiso will generate an ISO image of the current filesystem as "
+"is, including all files in the /home directory. It is an easy way to "
+"remaster a SliTaz Live system, you just have to: boot, modify, writeiso."
 msgstr ""
 "La commande writeiso va générer une image ISO du\n"
-"\tsystème de fichiers courant, y compris tous les fichiers du répertoire /"
+"système de fichiers courant, y compris tous les fichiers du répertoire /"
 "home.\n"
-"\tC'est un moyen facile de remasteriser un système SliTaz Live, vous avez "
+"C'est un moyen facile de remasteriser un système SliTaz Live, vous avez "
 "juste\n"
-"\tà: démarrer, modifier, writeiso."
+"à: démarrer, modifier, writeiso."
 
-#: live.cgi:133
+#: live.cgi:148
 msgid "Compression type:"
 msgstr "Type de compression:"
 
-#: live.cgi:139
+#: live.cgi:154
 msgid "Write ISO"
 msgstr "Écrire une ISO"
 
-#: live.cgi:142
+#: live.cgi:158
 msgid "Live CD tools"
 msgstr "Outils pour Live CD"
 
-#: live.cgi:144 live.cgi:169
+#: live.cgi:160 live.cgi:192 styles/default/header.sh:84
 msgid "Convert ISO to loram"
 msgstr "Convertir une ISO en loram"
 
-#: live.cgi:146
+#: live.cgi:162
+#, fuzzy
 msgid ""
-"This command will convert an ISO image of a SliTaz Live CD\n"
-"\tto a new ISO image requiring less RAM to run."
+"This command will convert an ISO image of a SliTaz Live CD to a new ISO "
+"image requiring less RAM to run."
 msgstr ""
 "Cette commande permet de convertir une image ISO d'un Live CD SliTaz\n"
-"\ten une nouvelle image ISO nécessitant moins de RAM pour fonctionner."
+"en une nouvelle image ISO nécessitant moins de RAM pour fonctionner."
 
-#: live.cgi:152
+#: live.cgi:168
 msgid "ISO to convert"
 msgstr "ISO à convertir"
 
-#: live.cgi:156
+#: live.cgi:173
 msgid "The filesystem is always in RAM"
 msgstr "Le système de fichiers est toujours en RAM"
 
-#: live.cgi:159
+#: live.cgi:178
 msgid "The filesystem may be on a small CDROM"
 msgstr "Le système de fichiers peut être sur un petit CDROM"
 
-#: live.cgi:162
+#: live.cgi:183
 msgid "The filesystem may be on a large CDROM"
-msgstr "<Le système de fichiers peut être sur un grand CDROM"
+msgstr "Le système de fichiers peut être sur un grand CDROM"
 
-#: live.cgi:165 live.cgi:208
+#: live.cgi:187 live.cgi:234
 msgid "ISO to create"
 msgstr "ISO à créer"
 
-#: live.cgi:173 live.cgi:212
+#: live.cgi:196 live.cgi:239 styles/default/header.sh:85
 msgid "Build a meta ISO"
 msgstr "Construire une méta ISO"
 
-#: live.cgi:175
+#: live.cgi:198
+#, fuzzy
 msgid ""
-"Combines several ISO flavors like nested Russian dolls.\n"
-"\tThe amount of RAM available at startup will be used to select the\n"
-"\tutmost one."
+"Combines several ISO flavors like nested Russian dolls. The amount of RAM "
+"available at startup will be used to select the utmost one."
 msgstr ""
 "Combine plusieurs saveurs ISO comme des poupées russes emboîtées.\n"
-"\tLa taille de RAM disponible au démarrage sera utilisé pour sélectionner "
-"la\n"
-"\tplus adaptée."
+"La taille de RAM disponible au démarrage sera utilisé pour sélectionner la\n"
+"plus adaptée."
 
-#: live.cgi:188
+#: live.cgi:210
 msgid "ISO number"
 msgstr "Numéro d'ISO"
 
-#: live.cgi:190 live.cgi:203
+#: live.cgi:213 live.cgi:228
 msgid "Minimum RAM"
 msgstr "RAM minimum"
 
-#: live.cgi:201
+#: live.cgi:225
 msgid "ISO to add"
 msgstr "ISO à ajouter"
 
-#: live.cgi:205
+#: live.cgi:230
 msgid "Add to the list"
 msgstr "Ajouter à la liste"
 
+#: network.cgi:13
+msgid "TazPanel - Network"
+msgstr ""
+
 #: network.cgi:24
 msgid "Quality"
 msgstr "Qualité"
@@ -558,394 +867,482 @@
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: network.cgi:26 boot.cgi:86 lib/libtazpanel:88
+#: network.cgi:26 boot.cgi:84 lib/libtazpanel:99
 msgid "Status"
 msgstr "État"
 
-#: network.cgi:52
+#: network.cgi:53
 msgid "Connected"
 msgstr "Connecté"
 
-#: network.cgi:91
-msgid "Changed hostname:"
+#: network.cgi:96
+#, fuzzy, sh-format
+msgid "Changed hostname: $get_hostname"
 msgstr "Changer le nom de l'hôte"
 
-#: network.cgi:107
+#: network.cgi:112
 msgid "Scanning open ports..."
 msgstr "Balayer les ports ouverts"
 
-#: network.cgi:110
-msgid "Port scanning for"
+#: network.cgi:115
+#, fuzzy, sh-format
+msgid "Port scanning for $scan"
 msgstr "Balayage des ports pour"
 
-#: network.cgi:124
+#: network.cgi:129
 msgid "Setting up IP..."
 msgstr "Configurer l'IP..."
 
-#: network.cgi:140
+#: network.cgi:145
 msgid "Ethernet connection"
 msgstr "Connexion réseau"
 
-#: network.cgi:142
+#: network.cgi:147
+#, fuzzy
 msgid ""
-"Here you can configure a wired connection using DHCP to\n"
-"automatically get a random IP or configure a static/fixed IP"
+"Here you can configure a wired connection using DHCP to automatically get a "
+"random IP or configure a static/fixed IP"
 msgstr ""
 "Ici vous pouvez configurer une connexion filaire en utilisant le protocole "
 "DHCP pour\n"
 "obtenir automatiquement une adresse IP aléatoire ou configurer une adresse "
 "IP statique / fixe"
 
-#: network.cgi:145
+#: network.cgi:150
 msgid "Configuration"
 msgstr "Configuration"
 
-#: network.cgi:152 network.cgi:241
+#: network.cgi:157 network.cgi:247
 msgid "Value"
 msgstr "Valeur"
 
-#: network.cgi:156 lib/libtazpanel:86
+#: network.cgi:162 lib/libtazpanel:97
 msgid "Interface"
 msgstr "Interface"
 
-#: network.cgi:160
+#: network.cgi:166
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: network.cgi:164
+#: network.cgi:170
 msgid "Netmask"
 msgstr "Masque de sous-réseau"
 
-#: network.cgi:168
+#: network.cgi:174
 msgid "Gateway"
 msgstr "Passerelle"
 
-#: network.cgi:172
+#: network.cgi:178
 msgid "DNS server"
 msgstr "Serveur DNS"
 
-#: network.cgi:176
+#: network.cgi:183
 msgid "Activate (static)"
 msgstr "Activer (statique)"
 
-#: network.cgi:177
+#: network.cgi:184
 msgid "Activate (DHCP)"
 msgstr "Activer (Dynamique)"
 
-#: network.cgi:178
+#: network.cgi:185
 msgid "Disable"
 msgstr "Désactiver"
 
-#: network.cgi:181 network.cgi:260
+#: network.cgi:188 network.cgi:266
 msgid "Configuration file"
 msgstr "Fichier de configuration"
 
-#: network.cgi:183
+#: network.cgi:190
+#, fuzzy
 msgid ""
-"These values are the ethernet settings in the main\n"
-"/etc/network.conf configuration file"
+"These values are the ethernet settings in the main /etc/network.conf "
+"configuration file"
 msgstr ""
 "Ces valeurs sont celles des paramètres Ethernet dans le fichier\n"
 "de configuration principal /etc/network.conf"
 
-#: network.cgi:190 network.cgi:269
+#: network.cgi:196 network.cgi:274
 msgid "Manual Edit"
 msgstr "Édition manuelle"
 
-#: network.cgi:196
+#: network.cgi:202
 msgid "Scanning wireless interface..."
 msgstr "Scan des interfaces wireless..."
 
-#: network.cgi:200
+#: network.cgi:206
 msgid "Wireless connection"
 msgstr "Connection sans fil"
 
-#: network.cgi:203 network.cgi:290
+#: network.cgi:209 network.cgi:293 boot.cgi:167
 msgid "Start"
 msgstr "Démarrer"
 
-#: network.cgi:205 network.cgi:292
+#: network.cgi:211 network.cgi:295 boot.cgi:155
 msgid "Stop"
 msgstr "Arrêter"
 
-#: network.cgi:207
+#: network.cgi:213
 msgid "Scan"
 msgstr "Scanner"
 
-#: network.cgi:234
+#: network.cgi:240
 msgid "Connection"
 msgstr "Connexion"
 
-#: network.cgi:245
+#: network.cgi:251
 msgid "Wifi name (ESSID)"
 msgstr "Nom du réseau (EESID)"
 
-#: network.cgi:249
+#: network.cgi:255
 msgid "Password (Wifi key)"
 msgstr "Mot de passe (Clé Wifi)"
 
-#: network.cgi:253
+#: network.cgi:259
 msgid "Encryption type"
 msgstr "Type de chiffrement"
 
-#: network.cgi:257
+#: network.cgi:263
 msgid "Configure"
 msgstr "Configurer"
 
-#: network.cgi:262
+#: network.cgi:268
+#, fuzzy
 msgid ""
-"These values are the wifi settings in the main\n"
-"/etc/network.conf configuration file"
+"These values are the wifi settings in the main /etc/network.conf "
+"configuration file"
 msgstr ""
 "Ces valeurs sont celles des paramètres wifi dans le fichier\n"
 "de configuration principal /etc/network.conf"
 
-#: network.cgi:271
-msgid "Output of"
-msgstr "Résultat de"
+#: network.cgi:276
+#, fuzzy
+msgid "Output of iwconfig"
+msgstr "Sortie de "
 
-#: network.cgi:282
+#: network.cgi:286
 msgid "Networking"
 msgstr "Gestion de réseau"
 
-#: network.cgi:284
+#: network.cgi:288
 msgid "Manage network connections and services"
 msgstr "Gérer les connexions réseau et les services"
 
-#: network.cgi:288
-msgid "Connection:"
-msgstr "Connexion:"
-
-#: network.cgi:294
+#: network.cgi:297
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: network.cgi:297
+#: network.cgi:300
 msgid "Configuration:"
 msgstr "Configuration:"
 
-#: network.cgi:307
+#: network.cgi:309
 msgid "Hosts"
 msgstr "Hôtes"
 
-#: network.cgi:312
+#: network.cgi:314
 msgid "Edit hosts"
 msgstr "Editer les hôtes"
 
-#: network.cgi:314 installer.cgi:438
+#: network.cgi:316 installer.cgi:433
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
-#: network.cgi:317
+#: network.cgi:320
 msgid "Change hostname"
 msgstr "Changer le nom d'hôte"
 
-#: network.cgi:322
-msgid "Output of "
+#: network.cgi:324
+#, fuzzy
+msgid "Output of ifconfig"
 msgstr "Sortie de "
 
 #: network.cgi:328
 msgid "Routing table"
 msgstr "Table de routage"
 
-#: network.cgi:334
+#: network.cgi:332
 msgid "Domain name resolution"
 msgstr "Résolution de noms de domaines"
 
-#: network.cgi:340
+#: network.cgi:336
 msgid "ARP table"
 msgstr "Table ARP"
 
-#: network.cgi:346
+#: network.cgi:340
 msgid "IP Connections"
 msgstr "Connexions IP"
 
+#: boot.cgi:14
+msgid "TazPanel - Boot"
+msgstr ""
+
 #: boot.cgi:25
 msgid "Boot log files"
 msgstr "Journaux du démarrage"
 
-#: boot.cgi:31 boot.cgi:44
+#: boot.cgi:31 boot.cgi:42
 msgid "X server"
 msgstr "Serveur x"
 
-#: boot.cgi:61 boot.cgi:244
+#: boot.cgi:46
+msgid "Show more..."
+msgstr ""
+
+#: boot.cgi:61 boot.cgi:252 styles/default/header.sh:67
 msgid "Manage daemons"
 msgstr "Gérer les démons"
 
-#: boot.cgi:63
+#: boot.cgi:62
 msgid "Check, start and stop daemons on SliTaz"
 msgstr "Vérifier, démarrer et arrêter les démons sur SliTaz"
 
-#: boot.cgi:87
+#: boot.cgi:85
 msgid "Action"
 msgstr "Action"
 
-#: boot.cgi:88
+#: boot.cgi:86
 msgid "PID"
 msgstr "PID"
 
-#: boot.cgi:109
-msgid "<td>SliTaz Firewall with iptable rules</td>"
-msgstr "<td>Pare-feu SliTaz avec les règles iptables</td>"
+#: boot.cgi:108
+msgid "SliTaz Firewall with iptable rules"
+msgstr "Pare-feu SliTaz avec les règles iptables"
 
-#: boot.cgi:111
-msgid "<td>Small and fast web server with CGI support</td>"
-msgstr "<td>Serveur web léger et rapide avec support de CGI</td>"
+#: boot.cgi:110
+msgid "Small and fast web server with CGI support"
+msgstr "Serveur web léger et rapide avec support de CGI"
 
-#: boot.cgi:113
-msgid "<td>Network time protocol daemon</td>"
-msgstr "<td>Démon Network Time Protocol</td>"
+#: boot.cgi:112
+msgid "Network time protocol daemon"
+msgstr "Démon Network Time Protocol"
 
-#: boot.cgi:115
-msgid "<td>Anonymous FTP server</td>"
-msgstr "<td>Serveur anonyme FTP</td>"
+#: boot.cgi:114
+msgid "Anonymous FTP server"
+msgstr "Serveur anonyme FTP"
 
-#: boot.cgi:117
-msgid "<td>Busybox DHCP server</td>"
-msgstr "<td>Serveur DHCP Busybox</td>"
+#: boot.cgi:116
+msgid "Busybox DHCP server"
+msgstr "Serveur DHCP Busybox"
 
-#: boot.cgi:119
-msgid "<td>Linux Kernel log daemon</td>"
-msgstr "<td>Démon Linux Kernel log</td>"
+#: boot.cgi:118
+msgid "Linux Kernel log daemon"
+msgstr "Démon Linux Kernel log"
 
-#: boot.cgi:121
-msgid "<td>Execute scheduled commands</td>"
-msgstr "<td>Exécuter des commandes planifiées</td>"
+#: boot.cgi:120
+msgid "Execute scheduled commands"
+msgstr "Exécuter des commandes planifiées"
 
-#: boot.cgi:123
-msgid "<td>Small static DNS server daemon</td>"
-msgstr "<td>Démon du petit serveur DNS statique<</td>"
+#: boot.cgi:122
+msgid "Small static DNS server daemon"
+msgstr "Démon du petit serveur DNS statique"
 
-#: boot.cgi:125
-msgid "<td>Transfer a file on tftp request</td>"
-msgstr "<td>Transférer un fichier sur requête TFTP</td>"
+#: boot.cgi:124
+msgid "Transfer a file on tftp request"
+msgstr "Transférer un fichier sur requête TFTP"
 
-#: boot.cgi:127
-msgid "<td>Listen for network connections and launch programs</td>"
-msgstr "<td>Écoute des connexions réseau et lancement de programmes</td>"
+#: boot.cgi:126
+msgid "Listen for network connections and launch programs"
+msgstr "Écoute des connexions réseau et lancement de programmes"
 
-#: boot.cgi:129
-msgid "<td>Manage a ZeroConf IPv4 link-local address</td>"
-msgstr "<td>Gestion d'une adresse ZeroConf IPv4 link-local</td>"
+#: boot.cgi:128
+msgid "Manage a ZeroConf IPv4 link-local address"
+msgstr "Gestion d'une adresse ZeroConf IPv4 link-local"
 
-#: boot.cgi:191
+#: boot.cgi:153
+#, fuzzy
+msgid "Started"
+msgstr "Démarrer"
+
+#: boot.cgi:165
+#, fuzzy
+msgid "Stopped"
+msgstr "Arrêter"
+
+#: boot.cgi:193
 msgid "GRUB Boot loader"
 msgstr "Gestionnaire de démarrage GRUB"
 
-#: boot.cgi:193
+#: boot.cgi:195
 msgid "The first application started when the computer powers on"
 msgstr "La première application démarrée au lancement du système."
 
-#: boot.cgi:206 settings.cgi:283
+#: boot.cgi:201
+#, fuzzy
+msgid "Default entry:"
+msgstr "Miroir par défaut"
+
+#: boot.cgi:203
+msgid "Timeout:"
+msgstr ""
+
+#: boot.cgi:205
+msgid "Splash image:"
+msgstr ""
+
+#: boot.cgi:208 settings.cgi:289
 msgid "Change"
 msgstr "Changer"
 
-#: boot.cgi:211
+#: boot.cgi:210
+msgid "View or edit menu.lst"
+msgstr ""
+
+#: boot.cgi:213
 msgid "Boot entries"
 msgstr "Entrées de Grub"
 
-#: boot.cgi:217
+#: boot.cgi:219
 msgid "Entry"
 msgstr "Entrée"
 
-#: boot.cgi:225
+#: boot.cgi:235
 msgid "Web boot is available with gPXE"
 msgstr "Le démarrage réseau est disponible avec gPXE"
 
-#: boot.cgi:235
+#: boot.cgi:245
 msgid "Boot &amp; Start services"
 msgstr "Démarrage &amp; lancement des services"
 
-#: boot.cgi:237
+#: boot.cgi:246
 msgid "Everything that happens before user login"
 msgstr "Tout ce qui se produit avant le login de l'utilisateur"
 
-#: boot.cgi:242
+#: boot.cgi:250 styles/default/header.sh:65
 msgid "Boot logs"
 msgstr "Journaux de démarrage"
 
-#: boot.cgi:245
+#: boot.cgi:253 styles/default/header.sh:69
 msgid "Boot loader"
 msgstr "Chargeur d'amorçage "
 
-#: boot.cgi:250
+#: boot.cgi:258
 msgid "Main configuration file:"
 msgstr "Fichier de configuration principal:"
 
-#: boot.cgi:252
+#: boot.cgi:260
 msgid "Login manager settings:"
 msgstr "Réglages du gestionnaire de session:"
 
-#: boot.cgi:256
+#: boot.cgi:264
 msgid "Kernel cmdline"
 msgstr "Ligne de commande passée au noyau"
 
-#: boot.cgi:260
+#: boot.cgi:268
 msgid "Local startup commands"
 msgstr "Commandes locales exécutées au démarrage"
 
-#: boot.cgi:265
+#: boot.cgi:273
 msgid "Edit script"
 msgstr "Éditer le script"
 
-#: hardware.cgi:28
+#: hardware.cgi:13
+msgid "TazPanel - Hardware"
+msgstr ""
+
+#: hardware.cgi:29
 msgid "Detect hardware"
 msgstr "Detecter le matériel"
 
-#: hardware.cgi:29
+#: hardware.cgi:30
 msgid "Detect PCI and USB hardware"
 msgstr "Détecter le matériel PCI/USB"
 
-#: hardware.cgi:42
+#: hardware.cgi:42 hardware.cgi:117 styles/default/header.sh:75
 msgid "Kernel modules"
 msgstr "Modules du noyau"
 
+#: hardware.cgi:46
+#, fuzzy
+msgid "Modules search"
+msgstr "Module"
+
 #: hardware.cgi:49
 msgid "Manage, search or get information about the Linux kernel modules"
 msgstr ""
 "Gérer, rechercher ou obtenir des informations sur les modules du noyau Linux"
 
-#: hardware.cgi:55
-msgid "Detailed information for module: "
-msgstr "Les informations détaillées pour le module :"
+#: hardware.cgi:56
+#, sh-format
+msgid "Detailed information for module: $get_modinfo"
+msgstr "Les informations détaillées pour le module : $get_modinfo"
 
-#: hardware.cgi:71
-msgid "Matching result(s) for: "
-msgstr "Résultats correspondants pour : "
+#: hardware.cgi:70
+#, sh-format
+msgid "Matching result(s) for: $get_search"
+msgstr "Résultats correspondants pour : $get_search"
 
-#: hardware.cgi:84
+#: hardware.cgi:76
+#, fuzzy
+msgid "Module:"
+msgstr "Module"
+
+#: hardware.cgi:83
 msgid "Module"
 msgstr "Module"
 
-#: hardware.cgi:85 lib/libtazpanel:206
+#: hardware.cgi:84 lib/libtazpanel:217
 msgid "Size"
 msgstr "Taille"
 
-#: hardware.cgi:86 lib/libtazpanel:208
+#: hardware.cgi:85 lib/libtazpanel:219
 msgid "Used"
 msgstr "Utilisé"
 
-#: hardware.cgi:87
+#: hardware.cgi:86
 msgid "by"
 msgstr "par"
 
-#: hardware.cgi:113
+#: hardware.cgi:112
 msgid "Drivers &amp; Devices"
 msgstr "Pilotes &amp; périphériques"
 
-#: hardware.cgi:114
+#: hardware.cgi:113
 msgid "Manage your computer hardware"
 msgstr "Gérer le matériel de l'ordinateur"
 
-#: hardware.cgi:171
+#: hardware.cgi:119 styles/default/header.sh:77
+msgid "Detect PCI/USB"
+msgstr "Détecter le matériel PCI/USB"
+
+#: hardware.cgi:140
+msgid "Battery"
+msgstr ""
+
+#: hardware.cgi:142
+msgid "health"
+msgstr ""
+
+#: hardware.cgi:151
+#, sh-format
+msgid "Discharging $rempct% - $remtimef"
+msgstr ""
+
+#: hardware.cgi:155
+#, sh-format
+msgid "Charging $rempct% - $remtimef"
+msgstr ""
+
+#: hardware.cgi:157
+msgid "Charged 100%"
+msgstr ""
+
+#: hardware.cgi:165
+msgid "Temperature:"
+msgstr "Générer"
+
+#: hardware.cgi:180
 msgid "Brightness"
 msgstr "Luminosité d'écran"
 
-#: hardware.cgi:217
+#: hardware.cgi:242
 msgid "System memory"
 msgstr "Mémoire système"
 
-#: settings.cgi:88 settings.cgi:176
+#: settings.cgi:15
+msgid "TazPanel - Settings"
+msgstr ""
+
+#: settings.cgi:87 settings.cgi:183
 msgid "Manage users"
 msgstr "Gérer les utilisateurs"
 
@@ -977,173 +1374,204 @@
 msgid "Shell"
 msgstr "Shell"
 
-#: settings.cgi:138
+#: settings.cgi:143
 msgid "Password:"
 msgstr "Mot de passe:"
 
-#: settings.cgi:140
+#: settings.cgi:145
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: settings.cgi:144
+#: settings.cgi:149
 msgid "Add a new user"
 msgstr "Ajouter un utilisateur"
 
-#: settings.cgi:147 installer.cgi:467
+#: settings.cgi:154 installer.cgi:465
 msgid "User login:"
 msgstr "Nom de login:"
 
-#: settings.cgi:149
+#: settings.cgi:156
 msgid "User password:"
 msgstr "Mot de passe:"
 
-#: settings.cgi:151
+#: settings.cgi:159
 msgid "Create user"
 msgstr "Créer un utilisateur"
 
-#: settings.cgi:154
+#: settings.cgi:163
 msgid "Current user sessions"
 msgstr "Sessions utilisateur courantes"
 
-#: settings.cgi:159
+#: settings.cgi:167
 msgid "Last user sessions"
 msgstr "Dernières sessions utilisateur"
 
-#: settings.cgi:171
+#: settings.cgi:178
 msgid "System settings"
 msgstr "Réglages système"
 
-#: settings.cgi:172
+#: settings.cgi:179
 msgid "Manage system time, users or language settings"
 msgstr "Gérer l'horloge, les utilisateurs ou les paramètres de langue"
 
-#: settings.cgi:179
+#: settings.cgi:186
 msgid "System time"
 msgstr "Heure système"
 
-#: settings.cgi:181
-msgid "Time zome      :"
+#: settings.cgi:189
+#, fuzzy
+msgid "Time zome:"
 msgstr "Zone horaire  :"
 
-#: settings.cgi:182
-msgid "System time    :"
-msgstr "Heure du système:"
+#: settings.cgi:190
+#, fuzzy
+msgid "System time:"
+msgstr "Heure système"
 
-#: settings.cgi:183
-msgid "Hardware clock :"
+#: settings.cgi:191
+#, fuzzy
+msgid "Hardware clock:"
 msgstr "Horloge système:"
 
-#: settings.cgi:185
+#: settings.cgi:193
 msgid "Sync online"
 msgstr "Synchroniser en ligne"
 
-#: settings.cgi:186
+#: settings.cgi:194
 msgid "Set hardware clock"
 msgstr "Configurer l'horloge système"
 
-#: settings.cgi:193
+#: settings.cgi:200
 msgid "System language"
 msgstr "Langue du système"
 
-#: settings.cgi:204
-#, sh-format
+#: settings.cgi:211
+#, fuzzy, sh-format
 msgid ""
-"You must logout and login again to your current\n"
-"\t\t\t\tsession to use $new_locale locale."
+"You must logout and login again to your current session to use $new_locale "
+"locale."
 msgstr ""
 "Vous devez vous déconnecter et vous reconnecter à votre session\n"
 "\t\t\t\tcourante pour utiliser la locale $new_locale"
 
-#: settings.cgi:207
-msgid "Current system locales: "
+#: settings.cgi:214
+#, fuzzy
+msgid "Current system locales:"
 msgstr "Locales système courantes : "
 
-#: settings.cgi:213
+#: settings.cgi:220
 msgid "Available locales:"
 msgstr "Langues disponibles:"
 
-#: settings.cgi:218 settings.cgi:266 settings.cgi:276
+#: settings.cgi:225 settings.cgi:271 settings.cgi:282
 msgid "Activate"
 msgstr "Activer"
 
-#: settings.cgi:222
+#: settings.cgi:228
 msgid "Console keymap"
 msgstr "keymap de la console"
 
-#: settings.cgi:234
-msgid "Current console keymap: "
+#: settings.cgi:241
+#, fuzzy, sh-format
+msgid "Current console keymap: $keymap"
 msgstr "keymap de la console courante : "
 
-#: settings.cgi:253
+#: settings.cgi:258
 msgid "Suggested keymap for Xorg:"
 msgstr "keymap suggéré pour Xorg : "
 
-#: settings.cgi:262
+#: settings.cgi:267
 msgid "Available keymaps:"
 msgstr "Claviers disponibles:"
 
-#: settings.cgi:269
+#: settings.cgi:274
 msgid "Panel configuration"
 msgstr "Configuration du panneau"
 
-#: settings.cgi:272
+#: settings.cgi:278
 msgid "Style:"
 msgstr "Style:"
 
-#: settings.cgi:281
+#: settings.cgi:287
 msgid "Panel password:"
 msgstr "Mot de passe:"
 
-#: settings.cgi:287
-msgid "Configuration files: "
+#: settings.cgi:293
+#, fuzzy
+msgid "Configuration files:"
 msgstr "Fichiers de configuration"
 
-#: settings.cgi:289
+#: settings.cgi:295 styles/default/header.sh:24
 msgid "Panel"
 msgstr "Panneau"
 
-#: settings.cgi:291
+#: settings.cgi:297
 msgid "Server"
 msgstr "Serveur"
 
-#: settings.cgi:294
+#: settings.cgi:300
 msgid "TazPanel provides a debuging mode and page:"
 msgstr "TazPanel fournit un mode et une page debuging"
 
-#: lib/libtazpanel:89
+#: lib/libtazpanel:83
+msgid "connected"
+msgstr "Connecté"
+
+#: lib/libtazpanel:100
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: lib/libtazpanel:90
+#: lib/libtazpanel:101
 msgid "Scan ports"
 msgstr "Scan de ports"
 
-#: lib/libtazpanel:205
+#: lib/libtazpanel:214
 msgid "Disk"
 msgstr "Disque"
 
-#: lib/libtazpanel:207
+#: lib/libtazpanel:215
+msgid "Label"
+msgstr ""
+
+#: lib/libtazpanel:216
+msgid "Type"
+msgstr ""
+
+#: lib/libtazpanel:218
 msgid "Available"
 msgstr "Disponible"
 
-#: lib/libtazpanel:209
+#: lib/libtazpanel:220
 msgid "Mount point"
 msgstr "Point de montage"
 
-#: installer.cgi:120 installer.cgi:126
+#: installer.cgi:24
+msgid "TazPanel - Installer"
+msgstr "TazPanel - Installateur SliTaz"
+
+#: installer.cgi:116
+#, sh-format
+msgid "Creating setup file $INSTFILE."
+msgstr ""
+
+#: installer.cgi:120 installer.cgi:127
 msgid "Setup File Error"
 msgstr "Erreur dans le fichier de paramètrage"
 
-#: installer.cgi:141
+#: installer.cgi:121
+#, sh-format
+msgid "The setup file <strong>$INSTFILE</strong> doesn't exist."
+msgstr ""
+
+#: installer.cgi:142
 msgid "SliTaz Installer"
 msgstr "Installateur SliTaz"
 
-#: installer.cgi:143
+#: installer.cgi:144
 msgid ""
-"The SliTaz Installer installs or upgrades SliTaz to a hard disk\n"
-"\tdrive from a device like a Live-CD or LiveUSB key, from a SliTaz ISO "
-"file,\n"
-"\tor from the web by downloading an ISO file."
+"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."
 msgstr ""
 "L'installateur de SliTaz installe ou met à jour Slitaz sur un disque dur "
 "depuis un périphérique tel qu'un LiveCD ou une clé USB, depuis une image ISO "
@@ -1151,11 +1579,10 @@
 
 #: installer.cgi:157
 msgid ""
-"Install SliTaz on a partition of your hard disk drive. If\n"
-"\tyou decide to format your partition, all data will be lost. If you do not\n"
-"\tformat, all data except for any existing /home directory will be "
-"removed, \n"
-"\tthe home directory will be kept as is."
+"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."
 msgstr ""
 "Installe SliTaz sur une partition du disque dur. Si vous décidez de "
 "formatter la partition, toutes les données seront perdues. Si vous ne la "
@@ -1163,53 +1590,52 @@
 "répertoire /home existant seront détruites, le répertoire /home sera "
 "conservé tel quel."
 
-#: installer.cgi:163
+#: installer.cgi:162
 msgid ""
-"Before installation, you may need to create or resize partitions\n"
-"\ton your hard disk drive in order to make space for SliTaz GNU/Linux.\n"
-"\tYou can graphically manage your partitions with Gparted"
+"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"
 msgstr ""
 "Avant de commencer l'installation, il est peut-être nécessaire de créer ou "
 "redimensionner des partitions du disque dur de façon à laisser un espace "
 "utile à SliTaz. Il est possible de le faire graphiquement avec Gparted."
 
-#: installer.cgi:169 installer.cgi:249
+#: installer.cgi:166 installer.cgi:244 styles/default/header.sh:90
 msgid "Install SliTaz"
 msgstr "Installer SliTaz"
 
-#: installer.cgi:177
+#: installer.cgi:175
 msgid "Upgrade"
 msgstr "Mettre à jour"
 
-#: installer.cgi:179
+#: installer.cgi:177
 msgid ""
-"Upgrade an already installed SliTaz system on your hard disk\n"
-"\tdrive. Your /home /etc /var/www directories will be kept, all other "
-"directories\n"
-"\twill be removed. Any additional packages added to your old Slitaz system\n"
-"\twill be updated as long you have an active internet connection."
+"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."
 msgstr ""
 "Mettre à jour un système SliTaz déjà présent sur le disque dur. Les "
 "répertoires /home et /var/www seront conservés, tous les autres répertoires "
 "seront supprimés. Tous les paquets additionnels ajoutés à ce système SliTaz "
 "seront mis à jour à condition d'avoir une connexion Internet active."
 
-#: installer.cgi:186 installer.cgi:261
+#: installer.cgi:182 installer.cgi:257
 msgid "Upgrade SliTaz"
 msgstr "Mettre à jour SliTaz"
 
-#: installer.cgi:194
+#: installer.cgi:190
 msgid "Partitioning"
 msgstr "Partitionner"
 
-#: installer.cgi:197
+#: installer.cgi:193
+#, fuzzy
 msgid ""
-"On most used systems, the hard drive is already dedicated to \n"
-"\tpartitions for Windows<sup>&copy;</sup>, or Linux, or another operating \n"
-"\tsystem. You'll need to resize these partitions in order to make space for\n"
-"\tSliTaz GNU/Linux. SliTaz will co-exist with other operating systems "
-"already\n"
-"\tinstalled on your hard drive."
+"On most used systems, the hard drive is already dedicated to partitions for "
+"Windows<sup>&trade;</sup>, 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."
 msgstr ""
 "Sur la plupart des systèmes, le disque dur a déjà des partitions dédiées à "
 "Windows, ou Linux ou un autre système d'exploitation. Il est nécessaire de "
@@ -1217,51 +1643,46 @@
 "Linux. Slitaz co-existera avec les autres systèmes d'exploitation déjà "
 "installés sur le disque dur."
 
-#: installer.cgi:204
+#: installer.cgi:199
 msgid ""
-"The amount of space needed depends on how much software you \n"
-"\tplan to install\tand how much space you require for users. It's "
-"conceivable\n"
-"\tthat you could run a minimal SliTaz system in 300 megs or less, but 2 "
-"gigs\n"
-"\tis indeed more comfy."
+"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."
 msgstr ""
 "La taille de l'espace nécessaire dépend du nombre de paquets destiné à être "
 "installé et de l'espace requis réservé aux utilisateurs. Il est tout à fait "
 "concevable d'installer un système minilal de SLitaz dans moins de 300 Mo, "
 "mais 2 Go seront très confortables. "
 
-#: installer.cgi:209
+#: installer.cgi:204
 msgid ""
-"A separate home partition, and a partition that will be used \n"
-"\tas Linux swap space may be created if needed. Slitaz detects and uses "
-"swap\n"
-"\tpartitions automatically."
+"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."
 msgstr ""
 "Une partition séparée pour /home, et une partition d'échange (swap) peuvent "
 "être crées si nécessaire. Slitaz détecte et utilise automatiquement les "
 "partitions swap."
 
-#: installer.cgi:217
+#: installer.cgi:212
 msgid ""
-"You can graphically manage your partitions with Gparted. GParted\n"
-"\tis a partition editor for graphically managing your disk partitions. "
-"Gparted\n"
-"\tallows you to create, destroy, resize and copy partitions without data\n"
-"\tloss."
+"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."
 msgstr ""
 "Gérez graphiquement vos partitions avec Gparted. Gparted est un éditeur de "
 "partitions permettant de gérer graphiquement vos partitions. Gparted permet "
 "de créer, supprimer, redimensionner et recopier vos partitions sans perte de "
 "données."
 
-#: installer.cgi:223
+#: installer.cgi:216
+#, fuzzy
 msgid ""
-"Gparted supports ext2, ext3, ext4, linux swap, ntfs and fat32\n"
-"\tfilesystems right out of the box. Support for xjs, jfs, hfs and other\n"
-"\tfilesystems is available as well but you first need to add drivers for \n"
-"\tthese filesystems by installing the related packages xfsprogs, jfsutils,\n"
-"\tlinux-hfs and so on."
+"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 and so on."
 msgstr ""
 "Gparted supporte en standard les systèmes de fichiers Linux ext2, ext3, "
 "ext4, swap, Windows ntfs et fat32. Les systèmes de fichiers xfs, jfs, hfs ou "
@@ -1269,51 +1690,48 @@
 "préalables les drivers nécessaires en installant les paquets correspondants "
 "xfsprogs, jfsutils, linux-hfs etc.\""
 
-#: installer.cgi:230
+#: installer.cgi:223
 msgid "Execute Gparted"
 msgstr "Démarrer Gparted"
 
-#: installer.cgi:231
+#: installer.cgi:225
 msgid "Continue installation"
 msgstr "Continuer l'installation"
 
-#: installer.cgi:232
+#: installer.cgi:227
 msgid ""
-"Once you've made room for SliTaz on your drive,\tyou\n"
-"\tshould be able to continue installation."
+"Once you've made room for SliTaz on your drive, you should be able to "
+"continue installation."
 msgstr ""
 "Une fois que la place nécessaire à Slitaz sur le disque dur a été faite, il "
 "est possible de continuer l'installation."
 
-#: installer.cgi:237 installer.cgi:501 installer.cgi:512
+#: installer.cgi:232 installer.cgi:502 installer.cgi:513
 msgid "Back to Installer Start Page"
 msgstr "Retour au départ"
 
-#: installer.cgi:239
+#: installer.cgi:234
 msgid "Continue Installation"
 msgstr "Continuer l'installation"
 
-#: installer.cgi:250
+#: installer.cgi:246
 msgid ""
-"You're going to install SliTaz on a partition of your hard disk drive. If\n"
-"\tyou decide to format your HDD, all data will be lost. If you do not \n"
-"\tformat, all data except for any existing /home directory will be "
-"removed, \n"
-"\tthe home directory will be kept as is."
+"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."
 msgstr ""
 "Vous allez installer SliTaz sur une partition de votre disque dur. Si vous "
 "décidez de formatter la partition, toutes les données seront perdues. Si "
 "vous ne la formattez pas, toutes les données à l'exeception de celles "
 "présentes dans un répertoire existant /home seront détruites."
 
-#: installer.cgi:262
+#: installer.cgi:259
 msgid ""
-"You're going to upgrade an already installed SliTaz system on your hard "
-"disk\n"
-"\tdrive. Your /home /etc /var/www directories will be kept, all other "
-"directories\n"
-"\twill be removed. Any additional packages added to your old Slitaz system\n"
-"\twill be updated as long you have an active internet connection."
+"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 have an active internet connection."
 msgstr ""
 "Vous allez mettre à jour un système SliTaz existant déjà sur une partition "
 "de votre disque dur. Les répertoires /home et /var/www seront conservés, "
@@ -1321,119 +1739,123 @@
 "ajoutés à ce système SliTaz seront mis à jour à condition d'avoir une "
 "connexion Internet active."
 
-#: installer.cgi:277
+#: installer.cgi:273
 msgid "Slitaz source media"
 msgstr "Média source de Slitaz"
 
-#: installer.cgi:280
+#: installer.cgi:277
 msgid "LiveCD"
 msgstr "Live CD"
 
-#: installer.cgi:283
-msgid "LiveUSB"
+#: installer.cgi:280
+#, fuzzy
+msgid "LiveUSB:"
 msgstr "LiveUSB"
 
-#: installer.cgi:309
-msgid "ISO file"
+#: installer.cgi:306
+#, fuzzy
+msgid "ISO file:"
 msgstr "Fichier ISO"
 
-#: installer.cgi:310
+#: installer.cgi:307
 msgid "Full path to the ISO image file"
 msgstr "Chemin complet vers le fichier de l'image ISO"
 
-#: installer.cgi:314
+#: installer.cgi:310
+msgid "Web:"
+msgstr ""
+
+#: installer.cgi:311
 msgid "Stable"
 msgstr "Stable"
 
-#: installer.cgi:315
+#: installer.cgi:312
 msgid "Cooking"
 msgstr "Cooking"
 
-#: installer.cgi:316
+#: installer.cgi:314
 msgid "URL:"
 msgstr "URL:"
 
-#: installer.cgi:317
+#: installer.cgi:315
 msgid "Full url to an ISO image file"
 msgstr "URL complète de l'image ISO"
 
-#: installer.cgi:327
+#: installer.cgi:324
 msgid "Hard Disk Drive"
 msgstr "Disque dur"
 
-#: installer.cgi:336
+#: installer.cgi:333
 msgid "Install Slitaz to partition:"
 msgstr "Installer Slitaz sur la partition :"
 
-#: installer.cgi:341 installer.cgi:376 installer.cgi:409
+#: installer.cgi:338 installer.cgi:373 installer.cgi:405
 msgid "None"
 msgstr "*"
 
-#: installer.cgi:352
-msgid "Format partition as"
+#: installer.cgi:349 installer.cgi:416
+msgid "Format partition as:"
 msgstr "Formatter la partition en"
 
-#: installer.cgi:371
+#: installer.cgi:368
 msgid "Existing SliTaz partition to upgrade:"
 msgstr "Partition SliTaz existante à mettre à jour :"
 
-#: installer.cgi:393
+#: installer.cgi:389
 msgid "Options"
 msgstr "Options"
 
-#: installer.cgi:402
+#: installer.cgi:397
 msgid "home partition"
 msgstr "Partition /home"
 
-#: installer.cgi:404
+#: installer.cgi:400
 msgid "Use a separate partition for /home:"
 msgstr "Utiliser une autre partition pour /home"
 
-#: installer.cgi:420
-msgid "Format partition as:"
-msgstr "Formatter la partition en"
-
-#: installer.cgi:439
+#: installer.cgi:435
 msgid "Set Hostname to:"
 msgstr "Définir le nom du système :"
 
-#: installer.cgi:440
+#: installer.cgi:436
 msgid "Name of your system"
 msgstr "Nom du système"
 
-#: installer.cgi:451
+#: installer.cgi:446
 msgid "Root"
 msgstr "Root"
 
-#: installer.cgi:452
+#: installer.cgi:448
+#, fuzzy
 msgid "Root passwd:"
 msgstr "Mot de passe de root:"
 
-#: installer.cgi:453 installer.cgi:455
+#: installer.cgi:449 installer.cgi:452
 msgid "Password of root"
 msgstr "Mot de passe de root"
 
-#: installer.cgi:454 installer.cgi:473
+#: installer.cgi:451 installer.cgi:473
 msgid "Confirm password:"
 msgstr "Confirmer :"
 
-#: installer.cgi:466
+#: installer.cgi:463
+#, fuzzy
 msgid "User"
 msgstr "Utilisateur"
 
-#: installer.cgi:468
+#: installer.cgi:466
 msgid "Name of the first user"
 msgstr "Nom du premier compte d'utilisateur"
 
-#: installer.cgi:471
+#: installer.cgi:470
 msgid "User passwd:"
 msgstr "Mot de passe utilisateur :"
 
-#: installer.cgi:472 installer.cgi:474
+#: installer.cgi:471 installer.cgi:474
 msgid "Password of the first user"
 msgstr "Mot de passe de l'utilisateur"
 
-#: installer.cgi:485
+#: installer.cgi:484
 msgid "Grub"
 msgstr "Grub"
 
@@ -1445,63 +1867,204 @@
 "Installer le chargeur Grub. Généralement à valider à moins de vouloir "
 "installer Grub à la main."
 
-#: installer.cgi:489
+#: installer.cgi:490
 msgid "Enable Windows Dual-Boot."
 msgstr "Autoriser le double-boot avec Windows."
 
-#: installer.cgi:498
+#: installer.cgi:499
 msgid "Back to partitioning"
 msgstr "Retour au partitionnement"
 
-#: installer.cgi:505
+#: installer.cgi:506
 msgid "Proceed to SliTaz installation"
 msgstr "Procéder à l'installation de SliTaz"
 
-#: installer.cgi:507
+#: installer.cgi:508
 msgid "Installation complete. You can now restart (reboot)"
 msgstr "Installation terminée. Vous pouvez redémarrer."
 
-#: installer.cgi:509
+#: installer.cgi:510
 msgid "Installation failed. See log"
 msgstr "L'installation n'a pas aboutie. Voir le fichier journal"
 
-#: installer.cgi:527
+#: installer.cgi:530
 msgid "A web page that points a browser to a different page after 2 seconds"
 msgstr "Vous allez être redirigés vers une autre page dans 2 secondes"
 
-#: installer.cgi:532
+#: installer.cgi:536
 msgid ""
-"If your browser doesn't automatically redirect within a few seconds, \n"
-"you may want to go there manually"
+"If your browser doesn't automatically redirect within a few seconds, you may "
+"want to go there manually"
 msgstr ""
 "Si votre navigateur ne vous redirige pas automatiquement dans quelques "
 "secondes, vous devrez le faire manuellement"
 
-#: installer.cgi:547 installer.cgi:560
+#: installer.cgi:551 installer.cgi:566
 msgid "Tazinst Error"
 msgstr "Erreur de Tazinst"
 
-#: installer.cgi:548
+#: installer.cgi:552
+#, fuzzy
 msgid ""
-"the lightweight SliTaz HDD installer\n"
-"is missing. Any installation can not be done without tazinst."
+"<strong>tazinst</strong>, the lightweight SliTaz HDD installer is missing. "
+"Any installation can not be done without tazinst."
 msgstr ""
 "L'installateur léger de SliTaz n'a pas été trouvé. Aucune installation ne "
 "peut être entreprise sans tazinst."
 
-#: installer.cgi:550
+#: installer.cgi:555
 msgid "Check tazinst' permissions, or reinstall the slitaz-tools package:"
 msgstr ""
 "Vérifiez les permissions de tazinst, ou réinstallez le paquet slitaz-tools :"
 
-#: installer.cgi:573
+#: installer.cgi:581
 msgid "Proceeding: ()"
 msgstr "Procédure en cours :"
 
-#: installer.cgi:630 installer.cgi:641
+#: installer.cgi:582
+msgid "Please wait until processing is complete"
+msgstr ""
+
+#: installer.cgi:588
+msgid "Completed."
+msgstr ""
+
+#: installer.cgi:622
+#, fuzzy
+msgid "Hostname error"
+msgstr "Nom d'hôte"
+
+#: installer.cgi:626
+#, fuzzy
+msgid "Root password error"
+msgstr "Mot de passe de root:"
+
+#: installer.cgi:630
+#, fuzzy
+msgid "User login error"
+msgstr "Nom de login:"
+
+#: installer.cgi:634
+#, fuzzy
+msgid "User password error"
+msgstr "Mot de passe:"
+
+#: installer.cgi:637 installer.cgi:648
 msgid "Do you really want to continue?"
 msgstr "Désirez-vous vraiment continuer?"
 
+#: help.cgi:20
+#, fuzzy
+msgid "Manual"
+msgstr "Édition manuelle"
+
+#: help.cgi:28
+msgid "TazPanel - Help &amp; Doc"
+msgstr ""
+
+#: styles/default/header.sh:29
+msgid "Processes"
+msgstr ""
+
+#: styles/default/header.sh:31
+#, fuzzy
+msgid "Create Report"
+msgstr "Créer un rapport"
+
+#: styles/default/header.sh:34
+#, fuzzy
+msgid "Packages"
+msgstr "Paquet"
+
+#: styles/default/header.sh:41
+#, fuzzy
+msgid "Check updates"
+msgstr "Mettre à jour"
+
+#: styles/default/header.sh:49
+msgid "Ethernet"
+msgstr ""
+
+#: styles/default/header.sh:51
+msgid "Wireless"
+msgstr ""
+
+#: styles/default/header.sh:53
+#, fuzzy
+msgid "Config file"
+msgstr "Fichier de configuration"
+
+#: styles/default/header.sh:56
+#, fuzzy
+msgid "Settings"
+msgstr "Réglages système"
+
+#: styles/default/header.sh:59
+#, fuzzy
+msgid "Users"
+msgstr "Utilisateur"
+
+#: styles/default/header.sh:62
+#, fuzzy
+msgid "Boot"
+msgstr "Journaux de démarrage"
+
+#: styles/default/header.sh:72
+#, fuzzy
+msgid "Hardware"
+msgstr "Horloge système:"
+
+#: styles/default/header.sh:80
+#, fuzzy
+msgid "Live"
+msgstr "Live CD"
+
+#: styles/default/header.sh:82
+msgid "Create a live USB key"
+msgstr ""
+
+#: styles/default/header.sh:83
+#, fuzzy
+msgid "Create a live CD-ROM"
+msgstr "Écrire un LiveCD"
+
+#: styles/default/header.sh:91
+#, fuzzy
+msgid "Upgrade system"
+msgstr "Mettre à jour"
+
+#: styles/default/footer.sh:6
+msgid "Copyright"
+msgstr ""
+
+#: styles/default/footer.sh:8
+msgid "BSD License"
+msgstr ""
+
+#~ msgid "List:"
+#~ msgstr "Liste:"
+
+#~ msgid "System time    :"
+#~ msgstr "Heure du système:"
+
+#~ msgid "Usage:"
+#~ msgstr "Utilisation:"
+
+#~ msgid "Output of"
+#~ msgstr "Résultat de"
+
+#~ msgid "Host:"
+#~ msgstr "Hôte:"
+
+#~ msgid "Live USB"
+#~ msgstr "Live USB"
+
+#~ msgid "Connection:"
+#~ msgstr "Connexion:"
+
+#~ msgid "Format partition as"
+#~ msgstr "Formatter la partition en"
+
 #~ msgid "About"
 #~ msgstr "À propos"
 
@@ -1519,6 +2082,3 @@
 
 #~ msgid "Install Grub bootloader"
 #~ msgstr "Installer le chargeur d'amorçage Grub"
-
-#~ msgid "Filesystem"
-#~ msgstr "Système de fichier"
diff -r 5312e3716b01 -r fdfc6b494539 po/pt_BR.po
--- a/po/pt_BR.po	Fri May 04 12:57:53 2012 +0300
+++ b/po/pt_BR.po	Fri May 04 13:00:43 2012 +0300
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the Tazpanel package.
 # Claudinei Pereira <claudinei@slitaz.org>, 2011.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Tazpanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-02 10:12+0200\n"
+"POT-Creation-Date: 2012-05-04 02:44+0000\n"
 "PO-Revision-Date: 2011-04-21 21:00+0000\n"
 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>, 2011\n"
 "Language-Team: Portuguese <i18n@slitaz.org>\n"
@@ -18,6 +17,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: tazpanel:35
+#, fuzzy, sh-format
+msgid "Starting TazPanel web server on port $HTTPD_PORT..."
+msgstr "Parando o servidor web do TazPanel..."
+
 #: tazpanel:37
 #, fuzzy
 msgid "TazPanel Authentication - Default: root:root"
@@ -39,362 +43,634 @@
 msgid "Password changed successfully"
 msgstr "Senha mudada com sucesso"
 
-#: tazpanel:53
-msgid "Usage:"
-msgstr "Uso:"
+#: tazpanel:54
+#, sh-format
+msgid "Usage: $program_name [start|stop|passwd]"
+msgstr ""
 
-#: index.cgi:36 index.cgi:74
+#: index.cgi:38 index.cgi:83
 msgid "Differences"
 msgstr "Diferenças"
 
 #: index.cgi:72
+msgid "TazPanel - File"
+msgstr ""
+
+#: index.cgi:81
 msgid "Save"
 msgstr "Salvar"
 
-#: index.cgi:94 settings.cgi:256
+#: index.cgi:103 settings.cgi:261
 msgid "Edit"
 msgstr "Editar"
 
-#: index.cgi:113 index.cgi:313
+#: index.cgi:126
+msgid "TazPanel - Terminal"
+msgstr ""
+
+#: index.cgi:139
+msgid "Small terminal emulator, commands options are supported."
+msgstr "Pequeno emulador de terminal, opções de comandos são suportadas"
+
+#: index.cgi:141 index.cgi:158
+#, sh-format
+msgid "Commands: $commands"
+msgstr "Comandos: $commands"
+
+#: index.cgi:146
+#, sh-format
+msgid "Downloading to: $dl"
+msgstr "Baixando para: $dl"
+
+#: index.cgi:153
+#, sh-format
+msgid "$cmd needs an argument"
+msgstr ""
+
+#: index.cgi:157
+#, sh-format
+msgid "Unknown command: $cmd"
+msgstr ""
+
+#: index.cgi:162
+msgid "TazPanel - Process activity"
+msgstr "TazPanel - Atividade de processos"
+
+#: index.cgi:164
+msgid "Refresh:"
+msgstr ""
+
+#: index.cgi:169
+msgid "1s"
+msgstr ""
+
+#: index.cgi:170
+msgid "5s"
+msgstr ""
+
+#: index.cgi:171
+msgid "10s"
+msgstr ""
+
+#: index.cgi:172 live.cgi:152
+msgid "none"
+msgstr ""
+
+#: index.cgi:188
+msgid "TazPanel - Debug"
+msgstr ""
+
+#: index.cgi:191
+msgid "HTTP Environment"
+msgstr ""
+
+#: index.cgi:198
+msgid "TazPanel - System report"
+msgstr "TazPanel - Relatório do sistema"
+
+#: index.cgi:203
+#, sh-format
+msgid "Reporting to: $output"
+msgstr "Reportando a: $output"
+
+#: index.cgi:206
+msgid "Creating report header..."
+msgstr "Criando cabeçalho do relatório..."
+
+#: index.cgi:213 index.cgi:230
+msgid "SliTaz system report"
+msgstr "Relatório do sistema"
+
+#: index.cgi:227
+msgid "Creating system summary..."
+msgstr "Criando resumo do sistema..."
+
+#: index.cgi:231
+msgid "Date:"
+msgstr ""
+
+#: index.cgi:242
+msgid "Getting hardware info..."
+msgstr "Obtendo informação do sistema..."
+
+#: index.cgi:260
+msgid "Getting networking info..."
+msgstr "Obtendo informação da rede..."
+
+#: index.cgi:274
+msgid "Getting filesystems info..."
+msgstr "Obtendo informação do sistema de arquivos..."
+
+#: index.cgi:294
+msgid "Getting boot logs..."
+msgstr "Gerando logs de boot..."
+
+#: index.cgi:297 boot.cgi:29 boot.cgi:34
+msgid "Kernel messages"
+msgstr "Mensagens do kernel"
+
+#: index.cgi:300 boot.cgi:30 boot.cgi:38
+msgid "Boot scripts"
+msgstr "Scripts de boot"
+
+#: index.cgi:305
+msgid "Creating report footer..."
+msgstr "Criando rodapé do relatório..."
+
+#: index.cgi:317
+msgid "View report"
+msgstr "Ver relatório"
+
+#: index.cgi:318
+msgid "This report can be attached with a bug report on:"
+msgstr "Este relatório pode ser anexado a um aviso de bug em:"
+
+#: index.cgi:332
+#, sh-format
+msgid "Host: $hostname"
+msgstr "Nome do host: $hostname"
+
+#: index.cgi:333
+msgid "SliTaz administration and configuration Panel"
+msgstr "Painel de configuração e administração do SliTaz"
+
+#: index.cgi:337 styles/default/header.sh:27
 msgid "Terminal"
 msgstr "Terminal"
 
-#: index.cgi:126
-msgid "Small terminal emulator, commands options are supported."
-msgstr "Pequeno emulador de terminal, opções de comandos são suportadas"
-
-#: index.cgi:128 index.cgi:145
-msgid "Commands:"
-msgstr "Comandos:"
-
-#: index.cgi:132
-#, fuzzy
-msgid "Downloading to:"
-msgstr "Baixando para"
-
-#: index.cgi:149 index.cgi:315
+#: index.cgi:339
 msgid "Process activity"
 msgstr "Atividade de processos"
 
-#: index.cgi:151
-msgid "Refresh: "
-msgstr ""
-
-#: index.cgi:176
-#, fuzzy
-msgid "System report"
-msgstr "Relatório do sistema"
-
-#: index.cgi:180
-#, fuzzy
-msgid "Reporting to:"
-msgstr "Reportando a:"
-
-#: index.cgi:182
-#, fuzzy
-msgid "Creating report header...  "
-msgstr "Criando cabeçalho do relatório..."
-
-#: index.cgi:199
-#, fuzzy
-msgid "Creating system summary... "
-msgstr "Criando resumo do sistema..."
-
-#: index.cgi:212
-#, fuzzy
-msgid "Getting hardware info...   "
-msgstr "Obtendo informação do sistema..."
-
-#: index.cgi:236
-#, fuzzy
-msgid "Getting networking info... "
-msgstr "Obtendo informação da rede..."
-
-#: index.cgi:252
-#, fuzzy
-msgid "Getting filesystems info..."
-msgstr "Obtendo informação do sistema de arquivos..."
-
-#: index.cgi:276
-msgid "Getting boot logs...       "
-msgstr "Gerando logs de boot...   "
-
-#: index.cgi:278 boot.cgi:29 boot.cgi:34
-msgid "Kernel messages"
-msgstr "Mensagens do kernel"
-
-#: index.cgi:282 boot.cgi:30 boot.cgi:39
-msgid "Boot scripts"
-msgstr "Scripts de boot"
-
-#: index.cgi:288
-#, fuzzy
-msgid "Creating report footer...  "
-msgstr "Criando rodapé do relatório..."
-
-#: index.cgi:296
-msgid "View report"
-msgstr "Ver relatório"
-
-#: index.cgi:297
-msgid "This report can be attached with a bug report on: "
-msgstr "Este relatório pode ser anexado a um aviso de bug em: "
-
-#: index.cgi:308
-msgid "Host:"
-msgstr "Host:"
-
-#: index.cgi:309
-msgid "SliTaz administration and configuration Panel"
-msgstr "Painel de configuração e administração do SliTaz"
-
-#: index.cgi:317
+#: index.cgi:341
 #, fuzzy
 msgid "Create a report"
 msgstr "Criar relatório"
 
-#: index.cgi:320 pkgs.cgi:855
+#: index.cgi:344 pkgs.cgi:948
 msgid "Summary"
 msgstr "Sumário"
 
-#: index.cgi:323
+#: index.cgi:347
+msgid "Uptime:"
+msgstr "Uptime:"
+
+#: index.cgi:350
 #, fuzzy
-msgid "Uptime       :"
-msgstr "Uptime       :"
-
-#: index.cgi:324
-#, fuzzy
-msgid "Memory in Mb :"
+msgid "Memory in Mb:"
 msgstr "Memória em MB"
 
-#: index.cgi:326
-msgid "Linux kernel :"
+#: index.cgi:355
+#, sh-format
+msgid "Total: $memtotal, Used: $memused, Free: $memfree"
+msgstr ""
+
+#: index.cgi:360
+#, fuzzy
+msgid "Linux kernel:"
 msgstr "Kernel Linux :"
 
-#: index.cgi:331
+#: index.cgi:367
 msgid "Network status"
 msgstr "Status da Rede"
 
-#: index.cgi:334 hardware.cgi:193
+#: index.cgi:370 hardware.cgi:202
 msgid "Filesystem usage statistics"
 msgstr "Estatísticas de utilização do sistema de arquivos"
 
-#: index.cgi:355
+#: index.cgi:403
 msgid "Panel Activity"
 msgstr "Atividade do painel"
 
-#: pkgs.cgi:50
-msgid "Last recharge        : "
+#: pkgs.cgi:17
+msgid "TazPanel - Packages"
+msgstr ""
+
+#: pkgs.cgi:51
+#, fuzzy
+msgid "Last recharge:"
 msgstr "Última recarga      : "
 
+#: pkgs.cgi:58
+msgid "(Older than 10 days)"
+msgstr ""
+
 #: pkgs.cgi:60
-msgid "Installed packages   : "
+msgid "(Not older than 10 days)"
+msgstr ""
+
+#: pkgs.cgi:64
+#, fuzzy
+msgid "Installed packages:"
 msgstr "Pacotes instalados  : "
 
-#: pkgs.cgi:62
-msgid "Mirrored packages    : "
+#: pkgs.cgi:66
+#, fuzzy
+msgid "Mirrored packages:"
 msgstr "Pacotes no mirror   : "
 
-#: pkgs.cgi:64
-msgid "Upgradeable packages : "
+#: pkgs.cgi:68
+#, fuzzy
+msgid "Upgradeable packages:"
 msgstr "Pacotes atualizáveis: "
 
-#: pkgs.cgi:68
-msgid "Blocked packages     : "
+#: pkgs.cgi:70 pkgs.cgi:707
+msgid "Installed files:"
+msgstr "Pacotes instalados:"
+
+#: pkgs.cgi:72
+#, fuzzy
+msgid "Blocked packages:"
 msgstr "Pacotes bloqueados  : "
 
-#: pkgs.cgi:113
+#: pkgs.cgi:86
+#, fuzzy
+msgid "Delete"
+msgstr "Deletar usuário"
+
+#: pkgs.cgi:89
+msgid "Use as default"
+msgstr ""
+
+#: pkgs.cgi:120
 msgid "Search"
 msgstr "Buscar"
 
-#: pkgs.cgi:115
+#: pkgs.cgi:122
 msgid "Files"
 msgstr "Arquivos"
 
-#: pkgs.cgi:126 network.cgi:23 network.cgi:151 network.cgi:240 boot.cgi:84
-#: settings.cgi:104 lib/libtazpanel:87
+#: pkgs.cgi:134 pkgs.cgi:867 network.cgi:23 network.cgi:156 network.cgi:246
+#: boot.cgi:82 settings.cgi:104 lib/libtazpanel:98
 msgid "Name"
 msgstr "Nome"
 
-#: pkgs.cgi:127
+#: pkgs.cgi:135
 msgid "Version"
 msgstr "Versão"
 
-#: pkgs.cgi:128 boot.cgi:85
+#: pkgs.cgi:136 boot.cgi:83
 msgid "Description"
 msgstr "Descrição"
 
-#: pkgs.cgi:129 installer.cgi:313
+#: pkgs.cgi:137
 msgid "Web"
 msgstr "Web"
 
-#: pkgs.cgi:212 pkgs.cgi:321 pkgs.cgi:362 pkgs.cgi:416 pkgs.cgi:454
-#: pkgs.cgi:503 pkgs.cgi:575 pkgs.cgi:858
+#: pkgs.cgi:147
+msgid "Categories"
+msgstr ""
+
+#: pkgs.cgi:148
+#, fuzzy
+msgid "Base-system"
+msgstr "Sistema de arquios"
+
+#: pkgs.cgi:149
+msgid "X window"
+msgstr ""
+
+#: pkgs.cgi:150
+msgid "Utilities"
+msgstr ""
+
+#: pkgs.cgi:151 styles/default/header.sh:46
+#, fuzzy
+msgid "Network"
+msgstr "Rede"
+
+#: pkgs.cgi:152
+msgid "Games"
+msgstr ""
+
+#: pkgs.cgi:153
+msgid "Graphics"
+msgstr ""
+
+#: pkgs.cgi:154
+msgid "Office"
+msgstr ""
+
+#: pkgs.cgi:155
+msgid "Multimedia"
+msgstr ""
+
+#: pkgs.cgi:156
+msgid "Development"
+msgstr ""
+
+#: pkgs.cgi:157
+#, fuzzy
+msgid "System tools"
+msgstr "Tempo do sistema"
+
+#: pkgs.cgi:158
+msgid "Security"
+msgstr ""
+
+#: pkgs.cgi:159
+msgid "Misc"
+msgstr ""
+
+#: pkgs.cgi:160
+msgid "Meta"
+msgstr ""
+
+#: pkgs.cgi:161
+msgid "Non free"
+msgstr ""
+
+#: pkgs.cgi:162
+msgid "All"
+msgstr ""
+
+#: pkgs.cgi:168
+#, fuzzy
+msgid "Repositories"
+msgstr "Repositórios privados"
+
+#: pkgs.cgi:169
+msgid "Public"
+msgstr ""
+
+#: pkgs.cgi:177
+msgid "Any"
+msgstr ""
+
+#: pkgs.cgi:217 pkgs.cgi:339
+#, fuzzy
+msgid "Listing packages..."
+msgstr "Obtendo informação de pacote..."
+
+#: pkgs.cgi:220 pkgs.cgi:358 pkgs.cgi:412 pkgs.cgi:479 pkgs.cgi:520
+#: pkgs.cgi:580 pkgs.cgi:659 pkgs.cgi:952 styles/default/header.sh:37
 msgid "My packages"
 msgstr "Meus pacotes"
 
-#: pkgs.cgi:216 pkgs.cgi:262 pkgs.cgi:311 pkgs.cgi:352 pkgs.cgi:445
+#: pkgs.cgi:225 pkgs.cgi:284 pkgs.cgi:347 pkgs.cgi:401 pkgs.cgi:511
 #: settings.cgi:92
 msgid "Selection:"
 msgstr "Seleção:"
 
-#: pkgs.cgi:220 pkgs.cgi:266 pkgs.cgi:317 pkgs.cgi:358 pkgs.cgi:451
-msgid "List:"
-msgstr "Lista:"
+#: pkgs.cgi:226 pkgs.cgi:607
+msgid "Remove"
+msgstr "Remover"
 
-#: pkgs.cgi:258 pkgs.cgi:864
+#: pkgs.cgi:230 pkgs.cgi:289 pkgs.cgi:354 pkgs.cgi:408 pkgs.cgi:518
+#: pkgs.cgi:962 styles/default/header.sh:39
+msgid "Recharge list"
+msgstr "Recarregar lista"
+
+#: pkgs.cgi:232 pkgs.cgi:291 pkgs.cgi:356 pkgs.cgi:410 pkgs.cgi:477
+#: pkgs.cgi:964
+msgid "Check upgrades"
+msgstr "Checar atualizações"
+
+#: pkgs.cgi:275
+#, fuzzy
+msgid "Listing linkable packages..."
+msgstr "Obtendo informação de pacote..."
+
+#: pkgs.cgi:278 pkgs.cgi:958
 msgid "Linkable packages"
 msgstr "Pacotes ligáveis"
 
-#: pkgs.cgi:307
-msgid "Category:"
-msgstr "Categoria:"
+#: pkgs.cgi:285
+msgid "Link"
+msgstr ""
 
-#: pkgs.cgi:348
+#: pkgs.cgi:342
+#, sh-format
+msgid "Category: $category"
+msgstr "Categoria: $category"
+
+#: pkgs.cgi:366 pkgs.cgi:838
+#, sh-format
+msgid "Repository: $Repo_Name"
+msgstr ""
+
+#: pkgs.cgi:394
+#, fuzzy
+msgid "Searching packages..."
+msgstr "Buscar pacotes"
+
+#: pkgs.cgi:397
 msgid "Search packages"
 msgstr "Buscar pacotes"
 
-#: pkgs.cgi:355 pkgs.cgi:448
+#: pkgs.cgi:404 pkgs.cgi:514
 msgid "Toogle all"
 msgstr "Alternar todos"
 
-#: pkgs.cgi:371 pkgs.cgi:545
+#: pkgs.cgi:423
 msgid "Package"
 msgstr "Pacote"
 
-#: pkgs.cgi:372
+#: pkgs.cgi:424
 msgid "File"
 msgstr "Arquivo"
 
-#: pkgs.cgi:403
+#: pkgs.cgi:465
+#, fuzzy
+msgid "Recharging lists..."
+msgstr "Recarregar lista"
+
+#: pkgs.cgi:468
 msgid "Recharge"
 msgstr "Recarregar"
 
-#: pkgs.cgi:408
+#: pkgs.cgi:473
 msgid "Recharge checks for new or updated packages"
 msgstr "Opção recharge checa por pacotes novos ou atualizáveis"
 
-#: pkgs.cgi:414 pkgs.cgi:870
-msgid "Check upgrades"
-msgstr "Checar atualizações"
-
-#: pkgs.cgi:422
+#: pkgs.cgi:485
 msgid "Recharging packages list"
 msgstr "Recarregando lista de pacotes"
 
-#: pkgs.cgi:427
+#: pkgs.cgi:490
 msgid "Packages lists are up-to-date. You should check for upgrades now."
 msgstr "A lista de pacotes está atualizada. Cheque as atualizações."
 
-#: pkgs.cgi:441
+#: pkgs.cgi:503
+#, fuzzy
+msgid "Checking for upgrades..."
+msgstr "Checar atualizações"
+
+#: pkgs.cgi:506
 msgid "Up packages"
 msgstr "Pacotes atualizados"
 
-#: pkgs.cgi:497
+#: pkgs.cgi:575
 msgid "Performing tasks on packages"
 msgstr "Executando tarefas nos pacotes"
 
-#: pkgs.cgi:527
-msgid "Remove"
-msgstr "Remover"
+#: pkgs.cgi:585
+#, sh-format
+msgid "Executing $cmd for: $pkgs"
+msgstr ""
 
-#: pkgs.cgi:530
+#: pkgs.cgi:610
 msgid "Getting package info..."
 msgstr "Obtendo informação de pacote..."
 
-#: pkgs.cgi:541 pkgs.cgi:550 installer.cgi:155
+#: pkgs.cgi:622 installer.cgi:155 styles/default/header.sh:88
 msgid "Install"
 msgstr "Instalar"
 
-#: pkgs.cgi:560
+#: pkgs.cgi:626
+#, fuzzy, sh-format
+msgid "Package $PACKAGE"
+msgstr "Pacote"
+
+#: pkgs.cgi:634
+msgid "Install (Non Free)"
+msgstr ""
+
+#: pkgs.cgi:642
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: pkgs.cgi:562
+#: pkgs.cgi:646
 msgid "Block"
 msgstr "Bloquear"
 
-#: pkgs.cgi:609 pkgs.cgi:621
-msgid "Installed files:"
+#: pkgs.cgi:650
+msgid "Repack"
+msgstr ""
+
+#: pkgs.cgi:665
+#, fuzzy
+msgid "Name:"
+msgstr "Nome"
+
+#: pkgs.cgi:666
+#, fuzzy
+msgid "Version:"
+msgstr "Versão"
+
+#: pkgs.cgi:667
+#, fuzzy
+msgid "Description:"
+msgstr "Descrição"
+
+#: pkgs.cgi:668
+#, fuzzy
+msgid "Category:"
+msgstr "Categoria: $category"
+
+#: pkgs.cgi:672
+msgid "Maintainer:"
+msgstr ""
+
+#: pkgs.cgi:673 pkgs.cgi:702
+msgid "Website:"
+msgstr ""
+
+#: pkgs.cgi:674 pkgs.cgi:703
+#, fuzzy
+msgid "Sizes:"
+msgstr "Tamanho"
+
+#: pkgs.cgi:677
+msgid "Depends:"
+msgstr ""
+
+#: pkgs.cgi:684
+msgid "Suggested:"
+msgstr ""
+
+#: pkgs.cgi:690
+msgid "Tags:"
+msgstr ""
+
+#: pkgs.cgi:696
+#, fuzzy, sh-format
+msgid "Installed files: $I_FILES"
 msgstr "Pacotes instalados:"
 
-#: pkgs.cgi:666 pkgs.cgi:790
+#: pkgs.cgi:755 pkgs.cgi:884
 msgid "Set link"
 msgstr "Configurar ligação"
 
-#: pkgs.cgi:669 pkgs.cgi:791
+#: pkgs.cgi:758 pkgs.cgi:885
 msgid "Remove link"
 msgstr "Remover ligação"
 
-#: pkgs.cgi:675 pkgs.cgi:872
+#: pkgs.cgi:764 pkgs.cgi:966 styles/default/header.sh:43
 msgid "Administration"
 msgstr "Administração"
 
-#: pkgs.cgi:677
+#: pkgs.cgi:766
 msgid "Tazpkg administration and settings"
 msgstr "Administração e configuração do Tazpkg"
 
-#: pkgs.cgi:681
+#: pkgs.cgi:770
 msgid "Save configuration"
 msgstr "Salvar configuração"
 
-#: pkgs.cgi:683
+#: pkgs.cgi:772
 msgid "List configuration files"
 msgstr "Listar arquivos de configuração"
 
-#: pkgs.cgi:685
+#: pkgs.cgi:774
 msgid "Quick check"
 msgstr "Checagem rápida"
 
-#: pkgs.cgi:687
+#: pkgs.cgi:776
 msgid "Full check"
 msgstr "Checagem completa"
 
-#: pkgs.cgi:692
+#: pkgs.cgi:781
 msgid "Creating the package..."
 msgstr "Criando o pacote..."
 
-#: pkgs.cgi:697
-msgid "Path : "
+#: pkgs.cgi:786
+#, fuzzy
+msgid "Path:"
 msgstr "Caminho : "
 
-#: pkgs.cgi:700 boot.cgi:248
+#: pkgs.cgi:789 boot.cgi:256
 msgid "Configuration files"
 msgstr "Arquivos de configuração"
 
-#: pkgs.cgi:713
+#: pkgs.cgi:802
 msgid "Checking packages consistency..."
 msgstr "Checando consistência dos pacotes..."
 
-#: pkgs.cgi:719
+#: pkgs.cgi:808
 msgid "Full packages check..."
 msgstr "Checagem completa de pacotes..."
 
-#: pkgs.cgi:726
+#: pkgs.cgi:815
 msgid "Packages cache"
 msgstr "Cache de pacotes"
 
-#: pkgs.cgi:730
-msgid "Packages in the cache:"
+#: pkgs.cgi:820
+#, fuzzy, sh-format
+msgid "Packages in the cache: $cache_files ($cache_size)"
 msgstr "Pacotes no cache:"
 
-#: pkgs.cgi:736
+#: pkgs.cgi:827
 msgid "Default mirror"
 msgstr ""
 
-#: pkgs.cgi:738
+#: pkgs.cgi:831
 msgid "Current mirror list"
 msgstr "Lista de mirror atual"
 
-#: pkgs.cgi:761
+#: pkgs.cgi:855
 msgid "Private repositories"
 msgstr "Repositórios privados"
 
-#: pkgs.cgi:780
+#: pkgs.cgi:868
+msgid "mirror"
+msgstr ""
+
+#: pkgs.cgi:874
 msgid "Link to another SliTaz installation"
 msgstr "Ligação para outra instalação do SliTaz"
 
-#: pkgs.cgi:782
+#: pkgs.cgi:876
 msgid ""
 "This link points to the root of another SliTaz installation. You will be "
 "able to install packages using soft links to it."
@@ -402,159 +678,183 @@
 "Esta ligação aponta para a raiz de uma outra instalação do SliTaz. Você será "
 "capaz de instalar pacotes utilizando links para ela."
 
-#: pkgs.cgi:799
+#: pkgs.cgi:892
 msgid "SliTaz packages DVD"
 msgstr "DVD de pacotes do SliTaz"
 
-#: pkgs.cgi:811
+#: pkgs.cgi:894
+#, sh-format
+msgid ""
+"A bootable DVD image of all available packages for the $version version is "
+"generated every day. It also contains a copy of the website and can be used "
+"without an internet connection. This image can be installed on a DVD or an "
+"USB key."
+msgstr ""
+
+#: pkgs.cgi:904
 msgid "Download DVD image"
 msgstr "Baixar imagem de DVD"
 
-#: pkgs.cgi:813
+#: pkgs.cgi:906
 msgid "Install from DVD/USB key"
 msgstr "Instalar do DVD/Mídia USB"
 
-#: pkgs.cgi:816
-msgid "Install from ISO image: "
+#: pkgs.cgi:909
+#, fuzzy
+msgid "Install from ISO image:"
 msgstr "Instalar de imagem ISO: "
 
-#: pkgs.cgi:868
-msgid "Recharge list"
-msgstr "Recarregar lista"
-
-#: pkgs.cgi:878
+#: pkgs.cgi:972
 msgid "Latest log entries"
 msgstr "Últimas entradas de log"
 
-#: live.cgi:88
+#: live.cgi:25
+msgid "TazPanel - Live"
+msgstr ""
+
+#: live.cgi:83
 msgid "TODO"
 msgstr "TODO"
 
-#: live.cgi:96
+#: live.cgi:88
+msgid "SliTaz LiveUSB"
+msgstr "Sistema Live SliTaz"
+
+#: live.cgi:89
+msgid "Create Live USB SliTaz systems"
+msgstr "Cria e gerencia sistemas SliTaz Live CD/USB"
+
+#: live.cgi:92
+#, fuzzy
+msgid ""
+"Generate SliTaz LiveUSB media and boot in RAM! Insert a LiveCD into the "
+"cdrom drive, select the correct device and press Generate."
+msgstr ""
+"Gera uma mídia LiveUSB do SliTaz e inicializa pela RAM. Insira um\n"
+"LiveCD no drive de cdrom, selecione o dispositivo correto e \n"
+"pressione Gerar."
+
+#: live.cgi:97
+msgid "USB Media to use:"
+msgstr "Mídia USB para usar:"
+
+#: live.cgi:106 installer.cgi:299 installer.cgi:343 installer.cgi:378
+#: installer.cgi:410
+msgid "Not found"
+msgstr "Não encontrado"
+
+#: live.cgi:110
+msgid "Generate"
+msgstr "Gerar"
+
+#: live.cgi:129
 msgid "SliTaz Live Systems"
 msgstr "Sistema Live SliTaz"
 
-#: live.cgi:97
+#: live.cgi:130
 msgid "Create and manage Live CD or USB SliTaz systems"
 msgstr "Cria e gerencia sistemas SliTaz Live CD/USB"
 
-#: live.cgi:101
-msgid "Live USB"
+#: live.cgi:135
+#, fuzzy
+msgid "Create LiveUSB"
 msgstr "Live USB"
 
-#: live.cgi:103
-msgid ""
-"Generate SliTaz LiveUSB media and boot in RAM! Insert a\n"
-"\tLiveCD into the cdrom drive, select the correct device and press\n"
-"\tGenerate."
-msgstr ""
-"Gera uma mídia LiveUSB do SliTaz e inicializa pela RAM. Insira um\n"
-"\tLiveCD no drive de cdrom, selecione o dispositivo correto e \n"
-"\tpressione Gerar."
-
-#: live.cgi:108
-msgid "USB Media to use:"
-msgstr "Mídia USB para usar:"
-
-#: live.cgi:117 installer.cgi:302 installer.cgi:346 installer.cgi:381
-#: installer.cgi:414
-msgid "Not found"
-msgstr "Não encontrado"
-
-#: live.cgi:121
-msgid "Generate"
-msgstr "Gerar"
-
-#: live.cgi:125
+#: live.cgi:140
 msgid "Write a Live CD"
 msgstr "Crie um LiveCD"
 
-#: live.cgi:127
+#: live.cgi:142
+#, fuzzy
 msgid ""
-"The command writeiso will generate an ISO image of the\n"
-"\tcurrent filesystem as is, including all files in the /home directory.\n"
-"\tIt is an easy way to remaster a SliTaz Live system, you just have\n"
-"\tto: boot, modify, writeiso."
+"The command writeiso will generate an ISO image of the current filesystem as "
+"is, including all files in the /home directory. It is an easy way to "
+"remaster a SliTaz Live system, you just have to: boot, modify, writeiso."
 msgstr ""
 "O comando writeiso irá gerar uma imagem ISO do\n"
-"\tsistema de arquivos atual, incluindo arquivos no diretório /home.\n"
-"\tÉ uma forma fácil de remasterizar um sistema Live do SliTaz, você\n"
-"\tdeve: iniciar, modificar, writeiso."
+"sistema de arquivos atual, incluindo arquivos no diretório /home.\n"
+"É uma forma fácil de remasterizar um sistema Live do SliTaz, você\n"
+"deve: iniciar, modificar, writeiso."
 
-#: live.cgi:133
+#: live.cgi:148
 msgid "Compression type:"
 msgstr "Tipo de compressão:"
 
-#: live.cgi:139
+#: live.cgi:154
 msgid "Write ISO"
 msgstr "Criar ISO"
 
-#: live.cgi:142
+#: live.cgi:158
 msgid "Live CD tools"
 msgstr "Ferramentas de LiveCD"
 
-#: live.cgi:144 live.cgi:169
+#: live.cgi:160 live.cgi:192 styles/default/header.sh:84
 msgid "Convert ISO to loram"
 msgstr "Converter ISO para loram"
 
-#: live.cgi:146
+#: live.cgi:162
+#, fuzzy
 msgid ""
-"This command will convert an ISO image of a SliTaz Live CD\n"
-"\tto a new ISO image requiring less RAM to run."
+"This command will convert an ISO image of a SliTaz Live CD to a new ISO "
+"image requiring less RAM to run."
 msgstr ""
 "Este comando converte uma imagem ISO de um sistema SliTaz LiveCD\n"
-"\tem uma nova imagem ISO que utiliza menos memória RAM para rodar."
+"em uma nova imagem ISO que utiliza menos memória RAM para rodar."
 
-#: live.cgi:152
+#: live.cgi:168
 msgid "ISO to convert"
 msgstr "ISO para converter"
 
-#: live.cgi:156
+#: live.cgi:173
 msgid "The filesystem is always in RAM"
 msgstr "O sistema de arquivos sempre está na RAM"
 
-#: live.cgi:159
+#: live.cgi:178
 msgid "The filesystem may be on a small CDROM"
 msgstr "O sistema de arquivos pode estar em um cdrom de pouca capacidade"
 
-#: live.cgi:162
+#: live.cgi:183
 msgid "The filesystem may be on a large CDROM"
 msgstr "O sistema de arquivos pode estar em um cdrom de muita capacidade"
 
-#: live.cgi:165 live.cgi:208
+#: live.cgi:187 live.cgi:234
 msgid "ISO to create"
 msgstr "ISO para criar"
 
-#: live.cgi:173 live.cgi:212
+#: live.cgi:196 live.cgi:239 styles/default/header.sh:85
 msgid "Build a meta ISO"
 msgstr "Cria uma meta ISO"
 
-#: live.cgi:175
+#: live.cgi:198
+#, fuzzy
 msgid ""
-"Combines several ISO flavors like nested Russian dolls.\n"
-"\tThe amount of RAM available at startup will be used to select the\n"
-"\tutmost one."
+"Combines several ISO flavors like nested Russian dolls. The amount of RAM "
+"available at startup will be used to select the utmost one."
 msgstr ""
 "Combina várias ISO de variantes como Bonecas Russas.\n"
-"\tA quantidade de memória RAM disponível durante o boot será usada\n"
-"\tpara selecionar a melhor opção."
+"A quantidade de memória RAM disponível durante o boot será usada\n"
+"para selecionar a melhor opção."
 
-#: live.cgi:188
+#: live.cgi:210
 msgid "ISO number"
 msgstr "Número da ISO"
 
-#: live.cgi:190 live.cgi:203
+#: live.cgi:213 live.cgi:228
 msgid "Minimum RAM"
 msgstr "RAM Mínima"
 
-#: live.cgi:201
+#: live.cgi:225
 msgid "ISO to add"
 msgstr "ISO para adicionar"
 
-#: live.cgi:205
+#: live.cgi:230
 msgid "Add to the list"
 msgstr "Adicionar para lista"
 
+#: network.cgi:13
+msgid "TazPanel - Network"
+msgstr ""
+
 #: network.cgi:24
 msgid "Quality"
 msgstr "Qualidade"
@@ -563,397 +863,493 @@
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: network.cgi:26 boot.cgi:86 lib/libtazpanel:88
+#: network.cgi:26 boot.cgi:84 lib/libtazpanel:99
 msgid "Status"
 msgstr "Status"
 
-#: network.cgi:52
+#: network.cgi:53
 msgid "Connected"
 msgstr "Conectado"
 
-#: network.cgi:91
-msgid "Changed hostname:"
+#: network.cgi:96
+#, fuzzy, sh-format
+msgid "Changed hostname: $get_hostname"
 msgstr "Nome de host alterado:"
 
-#: network.cgi:107
+#: network.cgi:112
 msgid "Scanning open ports..."
 msgstr "Procurando portas abertas..."
 
-#: network.cgi:110
-msgid "Port scanning for"
+#: network.cgi:115
+#, fuzzy, sh-format
+msgid "Port scanning for $scan"
 msgstr "Procura de portas para"
 
-#: network.cgi:124
+#: network.cgi:129
 msgid "Setting up IP..."
 msgstr "Configurando IP..."
 
-#: network.cgi:140
+#: network.cgi:145
 msgid "Ethernet connection"
 msgstr "Conexão ethernet"
 
-#: network.cgi:142
+#: network.cgi:147
+#, fuzzy
 msgid ""
-"Here you can configure a wired connection using DHCP to\n"
-"automatically get a random IP or configure a static/fixed IP"
+"Here you can configure a wired connection using DHCP to automatically get a "
+"random IP or configure a static/fixed IP"
 msgstr ""
 "Aqui você pode configurar conexões cabeadas usando DHCP para\n"
 "obter automaticamente um IP aleatório ou configurar um IP fixo"
 
-#: network.cgi:145
+#: network.cgi:150
 msgid "Configuration"
 msgstr "Configuração"
 
-#: network.cgi:152 network.cgi:241
+#: network.cgi:157 network.cgi:247
 msgid "Value"
 msgstr "Valor"
 
-#: network.cgi:156 lib/libtazpanel:86
+#: network.cgi:162 lib/libtazpanel:97
 msgid "Interface"
 msgstr "Interface"
 
-#: network.cgi:160
+#: network.cgi:166
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: network.cgi:164
+#: network.cgi:170
 msgid "Netmask"
 msgstr "Máscara de Rede"
 
-#: network.cgi:168
+#: network.cgi:174
 msgid "Gateway"
 msgstr "Gateway"
 
-#: network.cgi:172
+#: network.cgi:178
 msgid "DNS server"
 msgstr "Servidor DNS"
 
-#: network.cgi:176
+#: network.cgi:183
 msgid "Activate (static)"
 msgstr "Ativar (estático)"
 
-#: network.cgi:177
+#: network.cgi:184
 msgid "Activate (DHCP)"
 msgstr "Ativar (DHCP)"
 
-#: network.cgi:178
+#: network.cgi:185
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: network.cgi:181 network.cgi:260
+#: network.cgi:188 network.cgi:266
 msgid "Configuration file"
 msgstr "Arquivo de configuração"
 
-#: network.cgi:183
+#: network.cgi:190
+#, fuzzy
 msgid ""
-"These values are the ethernet settings in the main\n"
-"/etc/network.conf configuration file"
+"These values are the ethernet settings in the main /etc/network.conf "
+"configuration file"
 msgstr ""
 "Esses valores são as configurações da rede ethernet no\n"
 "arquivo de configuração /etc/network.conf"
 
-#: network.cgi:190 network.cgi:269
+#: network.cgi:196 network.cgi:274
 msgid "Manual Edit"
 msgstr "Edição manual"
 
-#: network.cgi:196
+#: network.cgi:202
 msgid "Scanning wireless interface..."
 msgstr "Procurando interface sem fio..."
 
-#: network.cgi:200
+#: network.cgi:206
 msgid "Wireless connection"
 msgstr "Conexões sem fio"
 
-#: network.cgi:203 network.cgi:290
+#: network.cgi:209 network.cgi:293 boot.cgi:167
 msgid "Start"
 msgstr "Iniciar"
 
-#: network.cgi:205 network.cgi:292
+#: network.cgi:211 network.cgi:295 boot.cgi:155
 msgid "Stop"
 msgstr "Parar"
 
-#: network.cgi:207
+#: network.cgi:213
 msgid "Scan"
 msgstr "Procurar"
 
-#: network.cgi:234
+#: network.cgi:240
 #, fuzzy
 msgid "Connection"
 msgstr "Conexão"
 
-#: network.cgi:245
+#: network.cgi:251
 msgid "Wifi name (ESSID)"
 msgstr ""
 
-#: network.cgi:249
+#: network.cgi:255
 msgid "Password (Wifi key)"
 msgstr ""
 
-#: network.cgi:253
-#, fuzzy
+#: network.cgi:259
 msgid "Encryption type"
 msgstr "Encriptação"
 
-#: network.cgi:257
-#, fuzzy
+#: network.cgi:263
 msgid "Configure"
 msgstr "Configuração"
 
-#: network.cgi:262
+#: network.cgi:268
+#, fuzzy
 msgid ""
-"These values are the wifi settings in the main\n"
-"/etc/network.conf configuration file"
+"These values are the wifi settings in the main /etc/network.conf "
+"configuration file"
 msgstr ""
 "Esses valores são as configurações da rede sem fio no\n"
 "arquivo de configuração /etc/network.conf"
 
-#: network.cgi:271
-msgid "Output of"
-msgstr "Saída de"
+#: network.cgi:276
+#, fuzzy
+msgid "Output of iwconfig"
+msgstr "Saída de "
 
-#: network.cgi:282
+#: network.cgi:286
 msgid "Networking"
 msgstr "Rede"
 
-#: network.cgi:284
+#: network.cgi:288
 msgid "Manage network connections and services"
 msgstr "Gerenciar serviços e conexões de rede"
 
-#: network.cgi:288
-msgid "Connection:"
-msgstr "Conexão"
-
-#: network.cgi:294
+#: network.cgi:297
 #, fuzzy
 msgid "Restart"
 msgstr "Iniciar"
 
-#: network.cgi:297
+#: network.cgi:300
 msgid "Configuration:"
 msgstr "Configuração:"
 
-#: network.cgi:307
+#: network.cgi:309
 msgid "Hosts"
 msgstr "Hosts"
 
-#: network.cgi:312
+#: network.cgi:314
 msgid "Edit hosts"
 msgstr "Editar hosts"
 
-#: network.cgi:314 installer.cgi:438
+#: network.cgi:316 installer.cgi:433
 msgid "Hostname"
 msgstr "Nome do host"
 
-#: network.cgi:317
+#: network.cgi:320
 msgid "Change hostname"
 msgstr "Mudar nome do host"
 
-#: network.cgi:322
-msgid "Output of "
+#: network.cgi:324
+#, fuzzy
+msgid "Output of ifconfig"
 msgstr "Saída de "
 
 #: network.cgi:328
 msgid "Routing table"
 msgstr "Tabela de roteamento"
 
-#: network.cgi:334
+#: network.cgi:332
 msgid "Domain name resolution"
 msgstr "Resolução de nome de domínio"
 
-#: network.cgi:340
+#: network.cgi:336
 msgid "ARP table"
 msgstr "Tabela ARP"
 
-#: network.cgi:346
+#: network.cgi:340
 msgid "IP Connections"
 msgstr "Conexões IP"
 
+#: boot.cgi:14
+msgid "TazPanel - Boot"
+msgstr ""
+
 #: boot.cgi:25
 msgid "Boot log files"
 msgstr "Arquivos de log de boot"
 
-#: boot.cgi:31 boot.cgi:44
+#: boot.cgi:31 boot.cgi:42
 msgid "X server"
 msgstr "Servidor X"
 
-#: boot.cgi:61 boot.cgi:244
+#: boot.cgi:46
+msgid "Show more..."
+msgstr ""
+
+#: boot.cgi:61 boot.cgi:252 styles/default/header.sh:67
 msgid "Manage daemons"
 msgstr "Gerenciar daemons"
 
-#: boot.cgi:63
+#: boot.cgi:62
 msgid "Check, start and stop daemons on SliTaz"
 msgstr "Checar, iniciar e parar daemons no SliTaz"
 
-#: boot.cgi:87
+#: boot.cgi:85
 msgid "Action"
 msgstr "Ação"
 
-#: boot.cgi:88
+#: boot.cgi:86
 msgid "PID"
 msgstr "PID"
 
-#: boot.cgi:109
-msgid "<td>SliTaz Firewall with iptable rules</td>"
-msgstr "<td>Firewall do SliTaz com regras do iptables</td>"
+#: boot.cgi:108
+msgid "SliTaz Firewall with iptable rules"
+msgstr "Firewall do SliTaz com regras do iptables"
 
-#: boot.cgi:111
-msgid "<td>Small and fast web server with CGI support</td>"
+#: boot.cgi:110
+#, fuzzy
+msgid "Small and fast web server with CGI support"
 msgstr "<td>Pequeno e rápido servidor web com suporte a CGI</td>"
 
-#: boot.cgi:113
-msgid "<td>Network time protocol daemon</td>"
+#: boot.cgi:112
+#, fuzzy
+msgid "Network time protocol daemon"
 msgstr "<td>Daemon do protocolo de tempo de rede</td>"
 
-#: boot.cgi:115
-msgid "<td>Anonymous FTP server</td>"
+#: boot.cgi:114
+#, fuzzy
+msgid "Anonymous FTP server"
 msgstr "<td>Servidor FTP anônimo</td>"
 
-#: boot.cgi:117
-msgid "<td>Busybox DHCP server</td>"
+#: boot.cgi:116
+#, fuzzy
+msgid "Busybox DHCP server"
 msgstr "<td>Servidor DHCP do busybox</td>"
 
-#: boot.cgi:119
-msgid "<td>Linux Kernel log daemon</td>"
+#: boot.cgi:118
+#, fuzzy
+msgid "Linux Kernel log daemon"
 msgstr "<td>Daemon de log do kernel Linux</td>"
 
-#: boot.cgi:121
-msgid "<td>Execute scheduled commands</td>"
+#: boot.cgi:120
+#, fuzzy
+msgid "Execute scheduled commands"
 msgstr "<td>Executar comandos agendados</td>"
 
-#: boot.cgi:123
-msgid "<td>Small static DNS server daemon</td>"
+#: boot.cgi:122
+#, fuzzy
+msgid "Small static DNS server daemon"
 msgstr "<td>Daemon do pequeno servidor estático de DNS</td>"
 
-#: boot.cgi:125
-msgid "<td>Transfer a file on tftp request</td>"
+#: boot.cgi:124
+#, fuzzy
+msgid "Transfer a file on tftp request"
 msgstr "<td>Transferir um arquivo por requisição tftp</td>"
 
-#: boot.cgi:127
-msgid "<td>Listen for network connections and launch programs</td>"
+#: boot.cgi:126
+#, fuzzy
+msgid "Listen for network connections and launch programs"
 msgstr "<td>Esperar por uma conexão de rede e executa programas</td>"
 
-#: boot.cgi:129
-msgid "<td>Manage a ZeroConf IPv4 link-local address</td>"
+#: boot.cgi:128
+#, fuzzy
+msgid "Manage a ZeroConf IPv4 link-local address"
 msgstr "<td>Gerencia um endereço IPv4 pelo ZeroConf</td>"
 
-#: boot.cgi:191
+#: boot.cgi:153
+#, fuzzy
+msgid "Started"
+msgstr "Iniciar"
+
+#: boot.cgi:165
+#, fuzzy
+msgid "Stopped"
+msgstr "Parar"
+
+#: boot.cgi:193
 msgid "GRUB Boot loader"
 msgstr "Gerenciador de boot GRUB"
 
-#: boot.cgi:193
+#: boot.cgi:195
 msgid "The first application started when the computer powers on"
 msgstr "O primeiro aplicativo iniciado quando o computador é ligado"
 
-#: boot.cgi:206 settings.cgi:283
+#: boot.cgi:201
+msgid "Default entry:"
+msgstr ""
+
+#: boot.cgi:203
+msgid "Timeout:"
+msgstr ""
+
+#: boot.cgi:205
+msgid "Splash image:"
+msgstr ""
+
+#: boot.cgi:208 settings.cgi:289
 msgid "Change"
 msgstr "Alterar"
 
-#: boot.cgi:211
+#: boot.cgi:210
+msgid "View or edit menu.lst"
+msgstr ""
+
+#: boot.cgi:213
 msgid "Boot entries"
 msgstr "Entradas de boot"
 
-#: boot.cgi:217
+#: boot.cgi:219
 msgid "Entry"
 msgstr "Entrada"
 
-#: boot.cgi:225
+#: boot.cgi:235
 #, fuzzy
 msgid "Web boot is available with gPXE"
 msgstr "Boot via web está disponível pelo gPXE"
 
-#: boot.cgi:235
+#: boot.cgi:245
 msgid "Boot &amp; Start services"
 msgstr "Serviços de Boot &amp; inicialização"
 
-#: boot.cgi:237
+#: boot.cgi:246
 msgid "Everything that happens before user login"
 msgstr "Tudo o que ocorre antes do login de usuário"
 
-#: boot.cgi:242
+#: boot.cgi:250 styles/default/header.sh:65
 msgid "Boot logs"
 msgstr "Logs de boot"
 
-#: boot.cgi:245
+#: boot.cgi:253 styles/default/header.sh:69
 msgid "Boot loader"
 msgstr "Gerenciador de boot"
 
-#: boot.cgi:250
+#: boot.cgi:258
 msgid "Main configuration file:"
 msgstr "Arquivo de configuração principal:"
 
-#: boot.cgi:252
+#: boot.cgi:260
 msgid "Login manager settings:"
 msgstr "Configurações do gerenciador de login:"
 
-#: boot.cgi:256
+#: boot.cgi:264
 msgid "Kernel cmdline"
 msgstr "Opções de linha de comando do kernel"
 
-#: boot.cgi:260
+#: boot.cgi:268
 msgid "Local startup commands"
 msgstr "Comandos de inicialização locais"
 
-#: boot.cgi:265
+#: boot.cgi:273
 msgid "Edit script"
 msgstr "Editar script"
 
-#: hardware.cgi:28
+#: hardware.cgi:13
+msgid "TazPanel - Hardware"
+msgstr ""
+
+#: hardware.cgi:29
 #, fuzzy
 msgid "Detect hardware"
 msgstr "Configurar relógio do hardware"
 
-#: hardware.cgi:29
+#: hardware.cgi:30
 msgid "Detect PCI and USB hardware"
 msgstr ""
 
-#: hardware.cgi:42
+#: hardware.cgi:42 hardware.cgi:117 styles/default/header.sh:75
 msgid "Kernel modules"
 msgstr "Módulos de kernel"
 
+#: hardware.cgi:46
+#, fuzzy
+msgid "Modules search"
+msgstr "Módulo"
+
 #: hardware.cgi:49
 msgid "Manage, search or get information about the Linux kernel modules"
 msgstr "Gerenciar, buscar e obter informações sobre módulos do kernel linux"
 
-#: hardware.cgi:55
-msgid "Detailed information for module: "
+#: hardware.cgi:56
+#, fuzzy, sh-format
+msgid "Detailed information for module: $get_modinfo"
 msgstr "Informações detalhadas de módulo: "
 
-#: hardware.cgi:71
-msgid "Matching result(s) for: "
+#: hardware.cgi:70
+#, fuzzy, sh-format
+msgid "Matching result(s) for: $get_search"
 msgstr "Resultado(s) encontrado(s) para: "
 
-#: hardware.cgi:84
+#: hardware.cgi:76
+#, fuzzy
+msgid "Module:"
+msgstr "Módulo"
+
+#: hardware.cgi:83
 msgid "Module"
 msgstr "Módulo"
 
-#: hardware.cgi:85 lib/libtazpanel:206
+#: hardware.cgi:84 lib/libtazpanel:217
 msgid "Size"
 msgstr "Tamanho"
 
-#: hardware.cgi:86 lib/libtazpanel:208
+#: hardware.cgi:85 lib/libtazpanel:219
 msgid "Used"
 msgstr "Usado"
 
-#: hardware.cgi:87
+#: hardware.cgi:86
 msgid "by"
 msgstr "por"
 
-#: hardware.cgi:113
+#: hardware.cgi:112
 msgid "Drivers &amp; Devices"
 msgstr "Drivers &amp; dispositivos"
 
-#: hardware.cgi:114
+#: hardware.cgi:113
 msgid "Manage your computer hardware"
 msgstr "Gerencie o hardware de seu computador"
 
-#: hardware.cgi:171
+#: hardware.cgi:119 styles/default/header.sh:77
+msgid "Detect PCI/USB"
+msgstr ""
+
+#: hardware.cgi:140
+msgid "Battery"
+msgstr ""
+
+#: hardware.cgi:142
+msgid "health"
+msgstr ""
+
+#: hardware.cgi:151
+#, sh-format
+msgid "Discharging $rempct% - $remtimef"
+msgstr ""
+
+#: hardware.cgi:155
+#, sh-format
+msgid "Charging $rempct% - $remtimef"
+msgstr ""
+
+#: hardware.cgi:157
+msgid "Charged 100%"
+msgstr ""
+
+#: hardware.cgi:165
+#, fuzzy
+msgid "Temperature:"
+msgstr "Gerar"
+
+#: hardware.cgi:180
 msgid "Brightness"
 msgstr ""
 
-#: hardware.cgi:217
+#: hardware.cgi:242
 msgid "System memory"
 msgstr "Memória do sistema"
 
-#: settings.cgi:88 settings.cgi:176
+#: settings.cgi:15
+msgid "TazPanel - Settings"
+msgstr ""
+
+#: settings.cgi:87 settings.cgi:183
 msgid "Manage users"
 msgstr "Gerencie usuários"
 
@@ -985,431 +1381,455 @@
 msgid "Shell"
 msgstr "Shell"
 
-#: settings.cgi:138
+#: settings.cgi:143
 msgid "Password:"
 msgstr "Senha:"
 
-#: settings.cgi:140
+#: settings.cgi:145
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: settings.cgi:144
+#: settings.cgi:149
 msgid "Add a new user"
 msgstr "Adicionar um novo usuário"
 
-#: settings.cgi:147 installer.cgi:467
+#: settings.cgi:154 installer.cgi:465
 msgid "User login:"
 msgstr "Login do usuário:"
 
-#: settings.cgi:149
+#: settings.cgi:156
 msgid "User password:"
 msgstr "Senha do usuário:"
 
-#: settings.cgi:151
+#: settings.cgi:159
 msgid "Create user"
 msgstr "Criar usuário"
 
-#: settings.cgi:154
+#: settings.cgi:163
 msgid "Current user sessions"
 msgstr "Sessões do usuário atual"
 
-#: settings.cgi:159
+#: settings.cgi:167
 msgid "Last user sessions"
 msgstr "Sessões do último usuário"
 
-#: settings.cgi:171
+#: settings.cgi:178
 msgid "System settings"
 msgstr "Configurações do sistema"
 
-#: settings.cgi:172
+#: settings.cgi:179
 msgid "Manage system time, users or language settings"
 msgstr "Gerencie configurações do tempo do sistema, usuários e linguagem"
 
-#: settings.cgi:179
+#: settings.cgi:186
 msgid "System time"
 msgstr "Tempo do sistema"
 
-#: settings.cgi:181
-msgid "Time zome      :"
+#: settings.cgi:189
+#, fuzzy
+msgid "Time zome:"
 msgstr "Zona horária  :"
 
-#: settings.cgi:182
-msgid "System time    :"
-msgstr "Tempo do sistema:"
+#: settings.cgi:190
+#, fuzzy
+msgid "System time:"
+msgstr "Tempo do sistema"
 
-#: settings.cgi:183
-msgid "Hardware clock :"
+#: settings.cgi:191
+#, fuzzy
+msgid "Hardware clock:"
 msgstr "Relógio de hardware:"
 
-#: settings.cgi:185
+#: settings.cgi:193
 msgid "Sync online"
 msgstr "Sincronização online"
 
-#: settings.cgi:186
+#: settings.cgi:194
 msgid "Set hardware clock"
 msgstr "Configurar relógio do hardware"
 
-#: settings.cgi:193
+#: settings.cgi:200
 msgid "System language"
 msgstr "Linguagem do sistema"
 
-#: settings.cgi:204
-#, sh-format
+#: settings.cgi:211
+#, fuzzy, sh-format
 msgid ""
-"You must logout and login again to your current\n"
-"\t\t\t\tsession to use $new_locale locale."
+"You must logout and login again to your current session to use $new_locale "
+"locale."
 msgstr ""
 "Você deve sair e fazer login novamente para\n"
 "\t\t\t\tusar o locale $new_locale."
 
-#: settings.cgi:207
-msgid "Current system locales: "
+#: settings.cgi:214
+#, fuzzy
+msgid "Current system locales:"
 msgstr "Locales da sessão atual: "
 
-#: settings.cgi:213
+#: settings.cgi:220
 msgid "Available locales:"
 msgstr "Locales disponíveis:"
 
-#: settings.cgi:218 settings.cgi:266 settings.cgi:276
+#: settings.cgi:225 settings.cgi:271 settings.cgi:282
 msgid "Activate"
 msgstr "Ativar"
 
-#: settings.cgi:222
+#: settings.cgi:228
 msgid "Console keymap"
 msgstr "Mapa de teclas do teclado"
 
-#: settings.cgi:234
-msgid "Current console keymap: "
+#: settings.cgi:241
+#, fuzzy, sh-format
+msgid "Current console keymap: $keymap"
 msgstr "Mapa de teclado atual: "
 
-#: settings.cgi:253
+#: settings.cgi:258
 msgid "Suggested keymap for Xorg:"
 msgstr "Mapa de teclado sugerido para o Xorg:"
 
-#: settings.cgi:262
+#: settings.cgi:267
 msgid "Available keymaps:"
 msgstr "Mapa de teclado disponíveis:"
 
-#: settings.cgi:269
+#: settings.cgi:274
 msgid "Panel configuration"
 msgstr "Configuração do Painel"
 
-#: settings.cgi:272
+#: settings.cgi:278
 msgid "Style:"
 msgstr "Estilo:"
 
-#: settings.cgi:281
+#: settings.cgi:287
 msgid "Panel password:"
 msgstr "Senha do painel:"
 
-#: settings.cgi:287
-msgid "Configuration files: "
+#: settings.cgi:293
+#, fuzzy
+msgid "Configuration files:"
 msgstr "Arquivos de configuração: "
 
-#: settings.cgi:289
+#: settings.cgi:295 styles/default/header.sh:24
 msgid "Panel"
 msgstr "Painel"
 
-#: settings.cgi:291
+#: settings.cgi:297
 msgid "Server"
 msgstr "Servidor"
 
-#: settings.cgi:294
+#: settings.cgi:300
 msgid "TazPanel provides a debuging mode and page:"
 msgstr "O TazPanel oferece um modo de debug:"
 
-#: lib/libtazpanel:89
+#: lib/libtazpanel:83
+#, fuzzy
+msgid "connected"
+msgstr "Conectado"
+
+#: lib/libtazpanel:100
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: lib/libtazpanel:90
+#: lib/libtazpanel:101
 msgid "Scan ports"
 msgstr "Buscar portas"
 
-#: lib/libtazpanel:205
+#: lib/libtazpanel:214
 msgid "Disk"
 msgstr ""
 
-#: lib/libtazpanel:207
+#: lib/libtazpanel:215
+msgid "Label"
+msgstr ""
+
+#: lib/libtazpanel:216
+msgid "Type"
+msgstr ""
+
+#: lib/libtazpanel:218
 msgid "Available"
 msgstr "Disponível"
 
-#: lib/libtazpanel:209
+#: lib/libtazpanel:220
 msgid "Mount point"
 msgstr "Ponto de montagem"
 
-#: installer.cgi:120 installer.cgi:126
+#: installer.cgi:24
+#, fuzzy
+msgid "TazPanel - Installer"
+msgstr "Instalar"
+
+#: installer.cgi:116
+#, sh-format
+msgid "Creating setup file $INSTFILE."
+msgstr ""
+
+#: installer.cgi:120 installer.cgi:127
 msgid "Setup File Error"
 msgstr ""
 
-#: installer.cgi:141
+#: installer.cgi:121
+#, sh-format
+msgid "The setup file <strong>$INSTFILE</strong> doesn't exist."
+msgstr ""
+
+#: installer.cgi:142
 #, fuzzy
 msgid "SliTaz Installer"
 msgstr "Instalar"
 
-#: installer.cgi:143
+#: installer.cgi:144
 msgid ""
-"The SliTaz Installer installs or upgrades SliTaz to a hard disk\n"
-"\tdrive from a device like a Live-CD or LiveUSB key, from a SliTaz ISO "
-"file,\n"
-"\tor from the web by downloading an ISO file."
+"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."
 msgstr ""
 
 #: installer.cgi:157
 msgid ""
-"Install SliTaz on a partition of your hard disk drive. If\n"
-"\tyou decide to format your partition, all data will be lost. If you do not\n"
-"\tformat, all data except for any existing /home directory will be "
-"removed, \n"
-"\tthe home directory will be kept as is."
+"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."
 msgstr ""
 
-#: installer.cgi:163
+#: installer.cgi:162
 msgid ""
-"Before installation, you may need to create or resize partitions\n"
-"\ton your hard disk drive in order to make space for SliTaz GNU/Linux.\n"
-"\tYou can graphically manage your partitions with Gparted"
+"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"
 msgstr ""
 
-#: installer.cgi:169 installer.cgi:249
+#: installer.cgi:166 installer.cgi:244 styles/default/header.sh:90
 #, fuzzy
 msgid "Install SliTaz"
 msgstr "Instalar"
 
-#: installer.cgi:177
+#: installer.cgi:175
 msgid "Upgrade"
 msgstr ""
 
-#: installer.cgi:179
+#: installer.cgi:177
 msgid ""
-"Upgrade an already installed SliTaz system on your hard disk\n"
-"\tdrive. Your /home /etc /var/www directories will be kept, all other "
-"directories\n"
-"\twill be removed. Any additional packages added to your old Slitaz system\n"
-"\twill be updated as long you have an active internet connection."
+"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."
 msgstr ""
 
-#: installer.cgi:186 installer.cgi:261
+#: installer.cgi:182 installer.cgi:257
 msgid "Upgrade SliTaz"
 msgstr ""
 
-#: installer.cgi:194
+#: installer.cgi:190
 msgid "Partitioning"
 msgstr ""
 
-#: installer.cgi:197
+#: installer.cgi:193
 msgid ""
-"On most used systems, the hard drive is already dedicated to \n"
-"\tpartitions for Windows<sup>&copy;</sup>, or Linux, or another operating \n"
-"\tsystem. You'll need to resize these partitions in order to make space for\n"
-"\tSliTaz GNU/Linux. SliTaz will co-exist with other operating systems "
-"already\n"
-"\tinstalled on your hard drive."
+"On most used systems, the hard drive is already dedicated to partitions for "
+"Windows<sup>&trade;</sup>, 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."
+msgstr ""
+
+#: installer.cgi:199
+msgid ""
+"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."
 msgstr ""
 
 #: installer.cgi:204
 msgid ""
-"The amount of space needed depends on how much software you \n"
-"\tplan to install\tand how much space you require for users. It's "
-"conceivable\n"
-"\tthat you could run a minimal SliTaz system in 300 megs or less, but 2 "
-"gigs\n"
-"\tis indeed more comfy."
+"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."
 msgstr ""
 
-#: installer.cgi:209
+#: installer.cgi:212
 msgid ""
-"A separate home partition, and a partition that will be used \n"
-"\tas Linux swap space may be created if needed. Slitaz detects and uses "
-"swap\n"
-"\tpartitions automatically."
+"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."
 msgstr ""
 
-#: installer.cgi:217
+#: installer.cgi:216
 msgid ""
-"You can graphically manage your partitions with Gparted. GParted\n"
-"\tis a partition editor for graphically managing your disk partitions. "
-"Gparted\n"
-"\tallows you to create, destroy, resize and copy partitions without data\n"
-"\tloss."
+"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 and so on."
 msgstr ""
 
 #: installer.cgi:223
-msgid ""
-"Gparted supports ext2, ext3, ext4, linux swap, ntfs and fat32\n"
-"\tfilesystems right out of the box. Support for xjs, jfs, hfs and other\n"
-"\tfilesystems is available as well but you first need to add drivers for \n"
-"\tthese filesystems by installing the related packages xfsprogs, jfsutils,\n"
-"\tlinux-hfs and so on."
-msgstr ""
-
-#: installer.cgi:230
 msgid "Execute Gparted"
 msgstr ""
 
-#: installer.cgi:231
+#: installer.cgi:225
 #, fuzzy
 msgid "Continue installation"
 msgstr "Ligação para outra instalação do SliTaz"
 
-#: installer.cgi:232
+#: installer.cgi:227
 msgid ""
-"Once you've made room for SliTaz on your drive,\tyou\n"
-"\tshould be able to continue installation."
+"Once you've made room for SliTaz on your drive, you should be able to "
+"continue installation."
 msgstr ""
 
-#: installer.cgi:237 installer.cgi:501 installer.cgi:512
+#: installer.cgi:232 installer.cgi:502 installer.cgi:513
 msgid "Back to Installer Start Page"
 msgstr ""
 
-#: installer.cgi:239
+#: installer.cgi:234
+#, fuzzy
 msgid "Continue Installation"
+msgstr "Ligação para outra instalação do SliTaz"
+
+#: installer.cgi:246
+msgid ""
+"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."
 msgstr ""
 
-#: installer.cgi:250
+#: installer.cgi:259
 msgid ""
-"You're going to install SliTaz on a partition of your hard disk drive. If\n"
-"\tyou decide to format your HDD, all data will be lost. If you do not \n"
-"\tformat, all data except for any existing /home directory will be "
-"removed, \n"
-"\tthe home directory will be kept as is."
+"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 have an active internet connection."
 msgstr ""
 
-#: installer.cgi:262
-msgid ""
-"You're going to upgrade an already installed SliTaz system on your hard "
-"disk\n"
-"\tdrive. Your /home /etc /var/www directories will be kept, all other "
-"directories\n"
-"\twill be removed. Any additional packages added to your old Slitaz system\n"
-"\twill be updated as long you have an active internet connection."
+#: installer.cgi:273
+msgid "Slitaz source media"
 msgstr ""
 
 #: installer.cgi:277
-msgid "Slitaz source media"
-msgstr ""
-
-#: installer.cgi:280
 #, fuzzy
 msgid "LiveCD"
 msgstr "Ferramentas de LiveCD"
 
-#: installer.cgi:283
+#: installer.cgi:280
 #, fuzzy
-msgid "LiveUSB"
+msgid "LiveUSB:"
 msgstr "Live USB"
 
-#: installer.cgi:309
-msgid "ISO file"
+#: installer.cgi:306
+msgid "ISO file:"
 msgstr ""
 
+#: installer.cgi:307
+#, fuzzy
+msgid "Full path to the ISO image file"
+msgstr "Instalar de imagem ISO: "
+
 #: installer.cgi:310
-msgid "Full path to the ISO image file"
+msgid "Web:"
 msgstr ""
 
-#: installer.cgi:314
+#: installer.cgi:311
 #, fuzzy
 msgid "Stable"
 msgstr "Tabela ARP"
 
-#: installer.cgi:315
+#: installer.cgi:312
 msgid "Cooking"
 msgstr ""
 
-#: installer.cgi:316
+#: installer.cgi:314
 msgid "URL:"
 msgstr ""
 
-#: installer.cgi:317
+#: installer.cgi:315
 #, fuzzy
 msgid "Full url to an ISO image file"
 msgstr "Instalar de imagem ISO: "
 
-#: installer.cgi:327
+#: installer.cgi:324
 msgid "Hard Disk Drive"
 msgstr ""
 
-#: installer.cgi:336
+#: installer.cgi:333
 #, fuzzy
 msgid "Install Slitaz to partition:"
 msgstr "Instalar"
 
-#: installer.cgi:341 installer.cgi:376 installer.cgi:409
+#: installer.cgi:338 installer.cgi:373 installer.cgi:405
 msgid "None"
 msgstr ""
 
-#: installer.cgi:352
-msgid "Format partition as"
+#: installer.cgi:349 installer.cgi:416
+msgid "Format partition as:"
 msgstr ""
 
-#: installer.cgi:371
+#: installer.cgi:368
 msgid "Existing SliTaz partition to upgrade:"
 msgstr ""
 
-#: installer.cgi:393
+#: installer.cgi:389
 #, fuzzy
 msgid "Options"
 msgstr "Ação"
 
-#: installer.cgi:402
+#: installer.cgi:397
 msgid "home partition"
 msgstr ""
 
-#: installer.cgi:404
+#: installer.cgi:400
 msgid "Use a separate partition for /home:"
 msgstr ""
 
-#: installer.cgi:420
-msgid "Format partition as:"
-msgstr ""
-
-#: installer.cgi:439
+#: installer.cgi:435
 #, fuzzy
 msgid "Set Hostname to:"
 msgstr "Nome do host"
 
-#: installer.cgi:440
+#: installer.cgi:436
 msgid "Name of your system"
 msgstr ""
 
-#: installer.cgi:451
+#: installer.cgi:446
 msgid "Root"
 msgstr ""
 
-#: installer.cgi:452
+#: installer.cgi:448
 #, fuzzy
 msgid "Root passwd:"
 msgstr "Nova senha: "
 
-#: installer.cgi:453 installer.cgi:455
+#: installer.cgi:449 installer.cgi:452
 #, fuzzy
 msgid "Password of root"
 msgstr "Senha:"
 
-#: installer.cgi:454 installer.cgi:473
+#: installer.cgi:451 installer.cgi:473
 #, fuzzy
 msgid "Confirm password:"
 msgstr "Senha do usuário:"
 
-#: installer.cgi:466
+#: installer.cgi:463
 #, fuzzy
 msgid "User"
 msgstr "ID de usuário"
 
-#: installer.cgi:468
+#: installer.cgi:466
 msgid "Name of the first user"
 msgstr ""
 
-#: installer.cgi:471
+#: installer.cgi:470
 #, fuzzy
 msgid "User passwd:"
 msgstr "Senha do usuário:"
 
-#: installer.cgi:472 installer.cgi:474
+#: installer.cgi:471 installer.cgi:474
+#, fuzzy
 msgid "Password of the first user"
-msgstr ""
+msgstr "Senha:"
 
-#: installer.cgi:485
+#: installer.cgi:484
 msgid "Grub"
 msgstr ""
 
@@ -1419,65 +1839,199 @@
 "install grub by hand yourself."
 msgstr ""
 
-#: installer.cgi:489
+#: installer.cgi:490
 msgid "Enable Windows Dual-Boot."
 msgstr ""
 
-#: installer.cgi:498
+#: installer.cgi:499
 msgid "Back to partitioning"
 msgstr ""
 
-#: installer.cgi:505
+#: installer.cgi:506
 #, fuzzy
 msgid "Proceed to SliTaz installation"
 msgstr "Ligação para outra instalação do SliTaz"
 
-#: installer.cgi:507
+#: installer.cgi:508
 msgid "Installation complete. You can now restart (reboot)"
 msgstr ""
 
-#: installer.cgi:509
+#: installer.cgi:510
 msgid "Installation failed. See log"
 msgstr ""
 
-#: installer.cgi:527
+#: installer.cgi:530
 msgid "A web page that points a browser to a different page after 2 seconds"
 msgstr ""
 
-#: installer.cgi:532
+#: installer.cgi:536
 msgid ""
-"If your browser doesn't automatically redirect within a few seconds, \n"
-"you may want to go there manually"
+"If your browser doesn't automatically redirect within a few seconds, you may "
+"want to go there manually"
 msgstr ""
 
-#: installer.cgi:547 installer.cgi:560
+#: installer.cgi:551 installer.cgi:566
 msgid "Tazinst Error"
 msgstr ""
 
-#: installer.cgi:548
+#: installer.cgi:552
 msgid ""
-"the lightweight SliTaz HDD installer\n"
-"is missing. Any installation can not be done without tazinst."
+"<strong>tazinst</strong>, the lightweight SliTaz HDD installer is missing. "
+"Any installation can not be done without tazinst."
 msgstr ""
 
-#: installer.cgi:550
+#: installer.cgi:555
 msgid "Check tazinst' permissions, or reinstall the slitaz-tools package:"
 msgstr ""
 
-#: installer.cgi:573
+#: installer.cgi:581
 msgid "Proceeding: ()"
 msgstr ""
 
-#: installer.cgi:630 installer.cgi:641
+#: installer.cgi:582
+msgid "Please wait until processing is complete"
+msgstr ""
+
+#: installer.cgi:588
+msgid "Completed."
+msgstr ""
+
+#: installer.cgi:622
+#, fuzzy
+msgid "Hostname error"
+msgstr "Nome do host"
+
+#: installer.cgi:626
+#, fuzzy
+msgid "Root password error"
+msgstr "Nova senha: "
+
+#: installer.cgi:630
+#, fuzzy
+msgid "User login error"
+msgstr "Login do usuário:"
+
+#: installer.cgi:634
+#, fuzzy
+msgid "User password error"
+msgstr "Senha do usuário:"
+
+#: installer.cgi:637 installer.cgi:648
 msgid "Do you really want to continue?"
 msgstr ""
 
+#: help.cgi:20
+#, fuzzy
+msgid "Manual"
+msgstr "Edição manual"
+
+#: help.cgi:28
+msgid "TazPanel - Help &amp; Doc"
+msgstr ""
+
+#: styles/default/header.sh:29
+msgid "Processes"
+msgstr ""
+
+#: styles/default/header.sh:31
+#, fuzzy
+msgid "Create Report"
+msgstr "Criar relatório"
+
+#: styles/default/header.sh:34
+#, fuzzy
+msgid "Packages"
+msgstr "Pacote"
+
+#: styles/default/header.sh:41
+#, fuzzy
+msgid "Check updates"
+msgstr "Checar atualizações"
+
+#: styles/default/header.sh:49
+msgid "Ethernet"
+msgstr ""
+
+#: styles/default/header.sh:51
+msgid "Wireless"
+msgstr ""
+
+#: styles/default/header.sh:53
+#, fuzzy
+msgid "Config file"
+msgstr "Arquivo de configuração"
+
+#: styles/default/header.sh:56
+#, fuzzy
+msgid "Settings"
+msgstr "Configurações do sistema"
+
+#: styles/default/header.sh:59
+#, fuzzy
+msgid "Users"
+msgstr "ID de usuário"
+
+#: styles/default/header.sh:62
+#, fuzzy
+msgid "Boot"
+msgstr "Logs de boot"
+
+#: styles/default/header.sh:72
+#, fuzzy
+msgid "Hardware"
+msgstr "Relógio de hardware:"
+
+#: styles/default/header.sh:80
+#, fuzzy
+msgid "Live"
+msgstr "Ferramentas de LiveCD"
+
+#: styles/default/header.sh:82
+msgid "Create a live USB key"
+msgstr ""
+
+#: styles/default/header.sh:83
+#, fuzzy
+msgid "Create a live CD-ROM"
+msgstr "Crie um LiveCD"
+
+#: styles/default/header.sh:91
+msgid "Upgrade system"
+msgstr ""
+
+#: styles/default/footer.sh:6
+msgid "Copyright"
+msgstr ""
+
+#: styles/default/footer.sh:8
+msgid "BSD License"
+msgstr ""
+
+#~ msgid "List:"
+#~ msgstr "Lista:"
+
+#~ msgid "System time    :"
+#~ msgstr "Tempo do sistema:"
+
+#~ msgid "Usage:"
+#~ msgstr "Uso:"
+
+#~ msgid "Output of"
+#~ msgstr "Saída de"
+
+#~ msgid "Host:"
+#~ msgstr "Host:"
+
+#, fuzzy
+#~ msgid "Uptime       :"
+#~ msgstr "Uptime       :"
+
+#~ msgid "Live USB"
+#~ msgstr "Live USB"
+
+#~ msgid "Connection:"
+#~ msgstr "Conexão"
+
 #, fuzzy
 #~ msgid "Host"
 #~ msgstr "Host:"
-
-#~ msgid "Filesystem"
-#~ msgstr "Sistema de arquios"
-
-#~ msgid "Uptime:"
-#~ msgstr "Uptime:"
diff -r 5312e3716b01 -r fdfc6b494539 po/ru.po
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/po/ru.po	Fri May 04 13:00:43 2012 +0300
@@ -0,0 +1,1939 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: TazPanel 1.4.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-04 02:44+0000\n"
+"PO-Revision-Date: 2012-05-04 12:45+0300\n"
+"Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: ../\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: tazpanel:35
+#, sh-format
+msgid "Starting TazPanel web server on port $HTTPD_PORT..."
+msgstr "Веб-сервер TazPanel запускается на порту $HTTPD_PORT..."
+
+#: tazpanel:37
+msgid "TazPanel Authentication - Default: root:root"
+msgstr "Аутентификация TazPanel (по умолчанию root:root)"
+
+#: tazpanel:42
+msgid "Stopping TazPanel web server..."
+msgstr "Остановка веб-сервера TazPanel…"
+
+#: tazpanel:46
+msgid "Changing password for TazPanel"
+msgstr "Изменение пароля TazPanel"
+
+#: tazpanel:47
+msgid "New password: "
+msgstr "Новый пароль: "
+
+#: tazpanel:49
+msgid "Password changed successfully"
+msgstr "Пароль успешно изменен"
+
+#: tazpanel:54
+#, sh-format
+msgid "Usage: $program_name [start|stop|passwd]"
+msgstr "Использование: $program_name [start|stop|passwd]"
+
+#: index.cgi:38
+#: index.cgi:83
+msgid "Differences"
+msgstr "Различия"
+
+#: index.cgi:72
+msgid "TazPanel - File"
+msgstr "Файл | TazPanel"
+
+#: index.cgi:81
+msgid "Save"
+msgstr "Сохранить"
+
+#: index.cgi:103
+#: settings.cgi:261
+msgid "Edit"
+msgstr "Правка"
+
+#: index.cgi:126
+msgid "TazPanel - Terminal"
+msgstr "Терминал | TazPanel"
+
+#: index.cgi:139
+msgid "Small terminal emulator, commands options are supported."
+msgstr "Маленький эмулятор терминала, поддерживаются параметры команд."
+
+#: index.cgi:141
+#: index.cgi:158
+#, sh-format
+msgid "Commands: $commands"
+msgstr "Команды: $commands"
+
+#: index.cgi:146
+#, sh-format
+msgid "Downloading to: $dl"
+msgstr "Загрузка в: $dl"
+
+#: index.cgi:153
+#, sh-format
+msgid "$cmd needs an argument"
+msgstr "Команда $cmd требует аргумент"
+
+#: index.cgi:157
+#, sh-format
+msgid "Unknown command: $cmd"
+msgstr "Неизвестная команда: $cmd"
+
+#: index.cgi:162
+msgid "TazPanel - Process activity"
+msgstr "Активность процессов | TazPanel"
+
+#: index.cgi:164
+msgid "Refresh:"
+msgstr "Обновить:"
+
+#: index.cgi:169
+msgid "1s"
+msgstr "1 с"
+
+#: index.cgi:170
+msgid "5s"
+msgstr "5 с"
+
+#: index.cgi:171
+msgid "10s"
+msgstr "10 с"
+
+#: index.cgi:172
+#: live.cgi:152
+msgid "none"
+msgstr "нет"
+
+#: index.cgi:188
+msgid "TazPanel - Debug"
+msgstr "Отладка | TazPanel"
+
+#: index.cgi:191
+msgid "HTTP Environment"
+msgstr "Переменные окружения HTTP"
+
+#: index.cgi:198
+msgid "TazPanel - System report"
+msgstr "Системный отчет | TazPanel"
+
+#: index.cgi:203
+#, sh-format
+msgid "Reporting to: $output"
+msgstr "Файл отчета: $output"
+
+#: index.cgi:206
+msgid "Creating report header..."
+msgstr "Создание заголовка отчета…"
+
+#: index.cgi:213
+#: index.cgi:230
+msgid "SliTaz system report"
+msgstr "Системный отчет SliTaz"
+
+#: index.cgi:227
+msgid "Creating system summary..."
+msgstr "Получение сводки о системе…"
+
+#: index.cgi:231
+msgid "Date:"
+msgstr "Дата:"
+
+#: index.cgi:242
+msgid "Getting hardware info..."
+msgstr "Получение информации об оборудовании…"
+
+#: index.cgi:260
+msgid "Getting networking info..."
+msgstr "Получение информации о сетях…"
+
+#: index.cgi:274
+msgid "Getting filesystems info..."
+msgstr "Получение информации о файловых системах…"
+
+#: index.cgi:294
+msgid "Getting boot logs..."
+msgstr "Получение журналов загрузки…"
+
+#: index.cgi:297
+#: boot.cgi:29
+#: boot.cgi:34
+msgid "Kernel messages"
+msgstr "Сообщения ядра"
+
+#: index.cgi:300
+#: boot.cgi:30
+#: boot.cgi:38
+msgid "Boot scripts"
+msgstr "Загрузочные скрипты"
+
+#: index.cgi:305
+msgid "Creating report footer..."
+msgstr "Завершение создание отчета…"
+
+#: index.cgi:317
+msgid "View report"
+msgstr "Просмотреть отчет"
+
+#: index.cgi:318
+msgid "This report can be attached with a bug report on:"
+msgstr "Этот отчет можно прикрепить к баг-репорту здесь:"
+
+#: index.cgi:332
+#, sh-format
+msgid "Host: $hostname"
+msgstr "Хост: $hostname"
+
+#: index.cgi:333
+msgid "SliTaz administration and configuration Panel"
+msgstr "Панель администрирования и настройки SliTaz"
+
+#: index.cgi:337
+#: styles/default/header.sh:27
+msgid "Terminal"
+msgstr "Терминал"
+
+#: index.cgi:339
+msgid "Process activity"
+msgstr "Активность процессов"
+
+#: index.cgi:341
+msgid "Create a report"
+msgstr "Создать отчет"
+
+#: index.cgi:344
+#: pkgs.cgi:948
+msgid "Summary"
+msgstr "Сводка"
+
+#: index.cgi:347
+msgid "Uptime:"
+msgstr "Время работы:"
+
+#: index.cgi:350
+msgid "Memory in Mb:"
+msgstr "Память в МБ:"
+
+#: index.cgi:355
+#, sh-format
+msgid "Total: $memtotal, Used: $memused, Free: $memfree"
+msgstr "Всего: $memtotal, занято: $memused, свободно: $memfree"
+
+#: index.cgi:360
+msgid "Linux kernel:"
+msgstr "Ядро Linux:"
+
+#: index.cgi:367
+msgid "Network status"
+msgstr "Состояние сети"
+
+#: index.cgi:370
+#: hardware.cgi:202
+msgid "Filesystem usage statistics"
+msgstr "Статистика использования файловых систем"
+
+#: index.cgi:403
+msgid "Panel Activity"
+msgstr "Действия панели"
+
+#: pkgs.cgi:17
+msgid "TazPanel - Packages"
+msgstr "Пакеты | TazPanel"
+
+#: pkgs.cgi:51
+msgid "Last recharge:"
+msgstr "Последнее обновление:"
+
+#: pkgs.cgi:58
+msgid "(Older than 10 days)"
+msgstr "(старше, чем 10 дней)"
+
+#: pkgs.cgi:60
+msgid "(Not older than 10 days)"
+msgstr "(не старше, чем 10 дней)"
+
+#: pkgs.cgi:64
+msgid "Installed packages:"
+msgstr "Установленные пакеты:"
+
+#: pkgs.cgi:66
+msgid "Mirrored packages:"
+msgstr "Пакетов на зеркале:"
+
+#: pkgs.cgi:68
+msgid "Upgradeable packages:"
+msgstr "Обновляемых пакетов:"
+
+#: pkgs.cgi:70
+#: pkgs.cgi:707
+msgid "Installed files:"
+msgstr "Установленные файлы:"
+
+#: pkgs.cgi:72
+msgid "Blocked packages:"
+msgstr "Заблокированных пакетов:"
+
+#: pkgs.cgi:86
+msgid "Delete"
+msgstr "Удалить"
+
+#: pkgs.cgi:89
+msgid "Use as default"
+msgstr "Использовать по умолчанию"
+
+#: pkgs.cgi:120
+msgid "Search"
+msgstr "Поиск"
+
+#: pkgs.cgi:122
+msgid "Files"
+msgstr "Файлы"
+
+#: pkgs.cgi:134
+#: pkgs.cgi:867
+#: network.cgi:23
+#: network.cgi:156
+#: network.cgi:246
+#: boot.cgi:82
+#: settings.cgi:104
+#: lib/libtazpanel:98
+msgid "Name"
+msgstr "Название"
+
+#: pkgs.cgi:135
+msgid "Version"
+msgstr "Версия"
+
+#: pkgs.cgi:136
+#: boot.cgi:83
+msgid "Description"
+msgstr "Описание"
+
+#: pkgs.cgi:137
+msgid "Web"
+msgstr "Сайт"
+
+#: pkgs.cgi:147
+msgid "Categories"
+msgstr "Категории"
+
+#: pkgs.cgi:148
+msgid "Base-system"
+msgstr "Базовые"
+
+#: pkgs.cgi:149
+msgid "X window"
+msgstr "Окна X"
+
+#: pkgs.cgi:150
+msgid "Utilities"
+msgstr "Утилиты"
+
+#: pkgs.cgi:151
+#: styles/default/header.sh:46
+msgid "Network"
+msgstr "Сети"
+
+#: pkgs.cgi:152
+msgid "Games"
+msgstr "Игры"
+
+#: pkgs.cgi:153
+msgid "Graphics"
+msgstr "Графика"
+
+#: pkgs.cgi:154
+msgid "Office"
+msgstr "Офис"
+
+#: pkgs.cgi:155
+msgid "Multimedia"
+msgstr "Мультимедиа"
+
+#: pkgs.cgi:156
+msgid "Development"
+msgstr "Разработка"
+
+#: pkgs.cgi:157
+msgid "System tools"
+msgstr "Утилиты"
+
+#: pkgs.cgi:158
+msgid "Security"
+msgstr "Безопасность"
+
+#: pkgs.cgi:159
+msgid "Misc"
+msgstr "Прочее"
+
+#: pkgs.cgi:160
+msgid "Meta"
+msgstr "Мета"
+
+#: pkgs.cgi:161
+msgid "Non free"
+msgstr "Несвободные"
+
+#: pkgs.cgi:162
+msgid "All"
+msgstr "Все"
+
+#: pkgs.cgi:168
+msgid "Repositories"
+msgstr "Репозитории"
+
+#: pkgs.cgi:169
+msgid "Public"
+msgstr "Общественный"
+
+#: pkgs.cgi:177
+msgid "Any"
+msgstr "Любой"
+
+#: pkgs.cgi:217
+#: pkgs.cgi:339
+msgid "Listing packages..."
+msgstr "Список пакетов…"
+
+#: pkgs.cgi:220
+#: pkgs.cgi:358
+#: pkgs.cgi:412
+#: pkgs.cgi:479
+#: pkgs.cgi:520
+#: pkgs.cgi:580
+#: pkgs.cgi:659
+#: pkgs.cgi:952
+#: styles/default/header.sh:37
+msgid "My packages"
+msgstr "Мои пакеты"
+
+#: pkgs.cgi:225
+#: pkgs.cgi:284
+#: pkgs.cgi:347
+#: pkgs.cgi:401
+#: pkgs.cgi:511
+#: settings.cgi:92
+msgid "Selection:"
+msgstr "Отмеченное:"
+
+#: pkgs.cgi:226
+#: pkgs.cgi:607
+msgid "Remove"
+msgstr "Удалить"
+
+#: pkgs.cgi:230
+#: pkgs.cgi:289
+#: pkgs.cgi:354
+#: pkgs.cgi:408
+#: pkgs.cgi:518
+#: pkgs.cgi:962
+#: styles/default/header.sh:39
+msgid "Recharge list"
+msgstr "Обновить список"
+
+#: pkgs.cgi:232
+#: pkgs.cgi:291
+#: pkgs.cgi:356
+#: pkgs.cgi:410
+#: pkgs.cgi:477
+#: pkgs.cgi:964
+msgid "Check upgrades"
+msgstr "Проверить обновления"
+
+#: pkgs.cgi:275
+msgid "Listing linkable packages..."
+msgstr "Список ссылающихся пакетов…"
+
+#: pkgs.cgi:278
+#: pkgs.cgi:958
+msgid "Linkable packages"
+msgstr "Присоединенные пакеты"
+
+#: pkgs.cgi:285
+msgid "Link"
+msgstr "Ссылка"
+
+#: pkgs.cgi:342
+#, sh-format
+msgid "Category: $category"
+msgstr "Категория: $category"
+
+#: pkgs.cgi:366
+#: pkgs.cgi:838
+#, sh-format
+msgid "Repository: $Repo_Name"
+msgstr "Репозитарий: $Repo_Name"
+
+#: pkgs.cgi:394
+msgid "Searching packages..."
+msgstr "Поиск пакетов…"
+
+#: pkgs.cgi:397
+msgid "Search packages"
+msgstr "Поиск пакетов"
+
+#: pkgs.cgi:404
+#: pkgs.cgi:514
+msgid "Toogle all"
+msgstr "Переключить все"
+
+#: pkgs.cgi:423
+msgid "Package"
+msgstr "Пакет"
+
+#: pkgs.cgi:424
+msgid "File"
+msgstr "Файл"
+
+#: pkgs.cgi:465
+msgid "Recharging lists..."
+msgstr "Обновление списка…"
+
+#: pkgs.cgi:468
+msgid "Recharge"
+msgstr "Обновить"
+
+#: pkgs.cgi:473
+msgid "Recharge checks for new or updated packages"
+msgstr "Обновление ищет новые и обновленные пакеты"
+
+#: pkgs.cgi:485
+msgid "Recharging packages list"
+msgstr "Обновить список пакетов"
+
+#: pkgs.cgi:490
+msgid "Packages lists are up-to-date. You should check for upgrades now."
+msgstr "Список пакетов обновлен до актуального состояния. Теперь вы можете проверить обновления."
+
+#: pkgs.cgi:503
+msgid "Checking for upgrades..."
+msgstr "Проверка обновлений…"
+
+#: pkgs.cgi:506
+msgid "Up packages"
+msgstr "Обновить пакеты"
+
+#: pkgs.cgi:575
+msgid "Performing tasks on packages"
+msgstr "Выполнение задач над пакетами"
+
+#: pkgs.cgi:585
+#, sh-format
+msgid "Executing $cmd for: $pkgs"
+msgstr "Выполняется $cmd для: $pkgs"
+
+#: pkgs.cgi:610
+msgid "Getting package info..."
+msgstr "Получение информации о пакете…"
+
+#: pkgs.cgi:622
+#: installer.cgi:155
+#: styles/default/header.sh:88
+msgid "Install"
+msgstr "Установить"
+
+#: pkgs.cgi:626
+#, sh-format
+msgid "Package $PACKAGE"
+msgstr "Пакет $PACKAGE"
+
+#: pkgs.cgi:634
+msgid "Install (Non Free)"
+msgstr "Установить (несвободные)"
+
+#: pkgs.cgi:642
+msgid "Unblock"
+msgstr "Разблокировать"
+
+#: pkgs.cgi:646
+msgid "Block"
+msgstr "Заблокировать"
+
+#: pkgs.cgi:650
+msgid "Repack"
+msgstr "Перепаковать"
+
+#: pkgs.cgi:665
+msgid "Name:"
+msgstr "Название:"
+
+#: pkgs.cgi:666
+msgid "Version:"
+msgstr "Версия:"
+
+#: pkgs.cgi:667
+msgid "Description:"
+msgstr "Описание:"
+
+#: pkgs.cgi:668
+msgid "Category:"
+msgstr "Категория:"
+
+#: pkgs.cgi:672
+msgid "Maintainer:"
+msgstr "Мэйнтейнер:"
+
+#: pkgs.cgi:673
+#: pkgs.cgi:702
+msgid "Website:"
+msgstr "Сайт:"
+
+#: pkgs.cgi:674
+#: pkgs.cgi:703
+msgid "Sizes:"
+msgstr "Размер:"
+
+#: pkgs.cgi:677
+msgid "Depends:"
+msgstr "Зависимости:"
+
+#: pkgs.cgi:684
+msgid "Suggested:"
+msgstr "Предлагает:"
+
+#: pkgs.cgi:690
+msgid "Tags:"
+msgstr "Теги:"
+
+#: pkgs.cgi:696
+#, sh-format
+msgid "Installed files: $I_FILES"
+msgstr "Установленные файлы: $I_FILES"
+
+#: pkgs.cgi:755
+#: pkgs.cgi:884
+msgid "Set link"
+msgstr "Установить ссылку"
+
+#: pkgs.cgi:758
+#: pkgs.cgi:885
+msgid "Remove link"
+msgstr "Удалить ссылку"
+
+#: pkgs.cgi:764
+#: pkgs.cgi:966
+#: styles/default/header.sh:43
+msgid "Administration"
+msgstr "Администрирование"
+
+#: pkgs.cgi:766
+msgid "Tazpkg administration and settings"
+msgstr "Администрирование и настройка TazPKG"
+
+#: pkgs.cgi:770
+msgid "Save configuration"
+msgstr "Сохранить настройки"
+
+#: pkgs.cgi:772
+msgid "List configuration files"
+msgstr "Список файлов настроек"
+
+#: pkgs.cgi:774
+msgid "Quick check"
+msgstr "Быстрая проверка"
+
+#: pkgs.cgi:776
+msgid "Full check"
+msgstr "Полная проверка"
+
+#: pkgs.cgi:781
+msgid "Creating the package..."
+msgstr "Создание пакета…"
+
+#: pkgs.cgi:786
+msgid "Path:"
+msgstr "Путь:"
+
+#: pkgs.cgi:789
+#: boot.cgi:256
+msgid "Configuration files"
+msgstr "Файлы настроек"
+
+#: pkgs.cgi:802
+msgid "Checking packages consistency..."
+msgstr "Проверка целостности пакетов…"
+
+#: pkgs.cgi:808
+msgid "Full packages check..."
+msgstr "Полная проверка пакетов…"
+
+#: pkgs.cgi:815
+msgid "Packages cache"
+msgstr "Кеш пакетов"
+
+#: pkgs.cgi:820
+#, sh-format
+msgid "Packages in the cache: $cache_files ($cache_size)"
+msgstr "Пакетов в кеше: $cache_files ($cache_size)"
+
+#: pkgs.cgi:827
+msgid "Default mirror"
+msgstr "Зеркало по умолчанию"
+
+#: pkgs.cgi:831
+msgid "Current mirror list"
+msgstr "Список текущих зеркал"
+
+#: pkgs.cgi:855
+msgid "Private repositories"
+msgstr "Частные репозитории"
+
+#: pkgs.cgi:868
+msgid "mirror"
+msgstr "зеркало"
+
+#: pkgs.cgi:874
+msgid "Link to another SliTaz installation"
+msgstr "Ссылка на другой установленный SliTaz"
+
+#: pkgs.cgi:876
+msgid "This link points to the root of another SliTaz installation. You will be able to install packages using soft links to it."
+msgstr "Эта ссылка указывает на корень файловой системы другого установленного SliTaz. Вы сможете устанавливать пакеты, используя символьные ссылки на них."
+
+#: pkgs.cgi:892
+msgid "SliTaz packages DVD"
+msgstr "DVD с пакетами SliTaz"
+
+#: pkgs.cgi:894
+#, sh-format
+msgid "A bootable DVD image of all available packages for the $version version is generated every day. It also contains a copy of the website and can be used without an internet connection. This image can be installed on a DVD or an USB key."
+msgstr "Образ загрузочного DVD со всеми доступными пакетами для версии $version генерируется каждый день. Он также содержит копию сайта и может быть использован при отсутствии соединения с интернетом. Этот образ можно записать на DVD или установить на USB-флеш."
+
+#: pkgs.cgi:904
+msgid "Download DVD image"
+msgstr "Загрузить образ DVD"
+
+#: pkgs.cgi:906
+msgid "Install from DVD/USB key"
+msgstr "Установить с DVD или USB-флеш"
+
+#: pkgs.cgi:909
+msgid "Install from ISO image:"
+msgstr "Установить из образа ISO:"
+
+#: pkgs.cgi:972
+msgid "Latest log entries"
+msgstr "Недавние пункты журнала"
+
+#: live.cgi:25
+msgid "TazPanel - Live"
+msgstr "«Живые» системы | TazPanel"
+
+#: live.cgi:83
+msgid "TODO"
+msgstr "БУДЕТ СДЕЛАНО"
+
+#: live.cgi:88
+msgid "SliTaz LiveUSB"
+msgstr "LiveUSB SliTaz"
+
+#: live.cgi:89
+msgid "Create Live USB SliTaz systems"
+msgstr "Создать систему LiveUSB SliTaz"
+
+#: live.cgi:92
+msgid "Generate SliTaz LiveUSB media and boot in RAM! Insert a LiveCD into the cdrom drive, select the correct device and press Generate."
+msgstr "Здесь можно создать SliTaz LiveUSB и загрузиться в ОЗУ! Вставьте LiveCD в привод CD-ROM, выберите необходимое устройство и нажмите «Создать»."
+
+#: live.cgi:97
+msgid "USB Media to use:"
+msgstr "Использовать носитель USB:"
+
+#: live.cgi:106
+#: installer.cgi:299
+#: installer.cgi:343
+#: installer.cgi:378
+#: installer.cgi:410
+msgid "Not found"
+msgstr "Не найден"
+
+#: live.cgi:110
+msgid "Generate"
+msgstr "Создать"
+
+#: live.cgi:129
+msgid "SliTaz Live Systems"
+msgstr "«Живые» системы SliTaz"
+
+#: live.cgi:130
+msgid "Create and manage Live CD or USB SliTaz systems"
+msgstr "Создание и управление системами LiveCD (LiveUSB) SliTaz"
+
+#: live.cgi:135
+msgid "Create LiveUSB"
+msgstr "Создать LiveUSB"
+
+#: live.cgi:140
+msgid "Write a Live CD"
+msgstr "Записать LiveCD"
+
+#: live.cgi:142
+msgid "The command writeiso will generate an ISO image of the current filesystem as is, including all files in the /home directory. It is an easy way to remaster a SliTaz Live system, you just have to: boot, modify, writeiso."
+msgstr "Команда writeiso создаст полный ISO-образ текущей системы, включая все файлы в папке /home. Простой путь пересборки «живой» системы SliTaz: загрузиться, модифицировать, writeiso."
+
+#: live.cgi:148
+msgid "Compression type:"
+msgstr "Тип сжатия:"
+
+#: live.cgi:154
+msgid "Write ISO"
+msgstr "Записать ISO"
+
+#: live.cgi:158
+msgid "Live CD tools"
+msgstr "Утилиты LiveCD"
+
+#: live.cgi:160
+#: live.cgi:192
+#: styles/default/header.sh:84
+msgid "Convert ISO to loram"
+msgstr "Преобразовать ISO в LoRAM"
+
+#: live.cgi:162
+msgid "This command will convert an ISO image of a SliTaz Live CD to a new ISO image requiring less RAM to run."
+msgstr "Эта команда преобразует образ ISO, содержащий SliTaz LiveCD в новый образ ISO, требующий меньше ОЗУ для запуска."
+
+#: live.cgi:168
+msgid "ISO to convert"
+msgstr "Исходный ISO"
+
+#: live.cgi:173
+msgid "The filesystem is always in RAM"
+msgstr "Файловая система всегда находится в ОЗУ"
+
+#: live.cgi:178
+msgid "The filesystem may be on a small CDROM"
+msgstr "Файловая система может находиться на небольшом CD-ROM"
+
+#: live.cgi:183
+msgid "The filesystem may be on a large CDROM"
+msgstr "Файловая система может находиться на большом CD-ROM"
+
+#: live.cgi:187
+#: live.cgi:234
+msgid "ISO to create"
+msgstr "Создать ISO"
+
+#: live.cgi:196
+#: live.cgi:239
+#: styles/default/header.sh:85
+msgid "Build a meta ISO"
+msgstr "Создать мета ISO"
+
+#: live.cgi:198
+msgid "Combines several ISO flavors like nested Russian dolls. The amount of RAM available at startup will be used to select the utmost one."
+msgstr "Комбинирование нескольких редакций ISO по принципу матрёшки. Размер доступного ОЗУ, определенный при запуске системы, влияет на выбор редакции."
+
+#: live.cgi:210
+msgid "ISO number"
+msgstr "Количество ISO"
+
+#: live.cgi:213
+#: live.cgi:228
+msgid "Minimum RAM"
+msgstr "Минимум ОЗУ"
+
+#: live.cgi:225
+msgid "ISO to add"
+msgstr "Добавить ISO"
+
+#: live.cgi:230
+msgid "Add to the list"
+msgstr "Добавить в список"
+
+#: network.cgi:13
+msgid "TazPanel - Network"
+msgstr "Сети | TazPanel"
+
+#: network.cgi:24
+msgid "Quality"
+msgstr "Уровень сигнала"
+
+#: network.cgi:25
+msgid "Encryption"
+msgstr "Шифрование"
+
+#: network.cgi:26
+#: boot.cgi:84
+#: lib/libtazpanel:99
+msgid "Status"
+msgstr "Состояние"
+
+#: network.cgi:53
+msgid "Connected"
+msgstr "Соединено"
+
+#: network.cgi:96
+#, sh-format
+msgid "Changed hostname: $get_hostname"
+msgstr "Измененное название хоста: $get_hostname"
+
+#: network.cgi:112
+msgid "Scanning open ports..."
+msgstr "Сканируются открытые порты…"
+
+#: network.cgi:115
+#, sh-format
+msgid "Port scanning for $scan"
+msgstr "Сканирование портов адреса $scan"
+
+#: network.cgi:129
+msgid "Setting up IP..."
+msgstr "Устанавливается IP…"
+
+#: network.cgi:145
+msgid "Ethernet connection"
+msgstr "Соединение Ethernet"
+
+#: network.cgi:147
+msgid "Here you can configure a wired connection using DHCP to automatically get a random IP or configure a static/fixed IP"
+msgstr "Здесь вы можете настроить проводное соединение, использующее DHCP для автоматического получения случайного IP, или указать статический (фиксированный) IP"
+
+#: network.cgi:150
+msgid "Configuration"
+msgstr "Настройки"
+
+#: network.cgi:157
+#: network.cgi:247
+msgid "Value"
+msgstr "Значение"
+
+#: network.cgi:162
+#: lib/libtazpanel:97
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: network.cgi:166
+msgid "IP address"
+msgstr "Адрес IP"
+
+#: network.cgi:170
+msgid "Netmask"
+msgstr "Маска сети"
+
+#: network.cgi:174
+msgid "Gateway"
+msgstr "Шлюз"
+
+#: network.cgi:178
+msgid "DNS server"
+msgstr "Сервер DNS"
+
+#: network.cgi:183
+msgid "Activate (static)"
+msgstr "Активировать (статически)"
+
+#: network.cgi:184
+msgid "Activate (DHCP)"
+msgstr "Активировать (DHCP)"
+
+#: network.cgi:185
+msgid "Disable"
+msgstr "Запретить"
+
+#: network.cgi:188
+#: network.cgi:266
+msgid "Configuration file"
+msgstr "Файл настроек"
+
+#: network.cgi:190
+msgid "These values are the ethernet settings in the main /etc/network.conf configuration file"
+msgstr "Эти значения — параметры Ethernet из главного настроечного файла /etc/network.conf"
+
+#: network.cgi:196
+#: network.cgi:274
+msgid "Manual Edit"
+msgstr "Ручная правка"
+
+#: network.cgi:202
+msgid "Scanning wireless interface..."
+msgstr "Сканирование беспроводного интерфейса…"
+
+#: network.cgi:206
+msgid "Wireless connection"
+msgstr "Беспроводное соединение"
+
+#: network.cgi:209
+#: network.cgi:293
+#: boot.cgi:167
+msgid "Start"
+msgstr "Запустить"
+
+#: network.cgi:211
+#: network.cgi:295
+#: boot.cgi:155
+msgid "Stop"
+msgstr "Остановить"
+
+#: network.cgi:213
+msgid "Scan"
+msgstr "Сканировать"
+
+#: network.cgi:240
+msgid "Connection"
+msgstr "Соединение"
+
+#: network.cgi:251
+msgid "Wifi name (ESSID)"
+msgstr "Название WiFi (ESSID)"
+
+#: network.cgi:255
+msgid "Password (Wifi key)"
+msgstr "Пароль (ключ WiFi)"
+
+#: network.cgi:259
+msgid "Encryption type"
+msgstr "Тип шифрования"
+
+#: network.cgi:263
+msgid "Configure"
+msgstr "Настроить"
+
+#: network.cgi:268
+msgid "These values are the wifi settings in the main /etc/network.conf configuration file"
+msgstr "Эти значения — параметры WiFi из главного настроечного файла /etc/network.conf"
+
+#: network.cgi:276
+msgid "Output of iwconfig"
+msgstr "Вывод команды iwconfig"
+
+#: network.cgi:286
+msgid "Networking"
+msgstr "Сети"
+
+#: network.cgi:288
+msgid "Manage network connections and services"
+msgstr "Управление сетевыми соединениями и услугами"
+
+#: network.cgi:297
+msgid "Restart"
+msgstr "Перезапуск"
+
+#: network.cgi:300
+msgid "Configuration:"
+msgstr "Настройки:"
+
+#: network.cgi:309
+msgid "Hosts"
+msgstr "Хосты"
+
+#: network.cgi:314
+msgid "Edit hosts"
+msgstr "Править хосты"
+
+#: network.cgi:316
+#: installer.cgi:433
+msgid "Hostname"
+msgstr "Имя хоста"
+
+#: network.cgi:320
+msgid "Change hostname"
+msgstr "Изменить имя хоста"
+
+#: network.cgi:324
+msgid "Output of ifconfig"
+msgstr "Вывод команды ifconfig"
+
+#: network.cgi:328
+msgid "Routing table"
+msgstr "Таблица маршрутизации"
+
+#: network.cgi:332
+msgid "Domain name resolution"
+msgstr "Разрешение имени домена"
+
+#: network.cgi:336
+msgid "ARP table"
+msgstr "Таблица ARP"
+
+#: network.cgi:340
+msgid "IP Connections"
+msgstr "Соединения IP"
+
+#: boot.cgi:14
+msgid "TazPanel - Boot"
+msgstr "Загрузка | TazPanel"
+
+#: boot.cgi:25
+msgid "Boot log files"
+msgstr "Файлы журнала загрузки"
+
+#: boot.cgi:31
+#: boot.cgi:42
+msgid "X server"
+msgstr "X-сервер"
+
+#: boot.cgi:46
+msgid "Show more..."
+msgstr "Смотреть еще…"
+
+#: boot.cgi:61
+#: boot.cgi:252
+#: styles/default/header.sh:67
+msgid "Manage daemons"
+msgstr "Управление демонами"
+
+#: boot.cgi:62
+msgid "Check, start and stop daemons on SliTaz"
+msgstr "Проверка, запуск и остановка демонов в SliTaz"
+
+#: boot.cgi:85
+msgid "Action"
+msgstr "Действие"
+
+#: boot.cgi:86
+msgid "PID"
+msgstr "PID"
+
+#: boot.cgi:108
+msgid "SliTaz Firewall with iptable rules"
+msgstr "Файрвол SliTaz с правилами iptable"
+
+#: boot.cgi:110
+msgid "Small and fast web server with CGI support"
+msgstr "Маленький и быстрый веб-сервер с поддержкой CGI"
+
+#: boot.cgi:112
+msgid "Network time protocol daemon"
+msgstr "Демон протокола сетевого времени"
+
+#: boot.cgi:114
+msgid "Anonymous FTP server"
+msgstr "Анонимный сервер FTP"
+
+#: boot.cgi:116
+msgid "Busybox DHCP server"
+msgstr "Сервер DHCP из Busybox"
+
+#: boot.cgi:118
+msgid "Linux Kernel log daemon"
+msgstr "Демон журнала ядра Linux"
+
+#: boot.cgi:120
+msgid "Execute scheduled commands"
+msgstr "Выполнить запланированные команды"
+
+#: boot.cgi:122
+msgid "Small static DNS server daemon"
+msgstr "Демон маленького статического сервера DNS"
+
+#: boot.cgi:124
+msgid "Transfer a file on tftp request"
+msgstr "Передать файлы по запросу TFTP"
+
+#: boot.cgi:126
+msgid "Listen for network connections and launch programs"
+msgstr "Слушать сетевые соединения и запускать программы"
+
+#: boot.cgi:128
+msgid "Manage a ZeroConf IPv4 link-local address"
+msgstr "Управлять присоединенным-локальным адресом ZeroConf IPv4"
+
+#: boot.cgi:153
+msgid "Started"
+msgstr "Запущен"
+
+#: boot.cgi:165
+msgid "Stopped"
+msgstr "Остановлен"
+
+#: boot.cgi:193
+msgid "GRUB Boot loader"
+msgstr "Загрузчик GRUB"
+
+#: boot.cgi:195
+msgid "The first application started when the computer powers on"
+msgstr "Первое приложение, запускаемое при включении питания"
+
+#: boot.cgi:201
+msgid "Default entry:"
+msgstr "Пункт по умолчанию:"
+
+#: boot.cgi:203
+msgid "Timeout:"
+msgstr "Таймаут:"
+
+#: boot.cgi:205
+msgid "Splash image:"
+msgstr "Загрузочная картинка:"
+
+#: boot.cgi:208
+#: settings.cgi:289
+msgid "Change"
+msgstr "Изменить"
+
+#: boot.cgi:210
+msgid "View or edit menu.lst"
+msgstr "Просмотр и правка menu.lst"
+
+#: boot.cgi:213
+msgid "Boot entries"
+msgstr "Загрузочные пункты"
+
+#: boot.cgi:219
+msgid "Entry"
+msgstr "Пункт"
+
+#: boot.cgi:235
+msgid "Web boot is available with gPXE"
+msgstr "Доступна веб-загрузка с gPXE"
+
+#: boot.cgi:245
+msgid "Boot &amp; Start services"
+msgstr "Загрузка и запуск служб"
+
+#: boot.cgi:246
+msgid "Everything that happens before user login"
+msgstr "Всё, что происходит перед входом пользователя в систему"
+
+#: boot.cgi:250
+#: styles/default/header.sh:65
+msgid "Boot logs"
+msgstr "Журналы загрузки"
+
+#: boot.cgi:253
+#: styles/default/header.sh:69
+msgid "Boot loader"
+msgstr "Загрузчик"
+
+#: boot.cgi:258
+msgid "Main configuration file:"
+msgstr "Главный файл настроек:"
+
+#: boot.cgi:260
+msgid "Login manager settings:"
+msgstr "Установки менеджера входа в систему:"
+
+#: boot.cgi:264
+msgid "Kernel cmdline"
+msgstr "Командная строка ядра"
+
+#: boot.cgi:268
+msgid "Local startup commands"
+msgstr "Локальные команды запуска"
+
+#: boot.cgi:273
+msgid "Edit script"
+msgstr "Править скрипт"
+
+#: hardware.cgi:13
+msgid "TazPanel - Hardware"
+msgstr "Оборудование | TazPanel"
+
+#: hardware.cgi:29
+msgid "Detect hardware"
+msgstr "Определить оборудование"
+
+#: hardware.cgi:30
+msgid "Detect PCI and USB hardware"
+msgstr "Определить оборудование PCI и USB"
+
+#: hardware.cgi:42
+#: hardware.cgi:117
+#: styles/default/header.sh:75
+msgid "Kernel modules"
+msgstr "Модули ядра"
+
+#: hardware.cgi:46
+msgid "Modules search"
+msgstr "Поиск модулей"
+
+#: hardware.cgi:49
+msgid "Manage, search or get information about the Linux kernel modules"
+msgstr "Управлять, искать и получать информацию о модулях ядра Linux"
+
+#: hardware.cgi:56
+#, sh-format
+msgid "Detailed information for module: $get_modinfo"
+msgstr "Подробности о модуле $get_modinfo"
+
+#: hardware.cgi:70
+#, sh-format
+msgid "Matching result(s) for: $get_search"
+msgstr "Результаты поиска $get_search"
+
+#: hardware.cgi:76
+msgid "Module:"
+msgstr "Модуль:"
+
+#: hardware.cgi:83
+msgid "Module"
+msgstr "Модуль"
+
+#: hardware.cgi:84
+#: lib/libtazpanel:217
+msgid "Size"
+msgstr "Размер"
+
+#: hardware.cgi:85
+#: lib/libtazpanel:219
+msgid "Used"
+msgstr "Используется"
+
+#: hardware.cgi:86
+msgid "by"
+msgstr "кем"
+
+#: hardware.cgi:112
+msgid "Drivers &amp; Devices"
+msgstr "Драйверы и устройства"
+
+#: hardware.cgi:113
+msgid "Manage your computer hardware"
+msgstr "Управление вашим компьютерным оборудованием"
+
+#: hardware.cgi:119
+#: styles/default/header.sh:77
+msgid "Detect PCI/USB"
+msgstr "Определить PCI/USB"
+
+#: hardware.cgi:140
+msgid "Battery"
+msgstr "Батарея"
+
+#: hardware.cgi:142
+msgid "health"
+msgstr "здоровье"
+
+#: hardware.cgi:151
+#, sh-format
+msgid "Discharging $rempct% - $remtimef"
+msgstr "Разряжается: $rempct % — осталось $remtimef"
+
+#: hardware.cgi:155
+#, sh-format
+msgid "Charging $rempct% - $remtimef"
+msgstr "Заряжается: $rempct % — осталось $remtimef"
+
+#: hardware.cgi:157
+msgid "Charged 100%"
+msgstr "Полностью заряжена"
+
+#: hardware.cgi:165
+msgid "Temperature:"
+msgstr "Температура:"
+
+#: hardware.cgi:180
+msgid "Brightness"
+msgstr "Яркость"
+
+#: hardware.cgi:242
+msgid "System memory"
+msgstr "Системная память"
+
+#: settings.cgi:15
+msgid "TazPanel - Settings"
+msgstr "Параметры | TazPanel"
+
+#: settings.cgi:87
+#: settings.cgi:183
+msgid "Manage users"
+msgstr "Управление пользователями"
+
+#: settings.cgi:93
+msgid "Delete user"
+msgstr "Удалить пользователя"
+
+#: settings.cgi:94
+msgid "Lock user"
+msgstr "Заблокировать пользователя"
+
+#: settings.cgi:95
+msgid "Unlock user"
+msgstr "Разблокировать пользователя"
+
+#: settings.cgi:102
+msgid "Login"
+msgstr "Логин"
+
+#: settings.cgi:103
+msgid "User ID"
+msgstr "ID пользователя"
+
+#: settings.cgi:105
+msgid "Home"
+msgstr "Домашняя папка"
+
+#: settings.cgi:106
+msgid "Shell"
+msgstr "Оболочка"
+
+#: settings.cgi:143
+msgid "Password:"
+msgstr "Пароль:"
+
+#: settings.cgi:145
+msgid "Change password"
+msgstr "Изменить пароль"
+
+#: settings.cgi:149
+msgid "Add a new user"
+msgstr "Добавить нового пользователя"
+
+#: settings.cgi:154
+#: installer.cgi:465
+msgid "User login:"
+msgstr "Логин пользователя:"
+
+#: settings.cgi:156
+msgid "User password:"
+msgstr "Пароль пользователя:"
+
+#: settings.cgi:159
+msgid "Create user"
+msgstr "Создать пользователя"
+
+#: settings.cgi:163
+msgid "Current user sessions"
+msgstr "Текущие сессии пользователя"
+
+#: settings.cgi:167
+msgid "Last user sessions"
+msgstr "Последние сессии пользователя"
+
+#: settings.cgi:178
+msgid "System settings"
+msgstr "Параметры системы"
+
+#: settings.cgi:179
+msgid "Manage system time, users or language settings"
+msgstr "Управление системным временем, пользователями и языками"
+
+#: settings.cgi:186
+msgid "System time"
+msgstr "Системное время"
+
+#: settings.cgi:189
+msgid "Time zome:"
+msgstr "Часовой пояс:"
+
+#: settings.cgi:190
+msgid "System time:"
+msgstr "Системное время:"
+
+#: settings.cgi:191
+msgid "Hardware clock:"
+msgstr "Часы оборудования:"
+
+#: settings.cgi:193
+msgid "Sync online"
+msgstr "Синхронизировать онлайн"
+
+#: settings.cgi:194
+msgid "Set hardware clock"
+msgstr "Установить часы оборудования"
+
+#: settings.cgi:200
+msgid "System language"
+msgstr "Язык системы"
+
+#: settings.cgi:211
+#, sh-format
+msgid "You must logout and login again to your current session to use $new_locale locale."
+msgstr "Вам необходимо выйти из системы и войти повторно, чтобы использовать локализацию «$new_locale»."
+
+#: settings.cgi:214
+msgid "Current system locales:"
+msgstr "Текущие системные локализации:"
+
+#: settings.cgi:220
+msgid "Available locales:"
+msgstr "Доступные локализации:"
+
+#: settings.cgi:225
+#: settings.cgi:271
+#: settings.cgi:282
+msgid "Activate"
+msgstr "Активировать"
+
+#: settings.cgi:228
+msgid "Console keymap"
+msgstr "Консольная раскладка"
+
+#: settings.cgi:241
+#, sh-format
+msgid "Current console keymap: $keymap"
+msgstr "Текущая консольная раскладка: $keymap"
+
+#: settings.cgi:258
+msgid "Suggested keymap for Xorg:"
+msgstr "Предлагаемая раскладка клавиатуры для XOrg"
+
+#: settings.cgi:267
+msgid "Available keymaps:"
+msgstr "Доступные раскладки:"
+
+#: settings.cgi:274
+msgid "Panel configuration"
+msgstr "Настройка панели"
+
+#: settings.cgi:278
+msgid "Style:"
+msgstr "Стиль:"
+
+#: settings.cgi:287
+msgid "Panel password:"
+msgstr "Пароль панели:"
+
+#: settings.cgi:293
+msgid "Configuration files:"
+msgstr "Файлы настроек:"
+
+#: settings.cgi:295
+#: styles/default/header.sh:24
+msgid "Panel"
+msgstr "Панель"
+
+#: settings.cgi:297
+msgid "Server"
+msgstr "Сервер"
+
+#: settings.cgi:300
+msgid "TazPanel provides a debuging mode and page:"
+msgstr "TazPanel поддерживает отладочный режим и страницу:"
+
+#: lib/libtazpanel:83
+msgid "connected"
+msgstr "соединен"
+
+#: lib/libtazpanel:100
+msgid "IP Address"
+msgstr "Адрес IP"
+
+#: lib/libtazpanel:101
+msgid "Scan ports"
+msgstr "Сканировать порты"
+
+#: lib/libtazpanel:214
+msgid "Disk"
+msgstr "Диск"
+
+#: lib/libtazpanel:215
+msgid "Label"
+msgstr "Метка"
+
+#: lib/libtazpanel:216
+msgid "Type"
+msgstr "Тип"
+
+#: lib/libtazpanel:218
+msgid "Available"
+msgstr "Доступно"
+
+#: lib/libtazpanel:220
+msgid "Mount point"
+msgstr "Точка монтирования"
+
+#: installer.cgi:24
+msgid "TazPanel - Installer"
+msgstr "Установщик | TazPanel"
+
+#: installer.cgi:116
+#, sh-format
+msgid "Creating setup file $INSTFILE."
+msgstr "Создание установочного файла $INSTFILE."
+
+#: installer.cgi:120
+#: installer.cgi:127
+msgid "Setup File Error"
+msgstr "Ошибка файла установок"
+
+#: installer.cgi:121
+#, sh-format
+msgid "The setup file <strong>$INSTFILE</strong> doesn't exist."
+msgstr "Установочный файл <strong>$INSTFILE</strong> отсутствует."
+
+#: installer.cgi:142
+msgid "SliTaz Installer"
+msgstr "Установщик SliTaz"
+
+#: installer.cgi:144
+msgid "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."
+msgstr "Установщик SliTaz предназначен для установки SliTaz на жесткий диск с LiveCD, LiveUSB, файла ISO или из интернета (путём загрузки файла ISO) и для обновления существующей системы."
+
+#: installer.cgi:157
+msgid "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."
+msgstr "Установить SliTaz на раздел жесткого диска. Если вы решите форматировать раздел, то вся информация будет утеряна. Если вы не будете форматировать, то вся информация, кроме существующей папки /home, будет удалена, а домашняя папка останется нетронутой."
+
+#: installer.cgi:162
+msgid "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"
+msgstr "Возможно, перед установкой вам будет необходимо создать или изменить размер разделов вашего жесткого диска, чтобы выделить место для SliTaz GNU/Linux. При помощи GPartEd вы можете управлять разделами в графической оболочке."
+
+#: installer.cgi:166
+#: installer.cgi:244
+#: styles/default/header.sh:90
+msgid "Install SliTaz"
+msgstr "Установить SliTaz"
+
+#: installer.cgi:175
+msgid "Upgrade"
+msgstr "Обновить"
+
+#: installer.cgi:177
+msgid "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."
+msgstr "Обновить систему SliTaz, установленную на жестком диске. Папки «/home», «/etc» и «/var/www» останутся нетронутыми, а все прочие папки будут удалены. При наличии активного соединения с интернетом, все дополнительные пакеты, которые были добавлены в систему SliTaz, будут обновлены."
+
+#: installer.cgi:182
+#: installer.cgi:257
+msgid "Upgrade SliTaz"
+msgstr "Обновить SliTaz"
+
+#: installer.cgi:190
+msgid "Partitioning"
+msgstr "Работа с разделами"
+
+#: installer.cgi:193
+msgid "On most used systems, the hard drive is already dedicated to partitions for Windows<sup>&trade;</sup>, 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."
+msgstr "На большинстве существующих систем жесткий диск уже разбит на разделы для операционной системы Windows™, Linux или какой-либо другой. Вам будет необходимо изменить размер этих разделов, чтобы выделить место для SliTaz GNU/Linux. SliTaz будет сосуществовать с прочими системами, установленными на вашем жестком диске."
+
+#: installer.cgi:199
+msgid "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."
+msgstr "Размер необходимого дискового пространства зависит от количества программ, которые вы планируете установить, а также от требуемого свободного пространства для пользователей. Возможно, вы захотите запустить минимальную систему SliTaz, размером не более 300 МБ, но с 2 ГБ на самом деле будет удобнее."
+
+#: installer.cgi:204
+msgid "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."
+msgstr "При необходимости будет создан отдельный раздел для домашних папок, а также раздел, который будет использоваться для подкачки. SliTaz находит и использует разделы swap автоматически."
+
+#: installer.cgi:212
+msgid "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."
+msgstr "При помощи редактора разделов GPartEd вы можете управлять вашими разделами в графической оболочке. GPartEd позволяет вам создавать, удалять, изменять размер и копировать разделы без потери данных."
+
+#: installer.cgi:216
+msgid "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 and so on."
+msgstr "GPartEd поддерживает «из коробки» файловые системы ext2, ext3, ext4, linux swap, ntfs и fat32. Также возможна поддержка xjs, jfs, hfs и других файловых систем, но сначала вам нужно установить драйверы для этих файловых систем, установив соответствующие пакеты xfsprogs, jfsutils, linux-hfs и т.п."
+
+#: installer.cgi:223
+msgid "Execute Gparted"
+msgstr "Запустить GPartEd"
+
+#: installer.cgi:225
+msgid "Continue installation"
+msgstr "Продолжить установку"
+
+#: installer.cgi:227
+msgid "Once you've made room for SliTaz on your drive, you should be able to continue installation."
+msgstr "Вы сможете продолжить установку, как только выделите место для SliTaz на вашем приводе."
+
+#: installer.cgi:232
+#: installer.cgi:502
+#: installer.cgi:513
+msgid "Back to Installer Start Page"
+msgstr "Назад к начальной странице установщика"
+
+#: installer.cgi:234
+msgid "Continue Installation"
+msgstr "Продолжить установку"
+
+#: installer.cgi:246
+msgid "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."
+msgstr "Вы собираетесь установить SliTaz на раздел вашего жесткого диска. Если вы решите форматировать ваш жесткий диск, то вся информация на нём будет утеряна. Если вы не будете форматировать, то вся информация, кроме существующей папки /home, будет удалена, а домашняя папка останется нетронутой."
+
+#: installer.cgi:259
+msgid "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 have an active internet connection."
+msgstr "Вы собираетесь обновить систему SliTaz, уже установленную на вашем жестком диске. Папки «/home», «/etc» и «/var/www» останутся нетронутыми, а все прочие папки будут удалены. При наличии соединения с интернетом, все дополнительные пакеты, которые вы установили, будут обновлены."
+
+#: installer.cgi:273
+msgid "Slitaz source media"
+msgstr "Источник SliTaz"
+
+#: installer.cgi:277
+msgid "LiveCD"
+msgstr "LiveCD"
+
+#: installer.cgi:280
+msgid "LiveUSB:"
+msgstr "LiveUSB:"
+
+#: installer.cgi:306
+msgid "ISO file:"
+msgstr "Файл ISO:"
+
+#: installer.cgi:307
+msgid "Full path to the ISO image file"
+msgstr "Полный путь к образу ISO"
+
+#: installer.cgi:310
+msgid "Web:"
+msgstr "Веб:"
+
+#: installer.cgi:311
+msgid "Stable"
+msgstr "стабильная"
+
+#: installer.cgi:312
+msgid "Cooking"
+msgstr "нестабильная"
+
+#: installer.cgi:314
+msgid "URL:"
+msgstr "Адрес:"
+
+#: installer.cgi:315
+msgid "Full url to an ISO image file"
+msgstr "Полный URL-путь к образу ISO"
+
+#: installer.cgi:324
+msgid "Hard Disk Drive"
+msgstr "Жесткий диск"
+
+#: installer.cgi:333
+msgid "Install Slitaz to partition:"
+msgstr "Установить SliTaz в раздел:"
+
+#: installer.cgi:338
+#: installer.cgi:373
+#: installer.cgi:405
+msgid "None"
+msgstr "нет"
+
+#: installer.cgi:349
+#: installer.cgi:416
+msgid "Format partition as:"
+msgstr "Форматировать раздел как:"
+
+#: installer.cgi:368
+msgid "Existing SliTaz partition to upgrade:"
+msgstr "Существующий радел SliTaz для обновления:"
+
+#: installer.cgi:389
+msgid "Options"
+msgstr "Параметры"
+
+#: installer.cgi:397
+msgid "home partition"
+msgstr "домашняя папка"
+
+#: installer.cgi:400
+msgid "Use a separate partition for /home:"
+msgstr "Использовать отдельный раздел для /home:"
+
+#: installer.cgi:435
+msgid "Set Hostname to:"
+msgstr "Установить имя хоста:"
+
+#: installer.cgi:436
+msgid "Name of your system"
+msgstr "Название вашей системы"
+
+#: installer.cgi:446
+msgid "Root"
+msgstr "Root"
+
+#: installer.cgi:448
+msgid "Root passwd:"
+msgstr "Пароль root:"
+
+#: installer.cgi:449
+#: installer.cgi:452
+msgid "Password of root"
+msgstr "Пароль root"
+
+#: installer.cgi:451
+#: installer.cgi:473
+msgid "Confirm password:"
+msgstr "Подтвердите пароль:"
+
+#: installer.cgi:463
+msgid "User"
+msgstr "Пользователь"
+
+#: installer.cgi:466
+msgid "Name of the first user"
+msgstr "Имя первого пользователя"
+
+#: installer.cgi:470
+msgid "User passwd:"
+msgstr "Пароль пользователя:"
+
+#: installer.cgi:471
+#: installer.cgi:474
+msgid "Password of the first user"
+msgstr "Пароль первого пользователя"
+
+#: installer.cgi:484
+msgid "Grub"
+msgstr "GRUB"
+
+#: installer.cgi:487
+msgid "Install Grub bootloader. Usually you should answer yes, unless you want to install grub by hand yourself."
+msgstr "Установить загрузчик GRUB. Отвечайте «да», за исключением случая, когда вы хотите установить GRUB вручную."
+
+#: installer.cgi:490
+msgid "Enable Windows Dual-Boot."
+msgstr "Включить двойную загрузку с Windows."
+
+#: installer.cgi:499
+msgid "Back to partitioning"
+msgstr "Назад к работе с разделами"
+
+#: installer.cgi:506
+msgid "Proceed to SliTaz installation"
+msgstr "Перейти к установке SliTaz"
+
+#: installer.cgi:508
+msgid "Installation complete. You can now restart (reboot)"
+msgstr "Установка завершена. Теперь вы можете перезагрузить систему"
+
+#: installer.cgi:510
+msgid "Installation failed. See log"
+msgstr "Установка не удалась. Смотрите журнал"
+
+#: installer.cgi:530
+msgid "A web page that points a browser to a different page after 2 seconds"
+msgstr "Страница переадресации (подождите 2 секунды)"
+
+#: installer.cgi:536
+msgid "If your browser doesn't automatically redirect within a few seconds, you may want to go there manually"
+msgstr "Если через несколько секунд ваш браузер не перейдет дальше автоматически, сделайте это вручную"
+
+#: installer.cgi:551
+#: installer.cgi:566
+msgid "Tazinst Error"
+msgstr "Ошибка TazInst"
+
+#: installer.cgi:552
+msgid "<strong>tazinst</strong>, the lightweight SliTaz HDD installer is missing. Any installation can not be done without tazinst."
+msgstr "Отсутствует <strong>tazinst</strong>, легковесный установщик SliTaz на жесткий диск. Без tazinst ничего не удастся установить."
+
+#: installer.cgi:555
+msgid "Check tazinst' permissions, or reinstall the slitaz-tools package:"
+msgstr "Проверьте права доступа tazinst, либо переустановите пакет slitaz-tools:"
+
+#: installer.cgi:581
+msgid "Proceeding: ()"
+msgstr "Выполнение: ()"
+
+#: installer.cgi:582
+msgid "Please wait until processing is complete"
+msgstr "Дождитесь завершения обработки"
+
+#: installer.cgi:588
+msgid "Completed."
+msgstr "Завершено."
+
+#: installer.cgi:622
+msgid "Hostname error"
+msgstr "Ошибка имени хоста"
+
+#: installer.cgi:626
+msgid "Root password error"
+msgstr "Ошибка пароля root"
+
+#: installer.cgi:630
+msgid "User login error"
+msgstr "Ошибка логина пользователя"
+
+#: installer.cgi:634
+msgid "User password error"
+msgstr "Ошибка пароля пользователя"
+
+#: installer.cgi:637
+#: installer.cgi:648
+msgid "Do you really want to continue?"
+msgstr "Вы действительно хотите продолжить?"
+
+#: help.cgi:20
+msgid "Manual"
+msgstr "Руководство"
+
+#: help.cgi:28
+msgid "TazPanel - Help &amp; Doc"
+msgstr "Справка и документация | TazPanel"
+
+#: styles/default/header.sh:29
+msgid "Processes"
+msgstr "Процессы"
+
+#: styles/default/header.sh:31
+msgid "Create Report"
+msgstr "Создать отчет"
+
+#: styles/default/header.sh:34
+msgid "Packages"
+msgstr "Пакеты"
+
+#: styles/default/header.sh:41
+msgid "Check updates"
+msgstr "Проверить обновления"
+
+#: styles/default/header.sh:49
+msgid "Ethernet"
+msgstr "Ethernet"
+
+#: styles/default/header.sh:51
+msgid "Wireless"
+msgstr "Беспроводные"
+
+#: styles/default/header.sh:53
+msgid "Config file"
+msgstr "Файл настроек"
+
+#: styles/default/header.sh:56
+msgid "Settings"
+msgstr "Настройки"
+
+#: styles/default/header.sh:59
+msgid "Users"
+msgstr "Пользователи"
+
+#: styles/default/header.sh:62
+msgid "Boot"
+msgstr "Загрузка"
+
+#: styles/default/header.sh:72
+msgid "Hardware"
+msgstr "Оборудование"
+
+#: styles/default/header.sh:80
+msgid "Live"
+msgstr "«Живые»"
+
+#: styles/default/header.sh:82
+msgid "Create a live USB key"
+msgstr "Создать «живую» USB-флешку"
+
+#: styles/default/header.sh:83
+msgid "Create a live CD-ROM"
+msgstr "Создать «живой» CD-ROM"
+
+#: styles/default/header.sh:91
+msgid "Upgrade system"
+msgstr "Обновить систему"
+
+#: styles/default/footer.sh:6
+msgid "Copyright"
+msgstr "Авторское право"
+
+#: styles/default/footer.sh:8
+msgid "BSD License"
+msgstr "Лицензия BSD"
+
+#~ msgid ""
+#~ "The setup file <strong>$INSTFILE</strong> is not readable. Check "
+#~ "permissions and ownership."
+#~ msgstr ""
+#~ "Установочный файл <strong>$INSTFILE</strong> невозможно прочитать. "
+#~ "Проверьте права доступа и владельца."
+#~ msgid ""
+#~ "<strong>tazinst</strong> ($v) is not at the required version ($r), use "
+#~ "tazinst in a xterm or reinstall the slitaz-tools package:"
+#~ msgstr ""
+#~ "Версия <strong>tazinst</strong> ($v) не соответствует требуемой версии "
+#~ "($r), запустите tazinst в xterm, либо переустановите пакет slitaz-tools:"
diff -r 5312e3716b01 -r fdfc6b494539 po/tazpanel.pot
--- a/po/tazpanel.pot	Fri May 04 12:57:53 2012 +0300
+++ b/po/tazpanel.pot	Fri May 04 13:00:43 2012 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: TazPanel 1.4.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-11 20:01+0300\n"
+"POT-Creation-Date: 2012-05-04 02:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,11 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: tazpanel:35
+#, sh-format
+msgid "Starting TazPanel web server on port $HTTPD_PORT..."
+msgstr ""
+
 #: tazpanel:37
 msgid "TazPanel Authentication - Default: root:root"
 msgstr ""
@@ -37,151 +42,199 @@
 msgid "Password changed successfully"
 msgstr ""
 
-#: tazpanel:53
-msgid "Usage:"
+#: tazpanel:54
+#, sh-format
+msgid "Usage: $program_name [start|stop|passwd]"
 msgstr ""
 
-#: index.cgi:38 index.cgi:76
+#: index.cgi:38 index.cgi:83
 msgid "Differences"
 msgstr ""
 
-#: index.cgi:66
+#: index.cgi:72
 msgid "TazPanel - File"
 msgstr ""
 
-#: index.cgi:74
+#: index.cgi:81
 msgid "Save"
 msgstr ""
 
-#: index.cgi:96 settings.cgi:256
+#: index.cgi:103 settings.cgi:261
 msgid "Edit"
 msgstr ""
 
-#: index.cgi:115
+#: index.cgi:126
 msgid "TazPanel - Terminal"
 msgstr ""
 
-#: index.cgi:128
+#: index.cgi:139
 msgid "Small terminal emulator, commands options are supported."
 msgstr ""
 
-#: index.cgi:130 index.cgi:147
-msgid "Commands:"
+#: index.cgi:141 index.cgi:158
+#, sh-format
+msgid "Commands: $commands"
 msgstr ""
 
-#: index.cgi:134
-msgid "Downloading to:"
+#: index.cgi:146
+#, sh-format
+msgid "Downloading to: $dl"
 msgstr ""
 
-#: index.cgi:151
+#: index.cgi:153
+#, sh-format
+msgid "$cmd needs an argument"
+msgstr ""
+
+#: index.cgi:157
+#, sh-format
+msgid "Unknown command: $cmd"
+msgstr ""
+
+#: index.cgi:162
 msgid "TazPanel - Process activity"
 msgstr ""
 
-#: index.cgi:153
-msgid "Refresh: "
+#: index.cgi:164
+msgid "Refresh:"
+msgstr ""
+
+#: index.cgi:169
+msgid "1s"
+msgstr ""
+
+#: index.cgi:170
+msgid "5s"
 msgstr ""
 
 #: index.cgi:171
+msgid "10s"
+msgstr ""
+
+#: index.cgi:172 live.cgi:152
+msgid "none"
+msgstr ""
+
+#: index.cgi:188
 msgid "TazPanel - Debug"
 msgstr ""
 
-#: index.cgi:178
+#: index.cgi:191
+msgid "HTTP Environment"
+msgstr ""
+
+#: index.cgi:198
 msgid "TazPanel - System report"
 msgstr ""
 
-#: index.cgi:182
-msgid "Reporting to:"
+#: index.cgi:203
+#, sh-format
+msgid "Reporting to: $output"
 msgstr ""
 
-#: index.cgi:184
-msgid "Creating report header...  "
+#: index.cgi:206
+msgid "Creating report header..."
 msgstr ""
 
-#: index.cgi:201
-msgid "Creating system summary... "
+#: index.cgi:213 index.cgi:230
+msgid "SliTaz system report"
 msgstr ""
 
-#: index.cgi:214
-msgid "Getting hardware info...   "
+#: index.cgi:227
+msgid "Creating system summary..."
 msgstr ""
 
-#: index.cgi:238
-msgid "Getting networking info... "
+#: index.cgi:231
+msgid "Date:"
 msgstr ""
 
-#: index.cgi:254
+#: index.cgi:242
+msgid "Getting hardware info..."
+msgstr ""
+
+#: index.cgi:260
+msgid "Getting networking info..."
+msgstr ""
+
+#: index.cgi:274
 msgid "Getting filesystems info..."
 msgstr ""
 
-#: index.cgi:278
-msgid "Getting boot logs...       "
+#: index.cgi:294
+msgid "Getting boot logs..."
 msgstr ""
 
-#: index.cgi:280 boot.cgi:29 boot.cgi:34
+#: index.cgi:297 boot.cgi:29 boot.cgi:34
 msgid "Kernel messages"
 msgstr ""
 
-#: index.cgi:284 boot.cgi:30 boot.cgi:39
+#: index.cgi:300 boot.cgi:30 boot.cgi:38
 msgid "Boot scripts"
 msgstr ""
 
-#: index.cgi:290
-msgid "Creating report footer...  "
+#: index.cgi:305
+msgid "Creating report footer..."
 msgstr ""
 
-#: index.cgi:298
+#: index.cgi:317
 msgid "View report"
 msgstr ""
 
-#: index.cgi:299
-msgid "This report can be attached with a bug report on: "
+#: index.cgi:318
+msgid "This report can be attached with a bug report on:"
 msgstr ""
 
-#: index.cgi:310
-msgid "Host:"
+#: index.cgi:332
+#, sh-format
+msgid "Host: $hostname"
 msgstr ""
 
-#: index.cgi:311
+#: index.cgi:333
 msgid "SliTaz administration and configuration Panel"
 msgstr ""
 
-#: index.cgi:315 styles/default/header.sh:27
+#: index.cgi:337 styles/default/header.sh:27
 msgid "Terminal"
 msgstr ""
 
-#: index.cgi:317
+#: index.cgi:339
 msgid "Process activity"
 msgstr ""
 
-#: index.cgi:319
+#: index.cgi:341
 msgid "Create a report"
 msgstr ""
 
-#: index.cgi:322 pkgs.cgi:855
+#: index.cgi:344 pkgs.cgi:948
 msgid "Summary"
 msgstr ""
 
-#: index.cgi:325
-msgid "Uptime       :"
+#: index.cgi:347
+msgid "Uptime:"
 msgstr ""
 
-#: index.cgi:326
-msgid "Memory in Mb :"
+#: index.cgi:350
+msgid "Memory in Mb:"
 msgstr ""
 
-#: index.cgi:328
-msgid "Linux kernel :"
+#: index.cgi:355
+#, sh-format
+msgid "Total: $memtotal, Used: $memused, Free: $memfree"
 msgstr ""
 
-#: index.cgi:333
+#: index.cgi:360
+msgid "Linux kernel:"
+msgstr ""
+
+#: index.cgi:367
 msgid "Network status"
 msgstr ""
 
-#: index.cgi:336 hardware.cgi:193
+#: index.cgi:370 hardware.cgi:202
 msgid "Filesystem usage statistics"
 msgstr ""
 
-#: index.cgi:357
+#: index.cgi:403
 msgid "Panel Activity"
 msgstr ""
 
@@ -189,244 +242,441 @@
 msgid "TazPanel - Packages"
 msgstr ""
 
-#: pkgs.cgi:50
-msgid "Last recharge        : "
+#: pkgs.cgi:51
+msgid "Last recharge:"
+msgstr ""
+
+#: pkgs.cgi:58
+msgid "(Older than 10 days)"
 msgstr ""
 
 #: pkgs.cgi:60
-msgid "Installed packages   : "
-msgstr ""
-
-#: pkgs.cgi:62
-msgid "Mirrored packages    : "
+msgid "(Not older than 10 days)"
 msgstr ""
 
 #: pkgs.cgi:64
-msgid "Upgradeable packages : "
+msgid "Installed packages:"
+msgstr ""
+
+#: pkgs.cgi:66
+msgid "Mirrored packages:"
 msgstr ""
 
 #: pkgs.cgi:68
-msgid "Blocked packages     : "
+msgid "Upgradeable packages:"
 msgstr ""
 
-#: pkgs.cgi:113
+#: pkgs.cgi:70 pkgs.cgi:707
+msgid "Installed files:"
+msgstr ""
+
+#: pkgs.cgi:72
+msgid "Blocked packages:"
+msgstr ""
+
+#: pkgs.cgi:86
+msgid "Delete"
+msgstr ""
+
+#: pkgs.cgi:89
+msgid "Use as default"
+msgstr ""
+
+#: pkgs.cgi:120
 msgid "Search"
 msgstr ""
 
-#: pkgs.cgi:115
+#: pkgs.cgi:122
 msgid "Files"
 msgstr ""
 
-#: pkgs.cgi:126 network.cgi:23 network.cgi:151 network.cgi:240 boot.cgi:84
-#: settings.cgi:104 lib/libtazpanel:87
+#: pkgs.cgi:134 pkgs.cgi:867 network.cgi:23 network.cgi:156 network.cgi:246
+#: boot.cgi:82 settings.cgi:104 lib/libtazpanel:98
 msgid "Name"
 msgstr ""
 
-#: pkgs.cgi:127
+#: pkgs.cgi:135
 msgid "Version"
 msgstr ""
 
-#: pkgs.cgi:128 boot.cgi:85
+#: pkgs.cgi:136 boot.cgi:83
 msgid "Description"
 msgstr ""
 
-#: pkgs.cgi:129 installer.cgi:313
+#: pkgs.cgi:137
 msgid "Web"
 msgstr ""
 
-#: pkgs.cgi:212 pkgs.cgi:321 pkgs.cgi:362 pkgs.cgi:416 pkgs.cgi:454
-#: pkgs.cgi:503 pkgs.cgi:575 pkgs.cgi:858 styles/default/header.sh:37
+#: pkgs.cgi:147
+msgid "Categories"
+msgstr ""
+
+#: pkgs.cgi:148
+msgid "Base-system"
+msgstr ""
+
+#: pkgs.cgi:149
+msgid "X window"
+msgstr ""
+
+#: pkgs.cgi:150
+msgid "Utilities"
+msgstr ""
+
+#: pkgs.cgi:151 styles/default/header.sh:46
+msgid "Network"
+msgstr ""
+
+#: pkgs.cgi:152
+msgid "Games"
+msgstr ""
+
+#: pkgs.cgi:153
+msgid "Graphics"
+msgstr ""
+
+#: pkgs.cgi:154
+msgid "Office"
+msgstr ""
+
+#: pkgs.cgi:155
+msgid "Multimedia"
+msgstr ""
+
+#: pkgs.cgi:156
+msgid "Development"
+msgstr ""
+
+#: pkgs.cgi:157
+msgid "System tools"
+msgstr ""
+
+#: pkgs.cgi:158
+msgid "Security"
+msgstr ""
+
+#: pkgs.cgi:159
+msgid "Misc"
+msgstr ""
+
+#: pkgs.cgi:160
+msgid "Meta"
+msgstr ""
+
+#: pkgs.cgi:161
+msgid "Non free"
+msgstr ""
+
+#: pkgs.cgi:162
+msgid "All"
+msgstr ""
+
+#: pkgs.cgi:168
+msgid "Repositories"
+msgstr ""
+
+#: pkgs.cgi:169
+msgid "Public"
+msgstr ""
+
+#: pkgs.cgi:177
+msgid "Any"
+msgstr ""
+
+#: pkgs.cgi:217 pkgs.cgi:339
+msgid "Listing packages..."
+msgstr ""
+
+#: pkgs.cgi:220 pkgs.cgi:358 pkgs.cgi:412 pkgs.cgi:479 pkgs.cgi:520
+#: pkgs.cgi:580 pkgs.cgi:659 pkgs.cgi:952 styles/default/header.sh:37
 msgid "My packages"
 msgstr ""
 
-#: pkgs.cgi:216 pkgs.cgi:262 pkgs.cgi:311 pkgs.cgi:352 pkgs.cgi:445
+#: pkgs.cgi:225 pkgs.cgi:284 pkgs.cgi:347 pkgs.cgi:401 pkgs.cgi:511
 #: settings.cgi:92
 msgid "Selection:"
 msgstr ""
 
-#: pkgs.cgi:220 pkgs.cgi:266 pkgs.cgi:317 pkgs.cgi:358 pkgs.cgi:451
-msgid "List:"
+#: pkgs.cgi:226 pkgs.cgi:607
+msgid "Remove"
 msgstr ""
 
-#: pkgs.cgi:258 pkgs.cgi:864
+#: pkgs.cgi:230 pkgs.cgi:289 pkgs.cgi:354 pkgs.cgi:408 pkgs.cgi:518
+#: pkgs.cgi:962 styles/default/header.sh:39
+msgid "Recharge list"
+msgstr ""
+
+#: pkgs.cgi:232 pkgs.cgi:291 pkgs.cgi:356 pkgs.cgi:410 pkgs.cgi:477
+#: pkgs.cgi:964
+msgid "Check upgrades"
+msgstr ""
+
+#: pkgs.cgi:275
+msgid "Listing linkable packages..."
+msgstr ""
+
+#: pkgs.cgi:278 pkgs.cgi:958
 msgid "Linkable packages"
 msgstr ""
 
-#: pkgs.cgi:307
+#: pkgs.cgi:285
+msgid "Link"
+msgstr ""
+
+#: pkgs.cgi:342
+#, sh-format
+msgid "Category: $category"
+msgstr ""
+
+#: pkgs.cgi:366 pkgs.cgi:838
+#, sh-format
+msgid "Repository: $Repo_Name"
+msgstr ""
+
+#: pkgs.cgi:394
+msgid "Searching packages..."
+msgstr ""
+
+#: pkgs.cgi:397
+msgid "Search packages"
+msgstr ""
+
+#: pkgs.cgi:404 pkgs.cgi:514
+msgid "Toogle all"
+msgstr ""
+
+#: pkgs.cgi:423
+msgid "Package"
+msgstr ""
+
+#: pkgs.cgi:424
+msgid "File"
+msgstr ""
+
+#: pkgs.cgi:465
+msgid "Recharging lists..."
+msgstr ""
+
+#: pkgs.cgi:468
+msgid "Recharge"
+msgstr ""
+
+#: pkgs.cgi:473
+msgid "Recharge checks for new or updated packages"
+msgstr ""
+
+#: pkgs.cgi:485
+msgid "Recharging packages list"
+msgstr ""
+
+#: pkgs.cgi:490
+msgid "Packages lists are up-to-date. You should check for upgrades now."
+msgstr ""
+
+#: pkgs.cgi:503
+msgid "Checking for upgrades..."
+msgstr ""
+
+#: pkgs.cgi:506
+msgid "Up packages"
+msgstr ""
+
+#: pkgs.cgi:575
+msgid "Performing tasks on packages"
+msgstr ""
+
+#: pkgs.cgi:585
+#, sh-format
+msgid "Executing $cmd for: $pkgs"
+msgstr ""
+
+#: pkgs.cgi:610
+msgid "Getting package info..."
+msgstr ""
+
+#: pkgs.cgi:622 installer.cgi:155 styles/default/header.sh:88
+msgid "Install"
+msgstr ""
+
+#: pkgs.cgi:626
+#, sh-format
+msgid "Package $PACKAGE"
+msgstr ""
+
+#: pkgs.cgi:634
+msgid "Install (Non Free)"
+msgstr ""
+
+#: pkgs.cgi:642
+msgid "Unblock"
+msgstr ""
+
+#: pkgs.cgi:646
+msgid "Block"
+msgstr ""
+
+#: pkgs.cgi:650
+msgid "Repack"
+msgstr ""
+
+#: pkgs.cgi:665
+msgid "Name:"
+msgstr ""
+
+#: pkgs.cgi:666
+msgid "Version:"
+msgstr ""
+
+#: pkgs.cgi:667
+msgid "Description:"
+msgstr ""
+
+#: pkgs.cgi:668
 msgid "Category:"
 msgstr ""
 
-#: pkgs.cgi:348
-msgid "Search packages"
+#: pkgs.cgi:672
+msgid "Maintainer:"
 msgstr ""
 
-#: pkgs.cgi:355 pkgs.cgi:448
-msgid "Toogle all"
+#: pkgs.cgi:673 pkgs.cgi:702
+msgid "Website:"
 msgstr ""
 
-#: pkgs.cgi:371 pkgs.cgi:545
-msgid "Package"
+#: pkgs.cgi:674 pkgs.cgi:703
+msgid "Sizes:"
 msgstr ""
 
-#: pkgs.cgi:372
-msgid "File"
+#: pkgs.cgi:677
+msgid "Depends:"
 msgstr ""
 
-#: pkgs.cgi:403
-msgid "Recharge"
+#: pkgs.cgi:684
+msgid "Suggested:"
 msgstr ""
 
-#: pkgs.cgi:408
-msgid "Recharge checks for new or updated packages"
+#: pkgs.cgi:690
+msgid "Tags:"
 msgstr ""
 
-#: pkgs.cgi:414 pkgs.cgi:870
-msgid "Check upgrades"
+#: pkgs.cgi:696
+#, sh-format
+msgid "Installed files: $I_FILES"
 msgstr ""
 
-#: pkgs.cgi:422
-msgid "Recharging packages list"
-msgstr ""
-
-#: pkgs.cgi:427
-msgid "Packages lists are up-to-date. You should check for upgrades now."
-msgstr ""
-
-#: pkgs.cgi:441
-msgid "Up packages"
-msgstr ""
-
-#: pkgs.cgi:497
-msgid "Performing tasks on packages"
-msgstr ""
-
-#: pkgs.cgi:527
-msgid "Remove"
-msgstr ""
-
-#: pkgs.cgi:530
-msgid "Getting package info..."
-msgstr ""
-
-#: pkgs.cgi:541 pkgs.cgi:550 installer.cgi:155 styles/default/header.sh:88
-msgid "Install"
-msgstr ""
-
-#: pkgs.cgi:560
-msgid "Unblock"
-msgstr ""
-
-#: pkgs.cgi:562
-msgid "Block"
-msgstr ""
-
-#: pkgs.cgi:609 pkgs.cgi:621
-msgid "Installed files:"
-msgstr ""
-
-#: pkgs.cgi:666 pkgs.cgi:790
+#: pkgs.cgi:755 pkgs.cgi:884
 msgid "Set link"
 msgstr ""
 
-#: pkgs.cgi:669 pkgs.cgi:791
+#: pkgs.cgi:758 pkgs.cgi:885
 msgid "Remove link"
 msgstr ""
 
-#: pkgs.cgi:675 pkgs.cgi:872 styles/default/header.sh:43
+#: pkgs.cgi:764 pkgs.cgi:966 styles/default/header.sh:43
 msgid "Administration"
 msgstr ""
 
-#: pkgs.cgi:677
+#: pkgs.cgi:766
 msgid "Tazpkg administration and settings"
 msgstr ""
 
-#: pkgs.cgi:681
+#: pkgs.cgi:770
 msgid "Save configuration"
 msgstr ""
 
-#: pkgs.cgi:683
+#: pkgs.cgi:772
 msgid "List configuration files"
 msgstr ""
 
-#: pkgs.cgi:685
+#: pkgs.cgi:774
 msgid "Quick check"
 msgstr ""
 
-#: pkgs.cgi:687
+#: pkgs.cgi:776
 msgid "Full check"
 msgstr ""
 
-#: pkgs.cgi:692
+#: pkgs.cgi:781
 msgid "Creating the package..."
 msgstr ""
 
-#: pkgs.cgi:697
-msgid "Path : "
+#: pkgs.cgi:786
+msgid "Path:"
 msgstr ""
 
-#: pkgs.cgi:700 boot.cgi:248
+#: pkgs.cgi:789 boot.cgi:256
 msgid "Configuration files"
 msgstr ""
 
-#: pkgs.cgi:713
+#: pkgs.cgi:802
 msgid "Checking packages consistency..."
 msgstr ""
 
-#: pkgs.cgi:719
+#: pkgs.cgi:808
 msgid "Full packages check..."
 msgstr ""
 
-#: pkgs.cgi:726
+#: pkgs.cgi:815
 msgid "Packages cache"
 msgstr ""
 
-#: pkgs.cgi:730
-msgid "Packages in the cache:"
+#: pkgs.cgi:820
+#, sh-format
+msgid "Packages in the cache: $cache_files ($cache_size)"
 msgstr ""
 
-#: pkgs.cgi:736
+#: pkgs.cgi:827
 msgid "Default mirror"
 msgstr ""
 
-#: pkgs.cgi:738
+#: pkgs.cgi:831
 msgid "Current mirror list"
 msgstr ""
 
-#: pkgs.cgi:761
+#: pkgs.cgi:855
 msgid "Private repositories"
 msgstr ""
 
-#: pkgs.cgi:780
+#: pkgs.cgi:868
+msgid "mirror"
+msgstr ""
+
+#: pkgs.cgi:874
 msgid "Link to another SliTaz installation"
 msgstr ""
 
-#: pkgs.cgi:782
+#: pkgs.cgi:876
 msgid ""
 "This link points to the root of another SliTaz installation. You will be "
 "able to install packages using soft links to it."
 msgstr ""
 
-#: pkgs.cgi:799
+#: pkgs.cgi:892
 msgid "SliTaz packages DVD"
 msgstr ""
 
-#: pkgs.cgi:811
+#: pkgs.cgi:894
+#, sh-format
+msgid ""
+"A bootable DVD image of all available packages for the $version version is "
+"generated every day. It also contains a copy of the website and can be used "
+"without an internet connection. This image can be installed on a DVD or an "
+"USB key."
+msgstr ""
+
+#: pkgs.cgi:904
 msgid "Download DVD image"
 msgstr ""
 
-#: pkgs.cgi:813
+#: pkgs.cgi:906
 msgid "Install from DVD/USB key"
 msgstr ""
 
-#: pkgs.cgi:816
-msgid "Install from ISO image: "
+#: pkgs.cgi:909
+msgid "Install from ISO image:"
 msgstr ""
 
-#: pkgs.cgi:868 styles/default/header.sh:39
-msgid "Recharge list"
-msgstr ""
-
-#: pkgs.cgi:878
+#: pkgs.cgi:972
 msgid "Latest log entries"
 msgstr ""
 
@@ -446,23 +696,22 @@
 msgid "Create Live USB SliTaz systems"
 msgstr ""
 
-#: live.cgi:93
+#: live.cgi:92
 msgid ""
-"Generate SliTaz LiveUSB media and boot in RAM! Insert a\n"
-"\tLiveCD into the cdrom drive, select the correct device and press\n"
-"\tGenerate."
+"Generate SliTaz LiveUSB media and boot in RAM! Insert a LiveCD into the "
+"cdrom drive, select the correct device and press Generate."
 msgstr ""
 
-#: live.cgi:99
+#: live.cgi:97
 msgid "USB Media to use:"
 msgstr ""
 
-#: live.cgi:108 installer.cgi:302 installer.cgi:346 installer.cgi:381
-#: installer.cgi:414
+#: live.cgi:106 installer.cgi:299 installer.cgi:343 installer.cgi:378
+#: installer.cgi:410
 msgid "Not found"
 msgstr ""
 
-#: live.cgi:112
+#: live.cgi:110
 msgid "Generate"
 msgstr ""
 
@@ -478,84 +727,82 @@
 msgid "Create LiveUSB"
 msgstr ""
 
-#: live.cgi:139
+#: live.cgi:140
 msgid "Write a Live CD"
 msgstr ""
 
-#: live.cgi:141
+#: live.cgi:142
 msgid ""
-"The command writeiso will generate an ISO image of the\n"
-"\tcurrent filesystem as is, including all files in the /home directory.\n"
-"\tIt is an easy way to remaster a SliTaz Live system, you just have\n"
-"\tto: boot, modify, writeiso."
+"The command writeiso will generate an ISO image of the current filesystem as "
+"is, including all files in the /home directory. It is an easy way to "
+"remaster a SliTaz Live system, you just have to: boot, modify, writeiso."
 msgstr ""
 
-#: live.cgi:147
+#: live.cgi:148
 msgid "Compression type:"
 msgstr ""
 
-#: live.cgi:153
+#: live.cgi:154
 msgid "Write ISO"
 msgstr ""
 
-#: live.cgi:156
+#: live.cgi:158
 msgid "Live CD tools"
 msgstr ""
 
-#: live.cgi:158 live.cgi:183 styles/default/header.sh:84
+#: live.cgi:160 live.cgi:192 styles/default/header.sh:84
 msgid "Convert ISO to loram"
 msgstr ""
 
-#: live.cgi:160
+#: live.cgi:162
 msgid ""
-"This command will convert an ISO image of a SliTaz Live CD\n"
-"\tto a new ISO image requiring less RAM to run."
+"This command will convert an ISO image of a SliTaz Live CD to a new ISO "
+"image requiring less RAM to run."
 msgstr ""
 
-#: live.cgi:166
+#: live.cgi:168
 msgid "ISO to convert"
 msgstr ""
 
-#: live.cgi:170
+#: live.cgi:173
 msgid "The filesystem is always in RAM"
 msgstr ""
 
-#: live.cgi:173
+#: live.cgi:178
 msgid "The filesystem may be on a small CDROM"
 msgstr ""
 
-#: live.cgi:176
+#: live.cgi:183
 msgid "The filesystem may be on a large CDROM"
 msgstr ""
 
-#: live.cgi:179 live.cgi:222
+#: live.cgi:187 live.cgi:234
 msgid "ISO to create"
 msgstr ""
 
-#: live.cgi:187 live.cgi:226 styles/default/header.sh:85
+#: live.cgi:196 live.cgi:239 styles/default/header.sh:85
 msgid "Build a meta ISO"
 msgstr ""
 
-#: live.cgi:189
+#: live.cgi:198
 msgid ""
-"Combines several ISO flavors like nested Russian dolls.\n"
-"\tThe amount of RAM available at startup will be used to select the\n"
-"\tutmost one."
+"Combines several ISO flavors like nested Russian dolls. The amount of RAM "
+"available at startup will be used to select the utmost one."
 msgstr ""
 
-#: live.cgi:202
+#: live.cgi:210
 msgid "ISO number"
 msgstr ""
 
-#: live.cgi:204 live.cgi:217
+#: live.cgi:213 live.cgi:228
 msgid "Minimum RAM"
 msgstr ""
 
-#: live.cgi:215
+#: live.cgi:225
 msgid "ISO to add"
 msgstr ""
 
-#: live.cgi:219
+#: live.cgi:230
 msgid "Add to the list"
 msgstr ""
 
@@ -571,193 +818,195 @@
 msgid "Encryption"
 msgstr ""
 
-#: network.cgi:26 boot.cgi:86 lib/libtazpanel:88
+#: network.cgi:26 boot.cgi:84 lib/libtazpanel:99
 msgid "Status"
 msgstr ""
 
-#: network.cgi:52
+#: network.cgi:53
 msgid "Connected"
 msgstr ""
 
-#: network.cgi:91
-msgid "Changed hostname:"
+#: network.cgi:96
+#, sh-format
+msgid "Changed hostname: $get_hostname"
 msgstr ""
 
-#: network.cgi:107
+#: network.cgi:112
 msgid "Scanning open ports..."
 msgstr ""
 
-#: network.cgi:110
-msgid "Port scanning for"
+#: network.cgi:115
+#, sh-format
+msgid "Port scanning for $scan"
 msgstr ""
 
-#: network.cgi:124
+#: network.cgi:129
 msgid "Setting up IP..."
 msgstr ""
 
-#: network.cgi:140
+#: network.cgi:145
 msgid "Ethernet connection"
 msgstr ""
 
-#: network.cgi:142
+#: network.cgi:147
 msgid ""
-"Here you can configure a wired connection using DHCP to\n"
-"automatically get a random IP or configure a static/fixed IP"
+"Here you can configure a wired connection using DHCP to automatically get a "
+"random IP or configure a static/fixed IP"
 msgstr ""
 
-#: network.cgi:145
+#: network.cgi:150
 msgid "Configuration"
 msgstr ""
 
-#: network.cgi:152 network.cgi:241
+#: network.cgi:157 network.cgi:247
 msgid "Value"
 msgstr ""
 
-#: network.cgi:156 lib/libtazpanel:86
+#: network.cgi:162 lib/libtazpanel:97
 msgid "Interface"
 msgstr ""
 
-#: network.cgi:160
+#: network.cgi:166
 msgid "IP address"
 msgstr ""
 
-#: network.cgi:164
+#: network.cgi:170
 msgid "Netmask"
 msgstr ""
 
-#: network.cgi:168
+#: network.cgi:174
 msgid "Gateway"
 msgstr ""
 
-#: network.cgi:172
+#: network.cgi:178
 msgid "DNS server"
 msgstr ""
 
-#: network.cgi:176
+#: network.cgi:183
 msgid "Activate (static)"
 msgstr ""
 
-#: network.cgi:177
+#: network.cgi:184
 msgid "Activate (DHCP)"
 msgstr ""
 
-#: network.cgi:178
+#: network.cgi:185
 msgid "Disable"
 msgstr ""
 
-#: network.cgi:181 network.cgi:260
+#: network.cgi:188 network.cgi:266
 msgid "Configuration file"
 msgstr ""
 
-#: network.cgi:183
+#: network.cgi:190
 msgid ""
-"These values are the ethernet settings in the main\n"
-"/etc/network.conf configuration file"
+"These values are the ethernet settings in the main /etc/network.conf "
+"configuration file"
 msgstr ""
 
-#: network.cgi:190 network.cgi:269
+#: network.cgi:196 network.cgi:274
 msgid "Manual Edit"
 msgstr ""
 
-#: network.cgi:196
+#: network.cgi:202
 msgid "Scanning wireless interface..."
 msgstr ""
 
-#: network.cgi:200
+#: network.cgi:206
 msgid "Wireless connection"
 msgstr ""
 
-#: network.cgi:203 network.cgi:289
+#: network.cgi:209 network.cgi:293 boot.cgi:167
 msgid "Start"
 msgstr ""
 
-#: network.cgi:205 network.cgi:291
+#: network.cgi:211 network.cgi:295 boot.cgi:155
 msgid "Stop"
 msgstr ""
 
-#: network.cgi:207
+#: network.cgi:213
 msgid "Scan"
 msgstr ""
 
-#: network.cgi:234
+#: network.cgi:240
 msgid "Connection"
 msgstr ""
 
-#: network.cgi:245
+#: network.cgi:251
 msgid "Wifi name (ESSID)"
 msgstr ""
 
-#: network.cgi:249
+#: network.cgi:255
 msgid "Password (Wifi key)"
 msgstr ""
 
-#: network.cgi:253
+#: network.cgi:259
 msgid "Encryption type"
 msgstr ""
 
-#: network.cgi:257
+#: network.cgi:263
 msgid "Configure"
 msgstr ""
 
-#: network.cgi:262
+#: network.cgi:268
 msgid ""
-"These values are the wifi settings in the main\n"
-"/etc/network.conf configuration file"
+"These values are the wifi settings in the main /etc/network.conf "
+"configuration file"
 msgstr ""
 
-#: network.cgi:271
-msgid "Output of"
+#: network.cgi:276
+msgid "Output of iwconfig"
 msgstr ""
 
-#: network.cgi:282
+#: network.cgi:286
 msgid "Networking"
 msgstr ""
 
-#: network.cgi:284
+#: network.cgi:288
 msgid "Manage network connections and services"
 msgstr ""
 
-#: network.cgi:293
+#: network.cgi:297
 msgid "Restart"
 msgstr ""
 
-#: network.cgi:296
+#: network.cgi:300
 msgid "Configuration:"
 msgstr ""
 
-#: network.cgi:306
+#: network.cgi:309
 msgid "Hosts"
 msgstr ""
 
-#: network.cgi:311
+#: network.cgi:314
 msgid "Edit hosts"
 msgstr ""
 
-#: network.cgi:313 installer.cgi:438
+#: network.cgi:316 installer.cgi:433
 msgid "Hostname"
 msgstr ""
 
-#: network.cgi:316
+#: network.cgi:320
 msgid "Change hostname"
 msgstr ""
 
-#: network.cgi:321
-msgid "Output of "
+#: network.cgi:324
+msgid "Output of ifconfig"
 msgstr ""
 
-#: network.cgi:327
+#: network.cgi:328
 msgid "Routing table"
 msgstr ""
 
-#: network.cgi:333
+#: network.cgi:332
 msgid "Domain name resolution"
 msgstr ""
 
-#: network.cgi:339
+#: network.cgi:336
 msgid "ARP table"
 msgstr ""
 
-#: network.cgi:345
+#: network.cgi:340
 msgid "IP Connections"
 msgstr ""
 
@@ -769,127 +1018,155 @@
 msgid "Boot log files"
 msgstr ""
 
-#: boot.cgi:31 boot.cgi:44
+#: boot.cgi:31 boot.cgi:42
 msgid "X server"
 msgstr ""
 
-#: boot.cgi:61 boot.cgi:244 styles/default/header.sh:67
+#: boot.cgi:46
+msgid "Show more..."
+msgstr ""
+
+#: boot.cgi:61 boot.cgi:252 styles/default/header.sh:67
 msgid "Manage daemons"
 msgstr ""
 
-#: boot.cgi:63
+#: boot.cgi:62
 msgid "Check, start and stop daemons on SliTaz"
 msgstr ""
 
-#: boot.cgi:87
+#: boot.cgi:85
 msgid "Action"
 msgstr ""
 
-#: boot.cgi:88
+#: boot.cgi:86
 msgid "PID"
 msgstr ""
 
-#: boot.cgi:109
-msgid "<td>SliTaz Firewall with iptable rules</td>"
+#: boot.cgi:108
+msgid "SliTaz Firewall with iptable rules"
 msgstr ""
 
-#: boot.cgi:111
-msgid "<td>Small and fast web server with CGI support</td>"
+#: boot.cgi:110
+msgid "Small and fast web server with CGI support"
 msgstr ""
 
-#: boot.cgi:113
-msgid "<td>Network time protocol daemon</td>"
+#: boot.cgi:112
+msgid "Network time protocol daemon"
 msgstr ""
 
-#: boot.cgi:115
-msgid "<td>Anonymous FTP server</td>"
+#: boot.cgi:114
+msgid "Anonymous FTP server"
 msgstr ""
 
-#: boot.cgi:117
-msgid "<td>Busybox DHCP server</td>"
+#: boot.cgi:116
+msgid "Busybox DHCP server"
 msgstr ""
 
-#: boot.cgi:119
-msgid "<td>Linux Kernel log daemon</td>"
+#: boot.cgi:118
+msgid "Linux Kernel log daemon"
 msgstr ""
 
-#: boot.cgi:121
-msgid "<td>Execute scheduled commands</td>"
+#: boot.cgi:120
+msgid "Execute scheduled commands"
 msgstr ""
 
-#: boot.cgi:123
-msgid "<td>Small static DNS server daemon</td>"
+#: boot.cgi:122
+msgid "Small static DNS server daemon"
 msgstr ""
 
-#: boot.cgi:125
-msgid "<td>Transfer a file on tftp request</td>"
+#: boot.cgi:124
+msgid "Transfer a file on tftp request"
 msgstr ""
 
-#: boot.cgi:127
-msgid "<td>Listen for network connections and launch programs</td>"
+#: boot.cgi:126
+msgid "Listen for network connections and launch programs"
 msgstr ""
 
-#: boot.cgi:129
-msgid "<td>Manage a ZeroConf IPv4 link-local address</td>"
+#: boot.cgi:128
+msgid "Manage a ZeroConf IPv4 link-local address"
 msgstr ""
 
-#: boot.cgi:191
+#: boot.cgi:153
+msgid "Started"
+msgstr ""
+
+#: boot.cgi:165
+msgid "Stopped"
+msgstr ""
+
+#: boot.cgi:193
 msgid "GRUB Boot loader"
 msgstr ""
 
-#: boot.cgi:193
+#: boot.cgi:195
 msgid "The first application started when the computer powers on"
 msgstr ""
 
-#: boot.cgi:206 settings.cgi:283
+#: boot.cgi:201
+msgid "Default entry:"
+msgstr ""
+
+#: boot.cgi:203
+msgid "Timeout:"
+msgstr ""
+
+#: boot.cgi:205
+msgid "Splash image:"
+msgstr ""
+
+#: boot.cgi:208 settings.cgi:289
 msgid "Change"
 msgstr ""
 
-#: boot.cgi:211
+#: boot.cgi:210
+msgid "View or edit menu.lst"
+msgstr ""
+
+#: boot.cgi:213
 msgid "Boot entries"
 msgstr ""
 
-#: boot.cgi:217
+#: boot.cgi:219
 msgid "Entry"
 msgstr ""
 
-#: boot.cgi:225
+#: boot.cgi:235
 msgid "Web boot is available with gPXE"
 msgstr ""
 
-#: boot.cgi:235
+#: boot.cgi:245
 msgid "Boot &amp; Start services"
 msgstr ""
 
-#: boot.cgi:237
+#: boot.cgi:246
 msgid "Everything that happens before user login"
 msgstr ""
 
-#: boot.cgi:242 styles/default/header.sh:65
+#: boot.cgi:250 styles/default/header.sh:65
 msgid "Boot logs"
 msgstr ""
 
-#: boot.cgi:245 styles/default/header.sh:69
+#: boot.cgi:253 styles/default/header.sh:69
 msgid "Boot loader"
 msgstr ""
 
-#: boot.cgi:250
+#: boot.cgi:258
 msgid "Main configuration file:"
 msgstr ""
 
-#: boot.cgi:252
+#: boot.cgi:260
 msgid "Login manager settings:"
 msgstr ""
 
-#: boot.cgi:256
+#: boot.cgi:264
 msgid "Kernel cmdline"
 msgstr ""
 
-#: boot.cgi:260
+#: boot.cgi:268
 msgid "Local startup commands"
 msgstr ""
 
-#: boot.cgi:265
+#: boot.cgi:273
 msgid "Edit script"
 msgstr ""
 
@@ -897,59 +1174,99 @@
 msgid "TazPanel - Hardware"
 msgstr ""
 
-#: hardware.cgi:28
+#: hardware.cgi:29
 msgid "Detect hardware"
 msgstr ""
 
-#: hardware.cgi:29
+#: hardware.cgi:30
 msgid "Detect PCI and USB hardware"
 msgstr ""
 
-#: hardware.cgi:42 styles/default/header.sh:75
+#: hardware.cgi:42 hardware.cgi:117 styles/default/header.sh:75
 msgid "Kernel modules"
 msgstr ""
 
+#: hardware.cgi:46
+msgid "Modules search"
+msgstr ""
+
 #: hardware.cgi:49
 msgid "Manage, search or get information about the Linux kernel modules"
 msgstr ""
 
-#: hardware.cgi:55
-msgid "Detailed information for module: "
+#: hardware.cgi:56
+#, sh-format
+msgid "Detailed information for module: $get_modinfo"
 msgstr ""
 
-#: hardware.cgi:71
-msgid "Matching result(s) for: "
+#: hardware.cgi:70
+#, sh-format
+msgid "Matching result(s) for: $get_search"
 msgstr ""
 
-#: hardware.cgi:84
+#: hardware.cgi:76
+msgid "Module:"
+msgstr ""
+
+#: hardware.cgi:83
 msgid "Module"
 msgstr ""
 
-#: hardware.cgi:85 lib/libtazpanel:206
+#: hardware.cgi:84 lib/libtazpanel:217
 msgid "Size"
 msgstr ""
 
-#: hardware.cgi:86 lib/libtazpanel:208
+#: hardware.cgi:85 lib/libtazpanel:219
 msgid "Used"
 msgstr ""
 
-#: hardware.cgi:87
+#: hardware.cgi:86
 msgid "by"
 msgstr ""
 
-#: hardware.cgi:113
+#: hardware.cgi:112
 msgid "Drivers &amp; Devices"
 msgstr ""
 
-#: hardware.cgi:114
+#: hardware.cgi:113
 msgid "Manage your computer hardware"
 msgstr ""
 
-#: hardware.cgi:171
+#: hardware.cgi:119 styles/default/header.sh:77
+msgid "Detect PCI/USB"
+msgstr ""
+
+#: hardware.cgi:140
+msgid "Battery"
+msgstr ""
+
+#: hardware.cgi:142
+msgid "health"
+msgstr ""
+
+#: hardware.cgi:151
+#, sh-format
+msgid "Discharging $rempct% - $remtimef"
+msgstr ""
+
+#: hardware.cgi:155
+#, sh-format
+msgid "Charging $rempct% - $remtimef"
+msgstr ""
+
+#: hardware.cgi:157
+msgid "Charged 100%"
+msgstr ""
+
+#: hardware.cgi:165
+msgid "Temperature:"
+msgstr ""
+
+#: hardware.cgi:180
 msgid "Brightness"
 msgstr ""
 
-#: hardware.cgi:217
+#: hardware.cgi:242
 msgid "System memory"
 msgstr ""
 
@@ -957,7 +1274,7 @@
 msgid "TazPanel - Settings"
 msgstr ""
 
-#: settings.cgi:88 settings.cgi:176
+#: settings.cgi:87 settings.cgi:183
 msgid "Manage users"
 msgstr ""
 
@@ -989,154 +1306,167 @@
 msgid "Shell"
 msgstr ""
 
-#: settings.cgi:138
+#: settings.cgi:143
 msgid "Password:"
 msgstr ""
 
-#: settings.cgi:140
+#: settings.cgi:145
 msgid "Change password"
 msgstr ""
 
-#: settings.cgi:144
+#: settings.cgi:149
 msgid "Add a new user"
 msgstr ""
 
-#: settings.cgi:147 installer.cgi:467
+#: settings.cgi:154 installer.cgi:465
 msgid "User login:"
 msgstr ""
 
-#: settings.cgi:149
+#: settings.cgi:156
 msgid "User password:"
 msgstr ""
 
-#: settings.cgi:151
+#: settings.cgi:159
 msgid "Create user"
 msgstr ""
 
-#: settings.cgi:154
+#: settings.cgi:163
 msgid "Current user sessions"
 msgstr ""
 
-#: settings.cgi:159
+#: settings.cgi:167
 msgid "Last user sessions"
 msgstr ""
 
-#: settings.cgi:171
+#: settings.cgi:178
 msgid "System settings"
 msgstr ""
 
-#: settings.cgi:172
+#: settings.cgi:179
 msgid "Manage system time, users or language settings"
 msgstr ""
 
-#: settings.cgi:179
+#: settings.cgi:186
 msgid "System time"
 msgstr ""
 
-#: settings.cgi:181
-msgid "Time zome      :"
+#: settings.cgi:189
+msgid "Time zome:"
 msgstr ""
 
-#: settings.cgi:182
-msgid "System time    :"
+#: settings.cgi:190
+msgid "System time:"
 msgstr ""
 
-#: settings.cgi:183
-msgid "Hardware clock :"
+#: settings.cgi:191
+msgid "Hardware clock:"
 msgstr ""
 
-#: settings.cgi:185
+#: settings.cgi:193
 msgid "Sync online"
 msgstr ""
 
-#: settings.cgi:186
+#: settings.cgi:194
 msgid "Set hardware clock"
 msgstr ""
 
-#: settings.cgi:193
+#: settings.cgi:200
 msgid "System language"
 msgstr ""
 
-#: settings.cgi:204
+#: settings.cgi:211
 #, sh-format
 msgid ""
-"You must logout and login again to your current\n"
-"\t\t\t\tsession to use $new_locale locale."
+"You must logout and login again to your current session to use $new_locale "
+"locale."
 msgstr ""
 
-#: settings.cgi:207
-msgid "Current system locales: "
+#: settings.cgi:214
+msgid "Current system locales:"
 msgstr ""
 
-#: settings.cgi:213
+#: settings.cgi:220
 msgid "Available locales:"
 msgstr ""
 
-#: settings.cgi:218 settings.cgi:266 settings.cgi:276
+#: settings.cgi:225 settings.cgi:271 settings.cgi:282
 msgid "Activate"
 msgstr ""
 
-#: settings.cgi:222
+#: settings.cgi:228
 msgid "Console keymap"
 msgstr ""
 
-#: settings.cgi:234
-msgid "Current console keymap: "
+#: settings.cgi:241
+#, sh-format
+msgid "Current console keymap: $keymap"
 msgstr ""
 
-#: settings.cgi:253
+#: settings.cgi:258
 msgid "Suggested keymap for Xorg:"
 msgstr ""
 
-#: settings.cgi:262
+#: settings.cgi:267
 msgid "Available keymaps:"
 msgstr ""
 
-#: settings.cgi:269
+#: settings.cgi:274
 msgid "Panel configuration"
 msgstr ""
 
-#: settings.cgi:272
+#: settings.cgi:278
 msgid "Style:"
 msgstr ""
 
-#: settings.cgi:281
+#: settings.cgi:287
 msgid "Panel password:"
 msgstr ""
 
-#: settings.cgi:287
-msgid "Configuration files: "
+#: settings.cgi:293
+msgid "Configuration files:"
 msgstr ""
 
-#: settings.cgi:289 styles/default/header.sh:24
+#: settings.cgi:295 styles/default/header.sh:24
 msgid "Panel"
 msgstr ""
 
-#: settings.cgi:291
+#: settings.cgi:297
 msgid "Server"
 msgstr ""
 
-#: settings.cgi:294
+#: settings.cgi:300
 msgid "TazPanel provides a debuging mode and page:"
 msgstr ""
 
-#: lib/libtazpanel:89
+#: lib/libtazpanel:83
+msgid "connected"
+msgstr ""
+
+#: lib/libtazpanel:100
 msgid "IP Address"
 msgstr ""
 
-#: lib/libtazpanel:90
+#: lib/libtazpanel:101
 msgid "Scan ports"
 msgstr ""
 
-#: lib/libtazpanel:205
+#: lib/libtazpanel:214
 msgid "Disk"
 msgstr ""
 
-#: lib/libtazpanel:207
+#: lib/libtazpanel:215
+msgid "Label"
+msgstr ""
+
+#: lib/libtazpanel:216
+msgid "Type"
+msgstr ""
+
+#: lib/libtazpanel:218
 msgid "Available"
 msgstr ""
 
-#: lib/libtazpanel:209
+#: lib/libtazpanel:220
 msgid "Mount point"
 msgstr ""
 
@@ -1144,261 +1474,260 @@
 msgid "TazPanel - Installer"
 msgstr ""
 
-#: installer.cgi:120 installer.cgi:126
+#: installer.cgi:116
+#, sh-format
+msgid "Creating setup file $INSTFILE."
+msgstr ""
+
+#: installer.cgi:120 installer.cgi:127
 msgid "Setup File Error"
 msgstr ""
 
-#: installer.cgi:141
+#: installer.cgi:121
+#, sh-format
+msgid "The setup file <strong>$INSTFILE</strong> doesn't exist."
+msgstr ""
+
+#: installer.cgi:142
 msgid "SliTaz Installer"
 msgstr ""
 
-#: installer.cgi:143
+#: installer.cgi:144
 msgid ""
-"The SliTaz Installer installs or upgrades SliTaz to a hard disk\n"
-"\tdrive from a device like a Live-CD or LiveUSB key, from a SliTaz ISO "
-"file,\n"
-"\tor from the web by downloading an ISO file."
+"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."
 msgstr ""
 
 #: installer.cgi:157
 msgid ""
-"Install SliTaz on a partition of your hard disk drive. If\n"
-"\tyou decide to format your partition, all data will be lost. If you do not\n"
-"\tformat, all data except for any existing /home directory will be removed,\n"
-"\tthe home directory will be kept as is."
+"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."
 msgstr ""
 
-#: installer.cgi:163
+#: installer.cgi:162
 msgid ""
-"Before installation, you may need to create or resize partitions\n"
-"\ton your hard disk drive in order to make space for SliTaz GNU/Linux.\n"
-"\tYou can graphically manage your partitions with Gparted"
+"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"
 msgstr ""
 
-#: installer.cgi:169 installer.cgi:249 styles/default/header.sh:90
+#: installer.cgi:166 installer.cgi:244 styles/default/header.sh:90
 msgid "Install SliTaz"
 msgstr ""
 
-#: installer.cgi:177
+#: installer.cgi:175
 msgid "Upgrade"
 msgstr ""
 
-#: installer.cgi:179
+#: installer.cgi:177
 msgid ""
-"Upgrade an already installed SliTaz system on your hard disk\n"
-"\tdrive. Your /home /etc /var/www directories will be kept, all other "
-"directories\n"
-"\twill be removed. Any additional packages added to your old Slitaz system\n"
-"\twill be updated as long you have an active internet connection."
+"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."
 msgstr ""
 
-#: installer.cgi:186 installer.cgi:261
+#: installer.cgi:182 installer.cgi:257
 msgid "Upgrade SliTaz"
 msgstr ""
 
-#: installer.cgi:194
+#: installer.cgi:190
 msgid "Partitioning"
 msgstr ""
 
-#: installer.cgi:197
+#: installer.cgi:193
 msgid ""
-"On most used systems, the hard drive is already dedicated to\n"
-"\tpartitions for Windows<sup>&copy;</sup>, or Linux, or another operating\n"
-"\tsystem. You'll need to resize these partitions in order to make space for\n"
-"\tSliTaz GNU/Linux. SliTaz will co-exist with other operating systems "
-"already\n"
-"\tinstalled on your hard drive."
+"On most used systems, the hard drive is already dedicated to partitions for "
+"Windows<sup>&trade;</sup>, 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."
+msgstr ""
+
+#: installer.cgi:199
+msgid ""
+"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."
 msgstr ""
 
 #: installer.cgi:204
 msgid ""
-"The amount of space needed depends on how much software you\n"
-"\tplan to install\tand how much space you require for users. It's "
-"conceivable\n"
-"\tthat you could run a minimal SliTaz system in 300 megs or less, but 2 "
-"gigs\n"
-"\tis indeed more comfy."
+"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."
 msgstr ""
 
-#: installer.cgi:209
+#: installer.cgi:212
 msgid ""
-"A separate home partition, and a partition that will be used\n"
-"\tas Linux swap space may be created if needed. Slitaz detects and uses "
-"swap\n"
-"\tpartitions automatically."
+"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."
 msgstr ""
 
-#: installer.cgi:217
+#: installer.cgi:216
 msgid ""
-"You can graphically manage your partitions with Gparted. GParted\n"
-"\tis a partition editor for graphically managing your disk partitions. "
-"Gparted\n"
-"\tallows you to create, destroy, resize and copy partitions without data\n"
-"\tloss."
+"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 and so on."
 msgstr ""
 
 #: installer.cgi:223
-msgid ""
-"Gparted supports ext2, ext3, ext4, linux swap, ntfs and fat32\n"
-"\tfilesystems right out of the box. Support for xjs, jfs, hfs and other\n"
-"\tfilesystems is available as well but you first need to add drivers for\n"
-"\tthese filesystems by installing the related packages xfsprogs, jfsutils,\n"
-"\tlinux-hfs and so on."
-msgstr ""
-
-#: installer.cgi:230
 msgid "Execute Gparted"
 msgstr ""
 
-#: installer.cgi:231
+#: installer.cgi:225
 msgid "Continue installation"
 msgstr ""
 
-#: installer.cgi:232
+#: installer.cgi:227
 msgid ""
-"Once you've made room for SliTaz on your drive,\tyou\n"
-"\tshould be able to continue installation."
+"Once you've made room for SliTaz on your drive, you should be able to "
+"continue installation."
 msgstr ""
 
-#: installer.cgi:237 installer.cgi:501 installer.cgi:512
+#: installer.cgi:232 installer.cgi:502 installer.cgi:513
 msgid "Back to Installer Start Page"
 msgstr ""
 
-#: installer.cgi:239
+#: installer.cgi:234
 msgid "Continue Installation"
 msgstr ""
 
-#: installer.cgi:250
+#: installer.cgi:246
 msgid ""
-"You're going to install SliTaz on a partition of your hard disk drive. If\n"
-"\tyou decide to format your HDD, all data will be lost. If you do not\n"
-"\tformat, all data except for any existing /home directory will be removed,\n"
-"\tthe home directory will be kept as is."
+"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."
 msgstr ""
 
-#: installer.cgi:262
+#: installer.cgi:259
 msgid ""
-"You're going to upgrade an already installed SliTaz system on your hard "
-"disk\n"
-"\tdrive. Your /home /etc /var/www directories will be kept, all other "
-"directories\n"
-"\twill be removed. Any additional packages added to your old Slitaz system\n"
-"\twill be updated as long you have an active internet connection."
+"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 have an active internet connection."
+msgstr ""
+
+#: installer.cgi:273
+msgid "Slitaz source media"
 msgstr ""
 
 #: installer.cgi:277
-msgid "Slitaz source media"
+msgid "LiveCD"
 msgstr ""
 
 #: installer.cgi:280
-msgid "LiveCD"
+msgid "LiveUSB:"
 msgstr ""
 
-#: installer.cgi:283
-msgid "LiveUSB"
+#: installer.cgi:306
+msgid "ISO file:"
 msgstr ""
 
-#: installer.cgi:309
-msgid "ISO file"
+#: installer.cgi:307
+msgid "Full path to the ISO image file"
 msgstr ""
 
 #: installer.cgi:310
-msgid "Full path to the ISO image file"
+msgid "Web:"
+msgstr ""
+
+#: installer.cgi:311
+msgid "Stable"
+msgstr ""
+
+#: installer.cgi:312
+msgid "Cooking"
 msgstr ""
 
 #: installer.cgi:314
-msgid "Stable"
+msgid "URL:"
 msgstr ""
 
 #: installer.cgi:315
-msgid "Cooking"
-msgstr ""
-
-#: installer.cgi:316
-msgid "URL:"
-msgstr ""
-
-#: installer.cgi:317
 msgid "Full url to an ISO image file"
 msgstr ""
 
-#: installer.cgi:327
+#: installer.cgi:324
 msgid "Hard Disk Drive"
 msgstr ""
 
-#: installer.cgi:336
+#: installer.cgi:333
 msgid "Install Slitaz to partition:"
 msgstr ""
 
-#: installer.cgi:341 installer.cgi:376 installer.cgi:409
+#: installer.cgi:338 installer.cgi:373 installer.cgi:405
 msgid "None"
 msgstr ""
 
-#: installer.cgi:352
-msgid "Format partition as"
+#: installer.cgi:349 installer.cgi:416
+msgid "Format partition as:"
 msgstr ""
 
-#: installer.cgi:371
+#: installer.cgi:368
 msgid "Existing SliTaz partition to upgrade:"
 msgstr ""
 
-#: installer.cgi:393
+#: installer.cgi:389
 msgid "Options"
 msgstr ""
 
-#: installer.cgi:402
+#: installer.cgi:397
 msgid "home partition"
 msgstr ""
 
-#: installer.cgi:404
+#: installer.cgi:400
 msgid "Use a separate partition for /home:"
 msgstr ""
 
-#: installer.cgi:420
-msgid "Format partition as:"
-msgstr ""
-
-#: installer.cgi:439
+#: installer.cgi:435
 msgid "Set Hostname to:"
 msgstr ""
 
-#: installer.cgi:440
+#: installer.cgi:436
 msgid "Name of your system"
 msgstr ""
 
-#: installer.cgi:451
+#: installer.cgi:446
 msgid "Root"
 msgstr ""
 
-#: installer.cgi:452
+#: installer.cgi:448
 msgid "Root passwd:"
 msgstr ""
 
-#: installer.cgi:453 installer.cgi:455
+#: installer.cgi:449 installer.cgi:452
 msgid "Password of root"
 msgstr ""
 
-#: installer.cgi:454 installer.cgi:473
+#: installer.cgi:451 installer.cgi:473
 msgid "Confirm password:"
 msgstr ""
 
-#: installer.cgi:466
+#: installer.cgi:463
 msgid "User"
 msgstr ""
 
-#: installer.cgi:468
+#: installer.cgi:466
 msgid "Name of the first user"
 msgstr ""
 
-#: installer.cgi:471
+#: installer.cgi:470
 msgid "User passwd:"
 msgstr ""
 
-#: installer.cgi:472 installer.cgi:474
+#: installer.cgi:471 installer.cgi:474
 msgid "Password of the first user"
 msgstr ""
 
-#: installer.cgi:485
+#: installer.cgi:484
 msgid "Grub"
 msgstr ""
 
@@ -1408,58 +1737,90 @@
 "install grub by hand yourself."
 msgstr ""
 
-#: installer.cgi:489
+#: installer.cgi:490
 msgid "Enable Windows Dual-Boot."
 msgstr ""
 
-#: installer.cgi:498
+#: installer.cgi:499
 msgid "Back to partitioning"
 msgstr ""
 
-#: installer.cgi:505
+#: installer.cgi:506
 msgid "Proceed to SliTaz installation"
 msgstr ""
 
-#: installer.cgi:507
+#: installer.cgi:508
 msgid "Installation complete. You can now restart (reboot)"
 msgstr ""
 
-#: installer.cgi:509
+#: installer.cgi:510
 msgid "Installation failed. See log"
 msgstr ""
 
-#: installer.cgi:527
+#: installer.cgi:530
 msgid "A web page that points a browser to a different page after 2 seconds"
 msgstr ""
 
-#: installer.cgi:532
+#: installer.cgi:536
 msgid ""
-"If your browser doesn't automatically redirect within a few seconds,\n"
-"you may want to go there manually"
+"If your browser doesn't automatically redirect within a few seconds, you may "
+"want to go there manually"
 msgstr ""
 
-#: installer.cgi:547 installer.cgi:560
+#: installer.cgi:551 installer.cgi:566
 msgid "Tazinst Error"
 msgstr ""
 
-#: installer.cgi:548
+#: installer.cgi:552
 msgid ""
-"the lightweight SliTaz HDD installer\n"
-"is missing. Any installation can not be done without tazinst."
+"<strong>tazinst</strong>, the lightweight SliTaz HDD installer is missing. "
+"Any installation can not be done without tazinst."
 msgstr ""
 
-#: installer.cgi:550
+#: installer.cgi:555
 msgid "Check tazinst' permissions, or reinstall the slitaz-tools package:"
 msgstr ""
 
-#: installer.cgi:573
+#: installer.cgi:581
 msgid "Proceeding: ()"
 msgstr ""
 
-#: installer.cgi:630 installer.cgi:641
+#: installer.cgi:582
+msgid "Please wait until processing is complete"
+msgstr ""
+
+#: installer.cgi:588
+msgid "Completed."
+msgstr ""
+
+#: installer.cgi:622
+msgid "Hostname error"
+msgstr ""
+
+#: installer.cgi:626
+msgid "Root password error"
+msgstr ""
+
+#: installer.cgi:630
+msgid "User login error"
+msgstr ""
+
+#: installer.cgi:634
+msgid "User password error"
+msgstr ""
+
+#: installer.cgi:637 installer.cgi:648
 msgid "Do you really want to continue?"
 msgstr ""
 
+#: help.cgi:20
+msgid "Manual"
+msgstr ""
+
+#: help.cgi:28
+msgid "TazPanel - Help &amp; Doc"
+msgstr ""
+
 #: styles/default/header.sh:29
 msgid "Processes"
 msgstr ""
@@ -1476,10 +1837,6 @@
 msgid "Check updates"
 msgstr ""
 
-#: styles/default/header.sh:46
-msgid "Network"
-msgstr ""
-
 #: styles/default/header.sh:49
 msgid "Ethernet"
 msgstr ""
@@ -1508,10 +1865,6 @@
 msgid "Hardware"
 msgstr ""
 
-#: styles/default/header.sh:77
-msgid "Detect PCI/USB"
-msgstr ""
-
 #: styles/default/header.sh:80
 msgid "Live"
 msgstr ""
diff -r 5312e3716b01 -r fdfc6b494539 settings.cgi
--- a/settings.cgi	Fri May 04 12:57:53 2012 +0300
+++ b/settings.cgi	Fri May 04 13:00:43 2012 +0300
@@ -31,7 +31,7 @@
 		unset IFS
 		for cmd in "Delete user" "Lock user" "Unlock user" \
 			   "Change password" ; do
-			[ "$(GET do)" == "$(gettext "$cmd")" ] || continue
+			[ "$(GET do)" == "$(gettext "$cmd")" ] || continue			# BUGGY
 			for user in $users ; do
 				case "$cmd" in
 				Delete*)	deluser $user ;;
@@ -84,27 +84,29 @@
 		# Users management
 		#
 		cat <<EOT
-<a name="users"></a>
-<h3>`gettext "Manage users"`</h3>
+<h3 id="users">$(gettext 'Manage users')</h3>
+
 <form method="get" action="$SCRIPT_NAME">
 <div id="actions">
 	<div class="float-left">
-		$(gettext "Selection:")
-		<input type="submit" name="do" value="`gettext "Delete user"`" />
-		<input type="submit" name="do" value="`gettext "Lock user"`" />
-		<input type="submit" name="do" value="`gettext "Unlock user"`" />
+		$(gettext 'Selection:')
+		<input type="submit" name="do" value="$(gettext 'Delete user')" />
+		<input type="submit" name="do" value="$(gettext 'Lock user')" />
+		<input type="submit" name="do" value="$(gettext 'Unlock user')" />
 	</div>
 </div>
-EOT
-		table_start
-		cat << EOT
+
+<table class="zebra">
+<thead>
 <tr class="thead">
-	<td>`gettext "Login"`</td>
-	<td>`gettext "User ID"`</td>
-	<td>`gettext "Name"`</td>
-	<td>`gettext "Home"`</td>
-	<td>`gettext "Shell"`</td>
+	<td>$(gettext 'Login')</td>
+	<td>$(gettext 'User ID')</td>
+	<td>$(gettext 'Name')</td>
+	<td>$(gettext 'Home')</td>
+	<td>$(gettext 'Shell')</td>
 </tr>
+</thead>
+</tbody>
 EOT
 		for login in `cat /etc/passwd | cut -d ":" -f 1`
 		do
@@ -132,34 +134,39 @@
 EOT
 			fi
 		done
-		table_end
+		cat << EOT
+</tbody>
+</table>
+EOT
 		cat << EOT
 <p>
-	$(gettext "Password":)
+	$(gettext 'Password:')
 	<input type="password" name="password" />
-	<input type="submit" name="do" value="`gettext "Change password"`" />
+	<input type="submit" name="do" value="$(gettext 'Change password')" />
 </p>
 </form>
 
-<h4>`gettext "Add a new user"`</h4>
+<h4>$(gettext 'Add a new user')</h4>
+
 <form method="get" action="$SCRIPT_NAME">
 	<input type="hidden" name="user" />
-	<p>`gettext "User login:"`</p>
-	<p><input type="text" name="adduser" size="30" /></p>
-	<p>`gettext "User password:"`</p>
-	<p><input type="password" name="passwd" size="30" /></p>
-	<input type="submit" value="`gettext "Create user"`" />
+	<table>
+		<tr><td>$(gettext 'User login:')</td>
+			<td><input type="text" name="adduser" size="30" /></td></tr>
+		<tr><td>$(gettext 'User password:')</td>
+			<td><input type="password" name="passwd" size="30" /></td></tr>
+		<tr><td colspan="2">
+			<input type="submit" value="$(gettext 'Create user')" /></td></tr>
+	</table>
 </form>
 
-<h4>`gettext "Current user sessions"`</h4>
-<pre>
-$(who)
-</pre>
+<h4>$(gettext 'Current user sessions')</h4>
 
-<h4>`gettext "Last user sessions"`</h4>
-<pre>
-$(last)
-</pre>
+<pre>$(who)</pre>
+
+<h4>$(gettext 'Last user sessions')</h4>
+
+<pre>$(last)</pre>
 EOT
 		;;
 	*)
@@ -168,29 +175,29 @@
 		#
 		cat << EOT
 <div id="wrapper">
-	<h2>$(gettext "System settings")</h2>
-	<p>$(gettext "Manage system time, users or language settings")<p>
+	<h2>$(gettext 'System settings')</h2>
+	<p>$(gettext 'Manage system time, users or language settings')<p>
 </div>
 <div id="actions">
 	<a class="button" href="$SCRIPT_NAME?users">
-		<img src="$IMAGES/users.png" />$(gettext "Manage users")</a>
+		<img src="$IMAGES/users.png" />$(gettext 'Manage users')</a>
 </div>
 
-<h3>`gettext "System time"`</h3>
-<pre>
-`gettext "Time zome      :"` `cat /etc/TZ`
-`gettext "System time    :"` `date`
-`gettext "Hardware clock :"` `hwclock -r`
-</pre>
-<a class="button" href="$SCRIPT_NAME?rdate">`gettext "Sync online"`</a>
-<a class="button" href="$SCRIPT_NAME?hwclock">`gettext "Set hardware clock"`</a>
+<h3>$(gettext 'System time')</h3>
+
+<table>
+	<tr><td>$(gettext 'Time zome:')</td><td>$(cat /etc/TZ)</td></tr>
+	<tr><td>$(gettext 'System time:')</td><td>$(date)</td></tr>
+	<tr><td>$(gettext 'Hardware clock:')</td><td>$(hwclock -r)</tr>
+</table>
+<a class="button" href="$SCRIPT_NAME?rdate">$(gettext 'Sync online')</a>
+<a class="button" href="$SCRIPT_NAME?hwclock">$(gettext 'Set hardware clock')</a>
 EOT
 		#
 		# Locale settings
 		#
 		cat << EOT
-<a name="locale"></a>
-<h3>`gettext "System language"`</h3>
+<h3 id="locale">$(gettext 'System language')</h3>
 <p>
 EOT
 		# Check if a new locale was requested
@@ -201,25 +208,24 @@
 			# System configuration
 			echo "LANG=$new_locale" > /etc/locale.conf
 			echo "LC_ALL=$new_locale" >> /etc/locale.conf
-			eval_gettext "You must logout and login again to your current
-				session to use \$new_locale locale."
+			eval_gettext "You must logout and login again to your current \
+session to use \$new_locale locale."
 		else
-			gettext "Current system locales: "
+			gettext 'Current system locales:'
 			locale -a
 		fi
 		cat << EOT
 </p>
 <form method="get" action="$SCRIPT_NAME">
-	$(gettext "Available locales:")
+	$(gettext 'Available locales:')
 	<select name="gen_locale">
-		<option value="en_US">en_US</options>
+		<option value="en_US">en__US</options>
 		$(list_locales)
 	</select>
-	<input type="submit" value="$(gettext "Activate")" />
+	<input type="submit" value="$(gettext 'Activate')" />
 </form>
 
-<a name="keymap"></a>
-<h3>`gettext "Console keymap"`</h3>
+<h3 id="keymap">$(gettext 'Console keymap')</h3>
 <p>
 EOT
 		# Check if a new keymap was requested
@@ -231,9 +237,8 @@
 				loadkmap < /usr/share/kmap/$new_keymap.kmap
 			fi
 		fi
-		gettext "Current console keymap: "
 		keymap=$(cat /etc/keymap.conf)
-		echo $keymap
+		eval_gettext 'Current console keymap: $keymap'
 		echo "</p>"
 		if [ -n "$keymap" ]; then
 			case "$keymap" in
@@ -250,49 +255,50 @@
 			keyboard_config=/etc/X11/xorg.conf.d/40-Keyboard.conf
 			cat << EOT
 <form method="get" action="$SCRIPT_NAME">
-	$(gettext "Suggested keymap for Xorg:")
+	$(gettext 'Suggested keymap for Xorg:')
 	<input type="submit" name "apply_xorg_kbd" value="$keymap" />
 	<a class="button" href="index.cgi?file=$keyboard_config">
-		<img src="$IMAGES/edit.png" />$(gettext "Edit")</a>
+		<img src="$IMAGES/edit.png" />$(gettext 'Edit')</a>
 </form>
 EOT
 		fi
 		cat << EOT
 <form method="get" action="$SCRIPT_NAME">
-	$(gettext "Available keymaps:")
+	$(gettext 'Available keymaps:')
 	<select name="gen_keymap">
 		$(list_keymaps)
 	</select>
-	<input type="submit" value="$(gettext "Activate")" />
+	<input type="submit" value="$(gettext 'Activate')" />
 </form>
 
-<h2>$(gettext "Panel configuration")</h2>
+<h2>$(gettext 'Panel configuration')</h2>
+
 <form method="get" action="$SCRIPT_NAME">
 	<p>
-		$(gettext "Style:")
+		$(gettext 'Style:')
 		<select name="style">
 			$(list_styles)
 		</select>
-		<input type="submit" value="$(gettext "Activate")" />
+		<input type="submit" value="$(gettext 'Activate')" />
 	</p>
 </form>
 <form method="get" action="$SCRIPT_NAME">
 	<p>
-		$(gettext "Panel password:")
+		$(gettext 'Panel password:')
 		<input type="password" name="panel_pass"/>
-		<input type="submit" value="$(gettext "Change")" />
+		<input type="submit" value="$(gettext 'Change')" />
 	</p>
 </form>
 <p>
-	$(gettext "Configuration files: ")
+	$(gettext 'Configuration files:')
 	<a class="button" href="index.cgi?file=$CONFIG">
-		<img src="$IMAGES/edit.png" />$(gettext "Panel")</a>
+		<img src="$IMAGES/edit.png" />$(gettext 'Panel')</a>
 	<a class="button" href="index.cgi?file=$HTTPD_CONF">
-		<img src="$IMAGES/edit.png" />$(gettext "Server")</a>
+		<img src="$IMAGES/edit.png" />$(gettext 'Server')</a>
 </p>
 <p>
-	$(gettext "TazPanel provides a debuging mode and page:")
-	<a href='/index.cgi?debug'>debug</a>
+	$(gettext 'TazPanel provides a debuging mode and page:')
+	<a href="/index.cgi?debug">debug</a>
 </p>
 EOT
 	;;
diff -r 5312e3716b01 -r fdfc6b494539 styles/default/style.css
--- a/styles/default/style.css	Fri May 04 12:57:53 2012 +0300
+++ b/styles/default/style.css	Fri May 04 13:00:43 2012 +0300
@@ -11,7 +11,7 @@
 body {
 	background: #ffffff;
 	color: black;
-	font: 13px sans-serif, vernada, arial;
+	font: 13px "DejaVu Sans", Ubuntu, "Droid Sans", "Liberation Sans", FreeSans, sans-serif;
 	margin: 25px 0 0;
 }
 
@@ -73,7 +73,7 @@
 }
 #menu li ul {
 	display: none; 
-	width: 180px;
+	min-width: 180px;
 	background-color: #f1efeb;
 	border: 1px solid #c1baad;
 }
@@ -100,6 +100,20 @@
 	border-radius: 2px;
 	/* border: 1px solid #c1baad; */
 }
+/* addings
+ * 
+ */
+#menu > ul {
+	visibility: hidden;
+	opacity: 0;
+	transition: visibility 0s linear 0.5s, opacity 0.5s linear;
+}
+#menu:hover > ul {
+	visibility: visible;
+	opacity: 1;
+	transition-delay: 0s;
+}
+
 
 #icons { margin: 3px 8px; float: right; }
 #icons img { padding: 0; }
@@ -151,8 +165,8 @@
 #wrapper { margin: 10px 0 20px; }
 
 #actions {
-	height: 20px;
-	margin: 16px 0;
+	min-height: 20px;
+	padding: 16px 0;
 }
 
 #actions p { margin: 6px 0; }
@@ -214,8 +228,12 @@
 	opacity: 0.9;
 }
 
-.float-left { float: left;  }
-.float-right { float: right; }
+.float-left {
+	float: left;
+}
+.float-right {
+	float: right;
+}
 
 /* Table */
 
@@ -241,17 +259,46 @@
 	font-weight: bold;
 }
 
-/* syntax_highlighter */
+/*
+ * Table Zebra
+ */
+
+table.zebra {
+	border: none;
+	border-collapse: collapse;
+	margin: 16px 0;
+	box-shadow: 0 0 0 2px #fff, 0 0 0 3px #ccc;
+}
+table.zebra tr:nth-child(even) {
+	background-color: rgba(0,0,0,0.05);
+}
+table.zebra thead tr td {
+	height: 22px;
+	background-color: #eee;
+	text-align: center;
+	vertical-align: middle;
+}
+table.zebra td + td {
+	border-left: 1px solid #ddd;
+}
+
+
+/*
+ * syntax_highlighter
+ */
 
 span.conf-comment { color: #666; }
 span.conf-var { color: #392600; }
 span.conf-val, span.sh-val { color: #f35a00; }
 span.sh-comment { color: #b20000; }
-span.activity-log { color: #888; font-size: 95%; }
+span.activity-log { color: #888; }
 span.diff-rm { color: red; }
 span.diff-add { color: green; }
 span.diff-at { color: blue;  }
-span.top { color: #00c800; font-weight: bold; font-size: 95%; }
+span.top { color: #00c800; font-weight: normal; }
+span.kernel-hex { color: #18A423; }
+span.kernel-id { color: #287FC7; }
+span.kernel-id2 { color: #843523; }
 
 /* alert messages */
 span.msg-ok { color: limegreen; }
@@ -260,6 +307,7 @@
 /* Misc */
 
 pre, .pre-main { 
+	font: 13px "DejaVu Sans Mono", "Droid Sans Mono", "Liberation Mono", FreeMono, monospace;
 	background-color: #f8f8f8; 
 	border: 1px solid #ddd; 
 	padding: 10px;
@@ -277,6 +325,12 @@
 	cursor: pointer;
 	color: #000;
 }
+a.button {
+	white-space: nowrap;
+	height: 16px;
+	margin: 2px 0;
+	display: inline-block;
+}
 
 input[type=submit]:hover, select:hover, .button:hover {
 	background-color: #ddd;
@@ -325,3 +379,33 @@
 
 #footer a { color: #bbb; }
 #footer a:hover { color: #555; }
+
+/* HTML5 Meter */
+.meter {
+	height: 22px;
+	min-width: 200px;
+	cursor: default;
+}
+.meter meter {
+	height: inherit;
+	width: 100%;
+	display: block;
+	border: 1px solid #ddd;
+	border-radius: 4px;
+}
+.meter span {
+	height: 22px;
+	display: block;
+	white-space: nowrap;
+	position: absolute;
+	margin: -18px auto 0 2px;
+}
+
+
+a.button, input {
+	-webkit-transition: all 0.3s ease-in-out;
+	-moz-transition: all 0.3s ease-in-out;
+	-o-transition: all 0.3s ease-in-out;
+	-ms-transition: all 0.3s ease-in-out;
+	transition: all 0.3s ease-in-out;
+}
diff -r 5312e3716b01 -r fdfc6b494539 tazpanel
--- a/tazpanel	Fri May 04 12:57:53 2012 +0300
+++ b/tazpanel	Fri May 04 13:00:43 2012 +0300
@@ -32,25 +32,26 @@
 
 case "$1" in
 	start)
-		gettext "Starting TazPanel web server on port $HTTPD_PORT..."
+		eval_gettext 'Starting TazPanel web server on port $HTTPD_PORT...'
 		httpd -p $HTTPD_PORT -u root -c $HTTPD_CONF \
-			-r "$(gettext "TazPanel Authentication - Default: root:root")" &
+			-r "$(gettext 'TazPanel Authentication - Default: root:root')" &
 		ps | grep "httpd -p $HTTPD_PORT " | grep -v grep | \
 			awk '{ print $1 }' > $PIDFILE
 		status ;;
 	stop)
-		gettext "Stopping TazPanel web server..."
+		gettext 'Stopping TazPanel web server...'
 		kill $(cat $PIDFILE) && status ;;
 	passwd|-p)
 		echo ""
-		gettext "Changing password for TazPanel"
-		gettext "New password: " && read pass
+		gettext 'Changing password for TazPanel'; echo
+		gettext 'New password: ' && read pass
 		sed -i s"/\/:root:.*/\/:root:$pass/" $HTTPD_CONF
-		gettext "Password changed successfully"; echo
+		gettext 'Password changed successfully'; echo
 		echo "" ;;
 	*)
+		program_name="$(basename $0)"
 		echo ""
-		gettext "Usage:" && echo " $(basename $0) [start|stop|passwd]"
+		eval_gettext 'Usage: $program_name [start|stop|passwd]'
 		echo "" ;;
 esac