[SCM] live-manual branch, upstream, updated. upstream/3.0_a12-1-g57c10a8

Daniel Baumann daniel at debian.org
Wed Jun 27 13:09:34 UTC 2012


The following commit has been merged in the upstream branch:
commit 57c10a890c3f7232dd93b6198ad6a184b4caeedc
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 27 15:09:23 2012 +0200

    Adding upstream version 3.0~a13.

diff --git a/VERSION b/VERSION
index 98a95e9..8d27758 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a12-1
+3.0~a13-1
diff --git a/manual/_sisu/home/index.html b/manual/_sisu/home/index.html
index 6dbeb1f..ea995d6 100644
--- a/manual/_sisu/home/index.html
+++ b/manual/_sisu/home/index.html
@@ -10,6 +10,7 @@
 	<h3>Available Languages</h3>
 
 	<ul>
+		<li><a href="index.ca.html">Català (Catalan)</a></li>
 		<li><a href="index.de.html">Deutsch (German)</a></li>
 		<li><a href="index.en.html">English</a></li>
 		<li><a href="index.es.html">Español (Spanish)</a></li>
diff --git a/manual/bin/find-fuzzy.sh b/manual/bin/find-fuzzy.sh
index 475b27d..bcb1b20 100755
--- a/manual/bin/find-fuzzy.sh
+++ b/manual/bin/find-fuzzy.sh
@@ -7,7 +7,7 @@ set -e
 echo ""
 echo "There are $(grep -w 'fuzzy' manual/po/*/* | wc -l) fuzzy strings altogether in live-manual."
 echo "This script can help you find and fix them. What is your language?."
-echo "Type: de, es, fr, it, pt_BR or ro ['a' to see all]['q' to quit]" 
+echo "Type: $(ls -C manual/po) ['a' to see all]['q' to quit]" 
 
 # Editor defaults to vim unless otherwise specified in preferences.
 
@@ -15,7 +15,7 @@ EDITOR="${EDITOR:-vim}"
 
 # Creating the function. Searches 'fuzzy' and offers to open editor to fix them.
 
-find_fuzzy ()
+Find_fuzzy ()
 {
 	echo ""
 	echo "There are $(grep -w 'fuzzy' manual/po/$ANSWER/* | wc -l) fuzzy strings in your language."
@@ -67,8 +67,8 @@ case "$ANSWER" in
 		echo "Translation English-English not implemented yet!"
 		;;
 
-	de|es|fr|it|pt_BR|ro)
-		find_fuzzy
+	ca|de|es|fr|it|pt_BR|ro)
+		Find_fuzzy
 		;;
 
 	a)
diff --git a/manual/ca/about_manual.ssi b/manual/ca/about_manual.ssi
new file mode 100644
index 0000000..45ea479
--- /dev/null
+++ b/manual/ca/about_manual.ssi
@@ -0,0 +1,301 @@
+:B~ Sobre aquest manual
+
+1~about-manual Sobre aquest manual
+
+Aquest manual serveix com a punt d'accés únic a tota la documentació
+relacionada amb el projecte Debian Live i en particular s'aplica al
+programari produït pel projecte per la versió Debian 7.0 "wheezy". Una
+versió actualitzada es pot trobar sempre a http://live.debian.net/
+
+Si bé live-manual es centra principalment en ajudar a construir un sistema
+viu i no en temes dels usuaris finals, un usuari final pot trobar informació
+útil en aquestes seccions: {Conceptes bàsics}#the-basics abasta la
+preparació d'imatges per ser arrencadas des dels dispositius o la xarxa, i
+{Personalització dels comportaments en temps
+d'execució}#customizing-run-time-behaviours descriu algunes de les opcions
+que es poden especificar durant l'arrencada del sistema, com ara la selecció
+de la disposició del teclat, la configuració regional i l'us de la
+persistència.
+
+Algunes de les ordres esmentades en el text s'han d'executar amb privilegis
+de superusuari que es poden obtenir esdevenint l'usuari root amb #{su}# o
+mitjançant l'ús de #{sudo}#. Per distingir entre les ordres que poden ser
+executades per un usuari sense privilegis i aquelles que requereixen
+privilegis de root, s'anteposa #{$}# o #{#}# respectivament. Aquest símbol
+no és part de l'ordre. 
+
+2~ Per als impacients
+
+Si bé creiem que tot el que hi ha en aquest manual és important si més no
+per alguns dels nostres usuaris, ens adonem que hi ha una gran quantitat de
+material per cobrir i que és possible que es vulgui experimentar l'èxit amb
+el programari aviat, abans d'aprofundir en els detalls. Per tant, us
+recomanem llegir en el següent ordre.
+
+En primer lloc, llegiu aquest capítol, {Sobre aquest manual}#about-manual,
+des del principi i acabant amb els {Termes}#terms. A continuació, saltar als
+tres tutorials abans dels {Exemples}#examples secció dissenyada per ensenyar
+la creació de la imatge i alguns aspectes bàsics de la
+personalització. Llegiu en primer lloc {Usant els
+exemples}#using-the-examples seguit per {Tutorial 1: Una imatge
+estàndard}#tutorial-1, {Tutorial 2: Una utilitat de navegador
+d'Internet}#tutorial-2 i finalment, {Tutorial 3: Una image
+personalitzada}#tutorial-3. Al final d'aquests tutorials, tindreu una idea
+del que es pot fer amb Debian Live.
+
+Us animem a tornar i a fer un estudi del manual en profunditat, la propera
+lectura pot ser {Conceptes bàsics}#the-basics, fregant o saltant
+{Construcció d'una imatge netboot}#building-netboot-image, i acabant per la
+lectura de la {Visió de conjunt de la
+personalització}#customization-overview i els capítols que la segueixen. En
+aquest punt, esperem que estigueu ben emocionats pel que es pot fer amb
+Debian Live i motivats per llegir la resta del manual, de principi a fi.
+
+2~terms Termes
+
+_* *{Sistema viu}*: Un sistema operatiu que pot arrencar sense necessitat
+d'instaŀlació en un disc dur. Els sistemes vius no alteren el sistema
+operatiu local(s) o els fitxer(s) ja instaŀlats al disc dur de l'ordinador a
+menys que així se'ls ho indiqui. Els sistemes vius normalment s'inician des
+de dispositius, com ara CD, DVD o memòries USB. Alguns també poden arrencar
+des de la xarxa.
+
+_* *{Debian Live}*: Un subprojecte de Debian, que manté els paquets
+live-boot, live-build, live-config i live-manual. 
+
+_* *{Sistema Debian Live}*: Un sistema viu que utilitza el programari del
+sistema operatiu Debian que es pot arrencar des d'un CD, DVD, memòries USB,
+o la xarxa (a través d'imatges netboot) i a través d'Internet (a través de
+paràmetre d'arrencada #{fetch=URL}#).
+
+_* *{Sistema amfitrió}*: L'entorn utilitzat per crear el sistema en viu.
+
+_* *{Sistema objectiu}*: L'entorn que s'utilitza per executar el sistema en
+viu.
+
+_* *{live-boot}*: Una coŀlecció de scripts per arrencar els sistemes
+vius. live-boot abans havia estat part de /{live-initramfs}/.
+
+_* *{live-build}*: Una coŀlecció de scripts utilitzats per construir
+sistemes personalitzats de Debian Live. live-build era anteriorment conegut
+com /{live-helper}/ i fins i tot abans conegut com /{live-package}/.
+
+_* *{live-config}*: Una coŀlecció de scripts utilitzats per configurar un
+sistema en viu durant el procés d'arrencada. live-config abans va ser part
+de /{live-initramfs}/.
+
+_* *{live-manual}*: Aquest document és mantingut en un paquet anomenat
+live-manual
+
+_* *{Instaŀlador de Debian (d-i)}*: El sistema oficial d'instaŀlació de la
+distribució Debian.
+
+_* *{Paràmeters d'arrencada}*: Els paràmetres que es poden introduir a
+l'indicador del carregador d'arrencada per influir en el nucli o live-config
+
+_* *{chroot}*: El programa /{chroot}/, #{chroot(8)}#, ens permet executar
+diferentes instàncies d'un entorn GNU/Linux a la vegada en un sol sistema
+sense reiniciar.
+
+_* *{Imatge binaria}*: Un fitxer que conté el sistema en viu, com ara
+binary.iso o binary.img.
+
+_* *{Distribució objectiu}*: La distribució en què es basa el sistema en
+viu. Que pot diferir de la distribució del sistema amfitrió.
+
+_* *{stable/testing/unstable}*: La distribució *{stable}* conté l'última
+distribució de Debian llençada oficialment. La distribució *{testing}* és
+l'àrea d'assaig per a la pròxima versió *{stable}*. Un avantatge important
+de l'ús d'aquesta distribució és que té versions més recents del programari
+en relació amb l'edició *{stable}*. La distribució *{unstable}* és on es
+produeix el desenvolupament actiu de Debian. En general, aquesta distribució
+és utilitzada pels desenvolupadors i els que els agrada viure en risc. Al
+llarg del manual, es tendeix a utilitzar els seus noms en clau, com ara
+wheezy or sid, ja que és el que fan servir les pròpies eines.
+
+2~ Autors
+
+Llistat d'autors (en ordre alfabètic)
+
+_* Ben Armstrong
+
+_* Brendan Sleight
+
+_* Chris Lamb
+
+_* Daniel Baumann
+
+_* Franklin Piat
+
+_* Jonas Stein
+
+_* Kai Hendry
+
+_* Marco Amadori
+
+_* Mathieu Geli
+
+_* Matthias Kirschner
+
+_* Richard Nelson
+
+_* Trent W. Buck
+
+2~how-to-contribute Contribuir en aquest document
+
+Aquest manual està pensat com un projecte comunitari i totes les propostes
+per millorar-lo i les contribucions són molt benvingudes. La millor forma
+d'enviar una contribució és enviar-la a la llista de correu. Si us plau,
+consulteu la secció {Contacte}#contact per més informació.
+
+Quan es presenta una contribució, si us plau, identificar clarament el
+titular dels drets d'autor i s'ha d'incloure la declaració de concessió de
+llicències. Recordar que per ser acceptada, la contribució ha de tenir una
+llicencia igual que la resta del document, a saber, la versió de la GPL 3 o
+superior.
+
+Les fonts d'aquest manual es mantenen utilitzant el sistema de control de
+versions Git. Es pot obtenir còpia actualitzada mitjançant l'execució de:
+
+code{
+
+$ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Abans de presentar una contribució, si us plau, previsualitzar el
+treball. Per previsualitzar el live-manual, assegurar-se que s'han instaŀlat
+els paquets necessaris per a la seva construcció  mitjançant l'execució de:
+
+code{
+
+# apt-get install make po4a sisu-complete libnokogiri-ruby
+
+}code
+
+Es pot crear el live-manual des del directori de nivell superior del arbre
+Git mitjançant l'execució de:
+
+code{
+
+ $ make build
+
+}code
+
+Com es necessita un cert temps per construir el manual en tots els idiomes
+suportats, potser resulti convenient quan es fa una prova construir per a un
+sol idioma, per exemple, mitjançant l'execució de:
+
+code{
+
+$ make build LANGUAGES=en
+
+}code
+
+També es possible crear per tipus de document, per exemple: 
+
+code{
+
+ $ make build FORMATS=pdf
+
+}code
+
+O combinar tot dos, per exemple:
+
+code{
+
+ $ make build LANGUAGES=it FORMATS=html
+
+}code
+
+3~ Aplicar canvis
+
+Qualsevol persona pot fer un commit directament al repositori. No obstant
+això, demanem que s'enviïn els canvis grans a la llista de correu per
+parlar-ne en primer lloc. Per fer un push al repositori, s'ha de seguir el
+següent procediment:
+
+_* Obtenir la clau pública:
+
+code{
+
+ $ mkdir -p ~/.ssh/identity.d
+ $ wget http://live.debian.net/other/keys/git@live.debian.net \
+     -O ~/.ssh/identity.d/git at live.debian.net
+ $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \
+     -O ~/.ssh/identity.d/git at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*
+
+}code
+
+_* Afegiu la següent secció a la configuració del vostre openssh-client:
+
+code{
+
+ $ cat >> ~/.ssh/config << EOF
+ Host live.debian.net
+     Hostname live.debian.net
+     User git
+     IdentityFile ~/.ssh/identity.d/git at live.debian.net
+ EOF
+
+}code
+
+_* Fer una ullada a una còpia del manual a través de ssh:
+
+code{
+
+ $ git clone git at live.debian.net:/live-manual.git
+ $ cd live-manual && git checkout debian-next
+
+}code
+
+_* Tenir en compte que s'han d'enviar els canvis a la branca debian-next, no
+a la branca debian.
+
+_* No fer un #{make commit}# a menys que s'actualitzen les traduccions al
+mateix temps, i en aquest cas, no barrejar els canvis al manual en anglès i
+les traduccions en el mateix commit, fer-ne un altre separat per cada
+un. Veure la secció {Traducció}#translation per a més detalls.
+
+_* Escriure missatges de commit que consisteixen en oracions completes i
+significatives en anglès, començant amb una lletra majúscula i acabant amb
+un punt. En general, aquestes començaran amb la forma
+'Fixing/Adding/Removing/Correcting/Translating', per exemple:
+
+code{
+
+ $ git commit -a -m "Adding a section on applying patches."
+
+}code
+
+_* Fer un push al servidor:
+
+code{
+
+ $ git push
+
+}code
+
+3~translation Traducció
+
+Per començar la traducció d'un idioma nou, seguir aquests passos:
+
+_* Traduir els fitxers *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* i
+*{index.html.in.pot}* a la vostra llengua amb el vostre editor favorit (per
+exemple /{poedit}/). Enviar els fitxers #{.po}# traduïts a la llista de
+correu perquè l'equip de traducció pugui comprovar la seva integritat.
+
+_* Per activar una nova llengua al autobuild, només cal afegir els arxius
+inicials traduïts a #{manual/po/${LANGUAGE}/}# i executar #{make commit}#. I
+llavors editar #{manual/_sisu/home/index.html}#.
+
+_* Una vegada que s'ha afegit la nova llengua, es pot continuar traduint la
+resta de fitxers dins de #{manual/po/}# a l'atzar.
+
+_* No oblidar que es necessari fer #{make commit}# per garantir que els
+manuals traduïts s'actualitzen a partir del fitxers po i llavors es poden
+revisar els canvis executant #{make build}# abans de #{git add .}#, #{git
+commit -a -m "Translating..."}# i #{git push}#.
+
+*{Nota:}* Es pot utilitzar #{make clean}# per netejar l'arbre git abans de fer un push.  Aquest  pas no és obligatori, gràcies al fitxer .gitignore, però és una bona pràctica per evitar enviar fitxers de forma involuntària.
diff --git a/manual/ca/about_project.ssi b/manual/ca/about_project.ssi
new file mode 100644
index 0000000..506e1f6
--- /dev/null
+++ b/manual/ca/about_project.ssi
@@ -0,0 +1,103 @@
+:B~ Sobre el Projecte Debian Live
+
+1~about-project Sobre el Projecte Debian Live
+
+2~ Motivació
+
+3~ Què passa amb els sistemes vius actuals
+
+Quan Debian Live va començar, ja hi havia diversos sistemes vius basats en
+Debian disponibles i que estaven fent una gran feina. Des de la perspectiva
+de Debian la majoria d'ells tenien una o més de les desavantatges següents:
+
+_* No són projectes de Debian i per tant no tenen suport des de Debian.
+
+_* Es barregen diferents distribucions, per exemple *{testing}* i
+*{unstable}*.
+
+_* Només donen suport a i386.
+
+_* Es modifique el comportament i/o l'aparença dels paquets, per estalviar
+espai.
+
+_* S'inclouen paquets de fora de l'arxiu de Debian.
+
+_* Inclouen nuclis personalitzats amb pedaços addicionals que no són part de
+Debian.
+
+_* Són grans i lents pel seu gran tamany i per tant no aptes com a sistemes
+de rescat.
+
+_* No estan disponibles en diferents formats, per exemple, CD, DVD, memòries
+USB i imatges netboot.
+
+3~ Per què crear el nostre pròpi sistema viu?
+
+Debian és el sistema operatiu universal: Debian té un sistema viu per
+mostrar arreu i per representar acuradament el sistema Debian amb els
+següents avantatges:
+
+_* Es tracta d'un subprojecte de Debian.
+
+_* Reflecteix l'estat (actual) d'una distribució.
+
+_* Funciona en tantes arquitectures com és possible.
+
+_* Es tracta només de paquets Debian sense modificacions.
+
+_* No conté paquets que no són a l'arxiu de Debian.
+
+_* S'utilitza un nucli Debian sense alteracions i sense pedaços addicionals.
+
+2~ Filosofia
+
+3~ Només paquets Debian sense modificacions de la secció "main" 
+
+Només farem servir els paquets des del repositori de Debian de la secció
+"main". La secció non-free no és part de Debian i per tant no es pot
+utilitzar per les imatges oficials del sistema viu.
+
+No canviarem cap paquet. Cada vegada que hàgim de canviar alguna cosa, ho
+farem en coordinació amb el mantenidor del paquet a Debian.
+
+Com a excepció, els nostres propis paquets, com ara live-boot, live-build o
+live-config poden ser utilitzats temporalment des del nostre propi
+repositori per raons de desenvolupament (per exemple, per crear instantànies
+de desenvolupament). Aquests paquets es pujaran a Debian de forma regular. 
+
+3~ Paquets del sistema viu sense cap configuració
+
+En aquesta fase no es publicarà o s'instal.larà cap configuració alternativa
+o d'exemple. Tots els paquets són utilitzats en la seva configuració per
+defecte, tal com són després d'una instaŀlació normal de Debian.
+
+Cada vegada que ens calgui una configuració per defecte diferent, ho farem
+en coordinació amb el mantenidor del paquet Debian.
+
+S'hi inclou un sistema per configurar paquets mitjançant debconf que permet
+instal.lar paquets configurats de forma personalitzada dins d'una imatge
+Debian Live personalitzada, però per a les imatges en viu oficials només
+utilitzarem una configuració per defecte. Per obtenir més informació, veure
+{Visió de conjunt de la personalització}#customization-overview.
+
+Excepció: Hi ha uns pocs canvis essencials necessaris per aconseguir que un
+sistema funcioni en viu. Aquests canvis essencials han de ser el més mínims
+possible i s'han de fusionar en el repositori de Debian si és possible.
+
+2~contact Contacte
+
+_* *{Llista de correu}*: El contacte principal del projecte és la llista de
+correu a http://lists.debian.org/debian-live/. Es pot enviar un correu
+directament a debian-live at lists.debian.org. Els arxius de la llista són a
+http://lists.debian.org/debian-live/.
+
+_* *{IRC}*: Un nombre d'usuaris i desenvolupadors estan presents al canal
+#debian-live a irc.debian.org (OFTC). Quan es pregunta al IRC, s'ha de tenir
+paciència esperant una resposta, si no hi ha cap resposta, es pot enviar un
+correu a la llista.
+
+_* *{BTS}*:  El{Sistema de seguiment d'errors de
+Debian}http://www.debian.org/Bugs/ (BTS) conté detalls d'errors notificats
+per usuaris i desenvolupadors. A cada error se li assigna un número i es
+manté a l'arxiu fins que es marca com tractat. Per obtenir més informació,
+vegeu {Informar d'errors}#bugs.
diff --git a/manual/ca/index.html.in b/manual/ca/index.html.in
new file mode 100644
index 0000000..aea9d39
--- /dev/null
+++ b/manual/ca/index.html.in
@@ -0,0 +1,66 @@
+<html>
+
+<head>
+	<title>Projecte Debian Live</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+
+<body>
+	<h2>Manual de Debian Live</h2>
+
+	<p>
+		<i>live-manual</i> està disponible en diferents formats de fitxer i està
+traduït a diversos idiomes. Tenir en compte que algunes de les traduccions
+poden estar incompletes o no estar al dia.
+	</p>
+
+	<p>
+
+		Si us plau, informeu dels errors, omissions, pedaços i suggeriments a la
+llista de correu <a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
+i llegiu sobre com contribuir al manual <a
+href="html/live-manual.ca.html#how-to-contribute">com contribuir</a>
+	</p>
+
+	<h3>Formats disponibles</h3>
+
+	<ul>
+		<li><a href="epub/live-manual.ca.epub">EPUB</a></li>
+		<li>HTML: <a href="html/live-manual/toc.ca.html">varies pàgines</a>, <a
+href="html/live-manual.ca.html">una sola pàgina</a></li>
+		<li><a href="odt/live-manual.ca.odt">ODF</a></li>
+		<li>PDF: <a href="pdf/portrait.ca.a4.pdf">retrat A4</a>, <a
+href="pdf/landscape.ca.a4.pdf">A4 paisatge</a>, <a
+href="pdf/portrait.ca.letter.pdf">carta retrat</a>, <a
+href="pdf/landscape.ca.letter.pdf">carta paisatge</a></li>
+		<li><a href="txt/live-manual.ca.txt">Text sense format</a></li>
+	</ul>
+
+	<p>
+		Darrera modificació: @DATE_CHANGE@<br />
+		Darrera generació: @DATE_BUILD@
+	</p>
+
+	<h3>Codi font</h3>
+
+	<p>
+		Les fonts d'aquest manual estan disponibles en un repositori <a
+href="http://git.or.cz/">Git</a> a live.debian.net.
+	</p>
+
+	<ul>
+		<li>Navegar:  <a
+href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
+		<li>Git: <a
+href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
+	</ul>
+
+	<p>
+		<a href="http://live.debian.net/">Debian Live</a> <<a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>>
+- <a href="http://live.debian.net/legal.html">Avís legal</a>
+	</p>
+</body>
+
+</html>
diff --git a/manual/ca/live-manual.ssm b/manual/ca/live-manual.ssm
new file mode 100644
index 0000000..0b0b93d
--- /dev/null
+++ b/manual/ca/live-manual.ssm
@@ -0,0 +1,65 @@
+% SiSU 2.0
+
+ at title: Manual Debian Live
+
+ at creator: Projecte Debian Live <debian-live at lists.debian.org>
+
+ at rights:
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
+ :license: Aquest programa és un programari lliure: es pot redistribuir i/o modificar sota els termes de la Llicència Pública General de la GNU com és publicada per la Free Software Foundation, ja sigui la versió 3 de la Llicència, o (si ho preferiu) qualsevol versió posterior.<br><br>Aquest programa es distribueix amb l'esperança que sigui útil, però sense cap garantia, fins i tot sense la garantia implícita de COMERCIALITZACIÓ o ADEQUACIÓ PER A PROPÒSITS DETERMINATS. Vegeu la Llicència General Pública de la GNU per a més detalls.<br><br>Haurieu de rebre una còpia de la Llicència Pública General de la GNU amb aquest programa. Si no és així, consulteu http://www.gnu.org/licenses/. <br><br>El text complet de la Llicència Pública General de la GNU es pot trobar a /usr/share/common-licenses/GPL-3.
+
+ at date:
+ :published: 2012-06-27
+
+ at publisher: Projecte Debian Live <debian-live at lists.debian.org>
+
+ at make:
+ :bold: /squeeze|wheezy|sid/
+ :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
+ :num_top: 1
+ :skin: skin_debian-live
+:A~ @title
+
+:B~ Sobre aquest manual
+
+<< about_manual.ssi
+
+<< about_project.ssi
+
+:B~ Usuari
+
+<< user_installation.ssi
+
+<< user_basics.ssi
+
+<< user_overview.ssi
+
+<< user_managing_a_configuration.ssi
+
+<< user_customization-overview.ssi
+
+<< user_customization-packages.ssi
+
+<< user_customization-contents.ssi
+
+<< user_customization-runtime.ssi
+
+<< user_customization-binary.ssi
+
+<< user_customization-installer.ssi
+
+:B~ Projecte
+
+<< project_bugs.ssi
+
+<< project_coding-style.ssi
+
+<< project_procedures.ssi
+
+:B~ Exemples
+
+<< user_examples.ssi
+
+:B~ Apèndix
+
+<< style_guide.ssi
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/ca/project_bugs.ssi
similarity index 99%
copy from manual/pt_BR/project_bugs.ssi
copy to manual/ca/project_bugs.ssi
index a051509..72e7ec0 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/ca/project_bugs.ssi
@@ -7,7 +7,7 @@ possible to perfect - with your help. Do not hesitate to report a bug: it is
 better to fill a report twice than never. However, this chapter includes
 recommendations how to file good bug reports.
 
-For the impatient:
+Per als impacients
 
 _* Always check first the image status updates on our homepage at
 http://live.debian.net/ for known issues.
diff --git a/manual/de/project_coding-style.ssi b/manual/ca/project_coding-style.ssi
similarity index 100%
copy from manual/de/project_coding-style.ssi
copy to manual/ca/project_coding-style.ssi
diff --git a/manual/pt_BR/project_procedures.ssi b/manual/ca/project_procedures.ssi
similarity index 99%
copy from manual/pt_BR/project_procedures.ssi
copy to manual/ca/project_procedures.ssi
index c183dc6..d0dceb5 100644
--- a/manual/pt_BR/project_procedures.ssi
+++ b/manual/ca/project_procedures.ssi
@@ -102,7 +102,7 @@ code{
 
    <http://cdimage.debian.org/cdimage/release/current-live/>
 
- Projeto Debian Live Homepage:
+Pàgina web del Projecte Debian Live:
 
    <http://live.debian.net/>
 
diff --git a/manual/it/style_guide.ssi b/manual/ca/style_guide.ssi
similarity index 99%
copy from manual/it/style_guide.ssi
copy to manual/ca/style_guide.ssi
index edd8e20..4be5827 100644
--- a/manual/it/style_guide.ssi
+++ b/manual/ca/style_guide.ssi
@@ -1,4 +1,4 @@
-:B~ Appendix
+:B~ Apèndix
 
 1~style-guide Style guide
 
diff --git a/manual/ca/user_basics.ssi b/manual/ca/user_basics.ssi
new file mode 100644
index 0000000..22f077a
--- /dev/null
+++ b/manual/ca/user_basics.ssi
@@ -0,0 +1,545 @@
+:B~ Conceptes bàsics
+
+1~the-basics Conceptes bàsics
+
+Aquest capítol conté una breu descripció del procés de construcció i les
+instruccions per a l'ús dels tres tipus d'imatge més comunes. El tipus
+d'imatge més versàtil #{iso-hybrid}# es pot utilitzar en una màquina
+virtual, en medis òptics o qualsevol altre dispositiu d'emmagatzematge USB
+portàtil. En certs casos especials, com ara l'ús de la persistència, el
+tipus #{hdd}# pot ser el més adequat per als dispositius USB. El capítol
+acaba amb instruccions per a la construcció d'una imatge tipus #{net}#, que
+és una mica més complicat a causa de la configuració necessària en el
+servidor. Aquest és un tema una mica avançat per a algú que no està
+familiaritzat ja amb l'arrencada en xarxa, però s'inclou aquí perquè un cop
+que la configuració es porta a terme, es tracta d'una forma molt convenient
+per provar i desplegar imatges per a l'arrencada en xarxa local sense la
+molèstia de tractar amb els dispositius de les imatges.
+
+Al llarg del capítol, sovint es fa referència als noms dels fitxers produïts
+per defecte per live-build. Si es descarrega una imatge prefabricada, els
+noms dels fitxers poden ser direrents.
+
+2~what-is-live Què és un sistema viu?
+
+Un sistema viu és un sistema operatiu que arrenca en un equip des d'un
+dispositiu extraïble, com un CD-ROM o una memòria USB o des d'una xarxa, a
+punt per fer servir sense cap tipus d'instaŀlació en la unitat(s)
+habitual(s), amb una configuració automàtica feta en temps d'execució (veure
+{Termes}#terms).
+
+Amb Debian Live, és un sistema operatiu Debian GNU/Linux, construït per una
+de les arquitectures suportades (actualment amd64, i386 powerpc i
+sparc). Conté les següents parts:
+
+_* *{Imatge del nucli Linux}*, generalment s'anomena #{vmlinuz*}#
+
+_* *{Imatge del disc RAM inicial (initrd)}*: un disc RAM configurat per a
+l'arrencada de Linux, que conté els mòduls que possiblement es necessitaran
+per muntar la imatge del sistema i algunes seqüències d'ordres per fer-ho.
+
+_* *{Imatge del sistema}*: Imatge del sistema de fitxers del sistema
+operatiu. Normalment, s'utilitza un sistema de fitxers comprimit SquashFS
+per minimitzar la mida de la imatge Debian Live. Tenir en compte que és de
+només lectura. Així, durant l'arrencada, el sistema Debian Live utilitzarà
+el disc RAM i un mecanisme de "unió" per permetre l'escriptura de fitxers en
+el sistema en funcionament. No obstant això, totes les modificacions es
+perdran en tancar si no és que s'utilitza la persistència opcional (vegeu
+{Persistència}#persistence).
+
+_* *{Carregador d'arrencada }*: Una petita peça de codi dissenyat per
+arrencar des del medi triat, possiblement presentant un indicador
+d'arrencada o un menú per permetre la selecció
+d'opcions/configuració. Carrega el nucli del Linux i el seu initrd per
+funcionar amb un sistema de fitxers del sistema associat. Es poden utilitzar
+diverses solucions, en funció dels medis de destinació i el format del
+sistema de fitxers que conté els components esmentats anteriorment: isolinux
+per arrencar des de CD o DVD en format ISO9660, syslinux per una unitat USB
+o HDD que s'iniciarà des de particions VFAT, extlinux per particions
+ext2/3/4 i btrfs, pxelinux per PXE netboot, GRUB per particions ext2/3/4,
+etc
+
+Es pot utilitzar live-build per construir la imatge del sistema amb
+especificacions pròpies, configurar un nucli de Linux, el initrd, i un
+carregador d'arrencada per executar-los, tot això en un format depenent dels
+dispositius (imatge ISO9660, imatge de disc, etc.)
+
+2~building-iso-hybrid Primers passos: construcció d'una imatge ISO híbrida
+
+Independentment del tipus d'imatge, s'haurà de fer els mateixos passos
+bàsics per construir una imatge cada vegada. Com a primer exemple, executar
+la següent seqüència d'ordres live-build per crear una imatge ISO híbrida
+de base que conté només el sistema estàndard de Debian sense X.org. És
+adequat per gravar en un CD o DVD, i també per copiar en una memòria USB.
+
+En primer lloc, executar l'ordre #{lb config}#. Això crearà una jerarquia
+«config/» en el directori actual per ser utilitzada per altres ordres:
+
+code{
+
+ $ lb config
+
+}code
+
+Aquí no es passa cap paràmetre a #{lb config}#, per tant s'utilitzaran les
+opcions per defecte. Veure {L'ordre lb config}#lb-config per més detalls.
+
+Ara que la jerarquia «config/» ja existeix, crear la imatge amb l'ordre #{lb
+build}#:
+
+code{
+
+ # lb build
+
+}code
+
+Aquest procés tardarà una mica, depenent de la velocitat de la connexió de
+la xarxa. Quan hagi acabat, ha d'haver un fitxer imatge
+#{binary.hybrid.iso}#, a punt per ser utilitzar, en el directori actual.
+
+2~using-iso-hybrid Usar una imatge ISO híbrida en viu
+
+Després de la construcció o la descàrrega d'una imatge ISO híbrida, que pot
+ser obtinguda a http://www.debian.org/CD/live/, el següent pas habitual és
+preparar els dispositius per a l'arrencada, ja sigui medis òptics com un
+CD-R(W) o DVD-R(W) o una memòria USB.
+
+3~burning-iso-image Gravar una imatge ISO en un medi físic
+
+Gravar una imatge ISO és fàcil. Simplement cal instaŀlar i utilitzar wodim
+des de la línia d'ordres per gravar la imatge. Per exemple:
+
+code{
+
+ # apt-get install wodim
+
+ $ wodim binary.hybrid.iso
+
+}code
+
+3~copying-iso-hybrid-to-usb Còpiar una imatge ISO híbrida en un dispositiu
+USB
+
+Les imatges ISO preparades amb l'ordre #{isohybrid}#, com les imatges
+binàries del tipus #{iso-hybrid}# produïdes per defecte és poden copiar
+directament a una memòria USB utilitzant el programa #{dd}# o un altre
+d'equivalent. Connectar una memòria USB amb una mida prou gran per al fitxer
+de la imatge i determinar quin dispositiu és, que d'ara endavant annomenarem
+#{${USBSTICK}}#. Aquest és el dispositiu de la memòria com per exemple
+#{/dev/sdb}#, no una partició, com ara #{/dev/sdb1}#! Es pot trobar el nom
+del dispositiu correcte mirant la sortida de #{dmesg}# després de connectar
+la memòria usb o encara millor, #{ls -l /dev/disk/by-id}#.
+
+Quan s'estigui segur de tenir el nom del dispositiu correcte, utilitzar
+l'ordre #{dd}# per a copiar la imatge a la memòria. *{Fent això es perdran
+definitivament tots els continguts anteriors de la memòria usb!}*
+
+code{
+
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
+
+}code
+
+
+3~booting-live-media Arrencar els medis en viu
+
+La primera vegada que s'arrenqui els medis en viu, ja sigui des de CD, DVD,
+memòria USB, o PXE, pot ser necessaria alguna petita configuració al BIOS
+del ordinador en primer lloc. Atès que les BIOS varien molt en les seves
+funcions i dreceres de teclat, no podem entrar en el tema en profunditat
+aquí. Algunes BIOS proporcionen una tecla per obrir un menú de dispositius
+d'arrencada, que és la manera més fàcil si es troba disponible al
+sistema. En cas contrari, cal entrar al menú de configuració del BIOS i
+canviar l'ordre d'arrencada per situar el dispositiu del sistema en viu
+abans que el dispositiu d'arrencada normal.
+
+Després d'arrencar des del dispositiu, es veurà un menu d'inici. S'ha de
+prémer «entrer» i el sistema s'iniciarà amb l'entrada #{Live}# i les seves
+opcions per defecte. Per obtenir més informació sobre les opcions
+d'arrencada, llegir la «ajuda» (help) al menú i també les pàgines del manual
+de live-boot i live-config que es troben dins del sistema en viu.
+
+Suposant que s'ha seleccionat #{Live}# i s'ha arrencat una imatge
+d'escriptori per defecte, després que els missatges d'arrencada hagin passat
+s'haurà iniciat una sessió com a usuari #{user}# i es veurà un escriptori, a
+punt per ser utilitzat. Si s'ha arrencat una imatge de la consola només, com
+les imatges preconfigurades #{standard}# o #{rescue}# s'iniciarà una sessió
+com a usuari #{user}# i es veurà el indicador de la shell, a punt per ser
+utilitzat.
+
+2~using-virtual-machine Utilitzar una màquina virtual per fer proves
+
+Pot ser un gran estalvi de temps per al desenvolupament d'imatges en viu
+executar-les en una màquina virtual (VM). Això no està exempt
+d'advertiments:
+
+_* L'execució d'una màquina virtual requereix de suficient memòria RAM, tant
+per al sistema operatiu convidat i l'amfitrió i es recomana una CPU amb
+maquinari amb suport per a la virtualització.
+
+_* Hi ha algunes limitacions inherents a l'execució en una màquina virtual,
+per exemple, rendiment de vídeo pobre, opcions limitadades de maquinari
+emulat.
+
+_* En el desenvolupament per a un maquinari específic, no hi ha substitut
+per al propi maquinari.
+
+_* De tant en tant hi ha errors que només sorgeixen durant l'execució en una
+màquina virtual. En cas de dubte, comprovar la imatge directament al
+maquinari.
+
+Sempre que es pugui treballar dins d'aquestes limitacions, examinar el
+programari de màquina virtual disponible i triar un que sigui adequat per a
+les necessitats pròpies.
+
+3~testing-iso-with-qemu Provar una imatge ISO amb QEMU
+
+La màquina virtual més versàtil dins Debian és QEMU. Si el processador té
+suport de maquinari per a la virtualització, utilitzar el paquet
+/{qemu-kvm}/; la descripció del paquet /{qemu-kvm}/ enumera breument els
+requeriments.
+
+Primer, instaŀlar /{qemu-kvm}/ si el processador ho suporta. Si no,
+instaŀlar /{qemu}/, en aquest cas el nom del programa és #{qemu}# en lloc de
+#{kvm}# en els exemples següents. El paquet /{qemu-utils}/  també és valuós
+per a la creació d'imatges de disc virtuals amb #{qemu-img}#.
+
+code{
+
+ # apt-get install qemu-kvm qemu-utils
+
+}code
+
+Arrencar una imatge ISO és senzill:
+
+code{
+
+ $ kvm -cdrom binary.hybrid.iso
+
+}code
+
+Veure les pàgines del manual per a més detalls
+
+3~testing-iso-with-virtualbox Provar una imatge ISO amb virtualbox-ose
+
+Per provar la ISO amb /{virtualbox-ose}/:
+
+code{
+
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
+
+ $ virtualbox
+
+}code
+
+Crear una nova màquina virtual, canviar els paràmetres d'emmagatzematge per
+utilitzar #{binary.hybrid.iso}# com  unitat de CD/DVD i arrencar la màquina.
+
+*{Nota:}* Per provar sistemes vius que contenen X.org amb /{virtualbox-ose}/, segurament es assenyat incloure el paquet del driver VirtualBox X.org, /{virtualbox-ose-guest-x11}/, en la configuració de live-build. En cas contrari, la resolució es limita a 800x600.
+
+code{
+
+ $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
+
+}code
+
+2~building-hdd Construir una imatge HDD
+
+Construir una imatge HDD és similar a una ISO híbrida en tots els aspectes,
+excepte que s'especifiqua #{-b hdd}# que el nom del fitxer resultant és
+#{binary.img}# i que no es pot gravar en medis òptics. És adequada per
+arrencar des de dispositius USB, discs durs USB, i altres dispositius
+d'emmagatzematge portàtils. Normalment, una imatge ISO híbrida es pot
+utilitzar per aquest propòsit en el seu lloc, però si el BIOS no maneja
+adequadament les imatges híbrides, o es desitja utilitzar l'espai lliure en
+els medis per a algun propòsit, com una partició per a la persistència, cal
+una imatge HDD.
+
+*{Nota:}* si s'ha creat una imatge ISO híbrida amb l'exemple anterior, s'haurà de netejar el directori de treball amb l'ordre #{lb clean}# (veure {L'ordre lb clean}#lb-clean):
+
+code{
+
+ # lb clean --binary
+
+}code
+
+Executar l'ordre #{lb config}# com abans, excepte que aquesta vegada
+especificant el tipus d'imatge HDD:
+
+code{
+
+ $ lb config -b hdd
+
+}code
+
+Ara construir la imatge amb l'ordre #{lb build}#:
+
+code{
+
+ # lb build
+
+}code
+
+Quan la construcció acabi, hauria d'haver un fitxer #{binary.img}# al
+directori actual.
+
+2~using-hdd-image Utilitzar una imatge HDD
+
+La imatge binària generada conté una partició VFAT i el carregador
+d'arrencada syslinux, llestos per ser escrits directament a una memòria
+USB. Donat que l'ús d'una imatge HDD és com utilitzar una imatge ISO híbrida
+en un USB, seguir les instruccions de {Usar una imatge ISO híbrida en
+viu}#using-iso-hybrid, però amb el nom de fitxer #{binary.img}# en lloc de
+#{binary.hybrid.iso}#.
+
+3~testing-hdd-with-qemu Provar una imatge HDD amb Qemu
+
+Primer, instaŀlar /{qemu}/ com s'ha descrit anteriorment a {Provar una
+imatge ISO amb QEMU}#testing-iso-with-qemu. A continuació, executar #{kvm}#
+o #{qemu}#, segons la versió instaŀlada al sistema amfitrió, especificant
+#{binary.img}# com a primer disc dur.
+
+code{
+
+ $ kvm -hda binary.img
+
+}code
+
+3~using-usb-extra-space Utilitzar l'espai lliure en una memòria USB
+
+Per poder utilitzar l'espai que queda lliure després de copiar
+#{binary.img}# en un dispositiu USB, utilitzar una eina de particionament
+com /{gparted}/ o /{parted}/ per crear una nova partició. La primera
+partició serà utilitzada pel sistema Debian Live.
+
+code{
+
+ # gparted ${USBSTICK}
+
+}code
+
+Després de crear la partició, on #{${PARTITION}}# és el nom de la partició,
+com ara #{/dev/sdb2}#, s'ha de crear un sistema de fitxers. Una opció
+possible seria ext4.
+
+code{
+
+ # mkfs.ext4 ${PARTITION}
+
+}code
+
+*{Nota:}* Si es vol utilitzar l'espai addicional amb Windows, pel que sembla, aquest sistema operatiu normalment no pot accedir a altres particions més que a la primera. Algunes solucions a aquest problema han estat discutides a la nostra {llista de correu}#contact, però sembla que no hi ha respostes fàcils.
+
+*{Recordar: Cada vegada que s'instaŀli una nova binary.img al dispositiu, es perdran totes les dades perquè la taula de particions se sobreescriu amb el contingut de la imatge, de manera que es assenyat fer una còpia de seguretat de la partició addicional per restaurar les dades de nou després d'actualitzar la imatge en viu.}*
+
+2~building-netboot-image Construir una imatge netboot
+
+La següent seqüència d'ordres crearà una imatge netboot bàsica que conté el
+sistema estàndard de Debian sense X.org. És adequada per a l'arrencada en
+xarxa.
+
+*{Nota:}* si s'ha realitzat algun dels exemples anteriors, s'haurà de netejar el directori de treball amb l'ordre #{lb clean}#:
+
+code{
+
+ # lb clean --binary
+
+}code
+
+Executar l'ordre següent per configurar la imatge per arrencar en xarxa:
+
+code{
+
+ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"
+
+}code
+
+A diferència de les imatges ISO i HDD, l'arrencada en xarxa no serveix el
+sistema de fitxers al client, per tant els fitxers  han de ser servits a
+través de NFS. Les opcions #{--net-root-path}# y #{--net-root-server}#
+especifiquen la ubicació i el servidor, respectivament,  del servidor NFS on
+es troba la imatge de sistema de fitxers a l'hora d'arrencar. Assegurar-se
+que aquests s'ajusten als valors adequats per la xarxa i el servidor pròpis.
+
+Ara construir la imatge amb l'ordre #{lb build}#:
+
+code{
+
+ # lb build
+
+}code
+
+En l'arrencada en xarxa, el client executa una petita peça de programari que
+normalment es troba a la EPROM de la targeta Ethernet. Aquest programa envia
+una petició DHCP per obtenir una adreça IP i la informació sobre què fer a
+continuació. Per regla general, el següent pas és aconseguir un carregador
+d'arrencada de més alt nivell a través del protocol TFTP. Podria ser GRUB,
+pxelinux o fins i tot arrencar directament a un sistema operatiu com Linux.
+
+Per exemple, si es descomprimeix el arxiu #{binary-net.tar.gz}# generat al
+directori #{/srv/debian-live}#, es trobarà  la imatge del sistema de fitxers
+a #{live/filesystem.squashfs}# i el nucli, initrd i carregador d'arrencada
+pxelinux a #{tftpboot/debian-live/i386}#.
+
+Ara hem de configurar els tres serveis al servidor per l'arrencada en xarxa:
+el servidor DHCP, servidor TFTP i el servidor NFS.
+
+3~ Servidor DHCP 
+
+S'ha de configurar el servidor DHCP de la xarxa per assegurar-se que dona
+una adreça IP per al client del sistema d'arrencada en xarxa, i per anunciar
+la ubicació del carregador d'arrencada PXE.
+
+Heus aquí un exemple per servir d'inspiració, escrit per al servidor ISC
+DHCP #{isc-dhcp-server}# al fitxer de configuració #{/etc/dhcp/dhcpd.conf}#:
+
+code{
+
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
+
+ ddns-update-style none;
+
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
+
+ default-lease-time 600;
+ max-lease-time 7200;
+
+ log-facility local7;
+
+ subnet 192.168.0.0 netmask 255.255.255.0 {
+   range 192.168.0.1 192.168.0.254;
+   next-server servername;
+   filename "pxelinux.0";
+}
+
+}code
+
+3~ Servidor TFTP
+
+Aquest serveix el nucli i el disc ram inicial per al sistema en temps
+d'execució.
+
+S'ha d'instaŀlar el paquet /{tftpd-hpa}/. Aquest pot servir tots els arxius
+continguts dins d'un directori arrel, per regla general
+#{/srv/tftp}#. Perquè es serveixen els arxius dins de
+#{/srv/debian-live/tftpboot}#, s'ha d'executar com a root la següent ordre:
+
+code{
+
+ # dpkg-reconfigure -plow tftpd-hpa
+
+}code
+
+i omplir el nou directori del servidor tftp quan ho hàgim de fer.
+
+3~ Servidor NFS
+
+Un cop l'ordinador ha descarregat, ha arrencat el nucli de Linux i ha
+carregat el initrd, intentarà muntar la imatge del sistema de fitxers en viu
+a través d'un servidor NFS.
+
+S'ha d'instaŀlar el paquet /{nfs-kernel-server}/
+
+Llavors, fer que la imatge del sistema de fitxers estigui disponible a
+través de NFS afegint una línia com la següent a #{/etc/exports}#:
+
+code{
+
+ /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
+
+}code
+
+i informar al servidor NFS sobre aquesta nova exportació amb la següent
+ordre:
+
+code{
+
+ # exportfs -rv
+
+}code
+
+La configuració d'aquests tres serveis pot ser una mica difícil. És possible
+que es necessiti una mica de paciència per aconseguir que tots tres
+funcionin plegats. Per obtenir més informació, veure el wiki de syslinux a
+http://syslinux.zytor.com/wiki/index.php/PXELINUX o la secció TFTP Net
+Booting al Manual del Instaŀlador de Debian a
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. Això pot ajudar,
+ja que els seus processos són molt similars.
+
+3~ Com provar l'arrencada en xarxa
+
+La creació d'imatges d'arrencada en xarxa es fa fàcil amb la màgia de
+live-build, però provar les imatges en màquines físiques pot costar molt de
+temps.
+
+Per fer la nostra vida més fàcil, podem utilitzar la virtualització. Hi ha
+dues solucions.
+
+3~ Qemu
+
+_* Instaŀlar /{qemu}/, /{bridge-utils}/, /{sudo}/.
+
+Editar #{/etc/qemu-ifup}#:
+
+code{
+
+ #!/bin/sh
+ sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
+ echo "Executing /etc/qemu-ifup"
+ echo "Bringing up $1 for bridged mode..."
+ sudo /sbin/ifconfig $1 0.0.0.0 promisc up
+ echo "Adding $1 to br0..."
+ sudo /usr/sbin/brctl addif br0 $1
+ sleep 2
+
+}code
+
+Descarregar o crear un #{grub-floppy-netboot}# (al svn).
+
+Llançar #{qemu}# amb "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
+
+3~ VMWare Player
+
+_* Instaŀlar VMWare Player (edició gratuïta «free as in beer»)
+
+_* Crear un directory PXETester amb un fitxer de text dins anomenat
+#{pxe.vwx}#
+
+_* Enganxar aquest text dins:
+
+code{
+
+ #!/usr/bin/vmware
+ config.version = "8"
+ virtualHW.version = "4"
+ memsize = "512"
+ MemAllowAutoScaleDown = "FALSE"
+
+ ide0:0.present = "FALSE"
+ ide1:0.present = "FALSE"
+ floppy0.present = "FALSE"
+ sound.present = "FALSE"
+ tools.remindInstall = "FALSE"
+
+ ethernet0.present = "TRUE"
+ ethernet0.addressType = "generated"
+
+ displayName = "Test Boot PXE"
+ guestOS = "other"
+
+ ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
+ uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ ethernet0.generatedAddressOffset = "0"
+
+}code
+
+_* Es pot jugar amb aquest fitxer de configuració (per exemple, canviar el
+limit de memòria a 256)
+
+_* Fer doble clic sobre aquest fitxer (o executar VMWare player i
+seleccionar aquest fitxer).
+
+_* Quan està en execució només cal prémer «espai» si sorgeix aquella
+pregunta estranya ...
diff --git a/manual/de/user_customization-binary.ssi b/manual/ca/user_customization-binary.ssi
similarity index 100%
copy from manual/de/user_customization-binary.ssi
copy to manual/ca/user_customization-binary.ssi
diff --git a/manual/de/user_customization-contents.ssi b/manual/ca/user_customization-contents.ssi
similarity index 100%
copy from manual/de/user_customization-contents.ssi
copy to manual/ca/user_customization-contents.ssi
diff --git a/manual/de/user_customization-installer.ssi b/manual/ca/user_customization-installer.ssi
similarity index 100%
copy from manual/de/user_customization-installer.ssi
copy to manual/ca/user_customization-installer.ssi
diff --git a/manual/de/user_customization-overview.ssi b/manual/ca/user_customization-overview.ssi
similarity index 100%
copy from manual/de/user_customization-overview.ssi
copy to manual/ca/user_customization-overview.ssi
diff --git a/manual/de/user_customization-packages.ssi b/manual/ca/user_customization-packages.ssi
similarity index 100%
copy from manual/de/user_customization-packages.ssi
copy to manual/ca/user_customization-packages.ssi
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/ca/user_customization-runtime.ssi
similarity index 69%
copy from manual/pt_BR/user_customization-runtime.ssi
copy to manual/ca/user_customization-runtime.ssi
index a5dc96b..5d83783 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/ca/user_customization-runtime.ssi
@@ -132,8 +132,8 @@ are lost at shutdown.
 
 'Persistence' is a common name for different kinds of solutions for saving
 across reboots some, or all, of this run-time evolution of the system. To
-understand how it could work it could be handy to know that even if the
-system is booted and run from read-only media, modification to the files and
+understand how it works it would be handy to know that even if the system is
+booted and run from read-only media, modifications to the files and
 directories are written on writable media, typically a ram disk (tmpfs) and
 ram disks' data do not survive reboots.
 
@@ -145,42 +145,31 @@ parameter to be specified at boot time: #{persistence}#.
 
 If the boot parameter #{persistence}# is set (and #{nopersistence}# is not
 set), local storage media (e.g. hard disks, USB drives) will be probed for
-persistence volumes during boot. A persistence volume is any of the
-following:
+persistence volumes during boot. It is possible to restrict which types of
+persistence volumes to use by specifying certain boot parameters described
+in the live-boot(7) man page. A persistence volume is any of the following:
 
 _* a partition, identified by its GPT name.
 
 _* a filesystem, identified by its filesystem label.
 
-_* an image/archive file located on the root of any readable filesystem
-(even an NTFS partition of a foreign OS), identified by its file name. In
-this case the file name must also use the containing filesystem as the file
-extension, e.g. "<label>.ext4".
+_* an image file located on the root of any readable filesystem (even an
+NTFS partition of a foreign OS), identified by its file name. In this case
+the file name must also use the containing filesystem as the file extension,
+e.g. "persistence.ext4".
 
-It is possible to restrict which types of persistence volumes to use by
-specifying certain boot parameters described in the live-boot(7) man
-page. The "identifying labels" referred to above can be any of the
-following:
+The volume label for overlays must be #{persistence}#. And in order to fully
+customize the volume's persistence there must be a file named
+#{live-persistence.conf}#. See {The live-persistence.conf
+file}#live-persistence-conf
 
-_* #{full-ov}# for full persistence overlays.
-
-_* #{custom-ov}# for custom overlays.
-
-_* #{live-sn}# for full system snapshots.
-
-_* #{home-sn}# for /home snapshots.
-
-3~ Full persistence overlays
-
-By 'full persistence' it is meant that instead of using a tmpfs for storing
-modifications to the read-only media (with the copy-on-write, COW, system) a
-persistence volume is used. For this type of persistence the volume label
-must be #{full-ov}#. This could, for instance, be an ext4 partition on a
-hard disk or on a usb key created with, e.g.:
+Here are some examples of how to prepare a volume to be used for
+persistence. It can be, for instance, an ext4 partition on a hard disk or on
+a usb key created with, e.g.:
 
 code{
 
- # mkfs.ext4 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L persistence /dev/sdb1
 
 }code
 
@@ -191,26 +180,25 @@ label with one of the following:
 
 code{
 
- $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
 
 }code
 
-Here's an example of how to create an ext4-based image file used for full
+Here's an example of how to create an ext4-based image file used for
 persistence:
 
 code{
 
- $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext4 -F full-ov
+ $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext4 -F persistence
 
 }code
 
-Then copy the #{full-ov}# file to the root of a writable partition and
-reboot.
+Then copy the #{persistence}# file to the root of a writable partition.
 
-3~ Custom overlays
+3~live-persistence-conf The live-persistence.conf file
 
-A volume with the label #{custom-ov}# can be configured to make arbitrary
+A volume with the label #{persistence}# can be configured to make arbitrary
 directories persistent. The file #{live-persistence.conf}#, located on the
 volume's filesystem root, controls which directories it makes persistent,
 and in which way.
@@ -222,7 +210,7 @@ persistent in an ext4 filesystem on the /dev/sdb1 partition:
 
 code{
 
- $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mkfs.ext4 -L persistence /dev/sdb1
  $ mount -t ext4 /dev/sdb1 /mnt
  $ echo "/home" >> /mnt/live-persistence.conf
  $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
@@ -235,8 +223,7 @@ on all changes to these directories will live in the persistence
 volume. Please note that any paths listed in the #{live-persistence.conf}#
 file cannot contain white spaces or the special #{.}# and #{..}# path
 components. Also, neither #{/live}# (or any of its sub-directories) nor
-#{/}# can be made persistent using custom mounts (for the latter, use the
-#{full-ov}# type persistence described above).
+#{/}# can be made persistent using custom mounts.
 
 Several different custom overlay volumes (with their own
 #{live-persistence.conf}# files) can be used at the same time, but if
@@ -248,37 +235,12 @@ in the same #{live-persistence.conf}# file. See the live-persistence.conf(5)
 man page for how to handle that case if you really need it (hint: you
 usually don't).
 
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistence volume to the system
-(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
-volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive
-named #{live-sn.cpio.gz}#. A power interruption during run time could lead
-to data loss, hence, if you have important changes, invoke #{live-snapshot
---refresh}# as often as needed. This type of persistence, since it does not
-write continuously to the persistence media, is the most flash-based device
-friendly and the fastest of all the persistence systems, but it occupies as
-much RAM as the size of the uncompressed snapshot.
-
-A /home version of snapshot exists too and its label is #{home-sn.*}#; it
-works the same as the main snapshot but it is only applied to /home.
-
-Snapshots cannot currently handle file deletion.
-
 3~ Persistence SubText
 
 If a user would need multiple persistence storage of the same type for
-different locations or testing, such as #{full-ov-nonwork}# and
-#{full-ov-work}#, the boot parameter #{persistence-subtext}# used in
+different locations or testing, such as #{persistence-nonwork}# and
+#{persistence-work}#, the boot parameter #{persistence-subtext}# used in
 conjunction with the boot parameter #{persistence}# will allow for multiple
 but unique persistence media. An example would be if a user wanted to use a
-persistence partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistence}# #{persistence-subtext=subText}#.
-
-3~ Partial remastering
-
-The run-time modification of the tmpfs could be collected using
-live-snapshot in a squashfs and added to the cd by remastering the iso in
-the case of cd-r or adding a session to multisession cd/dvd(rw); live-boot
-mounts all /live filesystem in order or with the module boot parameter.
+persistence partition labeled #{persistence-subText}# they would use the
+boot parameters of: #{persistence}# #{persistence-subtext=subText}#.
diff --git a/manual/pt_BR/user_examples.ssi b/manual/ca/user_examples.ssi
similarity index 98%
copy from manual/pt_BR/user_examples.ssi
copy to manual/ca/user_examples.ssi
index aa406ad..64e0a6b 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/ca/user_examples.ssi
@@ -1,4 +1,4 @@
-:B~ Examples
+:B~ Exemples
 
 1~examples Examples
 
@@ -55,7 +55,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -97,7 +97,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -162,7 +162,7 @@ code{
 }code
 
 Note that unlike in the first two tutorials, we no longer have to type
-#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+#{2>&1 | tee build.log}# as that is now included in #{auto/build}#.
 
 Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
 satisfied it works, it's time to initialize our #{git}# repository, adding
@@ -301,7 +301,7 @@ Now, build the image in the usual way:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/ca/user_installation.ssi b/manual/ca/user_installation.ssi
new file mode 100644
index 0000000..ea9c8a5
--- /dev/null
+++ b/manual/ca/user_installation.ssi
@@ -0,0 +1,181 @@
+:B~ Instaŀlació
+
+1~installation Instaŀlació
+
+2~requirements Requeriments
+
+La construcció d'imatges Debian Live té molts pocs requeriments.
+
+_* Accés de superusuari (root)
+
+_* Una versió actualitzada de live-build
+
+_* Una shell compatible amb POSIX, com ara /{bash}/ o /{dash}/.
+
+_* /{debootstrap}/ o /{cdebootstrap}/
+
+_* Linux 2.6.x
+
+Tenir en compte que no cal usar Debian o una distribució derivada de Debian
+ja que live-build funcionarà en gairebé qualsevol distribució amb els
+requisits anteriors.
+
+2~installing-live-build Instaŀlació de live-build
+
+Es pot instaŀlar live-build en un nombre de maneres diferentes:
+
+_* Des del repositori Debian
+
+_* À partir del codi font
+
+_* À partir d'instantànies
+
+Si s'utilitza Debian, la manera recomanada és instaŀlar live-build des del
+repositori de Debian.
+
+3~ Des del repositori de Debian
+
+Només cal instaŀlar live-build com qualsevol altre paquet:
+
+code{
+
+ # apt-get install live-build
+
+}code
+
+o
+
+code{
+
+ # aptitude install live-build
+
+}code
+
+3~ À partir del codi font
+
+live-build es desenvolupa utilitzant el sistema de control de versions Git.
+En els sistemes basats en Debian, això és proporcionat pel paquet git. Per
+comprovar l'últim codi, executar:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-build.git
+
+}code
+
+Es pot construir i instaŀlar un paquet Debian pròpi mitjançant l'execució
+de:
+
+code{
+
+ $ cd live-build
+ $ dpkg-buildpackage -rfakeroot -b -uc -us
+ $ cd ..
+
+}code
+
+Ara instaŀlar qualsevol dels fitxers #{.deb}# recent construïts que ens
+interessen, per exemple,
+
+code{
+
+ # dpkg -i live-build_2.0.8-1_all.deb
+
+}code
+
+Es pot instaŀlar live-build directament al sistema mitjançant l'execució de:
+
+code{
+
+ # make install
+
+}code
+
+i desinstaŀlar amb:
+
+code{
+
+ # make uninstall
+
+}code
+
+3~ A partir d'instantànies
+
+Si no es desitja construir o instaŀlar live-build a partir de les fonts, es
+pot utilitzar les instantànies. Aquestes es construeixen automàticament a
+partir de l'última versió del Git, i estan disponibles a
+http://live.debian.net/debian/.
+
+2~ Instal.lació de live-boot i live-config
+
+*{Nota:}* No cal instaŀlar live-boot o live-config en el sistema per crear sistemes personalitzats de Debian Live. No obstant, això no farà cap mal i és útil per a fins de referència. Si només es vol la documentació, ara es poden instaŀlar els paquets /{live-boot-doc}/ i /{live-config-doc}/ per separat.
+
+3~ Des del repositori de Debian
+
+Tots dos, live-boot i live-config, estan disponibles al arxiu de Debian,
+d'una manera similar a {Instaŀlació de live-build}#installing-live-build.
+
+3~ À partir del codi font
+
+Per utilitzar les darreres fonts del git, es pot seguir el procés
+seguent. Assegurar-se d'estar familiaritzat amb els termes esmentats a
+{Termes}#terms.
+
+_* Clonar les fonts de live-boot i live-config
+
+code{
+
+ $ git clone git://live.debian.net/git/live-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
+
+}code
+
+Consultar les pàgines del manual de live-boot i live-config per més detalls
+sobre la seva personalització si aquesta és la raó per construir aquests
+paquets a partir de les fonts.
+
+_* Crear els fitxers .deb de live-boot i live-config 
+
+S'ha de crear ja sigui en la distribució de destinació o en un chroot que
+contingui la plataforma de destinació: és a dir, si el objectiu és wheezy
+llavors s'ha de construir contra wheezy.
+
+Es pot utilitzar un constructor personal, com ara /{pbuilder}/ o /{sbuild}/
+si es necessita crear live-boot per a una distribució de destinació
+diferenta del sistema de construcció. Per exemple, per a les imatges en viu
+de wheezy, crear live-boot en un chroot wheezy. Si la distribució de
+destinació per casualitat coincideix amb la distribució del sistema de
+construcció, es pot construir directament en el sistema de construcció amb
+#{dpkg-buildpackage}# (proporcionat pel paquet /{dpkg-dev}/):
+
+code{
+
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
+
+}code
+
+_* Utilitzar tots el fitxers .deb generats
+
+Com live-boot i live-config són instaŀlats pel sistema live-build, instaŀlar
+els paquets en el sistema amfitrió no és suficient: S'han de tractar tots
+els fitxers .deb generats igual que qualsevol altre paquet personalitzat. Si
+us plau veure {Personalització de l'instaŀlació de
+paquets}#customizing-package-installation per a més informació. S'ha de
+prestar especial atenció a {Repositoris
+addicionals}#additional-repositories.
+
+3~ A partir d'instantànies
+
+Es pot deixar que live-build utilitzi les darreres instantànies de live-boot
+i live-config configurant un repositori de tercers en el directori de
+configuració de live-build. Suposant que ja s'ha creat un arbre de
+configuració del directori actual amb #{lb config}#:
+
+code{
+
+ $ lb config --archives live.debian.net
+
+}code
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/ca/user_managing_a_configuration.ssi
similarity index 98%
copy from manual/pt_BR/user_managing_a_configuration.ssi
copy to manual/ca/user_managing_a_configuration.ssi
index 8f6089a..6deb8ad 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/ca/user_managing_a_configuration.ssi
@@ -65,7 +65,7 @@ code{
  lb clean noauto "${@}"
  rm -f config/binary config/bootstrap \
      config/chroot config/common config/source
- rm -f binary.log
+ rm -f build.log
 
 }code
 
@@ -74,7 +74,7 @@ code{
 code{
 
  #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee binary.log
+ lb build noauto "${@}" 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/de/user_overview.ssi b/manual/ca/user_overview.ssi
similarity index 99%
copy from manual/de/user_overview.ssi
copy to manual/ca/user_overview.ssi
index c0e59b5..04578d4 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/ca/user_overview.ssi
@@ -5,7 +5,7 @@
 This chapter contains an overview of the three main tools used in building
 Debian Live systems: live-build, live-boot and live-config.
 
-2~live-build live-build
+2~live-build The live-build package
 
 live-build is a collection of scripts to build Debian Live systems. These
 scripts are also referred to as "commands".
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index bed7b17..43e2db1 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -199,7 +199,7 @@ Or combine both, e.g:
 
 code{
 
- $ make build FORMATS=html LANGUAGES=it
+ $ make build LANGUAGES=it FORMATS=html
 
 }code
 
@@ -273,20 +273,23 @@ code{
 
 3~translation Translation
 
-To submit a translation for a new language, follow these three steps:
+To start a translation for a new language, follow these steps:
 
-_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
-index.html.in.pot files to your language with your favourite editor (such as
-/{poedit}/). Send translated files to the mailing list. Once we have
-reviewed your submission, we will add the new language to the manual
-(providing the po files) and will enable it in the autobuild.
+_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and
+*{index.html.in.pot}* files to your language with your favourite editor
+(such as /{poedit}/). Send the translated #{.po}# files to the mailing list
+so that the translation team can check their integrity.
 
-_* Once the new language is added, you can randomly start translating all po
-files in #{manual/po/}#.
+_* To enable a new language in the autobuild it is enough to add the initial
+translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And
+then edit #{manual/_sisu/home/index.html}#.
+
+_* Once the new language is added, you can randomly continue translating the
+remaining po files in #{manual/po/}#.
 
 _* Don't forget you need #{make commit}# to ensure the translated manuals
 are updated from the po files and then you can review your changes launching
 #{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
 and #{git push}#.
 
-*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
+*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 5fb6f2b..de1fca0 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
 
 @date:
- :published: 04.06.2012
+ :published: 2012-06-27
 
 @publisher: Debian Live Projekt <debian-live at lists.debian.org>
 
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index a5dc96b..5d83783 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -132,8 +132,8 @@ are lost at shutdown.
 
 'Persistence' is a common name for different kinds of solutions for saving
 across reboots some, or all, of this run-time evolution of the system. To
-understand how it could work it could be handy to know that even if the
-system is booted and run from read-only media, modification to the files and
+understand how it works it would be handy to know that even if the system is
+booted and run from read-only media, modifications to the files and
 directories are written on writable media, typically a ram disk (tmpfs) and
 ram disks' data do not survive reboots.
 
@@ -145,42 +145,31 @@ parameter to be specified at boot time: #{persistence}#.
 
 If the boot parameter #{persistence}# is set (and #{nopersistence}# is not
 set), local storage media (e.g. hard disks, USB drives) will be probed for
-persistence volumes during boot. A persistence volume is any of the
-following:
+persistence volumes during boot. It is possible to restrict which types of
+persistence volumes to use by specifying certain boot parameters described
+in the live-boot(7) man page. A persistence volume is any of the following:
 
 _* a partition, identified by its GPT name.
 
 _* a filesystem, identified by its filesystem label.
 
-_* an image/archive file located on the root of any readable filesystem
-(even an NTFS partition of a foreign OS), identified by its file name. In
-this case the file name must also use the containing filesystem as the file
-extension, e.g. "<label>.ext4".
+_* an image file located on the root of any readable filesystem (even an
+NTFS partition of a foreign OS), identified by its file name. In this case
+the file name must also use the containing filesystem as the file extension,
+e.g. "persistence.ext4".
 
-It is possible to restrict which types of persistence volumes to use by
-specifying certain boot parameters described in the live-boot(7) man
-page. The "identifying labels" referred to above can be any of the
-following:
+The volume label for overlays must be #{persistence}#. And in order to fully
+customize the volume's persistence there must be a file named
+#{live-persistence.conf}#. See {The live-persistence.conf
+file}#live-persistence-conf
 
-_* #{full-ov}# for full persistence overlays.
-
-_* #{custom-ov}# for custom overlays.
-
-_* #{live-sn}# for full system snapshots.
-
-_* #{home-sn}# for /home snapshots.
-
-3~ Full persistence overlays
-
-By 'full persistence' it is meant that instead of using a tmpfs for storing
-modifications to the read-only media (with the copy-on-write, COW, system) a
-persistence volume is used. For this type of persistence the volume label
-must be #{full-ov}#. This could, for instance, be an ext4 partition on a
-hard disk or on a usb key created with, e.g.:
+Here are some examples of how to prepare a volume to be used for
+persistence. It can be, for instance, an ext4 partition on a hard disk or on
+a usb key created with, e.g.:
 
 code{
 
- # mkfs.ext4 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L persistence /dev/sdb1
 
 }code
 
@@ -191,26 +180,25 @@ label with one of the following:
 
 code{
 
- $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
 
 }code
 
-Here's an example of how to create an ext4-based image file used for full
+Here's an example of how to create an ext4-based image file used for
 persistence:
 
 code{
 
- $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext4 -F full-ov
+ $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext4 -F persistence
 
 }code
 
-Then copy the #{full-ov}# file to the root of a writable partition and
-reboot.
+Then copy the #{persistence}# file to the root of a writable partition.
 
-3~ Custom overlays
+3~live-persistence-conf The live-persistence.conf file
 
-A volume with the label #{custom-ov}# can be configured to make arbitrary
+A volume with the label #{persistence}# can be configured to make arbitrary
 directories persistent. The file #{live-persistence.conf}#, located on the
 volume's filesystem root, controls which directories it makes persistent,
 and in which way.
@@ -222,7 +210,7 @@ persistent in an ext4 filesystem on the /dev/sdb1 partition:
 
 code{
 
- $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mkfs.ext4 -L persistence /dev/sdb1
  $ mount -t ext4 /dev/sdb1 /mnt
  $ echo "/home" >> /mnt/live-persistence.conf
  $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
@@ -235,8 +223,7 @@ on all changes to these directories will live in the persistence
 volume. Please note that any paths listed in the #{live-persistence.conf}#
 file cannot contain white spaces or the special #{.}# and #{..}# path
 components. Also, neither #{/live}# (or any of its sub-directories) nor
-#{/}# can be made persistent using custom mounts (for the latter, use the
-#{full-ov}# type persistence described above).
+#{/}# can be made persistent using custom mounts.
 
 Several different custom overlay volumes (with their own
 #{live-persistence.conf}# files) can be used at the same time, but if
@@ -248,37 +235,12 @@ in the same #{live-persistence.conf}# file. See the live-persistence.conf(5)
 man page for how to handle that case if you really need it (hint: you
 usually don't).
 
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistence volume to the system
-(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
-volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive
-named #{live-sn.cpio.gz}#. A power interruption during run time could lead
-to data loss, hence, if you have important changes, invoke #{live-snapshot
---refresh}# as often as needed. This type of persistence, since it does not
-write continuously to the persistence media, is the most flash-based device
-friendly and the fastest of all the persistence systems, but it occupies as
-much RAM as the size of the uncompressed snapshot.
-
-A /home version of snapshot exists too and its label is #{home-sn.*}#; it
-works the same as the main snapshot but it is only applied to /home.
-
-Snapshots cannot currently handle file deletion.
-
 3~ Persistence SubText
 
 If a user would need multiple persistence storage of the same type for
-different locations or testing, such as #{full-ov-nonwork}# and
-#{full-ov-work}#, the boot parameter #{persistence-subtext}# used in
+different locations or testing, such as #{persistence-nonwork}# and
+#{persistence-work}#, the boot parameter #{persistence-subtext}# used in
 conjunction with the boot parameter #{persistence}# will allow for multiple
 but unique persistence media. An example would be if a user wanted to use a
-persistence partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistence}# #{persistence-subtext=subText}#.
-
-3~ Partial remastering
-
-The run-time modification of the tmpfs could be collected using
-live-snapshot in a squashfs and added to the cd by remastering the iso in
-the case of cd-r or adding a session to multisession cd/dvd(rw); live-boot
-mounts all /live filesystem in order or with the module boot parameter.
+persistence partition labeled #{persistence-subText}# they would use the
+boot parameters of: #{persistence}# #{persistence-subtext=subText}#.
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 2b724dc..07e5172 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -55,7 +55,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -97,7 +97,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -162,7 +162,7 @@ code{
 }code
 
 Note that unlike in the first two tutorials, we no longer have to type
-#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+#{2>&1 | tee build.log}# as that is now included in #{auto/build}#.
 
 Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
 satisfied it works, it's time to initialize our #{git}# repository, adding
@@ -301,7 +301,7 @@ Now, build the image in the usual way:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index c5aa801..2a28091 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -103,7 +103,7 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot and live-config
+2~ Installing live-boot and live-config
 
 *{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.
 
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index 8f6089a..6deb8ad 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -65,7 +65,7 @@ code{
  lb clean noauto "${@}"
  rm -f config/binary config/bootstrap \
      config/chroot config/common config/source
- rm -f binary.log
+ rm -f build.log
 
 }code
 
@@ -74,7 +74,7 @@ code{
 code{
 
  #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee binary.log
+ lb build noauto "${@}" 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index c0e59b5..04578d4 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -5,7 +5,7 @@
 This chapter contains an overview of the three main tools used in building
 Debian Live systems: live-build, live-boot and live-config.
 
-2~live-build live-build
+2~live-build The live-build package
 
 live-build is a collection of scripts to build Debian Live systems. These
 scripts are also referred to as "commands".
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index a8bf5c9..fdc633e 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -126,7 +126,7 @@ Or combine both, e.g:
 
 code{
 
- $ make build FORMATS=html LANGUAGES=it
+ $ make build LANGUAGES=it FORMATS=html
 
 }code
 
@@ -191,12 +191,14 @@ code{
 
 3~translation Translation
 
-To submit a translation for a new language, follow these three steps:
+To start a translation for a new language, follow these steps:
 
-_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html.in.pot files to your language with your favourite editor (such as /{poedit}/). Send translated files to the mailing list. Once we have reviewed your submission, we will add the new language to the manual (providing the po files) and will enable it in the autobuild.
+_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and *{index.html.in.pot}* files to your language with your favourite editor (such as /{poedit}/). Send the translated #{.po}# files to the mailing list so that the translation team can check their integrity.
 
-_* Once the new language is added, you can randomly start translating all po files in #{manual/po/}#.
+_* To enable a new language in the autobuild it is enough to add the initial translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And then edit #{manual/_sisu/home/index.html}#.
+
+_* Once the new language is added, you can randomly continue translating the remaining po files in #{manual/po/}#.
 
 _* Don't forget you need #{make commit}# to ensure the translated manuals are updated from the po files and then you can review your changes launching #{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}# and #{git push}#.
 
-*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
+*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index a74e408..4137e6e 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2012-06-04
+ :published: 2012-06-27
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index 7e455f1..f355aab 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -92,35 +92,25 @@ A live cd paradigm is a pre-installed system which runs from read-only media, li
 
 A Debian Live system is a generalization of this paradigm and thus supports other media in addition to CDs; but still, in its default behaviour, it should be considered read-only and all the run-time evolutions of the system are lost at shutdown.
 
-'Persistence' is a common name for different kinds of solutions for saving across reboots some, or all, of this run-time evolution of the system. To understand how it could work it could be handy to know that even if the system is booted and run from read-only media, modification to the files and directories are written on writable media, typically a ram disk (tmpfs) and ram disks' data do not survive reboots.
+'Persistence' is a common name for different kinds of solutions for saving across reboots some, or all, of this run-time evolution of the system. To understand how it works it would be handy to know that even if the system is booted and run from read-only media, modifications to the files and directories are written on writable media, typically a ram disk (tmpfs) and ram disks' data do not survive reboots.
 
 The data stored on this ramdisk should be saved on a writable persistent medium like local storage media, a network share or even a session of a multisession (re)writable CD/DVD. All these media are supported in Debian Live in different ways, and all but the last one require a special boot parameter to be specified at boot time: #{persistence}#.
 
-If the boot parameter #{persistence}# is set (and #{nopersistence}# is not set), local storage media (e.g. hard disks, USB drives) will be probed for persistence volumes during boot. A persistence volume is any of the following:
+If the boot parameter #{persistence}# is set (and #{nopersistence}# is not set), local storage media (e.g. hard disks, USB drives) will be probed for persistence volumes during boot. It is possible to restrict which types of persistence volumes to use by specifying certain boot parameters described in the live-boot(7) man page. A persistence volume is any of the following:
 
 _* a partition, identified by its GPT name.
 
 _* a filesystem, identified by its filesystem label.
 
-_* an image/archive file located on the root of any readable filesystem (even an NTFS partition of a foreign OS), identified by its file name. In this case the file name must also use the containing filesystem as the file extension, e.g. "<label>.ext4".
+_* an image file located on the root of any readable filesystem (even an NTFS partition of a foreign OS), identified by its file name. In this case the file name must also use the containing filesystem as the file extension, e.g. "persistence.ext4".
 
-It is possible to restrict which types of persistence volumes to use by specifying certain boot parameters described in the live-boot(7) man page. The "identifying labels" referred to above can be any of the following:
+The volume label for overlays must be #{persistence}#. And in order to fully customize the volume's persistence there must be a file named #{live-persistence.conf}#. See {The live-persistence.conf file}#live-persistence-conf
 
-_* #{full-ov}# for full persistence overlays.
-
-_* #{custom-ov}# for custom overlays.
-
-_* #{live-sn}# for full system snapshots.
-
-_* #{home-sn}# for /home snapshots.
-
-3~ Full persistence overlays
-
-By 'full persistence' it is meant that instead of using a tmpfs for storing modifications to the read-only media (with the copy-on-write, COW, system) a persistence volume is used. For this type of persistence the volume label must be #{full-ov}#. This could, for instance, be an ext4 partition on a hard disk or on a usb key created with, e.g.:
+Here are some examples of how to prepare a volume to be used for persistence. It can be, for instance, an ext4 partition on a hard disk or on a usb key created with, e.g.:
 
 code{
 
- # mkfs.ext4 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L persistence /dev/sdb1
 
 }code
 
@@ -130,52 +120,40 @@ If you already have a partition on your device, you could just change the label
 
 code{
 
- $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
 
 }code
 
-Here's an example of how to create an ext4-based image file used for full persistence:
+Here's an example of how to create an ext4-based image file used for persistence:
 
 code{
 
- $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext4 -F full-ov
+ $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext4 -F persistence
 
 }code
 
-Then copy the #{full-ov}# file to the root of a writable partition and reboot.
+Then copy the #{persistence}# file to the root of a writable partition.
 
-3~ Custom overlays
+3~live-persistence-conf The live-persistence.conf file
 
-A volume with the label #{custom-ov}# can be configured to make arbitrary directories persistent. The file #{live-persistence.conf}#, located on the volume's filesystem root, controls which directories it makes persistent, and in which way.
+A volume with the label #{persistence}# can be configured to make arbitrary directories persistent. The file #{live-persistence.conf}#, located on the volume's filesystem root, controls which directories it makes persistent, and in which way.
 
 How custom overlay mounts are configured is described in full detail in the live-persistence.conf(5) man page, but a simple example should be sufficient for most uses. Let's say we want to make our home directory and APT cache persistent in an ext4 filesystem on the /dev/sdb1 partition:
 
 code{
 
- $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mkfs.ext4 -L persistence /dev/sdb1
  $ mount -t ext4 /dev/sdb1 /mnt
  $ echo "/home" >> /mnt/live-persistence.conf
  $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
 
 }code
 
-Then we reboot. During the first boot the contents of #{/home}# and #{/var/cache/apt}# will be copied into the persistence volume, and from then on all changes to these directories will live in the persistence volume. Please note that any paths listed in the #{live-persistence.conf}# file cannot contain white spaces or the special #{.}# and #{..}# path components. Also, neither #{/live}# (or any of its sub-directories) nor #{/}# can be made persistent using custom mounts (for the latter, use the #{full-ov}# type persistence described above).
+Then we reboot. During the first boot the contents of #{/home}# and #{/var/cache/apt}# will be copied into the persistence volume, and from then on all changes to these directories will live in the persistence volume. Please note that any paths listed in the #{live-persistence.conf}# file cannot contain white spaces or the special #{.}# and #{..}# path components. Also, neither #{/live}# (or any of its sub-directories) nor #{/}# can be made persistent using custom mounts.
 
 Several different custom overlay volumes (with their own #{live-persistence.conf}# files) can be used at the same time, but if several volumes make the same directory persistent, only one of them will be used. If any two mounts are "nested" (i.e. one is a sub-directory of the other) the parent will be mounted before the child so no mount will be hidden by the other. Nested custom mounts are problematic if they are listed in the same #{live-persistence.conf}# file. See the live-persistence.conf(5) man page for how to handle that case if you really need it (hint: you usually don't).
 
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted while running but which are copied from a persistence volume to the system (tmpfs) at boot and which are resynced at reboot/shutdown of the system. The volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive named #{live-sn.cpio.gz}#. A power interruption during run time could lead to data loss, hence, if you have important changes, invoke #{live-snapshot --refresh}# as often as needed. This type of persistence, since it does not write continuously to the persistence media, is the most flash-based device friendly and the fastest of all the persistence systems, but it occupies as much RAM as the size of the uncompressed snapshot.
-
-A /home version of snapshot exists too and its label is #{home-sn.*}#; it works the same as the main snapshot but it is only applied to /home.
-
-Snapshots cannot currently handle file deletion.
-
 3~ Persistence SubText
 
-If a user would need multiple persistence storage of the same type for different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-work}#, the boot parameter #{persistence-subtext}# used in conjunction with the boot parameter #{persistence}# will allow for multiple but unique persistence media. An example would be if a user wanted to use a persistence partition labeled #{live-sn-subText}# they would use the boot parameters of: #{persistence}# #{persistence-subtext=subText}#.
-
-3~ Partial remastering
-
-The run-time modification of the tmpfs could be collected using live-snapshot in a squashfs and added to the cd by remastering the iso in the case of cd-r or adding a session to multisession cd/dvd(rw); live-boot mounts all /live filesystem in order or with the module boot parameter.
+If a user would need multiple persistence storage of the same type for different locations or testing, such as #{persistence-nonwork}# and #{persistence-work}#, the boot parameter #{persistence-subtext}# used in conjunction with the boot parameter #{persistence}# will allow for multiple but unique persistence media. An example would be if a user wanted to use a persistence partition labeled #{persistence-subText}# they would use the boot parameters of: #{persistence}# #{persistence-subtext=subText}#.
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index c063620..6a72646 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -38,7 +38,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -65,7 +65,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial 1}#tutorial-1
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -119,7 +119,7 @@ code{
 
 }code
 
-Note that unlike in the first two tutorials, we no longer have to type #{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+Note that unlike in the first two tutorials, we no longer have to type #{2>&1 | tee build.log}# as that is now included in #{auto/build}#.
 
 Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are satisfied it works, it's time to initialize our #{git}# repository, adding only the auto scripts we just created, and then make the first commit:
 
@@ -230,7 +230,7 @@ Now, build the image in the usual way:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 15be916..7966c4b 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -96,7 +96,7 @@ code{
 
 If you do not wish to build or install live-build from source, you can use snapshots. These are built automatically from the latest version in Git and are available on http://live.debian.net/debian/.
 
-2~ live-boot and live-config
+2~ Installing live-boot and live-config
 
 *{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.
 
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 7342877..b8721d3 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -37,7 +37,7 @@ code{
  lb clean noauto "${@}"
  rm -f config/binary config/bootstrap \
      config/chroot config/common config/source
- rm -f binary.log
+ rm -f build.log
 
 }code
 
@@ -46,7 +46,7 @@ code{
 code{
 
  #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee binary.log
+ lb build noauto "${@}" 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index df8abb4..6f3e319 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -4,7 +4,7 @@
 
 This chapter contains an overview of the three main tools used in building Debian Live systems: live-build, live-boot and live-config.
 
-2~live-build live-build
+2~live-build The live-build package
 
 live-build is a collection of scripts to build Debian Live systems. These scripts are also referred to as "commands".
 
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 8162bb7..b6c20bd 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -218,7 +218,7 @@ O combinar ambos, por ejemplo:
 
 code{
 
- $ make build FORMATS=html LANGUAGES=it
+ $ make build LANGUAGES=it FORMATS=html
 
 }code
 
@@ -299,17 +299,20 @@ code{
 
 3~translation Traducción
 
-Para enviar una traducción para un nuevo idioma, se deben seguir los
+Para comenzar la traducción de un idioma nuevo, se deben seguir los
 siguientes pasos:
 
-_* Traducir los ficheros about_manual.ssi.pot, about_project.ssi.pot e
-index.html.in.pot al idioma deseado con cualquier editor (como puede ser
-/{poedit}/) y enviarlos a la lista de correos. Una vez hayan sido revisados,
-el idioma será añadido al manual, (añadiendo los ficheros .po) y se activará
-en el autobuild.
+_* Traducir los ficheros *{about_manual.ssi.pot}*, *{about_project.ssi.pot}*
+y *{index.html.in.pot}* al idioma deseado con cualquier editor (como puede
+ser /{poedit}/). Enviar los ficheros #{.po}# traducidos a la lista de correo
+para que el equipo de traducción pueda revisar su integridad.
 
-_* Una vez que el nuevo idioma haya sido añadido, se puede comenzar la
-traducción de todos los ficheros .po exisitentes en #{manual/po/}# de manera
+_* Para activar una nueva lengua en el autobuild basta con añadir los
+ficheros traducidos inicialmente a #{manual/po/${LANGUAGE}/}# y ejecutar
+#{make commit}#. Y entonces editar #{manual/_sisu/home/index.html}#.
+
+_* Una vez que el nuevo idioma haya sido añadido, se puede continuar la
+traducción de los ficheros po restantes en #{manual/po/}# de manera
 aleatoria.
 
 _* No se debe olvidar la ejecución del comando #{make commit}# para asegurar
@@ -318,4 +321,4 @@ que los manuales traducidos son actualizados desde los ficheros
 de realizar la entrega mediante #{git add .}#, #{git commit -a -m
 "Translating..."}# y #{git push}#.
 
-*{Nota:}* Tener en cuenta que a pesar de que tanto #{make commit}# como #{make build}# borran el directorio «build», si se crea el manual para revisar los cambios tal y como se recomienda, es posible que se desee limpiar el árbol git antes de enviar los cambios. Para hacer esto, se puede usar #{make clean}#. Este último paso no es obligatorio, gracias al fichero .gitignore, pero es una buena práctica para evitar enviar ficheros involuntariamente.
+*{Nota:}* Se puede utilizar #{make clean}# para limpiar el árbol git antes de enviar los cambios. Este paso no es obligatorio, gracias al fichero .gitignore, pero es una buena práctica para evitar enviar ficheros involuntariamente.
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index a047bff..25ee007 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
 
 @date:
- :published: 04.06.2012
+ :published: 2012-06-27
 
 @publisher: Proyecto Debian Live <debian-live at lists.debian.org>
 
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index df8728f..55156de 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -38,7 +38,7 @@ _* *{Imagen del Disco RAM inicial (initrd)}*: Un Disco RAM configurado para
 el arranque de Linux, que incluya los módulos posiblemente necesarios para
 montar la imagen del sistema y algunos scripts para ponerlo en marcha.
 
-_* *{Imagen del sistema}*: La imagen del sistema de ficheros raiz. Por lo
+_* *{Imagen del sistema}*: La imagen del sistema de ficheros raíz. Por lo
 general, se utiliza un sistema de ficheros comprimido SquashFS para reducir
 al mínimo el tamaño de la imagen de Debian Live. Hay que tener en cuenta que
 es de sólo lectura. Por lo tanto, durante el arranque del sistema Debian
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index 85f5320..f596092 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -51,7 +51,7 @@ gancho locales en Live/chroot}#live-chroot-local-hooks
 
 Para incluir ficheros solamente hace falta añadirlos al directorio de
 configuración #{config/includes.chroot}#. Habrá una relación directa entre
-este directorio y el directorio raiz #{/}# del sistema en vivo. Por ejemplo,
+este directorio y el directorio raíz #{/}# del sistema en vivo. Por ejemplo,
 si se desea añadir un fichero para que sea el fichero
 #{/var/www/index.html}# del sistema en vivo se puede hacer lo siguiente:
 
@@ -101,7 +101,7 @@ code{
 
 }code
 
-Los ficheros aparecerán en el directorio raiz del medio desde el que se
+Los ficheros aparecerán en el directorio raíz del medio desde el que se
 instalará el sistema en vivo.
 
 3~binary-includes Includes en Binary 
diff --git a/manual/es/user_customization-overview.ssi b/manual/es/user_customization-overview.ssi
index e17dba0..3dc0d6a 100644
--- a/manual/es/user_customization-overview.ssi
+++ b/manual/es/user_customization-overview.ssi
@@ -48,9 +48,9 @@ directorio chroot, rellenándolo con todos los paquetes que han sido listados
 en la configuración y material adicional. En esta etapa se utiliza la
 mayoría de las personalizaciones de contenido. La etapa *{binary}* es la
 etapa final en la que se prepara la imagen del sistema en vivo utilizando el
-contenido del directorio chroot para construir el sistema de ficheros raiz
+contenido del directorio chroot para construir el sistema de ficheros raíz
 del futuro sistema en vivo, se incluye el instalador y cualquier otro
-material adicional de la imagen que no es parte el sistema de fichero raiz,
+material adicional de la imagen que no es parte el sistema de fichero raíz,
 como puede ser el gestor de arranque (bootloader) o ficheros de
 documentación. Posteriormente, en la etapa opcional *{source}* se creará el
 fichero comprimido (tarball) que contiene los ficheros de código fuente de
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index a0d312c..b455ef8 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -160,45 +160,35 @@ especificará en el momento del arranque: #{persistence}#.
 Si se usa el parámetro de arranque #{persistence}# (y no se usa la opción
 #{nopersistence}#), se busca en los medios de almacenamiento locales
 (p.ej. discos duros, llaves USB) volúmenes con persistencia durante el
-arranque. Un volumen persistente es cualquiera de los siguientes: 
+arranque. Es posible restringir qué tipos de volúmenes persistentes se
+pueden usar especificando ciertos parámetros de arranque descritos en la
+página del manual de live-boot(7). Un volumen persistente es cualquiera de
+los siguientes: 
 
 _* una partición, identificada por su nombre GPT.
 
 _* Un sistema de ficheros, identificado por su etiqueta de sistema de
 ficheros.
 
-_* una fichero imagen/archivo situado en el sistema raiz de cualquier
-sistema de ficheros que pueda ser leido (incluso una partición NTFS de otro
-sistema operativo), identificado por su nombre de fichero. En este caso el
-nombre del fichero debe contener el nombre el sistema de ficheros como
-extensión, p.ej. "<label>.ext4".
+_* una fichero imagen situado en la raíz de cualquier sistema de ficheros
+que pueda ser leido (incluso una partición NTFS de otro sistema operativo),
+identificado por su nombre de fichero. En este caso el nombre del fichero
+debe contener el nombre el sistema de ficheros como extensión,
+p.ej. "persistence.ext4".
 
-Es posible restringir qué tipos de volúmenes persistentes se pueden usar
-especificando ciertos parámetros de arranque descritos en la página del
-manual de live-boot(7). Las "etiquetas identificadoras" referidas
-anteriormente pueden ser cualquiera de las siguientes:
+La etiqueta del volumen para las capas de persistencia debe ser
+#{persistence}#. Y para poder personalizar de forma completa la persistencia
+del volumen tiene que haber un fichero llamado
+#{live-persistence.conf}#. Ver {El fichero
+live-persistence.conf}#live-persistence-conf
 
-_* #{full-ov}# para capas de persistencia total.
-
-_* #{custom-ov}# para capas personalizadas.
-
-_* #{live-sn}# para instantáneas del sistema entero.
-
-_* #{home-sn}# para instantáneas de /home.
-
-3~ Capas de persistencia total 
-
-Por «Persistencia total» se entiende la utilización de una partición de
-escritura en lugar de usar un tmpfs (sistema de ficheros temporal) para
-guardar los cambios realizados en los medios de sólo lectura (con el sistema
-copiar-al-escribir o COW «copy-on-write» N. del T.). Para utilizar este tipo
-de persistencia la etiqueta del volumen debe ser #{full-ov}#. Esta podría
-ser, por ejemplo, una partición ext4 o un disco duro o una llave usb creada
-con. p.ej:
+He aquí algunos ejemplos de cómo preparar un volumen para ser usado para la
+persistencia. Puede ser, por ejemplo, una partición en un disco duro o en
+una llave usb creada con, p.ej.
 
 code{
 
- # mkfs.ext4 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L persistence /dev/sdb1
 
 }code
 
@@ -209,28 +199,28 @@ etiqueta con uno de los siguientes:
 
 code{
 
- $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
 
 }code
 
-Un ejemplo de cómo crear un fichero imagen basado en ext4 usando
-persistencia total.
+Un ejemplo de cómo crear un fichero imagen basado en ext4 usado para la
+persistencia:
 
 code{
 
- $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext4 -F full-ov
+ $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext4 -F persistence
 
 }code
 
-A continuación, copiar el fichero #{full-ov}# en una partición grabable y
-reiniciar el sistema.
+A continuación, copiar el fichero #{persistence}# en la raíz de una
+partición grabable.
 
-3~ Capas personalizadas
+3~live-persistence-conf El fichero live-persistence.conf
 
-Un volumen con la etiqueta #{custom-ov}# puede ser personalizado para crear
+Un volumen con la etiqueta #{persistence}# puede ser configurado para crear
 arbitrariamente directorios persistentes. El fichero
-#{live-persistence.conf}#, situado en el sistema de ficheros raiz del
+#{live-persistence.conf}#, situado en el sistema de ficheros raíz del
 volumen, controla que directorios hace persistentes y también de que manera.
 
 En la página de manual de live-persistence.conf(5) se explica en detalle
@@ -241,7 +231,7 @@ ext4 en la partición /dev/sdb1:
 
 code{
 
- $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mkfs.ext4 -L persistence /dev/sdb1
  $ mount -t ext4 /dev/sdb1 /mnt
  $ echo "/home" >> /mnt/live-persistence.conf
  $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
@@ -254,8 +244,7 @@ momento todos los cambios en esos directorios se guardarán allí. Tener en
 cuenta que las rutas listadas en el fichero #{live-persistence.conf}# no
 pueden contener espacios en blanco ni los componentes especiales #{.}# y
 #{..}#. Además, ni #{/live}# (o ninguno de sus sub-directorios) ni #{/}#
-pueden hacerse persistentes montándolos de forma personalizada. Para esto
-último, usar el tipo de persistencia #{full-ov}# descrito anteriormente.
+pueden hacerse persistentes montándolos de forma personalizada.
 
 Se puede usar diferentes volúmenes de capas personalizados al mismo tiempo
 (con sus propios ficheros #{live-persistence.conf}#) pero si varios
@@ -268,42 +257,13 @@ en el mismo fichero #{live-persistence.conf}#. Consultar la página de manual
 de live-persistence.conf(5) para ver como manejar ese caso si realmente es
 necesario. (aclaración: normalmente no lo es).
 
-3~ Instantáneas
-
-Las instantáneas son colecciones de ficheros y directorios que no se montan
-durante la ejecución, pero que se copian desde un volumen persistente al
-sistema (tmpfs) en el arranque y que se resincroniza en el reinicio/apagado
-del sistema.  El volumen debe tener la etiqueta #{live-sn}#, y su valor
-predeterminado es un simple archivo cpio denominado #{live-sn.cpio.gz}#. Una
-interrupción del suministro eléctrico en tiempo de ejecución podría conducir
-a la pérdida de datos, por lo tanto, se puede usar la herramienta
-#{live-snapshot --refresh}# para sincronizar cambios importantes. Este tipo
-de persistencia es la menos agresiva con los dispositivos tipo flash y el
-más rápido de todos los sistemas de persistencia, ya que no escribe
-continuamente en los medios de almacenamiento, pero ocupa tanta RAM como el
-tamaño de la instantánea sin comprimir.
-
-Existe también una versión de la instantánea /home y su etiqueta es
-#{home-sn.*}#; que funciona igual que la instantánea principal, pero sólo se
-aplica a /home.
-
-Las instantáneas no pueden manejar el borrado de ficheros.
-
 3~ SubText persistente
 
 Si un usuario necesita un almacenamiento persistente múltiple del mismo tipo
-para diferentes lugares o pruebas, tales como #{full-ov-nonwork}# y
-#{full-ov-work}#, el parámetro de arranque #{persistence-subtext}# usado
+para diferentes lugares o pruebas, tales como #{persistence-nonwork}# y
+#{persistence-work}#, el parámetro de arranque #{persistence-subtext}# usado
 junto con el parámetro de arranque #{persistence}# permitirá medios de
 almacenamiento persistentes múltiples pero únicos. Un ejemplo sería, si un
 usuario desea utilizar una partición persistente etiquetada
-#{live-sn-subText}# usaría los parámetros de arranque: #{persistence}#
+#{persistence-subText}# usaría los parámetros de arranque: #{persistence}#
 #{persistence-subtext=subText}#.
-
-3~ Remasterización parcial
-
-La modificación en tiempo de ejecución de la tmpfs podría ser guardada
-usando una instantánea en vivo en un squashfs y añadirla a un cd
-remasterizando la iso en el caso de un cd-r o añadiendo una sesión a un
-cd/dvd(rw) multisesión; live-boot monta todo el sistema de ficheros /live en
-orden o con el parámetro del módulo de arranque.
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 28d711a..34c2a75 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -62,7 +62,7 @@ mientras se crea.
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -105,7 +105,7 @@ Crear la imagen, de nuevo como superusuario, guardando un log como en el
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -173,7 +173,7 @@ code{
 }code
 
 Tener en cuenta que a diferencia de los dos primeros tutoriales, ya no se
-tiene que escribir #{2>&1 | tee binary.log}# ya que esto se incluye ahora en
+tiene que escribir #{2>&1 | tee build.log}# ya que esto se incluye ahora en
 #{auto/build}#.
 
 Una vez que se ha probado la imagen (como en el {Tutorial 1}#tutorial-1) y
@@ -319,7 +319,7 @@ Ahora, crear la imagen de forma habitual:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/es/user_installation.ssi b/manual/es/user_installation.ssi
index 22b998a..f9dd2f9 100644
--- a/manual/es/user_installation.ssi
+++ b/manual/es/user_installation.ssi
@@ -106,7 +106,7 @@ Si no se desea crear o instalar live-build a partir del código fuente, se
 puede usar instantáneas. Estas se generan automáticamente a partir de la
 última versión de Git y están disponibles en http://live.debian.net/debian/.
 
-2~ live-boot y live-config
+2~ Instalación de live-boot y live-config
 
 *{Nota:}* No es necesario instalar live-boot o live-config en el sistema para crear sistemas personalizados de Debian Live. Sin embargo, eso no causará ningún daño y es útil por motivos de referencia. Si únicamente se desea tener la documentación, es posible instalar los paquetes /{live-boot-doc}/ y /{live-config-doc}/ de forma independiente.
 
diff --git a/manual/es/user_managing_a_configuration.ssi b/manual/es/user_managing_a_configuration.ssi
index ff8a810..24183b2 100644
--- a/manual/es/user_managing_a_configuration.ssi
+++ b/manual/es/user_managing_a_configuration.ssi
@@ -78,7 +78,7 @@ code{
  lb clean noauto "${@}"
  rm -f config/binary config/bootstrap \
      config/chroot config/common config/source
- rm -f binary.log
+ rm -f build.log
 
 }code
 
@@ -87,7 +87,7 @@ code{
 code{
 
  #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee binary.log
+ lb build noauto "${@}" 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index b61b0d1..ea3c22a 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -6,7 +6,7 @@ Este capítulo contiene una descripción general de las tres  herramientas
 principales utilizadas en la creación de sistemas Debian Live: live-build,
 live-boot y live-config.
 
-2~live-build live-build
+2~live-build El paquete live-build
 
 live-build es una colección de scripts para generar los sistemas Debian
 Live. A estos scripts también se les conoce como «comandos».
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index d5816d1..3723002 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -71,7 +71,7 @@ l'aide du paramètre de démarrage #{fetch=URL}#).
 
 _* *{Système hôte}*: L'environnement utilisé pour créer le système live.
 
-_* *{Système objectif}*: L'environnement utilisé pour faire fonctionner le
+_* *{Système cible}*: L'environnement utilisé pour faire fonctionner le
 système live.
 
 _* *{live-boot}*: Une collection de scripts utilisés pour lancer des
@@ -101,9 +101,9 @@ sans redémarrage.
 _* *{Image binaire}*: Un fichier contenant le système live, tel que
 binary.iso ou binary.img.
 
-_* *{Distribution objectif}*: La distribution sur laquelle votre système
-live sera basée. Ceci peut être diffèrent de la distribution de votre
-système hôte.
+_* *{Distribution cible}*: La distribution sur laquelle votre système live
+sera basée. Ceci peut être diffèrent de la distribution de votre système
+hôte.
 
 _* *{stable/testing/unstable}*: La distribution *{stable}* contient la
 dernière version officielle de Debian. La distribution *{testing}* est la
@@ -206,7 +206,7 @@ Ou combiner les deux, par exemple:
 
 code{
 
- $ make build FORMATS=html LANGUAGES=it
+ $ make build LANGUAGES=it FORMATS=html
 
 }code
 
@@ -258,7 +258,7 @@ pas sur la branche debian.
 _* Ne pas utiliser #{make commit}# à moins que vous mettez à jour les
 traductions dans le commit, et dans ce cas, ne pas mélanger les
 modifications apportées au manuel en anglais et les traductions dans la même
-livraison, mais utiliser commits séparées. Voir la section
+livraison, mais utiliser commits séparés. Voir la section
 {Traduction}#translation pour plus de détails.
 
 _* Veuillez écrire les commentaires du commit à l'aide de phrases complètes,
@@ -281,21 +281,23 @@ code{
 
 3~translation Traduction
 
-Pour soumettre une traduction pour une nouvelle langue, suivez ces trois
-étapes:
+Pour commencer la traduction d'une nouvelle langue, suivez ces étapes:
 
-_* Traduire les fichiers about_manual.ssi.pot, about_project.ssi.pot et
-index.html.in.pot à votre langue avec votre éditeur préféré (comme
-/{poedit}/). Envoyer les fichiers traduits à la liste de diffusion. Une fois
-que nous avons examiné votre livraison, nous allons ajouter une nouvelle
-langue au manuel (avec les fichiers po) et l'activer dans l'autobuild.
+_* Traduire les fichiers *{about_manual.ssi.pot}*, *{about_project.ssi.pot}*
+et *{index.html.in.pot}* à votre langue avec votre éditeur préféré (comme
+/{poedit}/). Envoyer les fichiers #{.po}# traduits à la liste de diffusion
+afin que l'équipe de traduction puisse vérifier leur intégrité.
 
-_* Une fois la nouvelle langue est ajoutée, vous pouvez commencer à traduire
-de façon aléatoire tous les fichiers po dans #{manual/po/}#.
+_* Pour activer une nouvelle langue dans l'autobuild il suffit d'ajouter les
+premiers fichiers traduits à #{manual/po/${LANGUAGE}/}# et lancer #{make
+commit}#.  Et alors modifier #{manual/_sisu/home/index.html}#.
+
+_* Une fois la nouvelle langue est ajoutée,  vous pouvez continuer avec la
+traduction des fichiers po dans #{manual/po/}# de façon aléatoire.
 
 _* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la
-traduction des manuels sont mis à jour à partir des fichiers po, alors vous
+traduction des manuels est mise à jour à partir des fichiers po, alors vous
 pouvez réviser vos modifications avec #{make build}# avant #{git add .}#,
 #{git commit -a -m "Translating..."}# et #{git push}#.
 
-*{Remarque:}* S'il vous plaît soyez conscients que même si les deux #{make commit}#  et  #{make build}# suppriment votre répertoire de construction, si vous construisez le manuel pour examiner vos modifications comme il est recommandé, et vous voulez nettoyer votre arbre git avant de les envoyer, vous pouvez utiliser #{make clean}#. Cette dernière étape n'est pas obligatoire grâce au fichier .gitignore mais il est une bonne pratique pour éviter d'envoyer certains fichiers involontairement.
+*{Remarque:}* Vous pouvez utiliser #{make clean}# pour nettoyer votre arbre git avant de faire un push. Cette étape n'est pas obligatoire grâce au fichier .gitignore mais c'est une bonne pratique pour éviter d'envoyer certains fichiers involontairement.
diff --git a/manual/fr/about_project.ssi b/manual/fr/about_project.ssi
index 150f6a6..a9f58d2 100644
--- a/manual/fr/about_project.ssi
+++ b/manual/fr/about_project.ssi
@@ -85,7 +85,7 @@ la personnalisation}#customization-overview.
 
 Exception: Il y a quelques changements essentiels nécessaires pour mettre un
 système live en marche. Ces changements essentiels doivent être maintenus
-aussi minimes que possible et devraient être fusionnées au sein du dépôt
+aussi minimes que possible et devraient être fusionnés au sein du dépôt
 Debian s'il est possible.
 
 2~contact Contact
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
index 2d600fa..2e4baa9 100644
--- a/manual/fr/index.html.in
+++ b/manual/fr/index.html.in
@@ -45,7 +45,7 @@ href="pdf/landscape.fr.letter.pdf">US paysage</a></li>
 	<h3>Source</h3>
 
 	<p>
-		Les sources de ce manuel sont disponibles dans un répertoire <a
+		Les sources de ce manuel sont disponibles dans un dépôt <a
 href="http://git.or.cz/">Git</a> sur live.debian.net.
 	</p>
 
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 813fea9..26057d2 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
 
 @date:
- :published: 04.06.2012
+ :published: 2012-06-27
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index d377565..4330b76 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -27,7 +27,7 @@ construisez.
 
 Parce que les distributions Debian *{testing}* et Debian *{unstable}* sont
 une cible mouvante, quand vous les spécifiez comme les distributions du
-système objectif, une construction avec succès n'est pas toujours possible.
+système cible, une construction avec succès n'est pas toujours possible.
 
 % FIXME:
 
@@ -41,8 +41,8 @@ http://live.debian.net/.
 Il est hors cadre de ce manuel vous former correctement à identifier et
 corriger les problèmes dans les paquets des distributions de développement,
 cependant, il y a deux choses que vous pouvez toujours essayer:  Si une
-construction échoue lorsque la distribution objectif est *{testing}*,
-essayez *{unstable}*. Si *{unstable}* ne fonctionne pas non plus, revenir à
+construction échoue lorsque la distribution cible est *{testing}*, essayez
+*{unstable}*. Si *{unstable}* ne fonctionne pas non plus, revenir à
 *{testing}* et fixer la nouvelle version du paquet qui échoue de
 *{unstable}* (voir {APT pinning}#apt-pinning pour plus de détails).
 
diff --git a/manual/fr/user_customization-overview.ssi b/manual/fr/user_customization-overview.ssi
index 66a81e2..1eb556a 100644
--- a/manual/fr/user_customization-overview.ssi
+++ b/manual/fr/user_customization-overview.ssi
@@ -45,7 +45,7 @@ personnalisation du contenu se produit à ce stade. La dernière étape de la
 préparation de l'image live est l'étape *{binary}*, qui construit une image
 démarrable, en utilisant le contenu du répertoire chroot pour construire le
 système de fichiers racine pour le système Live, il comprend l'installateur
-et tout autre matériel supplémentaire sur les supports objectif en dehors du
+et tout autre matériel supplémentaire sur les supports cibles en dehors du
 système de fichiers du système live. Après l'image live est construite, s'il
 est activé, le tarball des sources est construit dans l'étape *{source}*.
 
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index ccf897a..286a805 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -122,7 +122,7 @@ code{
 3~additional-repositories Dépôts additionnels
 
 Vous pouvez ajouter d'autres dépôts, élargissant votre choix de paquets
-au-delà ceux disponibles dans votre distribution objectif. Il peut être, par
+au-delà ceux disponibles dans votre distribution cible. Il peut être, par
 exemple, pour backports, expérimentaux ou des paquets personnalisés. Pour
 configurer des dépôts supplémentaires, créer les fichiers
 #{config/archives/your-repository.list.chroot}#, et/ou
@@ -549,7 +549,7 @@ installer tous les paquets live qui finissent dans l'image binaire de sid au
 moment de la construction. Vous devez ajouter sid à votre APT sources et le
 fixer de sorte que seulement les paquets que vous voulez sont installés au
 temps de construction et tous les autres sont de la distribution du système
-objectif, wheezy. Ce qui suit devrait accomplir ça:
+cible, wheezy. Ce qui suit devrait accomplir ça:
 
 code{
 
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index 9250394..fe825a8 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -143,11 +143,11 @@ pendant l'exécution du système sont perdus à l'arrêt.
 La «persistance» est un nom commun pour les différents types de solutions
 pour sauver, après un redémarrage, certaines ou toutes les données, de cette
 évolution pendant l'exécution du système. Pour comprendre comment cela
-pourrait fonctionner il pourrait être utile de savoir que même si le système
-est démarré et exécuté à partir d'un support en lecture seule, la
-modification des fichiers et répertoires sont écrits sur des supports
-inscriptibles, typiquement un disque ram (tmpfs) et aux disques RAM les
-données ne survivent pas à un redémarrage.
+fonctionne il peut être utile de savoir que même si le système est démarré
+et exécuté à partir d'un support en lecture seule, la modification des
+fichiers et répertoires sont écrits sur des supports inscriptibles,
+typiquement un disque ram (tmpfs) et aux disques RAM les données ne
+survivent pas à un redémarrage.
 
 Les données stockées sur ce disque virtuel doivent être enregistrées sur un
 support inscriptible persistant comme supports de stockage locaux, un
@@ -159,44 +159,32 @@ d'amorçage spéciale à préciser au moment du démarrage: #{persistence}#.
 Si le paramètre de démarrage #{persistence}# est réglé (et #{nopersistence}#
 n'est pas utilisé), les supports de stockage locaux (par exemple les disques
 durs, clés USB) seront examinés pour trouver des volumes persistants pendant
-le démarrage. Un volume persistant est un des éléments suivants:
+le démarrage. Il est possible de limiter les types de volumes persistants à
+utiliser en spécifiant certains paramètres de démarrage décrits dans la page
+de manuel live-boot(7). Un volume persistant est un des éléments suivants:
 
 _* une partition, identifiée par son nom GPT.
 
 _* un système de fichiers, identifié par son étiquette de système de
 fichiers.
 
-_* un fichier image/archive situé sur la racine de tout système de fichiers
-en lecture (même une partition NTFS d'un système d'exploitation étranger),
-identifié par son nom de fichier. Dans ce cas, le nom du fichier doit
-contenir le nom du système de fichiers comme extension, par exemple,
-"<label>.ext4".
+_* un fichier image situé sur la racine d'un système de fichiers en lecture
+(même une partition NTFS d'un système d'exploitation étranger), identifié
+par son nom de fichier. Dans ce cas, le nom du fichier doit contenir le nom
+du système de fichiers comme extension, par exemple, "persistence.ext4".
 
-Il est possible de limiter les types de volumes persistants à utiliser en
-spécifiant certains paramètres de démarrage décrits dans la page de manuel
-live-boot(7). Les "étiquettes d'identification" mentionnées ci-dessus
-peuvent être un des éléments suivants:
+L'étiquette du volume pour les couches de persistence doit être
+#{persistence}#. Et afin de personnaliser entièrement la persistance du
+volume il doit y avoir un fichier nommé #{live-persistence.conf}#. Voir {Le
+fichier live-persistence.conf}#live-persistence-conf
 
-_* #{full-ov}# pour couches de persistance pleine.
-
-_* #{custom-ov}# pour couches personalisées
-
-_* #{live-sn}# pour instantanés du système complet.
-
-_* #{home-sn}# pour instantanés du /home.
-
-3~ Couches de persistance pleine
-
-Par «persistance pleine» on entend que au lieu d'utiliser un tmpfs pour le
-stockage des modifications dans le support en lecture seule (avec le système
-copy-on-write, COW) une partition accessible en écriture est utilisée. Pour
-ce type de persistance le nom du volume doit être #{full-ov}#. Cela
-pourrait, par exemple, être une partition ext4 sur un disque dur ou sur une
-clé usb créée avec, par exemple:
+Voici quelques exemples de comment préparer un volume à utiliser pour la
+persistance. Il peut être, par exemple, une partition ext4 sur un disque dur
+ou sur une clé usb créée avec, par exemple:
 
 code{
 
- # mkfs.ext4 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L persistence /dev/sdb1
 
 }code
 
@@ -208,29 +196,30 @@ modifier l'étiquette avec l'un des suivants:
 
 code{
 
- $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
 
 }code
 
 Voici un exemple de comment créer un fichier image ext4 utilisé pour la
-persistance pleine:
+persistance:
 
 code{
 
- $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext4 -F full-ov
+ $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext4 -F persistence
 
 }code
 
-Ensuite, copiez le fichier #{full-ov}# sur une partition accessible en
-écriture et redémarrer.
+Ensuite, copiez le fichier #{persistence}# à la racine d'une partition
+accessible en écriture.
 
-3~ Couches personnalisées
+3~live-persistence-conf Le fichier live-persistence.conf
 
-Un volume avec l'étiquette #{custom-ov}# peut être configuré pour créer des
-répertoires persistants arbitraires. Le fichier #{live-persistence.conf}#,
-situé sur le système de fichiers racine du volume, contrôle quels
-répertoires il fait persistants, et de quelle manière.
+Un volume avec l'étiquette #{persistence}# peut être configuré pour créer
+des répertoires persistants arbitraires. Le fichier
+#{live-persistence.conf}#, situé sur le système de fichiers racine du
+volume, contrôle quels répertoires il fait persistants, et de quelle
+manière.
 
 Comment on configure monter des couches personnalisées est décrit en détail
 dans la page de manuel live-persistence.conf(5), mais un simple exemple
@@ -240,7 +229,7 @@ système de fichiers ext4 sur la partition /dev/sdb1:
 
 code{
 
- $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mkfs.ext4 -L persistence /dev/sdb1
  $ mount -t ext4 /dev/sdb1 /mnt
  $ echo "/home" >> /mnt/live-persistence.conf
  $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
@@ -252,59 +241,28 @@ et #{/var/cache/apt}# seront copiés dans le volume persistant, et à partir
 de ce moment tous les changements dans ces répertoires seront stockés dans
 le volume persistant. S'il vous plaît souligner que les chemins d'accès aux
 répertoriés dans le fichier #{live-persistence.conf}# ne peuvent pas
-contenir d'espaces blancs ou les éléments spéciaux #{.}# et #{..}#. En
+contenir des espaces blancs ou les éléments spéciaux #{.}# et #{..}#. En
 outre, ni #{/live}# (ou un de ses sous-répertoires), ni #{/}#  peuvent être
-rendus persistants en utilisant custom mounts (pour ce dernier, utilisez la
-persistance #{full-ov}# décrite ci-dessus).
+rendus persistants en utilisant montages personnalisés.
 
 Plusieurs volumes de couches personnalisées différents (avec leurs propres
-fichiers #{live-persistence.conf}#) peuvent être utilisées au même temps,
+fichiers #{live-persistence.conf}#) peuvent être utilisés au même temps,
 mais si plusieurs volumes font le même répertoire persistant, un seul
 d'entre eux sera utilisé. Si les deux sont «imbriqués» (un est un
 sous-répertoire de l'autre) le premier sera monté avant que le secondaire de
-sorte que aucun sera caché par l'autre. Monter  des éléments personnalisés
+sorte que aucun sera caché par l'autre. Monter des éléments personnalisés
 imbriqués est problématique s'ils sont énumérés dans le même fichier
 #{live-persistence.conf}#. Voir la page de manuel live-persistence.conf(5)
 pour savoir comment gérer ce cas, si vous avez vraiment besoin (remarque:
 vous n'avez généralement pas).
 
-3~ Instantanés
-
-Les instantanés sont des collections de fichiers et de répertoires qui ne
-sont pas montés lors de l'exécution, mais qui sont copiés à partir d'un
-périphérique persistant à le système (tmpfs) au démarrage et qui sont
-resynchronisés au redémarrage/arrêt du système. Le volume doit être étiqueté
-#{live-sn}#. Il est par défaut une simple archive cpio appelée
-#{live-sn.cpio.gz}#. Une coupure de courant pendant l'exécution pourrait
-conduire à la perte de données, donc un outil appelé #{live-snapshot
---refresh}# pourrait être appelé pour synchroniser des changements
-importants. Ce type de persistance, car elle n'écrit pas continuellement
-dans les supports persistants, est la plus respectuese avec les dispositifs
-flash et la plus rapide de tous les systèmes de persistance, mais elle
-occupe autant RAM que la taille de l'instantané non compressée.
-
-Une version d'instantané de /home existe aussi, et son étiquette est
-#{home-sn.*}#; elle fonctionne le même que l'instantané principal, mais
-c'est seulement appliqué à /home.
-
-Les instantanés ne peuvent pas actuellement gérer la suppression de
-fichiers.
-
 3~ SubText persistant
 
 Si un utilisateur a besoin de stockages persistants multiples du même type
-pour différents endroits ou l'essai, tel que #{full-ov-nonwork}# et
-#{full-ov-work}#, le paramètre de démarrage #{persistence-subtext}# utilisé
-en conjonction avec le paramètre de démarrage #{persistence}# permettra
-multiples, mais uniques, supports persistants. Un exemple serait le cas si
-un utilisateur voudrait utiliser une partition persistante étiquetée
-#{live-sn-subText}# il utiliserait les paramètres de démarrage:
-#{persistence}# #{persistence-subtext=subText}#.
-
-3~ Remasterisation partielle
-
-Les modifications de l'exécution du tmpfs pourraient être recueillies à
-l'aide de live-snapshot dans une squashfs et ajoutées au CD en remasterisant
-l'ISO dans le cas des CD-R ou en ajoutant une session à un cd/dvd(rw)
-multisession; live-boot monte tous les systèmes de fichiers /live dans
-l'ordre ou avec le paramètre de démarrage du module.
+pour différents endroits ou l'essai, tel que #{persistence-nonwork}# et
+#{persistence-work}#, le paramètre de démarrage #{persistence-subtext}#
+utilisé en conjonction avec le paramètre de démarrage #{persistence}#
+permettra multiples, mais uniques, supports persistants. Un exemple serait
+le cas si un utilisateur voudrait utiliser une partition persistante
+étiquetée #{persistence-subText}# il utiliserait les paramètres de
+démarrage: #{persistence}# #{persistence-subtext=subText}#.
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index cc169cb..0618967 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -62,7 +62,7 @@ un journal avec #{tee}#.
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -105,7 +105,7 @@ journal comme dans {Tutoriel 1}#tutorial-1:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -174,7 +174,7 @@ code{
 }code
 
 Notez que contrairement aux deux premiers tutoriels, nous n'avons plus
-besoin de taper #{2>&1 | tee binary.log}# parce que cela est maintenant
+besoin de taper #{2>&1 | tee build.log}# parce que cela est maintenant
 inclus dans #{auto/build}#.
 
 Une fois que vous avez testé l'image (comme dans {Tutoriel 1}#tutorial-1) et
@@ -321,7 +321,7 @@ Maintenant, construire l'image de la manière habituelle:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index 48c2671..ab8fc20 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -107,7 +107,7 @@ sources, vous pouvez utiliser des instantanés. Ils sont construits
 automatiquement à partir de la dernière version du dépôt Git et ils sont
 disponibles à http://live.debian.net/debian/.
 
-2~ live-boot et live-config
+2~ Installation de live-boot et live-config
 
 *{Remarque:}* Vous n'avez pas besoin d'installer live-boot ou live-config sur votre système afin de créer des systèmes Debian Live. Cependant, cela ne fera aucun mal et est utile à des fins de référence. Si vous voulez seulement la documentation, vous pouvez maintenant installer les paquets /{live-boot-doc}/ et /{live-config-doc}/ séparément.
 
@@ -137,15 +137,15 @@ vos paquets à partir des sources.
 
 _* Créer les fichiers .deb de live-boot et live-config
 
-Vous devez créer sur votre distribution objectif ou en chroot contenant
-votre plateforme objectif: cela signifie que si votre objectif est wheezy
-alors vous devez créer sur wheezy.
+Vous devez créer sur votre distribution cible ou en chroot contenant votre
+plateforme cible: cela signifie que si votre cible est wheezy alors vous
+devez créer sur wheezy.
 
 Utilisez un système de construction automatique personnel tel que
 /{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer live-boot pour une
-distribution objectif qui diffère de votre système de construction. Par
+distribution cible qui diffère de votre système de construction. Par
 exemple, pour les images live de wheezy, créez live-boot dans un chroot
-wheezy. Si votre distribution objectif correspond à votre distribution vous
+wheezy. Si votre distribution cible correspond à votre distribution vous
 pouvez créer directement sur le système de construction en utilisant
 #{dpkg-buildpackage}# (fourni par le paquet /{dpkg-dev}/):
 
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index efeb930..9bcf765 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -70,7 +70,7 @@ code{
  lb clean noauto "${@}"
  rm -f config/binary config/bootstrap \
      config/chroot config/common config/source
- rm -f binary.log
+ rm -f build.log
 
 }code
 
@@ -79,7 +79,7 @@ code{
 code{
 
  #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee binary.log
+ lb build noauto "${@}" 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index 2a7c197..b97ae25 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -5,7 +5,7 @@
 Ce chapitre contient un aperçu des trois principaux outils utilisés dans les
 systèmes de construction Debian Live: live-build, live-boot et live-config.
 
-2~live-build live-build
+2~live-build Le paquet live-build
 
 live-build est une collection de scripts pour construire des systèmes Debian
 Live. Ces scripts sont aussi appelés "commandes".
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 207d1ff..e09dd3c 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -2,10 +2,10 @@
 
 1~about-manual A proposito di questo manuale
 
-This manual serves as a single access point to all documentation related to
-the Debian Live project and in particular applies to the software produced
-by the project for the Debian 7.0 "wheezy" release. An up-to-date version
-can always be found at http://live.debian.net/
+Questo manuale funge da unico punto d'accesso a tutta la documentazione
+relativa al progetto Debian Live e si applica in particolare al software
+prodotto per il rilascio di Debian 7.0 "wheezy". Si può trovare una versione
+aggiornata all'indirizzo http://live.debian.net/
 
 Sebbene sia principalmente focalizzato nell'aiutare a costruire un sistema
 live e non su argomenti per l'utente finale, è comunque possibile trovare
@@ -25,27 +25,29 @@ di super-utente, i comandi sono preceduti rispettivamente da #{$}# o
 
 2~ Per gli impazienti
 
-While we believe that everything in this manual is important to at least
-some of our users, we realize it is a lot of material to cover and that you
-may wish to experience early success using the software before delving into
-the details. Therefore, we suggest reading in the following order.
-
-First, read this chapter, {About this manual}#about-manual, from the
-beginning and ending with the {Terms}#terms section. Next, skip to the three
-tutorials at the front of the {Examples}#examples section designed to teach
-you image building and customization basics. Read {Using the
-examples}#using-the-examples first, followed by {Tutorial 1: A standard
-image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and
-finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these
-tutorials, you will have a taste of what can be done with Debian Live.
-
-We encourage you to return to more in-depth study of the manual, perhaps
-next reading {The basics}#the-basics, skimming or skipping {Building a
-netboot image}#building-netboot-image, and finishing by reading the
-{Customization overview}#customization-overview and the chapters that follow
-it. By this point, we hope you are thoroughly excited by what can be done
-with Debian Live and motivated to read the rest of the manual,
-cover-to-cover.
+Sebbene crediamo che ogni cosa in questo manuale sia importante almeno per
+alcuni dei nostri utenti, ci rendiamo conto che c'è tanto materiale da
+trattare e che si potrebbe voler provare il software prima di entrare nei
+dettagli; pertanto suggeriamo di leggerlo nel seguente ordine.
+
+Per iniziare leggere questo capitolo, {A proposito di questo
+manuale}#about-manual, da cima a fondo insieme alla sezione
+{Glossario}#terms, quindi passare ai tre tutorial all'inizio della sezione
+{Esempi}#examples progettati per insegnare le basi della costruzione e della
+personalizzazione delle immagini. Si legga innanzitutto {Usare gli
+esempi}#using-the-examples, seguito da {Tutorial 1: un'immagine
+standard}#tutorial-1, {Tutorial 2: un programma di utilità web
+browser}#tutorial-2 e, infine, {Tutorial 3: un'immagine
+personalizzata}#tutorial-3. Alla fine di queste esercitazioni, si avrà un
+assaggio di ciò che si può fare con Debian Live.
+
+Ti invitiamo ad uno studio più approfondito del manuale, magari leggendo in
+seguito le {Nozioni di base}#the-basics, sfogliando o saltando {Creare
+un'immagine netboot}#building-netboot-image, e finendo con la lettura di
+{Panoramica sulla personalizzazione}#customization-overview e dei capitoli
+che lo seguono. A questo punto, ci auguriamo che tu sia davvero stimolato da
+ciò che si può fare con Debian Live e motivato a leggere il resto del
+manuale per intero.
 
 2~terms Glossario
 
@@ -98,15 +100,15 @@ binary.img.
 _* *{Target distribution}*: La distribuzione su cui sarà basato il sistema
 live. Può differire dalla distribuzione presente sul proprio computer.
 
-_* *{stable/testing/unstable}*: The *{stable}* distribution contains the
-latest officially released distribution of Debian. The *{testing}*
-distribution is the staging area for the next *{stable}* release. A major
-advantage of using this distribution is that it has more recent versions of
-software relative to the *{stable}* release. The *{unstable}* distribution
-is where active development of Debian occurs. Generally, this distribution
-is run by developers and those who like to live on the edge. Throughout the
-manual, we tend to use codenames for the releases, such as wheezy or sid, as
-that is what is supported by the tools themselves.
+_* *{stable/testing/unstable}*: La distribuzione *{stable}* contiene
+l'ultima distribuzione ufficialmente rilasciata da Debian; la *{testing}* è
+il punto di raccolta per i pacchetti della prossima *{stable}*. Uno dei
+principali vantaggi nell'uso di questa distribuzione sta nell'avere software
+più recente rispetto alla *{stable}*. La distribuzione *{unstable}* è dove
+avviene lo sviluppo attivo di Debian; viene generalmente usata dagli
+sviluppatori o da coloro che amano l'azzardo. In tutto il manuale tendiamo a
+usare i nomi in codice dei rilasci, ad esempio wheezy o sid, in quanto è
+quanto supportato dagli strumenti stessi.
 
 2~ Autori
 
@@ -198,7 +200,7 @@ O entrambi:
 
 code{
 
- $ make build FORMATS=html LANGUAGES=it
+ $ make build LANGUAGES=it FORMATS=html
 
 }code
 
@@ -248,15 +250,15 @@ code{
 _* Si noti che tutte le modifiche vanno eseguite sul ramo debian-next e non
 su quello debian.
 
-_* Do not use #{make commit}# unless you are updating translations in this
-commit, and in that case, do not mix changes to the English manual and
-translations in the same commit, but use separate commits for each. See the
-{Translation}#translation section for more details.
+_* Non usare #{make commit}# a meno che nel commit non si stiano aggiornando
+delle traduzioni, in tal caso non mescolare nello stesso le modifiche al
+manuale inglese e le traduzioni ma eseguire un commit per ognuna. Per
+maggiori dettagli vedere la sezione {Traduzione}#translation.
 
-_* Write commit messages that consist of complete, meaningful sentences in
-English, starting with a capital letter and ending with a full
-stop. Usually, these will start with the form
-'Fixing/Adding/Removing/Correcting/Translating', e.g.
+_* Si scrivano messaggi costituiti da frasi in inglese esaurienti e utili,
+inizianti con una lettera maiuscola e terminanti con un punto. Solitamente
+cominceranno con la forma "Fixing/Adding/Removing/Correcting/Translating",
+ad esempio:
 
 code{
 
@@ -274,22 +276,23 @@ code{
 
 3~translation Traduzione
 
-Per inviare una traduzione per una nuova lingua, seguire questi tre passi:
+To start a translation for a new language, follow these steps:
 
-_* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e
-index.html.in.pot nella propria lingua con il proprio editor preferito (tipo
-/{poedit}/). Inviare i file tradotti alla mailing list. Una volta che
-abbiamo ricevuto il contributo, aggiungeremo la nuova lingua al manuale
-(fornendo i file po) e la attiveremo per la procedura di compilazione
-automatica.
+_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and
+*{index.html.in.pot}* files to your language with your favourite editor
+(such as /{poedit}/). Send the translated #{.po}# files to the mailing list
+so that the translation team can check their integrity.
 
-_* Una volta che la nuova lingua è stata aggiunta, si può iniziare a
-tradurre tutti i file po situati in #{manual/po/}#, nell'ordine che si
-preferisce.
+_* To enable a new language in the autobuild it is enough to add the initial
+translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And
+then edit #{manual/_sisu/home/index.html}#.
+
+_* Once the new language is added, you can randomly continue translating the
+remaining po files in #{manual/po/}#.
 
 _* Non dimenticare che è necessario usare #{make commit}# per assicurarsi
 che i manuali tradotti siano aggiornati partendo dai file po, quindi si
 possono verificare le modifiche con #{make build}# prima di #{git add .}#,
 #{git commit -a -m "Translating..."}# e #{git push}#.
 
-*{Nota:}* anche se #{make commit}# e #{make build}# rimuovono entrambi la directory di compilazione, se si compila il manuale per rivedere le modifiche come consigliato, si consiglia di pulire l'albero git prima del push; per fare ciò si puà usare il comando #{make clean}#. Grazie al file .gitignore, quest'ultimo passaggio non è obbligatorio ma è una buona abitudine che evita di fare involontariamente il commit di certi file.
+*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 4b66ee6..4a36591 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
 
 @date:
- :published: 04.06.2012
+ :published: 2012-06-27
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/it/project_coding-style.ssi b/manual/it/project_coding-style.ssi
index 12f5c24..3c1158a 100644
--- a/manual/it/project_coding-style.ssi
+++ b/manual/it/project_coding-style.ssi
@@ -15,7 +15,7 @@ di `foo`.
 
 _* È possibile verificare i propri script con "sh -n" e "checkbashisms".
 
-_* Make sure all shell code runs with 'set -e'.
+Assicurarsi che tutto il codice giri con 'set -e'.
 
 2~ Rientri
 
@@ -149,5 +149,5 @@ test -x /bin/foo; ...}#".
 _* Ove possibile utilizzare #{case}# invece di #{test}#, essendo più facile
 da leggere e più veloce in esecuzione.
 
-_* Use capitalized names for functions to limit messing with the users
-environment.
+_* Per le funzioni utilizzare nomi che iniziano con la maiuscola per
+limitare i problemi con le variabili d'ambiente dell'utente.
diff --git a/manual/it/project_procedures.ssi b/manual/it/project_procedures.ssi
index 651218d..d5111bd 100644
--- a/manual/it/project_procedures.ssi
+++ b/manual/it/project_procedures.ssi
@@ -40,19 +40,20 @@ _* Le immagini vengono create e ospitate su cdimage.debian.org.
 
 2~ Rilasci minori
 
-_* Again, we need updated mirrors of debian, debian-security and
+_* Bisogna nuovamente aggiornare i mirror di debian, debian-security e
 debian-volatile.
 
 _* Le immagini vengono create e ospitate su cdimage.debian.org.
 
 _* Inviare email di annuncio.
 
-3~ Last Point Release of a Debian Release
+3~ Ultimo rilascio minore di un rilascio di Debian.
 
-Remember to adjust both chroot and binary mirrors when building the last set
-of images for a Debian release after it has been moved away from
-ftp.debian.org to archive.debian.org. That way, old prebuilt live images are
-still useful without user modifications.
+Quando si crea l'ultima serie di immagini per un rilascio di Debian che è
+stato spostato da ftp.debian.org a archive.debian.org, ricordarsi di
+sistemare i mirror del chroot e dei binari. In questo modo le vecchie
+immagini live create saranno ancora utili senza la necessità di modifiche da
+parte dell'utente.
 
 3~ Modello per l'annuncio di un rilascio minore.
 
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index b4ac2e8..a0b7ab2 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -16,9 +16,9 @@ setup è stato fatto, è un modo molto comodo per collaudare e distribuire
 immagini facendo il boot nella rete locale senza la seccatura di doversi
 occupare dei mezzi di divulgazione dell'immagine.
 
-Throughout the chapter, we will often refer to the default filenames
-produced by live-build. If you are downloading a prebuilt image instead, the
-actual filenames may vary.
+In tutto il capitolo faremo spesso riferimento ai nomi dei file predefiniti
+creati da live-build. Se si scarica invece un'immagine precompilata, i nomi
+possono variare.
 
 2~what-is-live Che cos'è un sistema live?
 
diff --git a/manual/it/user_customization-binary.ssi b/manual/it/user_customization-binary.ssi
index 27ece15..b602943 100644
--- a/manual/it/user_customization-binary.ssi
+++ b/manual/it/user_customization-binary.ssi
@@ -4,20 +4,20 @@ B~ Personalizzare l'immagine binaria
 
 2~ Bootloader
 
-live-build uses /{syslinux}/ and some of its derivatives (depending on the
-image type) as bootloaders by default. You can easily customize them in a
-number of ways that range from providing a full theme to changing the boot
-timeout or simply adding a personalized splash image. Some of the following
-examples of customization make use of different methods, like
-{includes}#includes or {hooks}#hooks.
+live-build usa /{syslinux}/ e alcuni dei suoi derivati (a seconda del tipo
+di immagine) come bootloader predefiniti. Si possono facilmente
+personalizzare in vari modi che vanno dal fornire un tema completo per
+modificare il timeout d'avvio o semplicemente per aggiungere un'immagine
+splash personalizzata. Alcuni dei seguenti esempi di personalizzazione fanno
+uso di metodi diversi, come {include}#includes o {hook}#hooks.
 
-If you want to use a full theme you can specify the #{--syslinux-theme}#
-option (see man #{lb_config}#). live-build will then retrieve the theme from
-the mirror and install it.
+Se si desidera utilizzare un tema completo è possibile specificare l'opzione
+#{--syslinux-theme}# (vedere man #{lb_config}#). live-build recupera quindi
+il tema dal mirror e lo installa.
 
-Imagine that you want to build a progress client but you prefer to include
-the server's theme because you want to have the help menu. Then you would
-launch #{lb config}# as follows:
+Si immagini di voler creare un client progress ma si preferisce includere il
+tema del server per avere il menù di aiuto. Si lancerà #{lb config}# come
+segue:
 
 code{
 
@@ -25,22 +25,22 @@ code{
 
 }code
 
-You can also create your own theme or modify an already existing one and if
-you do not have a mirror, you can add the package to
-#{config/packages.chroot}#. In this case it is not necessary to specify any
-option.
+È inoltre possibile creare il proprio tema o modificarne uno già esistente,
+e se non si dispone di un mirror si può aggiungere il pacchetto
+#{config/packages.chroot}#. In questo caso non è necessario specificare
+alcuna opzione.
 
-There is also the possibility of making smaller changes. For instance,
-syslinux derivatives are configured by default with a timeout of 0 (zero)
-which means that they will pause indefinitely at their splash screen until
-you press a key.
+Si può anche fare piccole modifiche. Per esempio i derivati di syslinux sono
+configurati con un timeout impostato a 0 (zero) in modo predefinito,
+significa che resteranno in pausa al loro splash screen fino a quando non si
+preme un tasto.
 
-To modify the boot timeout of a default #{iso-hybrid}# image you can edit a
-default *{isolinux.cfg}* file specifying the timeout in units of seconds and
-add it to #{config/includes.binary/isolinux/}#
+Per modificare il timeout di avvio di un'immagine #{iso-hybrid}# si può
+modificare un file *{isolinux.cfg}* predefinito specificando il timeout in
+unità di secondi e aggiungerlo a #{config/includes.binary/isolinux/}#
 
-A modified *{isolinux.cfg}* to boot after five seconds would be similar to
-this:
+Un file *{isolinux.cfg}* modificato per fare il boot dopo cinque secondi
+sarà simile a questo:
 
 code{
 
@@ -51,9 +51,9 @@ code{
 
 }code
 
-An alternative way of achieving the same goal could be writing a hook and
-adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run
-in the binary stage. A proposed example:
+Un modo alternativo per raggiungere lo stesso obiettivo potrebbe essere
+scrivere un hook e aggiungerlo a #{config/hooks/}# Ricordarsi di aggiungere
+il suffisso #{.binary}# per eseguirsi nella fase binaria. Ecco un esempio:
 
 code{
 
@@ -63,8 +63,9 @@ code{
 
 }code
 
-Likewise, if you want to use a personalized splash.png image you can add a
-picture of 640x480 pixels to #{config/includes.binary/isolinux/}#
+Allo stesso modo, se si vuole utilizzare un'immagine splash.png
+personalizzata basta aggiungerne una di 640x480 pixel a
+#{config/includes.binary/isolinux/}#
 
 2~ Metadati ISO
 
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index e7b9ad4..a6649e9 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -149,47 +149,37 @@ da specificare all'avvio: #{persistence}#.
 
 Se il parametro di boot #{persistence}# è impostato (e non lo è
 #{nopersistence}#), i supporti di memorizzazione locali (hard disk,
-dispositivi USB) saranno rilevati come volumi persistenti durante
-l'avvio. Un volume persistente è uno dei seguenti:
+dispositivi USB) saranno rilevati come volumi persistenti durante l'avvio. È
+possibile selezionare quali tipi utilizzare specificando certi parametri di
+avvio descritti nella manpage di live-boot(7). Un volume persistente è uno
+dei seguenti:
 
 _* una partizione, identificata dal suo nome GPT (GUID Partition Table).
 
 _* un filesystem, identificato dalla sua label.
 
-_* un file immagine o archivio situato nella directory radice di un
-qualsiasi filesystem leggibile (anche una partizione NTFS di un sistema
-estraneo), identificato dal nome del file. In questo caso il nome del file
-deve contenere anche il tipo di filesystem come estensione, ad esempio
+_* un file immagine situato nella directory radice di un qualsiasi
+filesystem leggibile (anche una partizione NTFS di un sistema estraneo),
+identificato dal nome del file. In questo caso il nome del file deve
+contenere anche il tipo di filesystem come estensione, ad esempio
 "<label>.ext4".
 
-È possibile limitare i tipi di volume persistenti da usare specificando
-certi parametri di boot descritti nella manpage di live-boot(7). Le "label
-identificative" di cui sopra possono essere una delle seguenti:
+The volume label for overlays must be #{persistence}#. And in order to fully
+customize the volume's persistence there must be a file named
+#{live-persistence.conf}#. See {The live-persistence.conf
+file}#live-persistence-conf
 
-_* #{full-ov}# per strati di persistenza completa.
-
-_* #{custom-ov}# per strati personalizzati.
-
-_* #{live-sn}# per istantanee del sistema completo.
-
-_* #{home-sn}# per istantanee della /home.
-
-3~ Strati di persistenza completa
-
-Con "persistenza completa" si intende l'uso di un volume persistente invece
-di un filesystem temporaneo (tmpfs) per salvare le modifiche al supporto in
-sola lettura (con il sistema COW, copy-on-write). Per questo tipo di
-persistenza la label deve essere #{full-ov}#, che potrebbe essere una
-partizione di tipo ext4 su un hard disk o una penna USB creata ad esempio
-con:
+Here are some examples of how to prepare a volume to be used for
+persistence. It can be, for instance, an ext4 partition on a hard disk or on
+a usb key created with, e.g.:
 
 code{
 
- # mkfs.ext4 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L persistence /dev/sdb1
 
 }code
 
-Vedee anche {Usare lo spazio rimanente su una penna
+Vedere anche {Usare lo spazio rimanente su una penna
 USB}#using-usb-extra-space.
 
 Se si possiede già una partizione sul dispositivo basta solo cambiare
@@ -197,26 +187,26 @@ l'etichetta con una delle seguenti:
 
 code{
 
- $ tune2fs -L full-ov /dev/sdb1 # per filesystems ext2,3,4
+ $ tune2fs -L persistence /dev/sdb1 # per filesystem ext2,3,4
 
 }code
 
 Ecco un esempio di come creare un file immagine ext4 da utilizzare per la
-persistenza completa:
+persistenza:
 
 code{
 
- $ dd if=/dev/null of=full-ov bs=1G seek=1 # per un file immagine da 1GB
- $ /sbin/mkfs.ext4 -F full-ov
+ $ dd if=/dev/null of=persistence bs=1G seek=1 # per un file immagine da 1GB
+ $ /sbin/mkfs.ext4 -F persistence
 
 }code
 
-Quindi copiare il file #{full-ov}# nella directory radice di una partizione
-scrivibile e riavviare.
+Quindi copiare il file #{persistence}# nella directory radice di una
+partizione scrivibile e riavviare.
 
-3~ Strati personalizzati
+3~live-persistence-conf The live-persistence.conf file
 
-Un volume con una label #{custom-ov}# può essere configurato per creare
+Un volume con una label #{persistence}# può essere configurato per creare
 directory persistenti arbitrarie. Il file #{live-persistence.conf}#, situato
 nella directory radice del filesystem del volume, controlla quali rendere
 persistenti e in che modo.
@@ -229,7 +219,7 @@ persistente in un filesystem ext4 sulla partizione /dev/sdb1:
 
 code{
 
- $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mkfs.ext4 -L persistence /dev/sdb1
  $ mount -t ext4 /dev/sdb1 /mnt
  $ echo "/home" >> /mnt/live-persistence.conf
  $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
@@ -242,8 +232,7 @@ le modifiche a queste directory risiederanno in modo persistente sul
 volume. C'è da considerare che tutti i path elencati nel file
 #{live-persistence.conf}# non possono contenere spazi o i caratteri speciali
 #{.}# e #{..}#; inoltre, né #{/live}# (o nessuna delle sue sottodirectory)
-né #{/}# può essere resa persistente tramite i mount personalizzati (per
-l'ultimo usare la tipologia #{full-ov}# descritta prima).
+né #{/}# può essere resa persistente tramite i mount personalizzati.
 
 Possono essere utilizzati svariati volumi di stratificazione personalizzati
 (con i rispettivi file #{live-persistence.conf}#) allo stesso tempo ma se
@@ -255,39 +244,12 @@ problematici se sono elencati nello stesso file #{live-persistence.conf}. Se
 si ha davvero la necessità (in genere non si dovrebbe averla), consultare la
 manpage di live-persistence.conf(5) per sapere come gestire questo caso.
 
-3~ Istantanee
-
-Le istantanee sono raccolte di file e directory che non vengono montate
-durante l'esecuzione ma copiate all'avvio da un volume persistente al
-sistema (tmpfs) e risincronizzate al riavvio e spegnimento. Il volume deve
-essere etichettato come #{live-sn}# sotto forma di un semplice archivio cpio
-nominato #{live-sn.cpio.gz}#. Un'interruzione di corrente durante
-l'esecuzione potrebbe portare ad una perdita di dati, se son state fatte
-modifiche importanti si può usare usare #{live-snapshot --refresh}# tante
-volte quanto necessario.Giacché non scrive continuamente sul dispositivo,
-questo tipo di persistenza è il sistema più comodo e veloce per dispositivi
-basati su memoria flash ma occupa tanta RAM quanta è la dimensione
-dell'istantanea decompressa.
-
-Esiste anche un'istantanea della /home con etichetta #{home-sn.*}#; funziona
-come la principale ma viene applicata solo ad /home.
-
-Attualmente le istantanee non possono gestire la cancellazione dei file.
-
 3~ Sottotesto persistente
 
 Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per
-differenti posti o per test, come #{full-ov-casa}# e #{full-ov-lavoro}#, il
-parametro d'avvio #{persistence-subtext}# usato in congiunzione con
-#{persistent}# permetterà supporti persistenti multipli ma univoci. Un
-esempio potrebbe essere un utente che vuole usare una partizione etichettata
-come #{live-sn-sottotesto}#, userebbe: #{persistence}#
-#{persistence-subtext=sottotesto}#.
-
-3~ Rimasterizzazione parziale
-
-Le modifiche in fase di esecuzione del tmpfs possono essere incluse in uno
-squashfs usando live-snapshot e aggiunte al cd per rimasterizzare la iso nel
-caso di un cd riscrivibile o aggiunto ad una sessione di un cd/dvd(rw)
-multisessione; live-boot monta tutti i filesystem /live in ordine o con il
-modulo del parametro d'avvio.
+differenti posti o per test, come #{persistence-casa}# e
+#{persistence-lavoro}#, il parametro d'avvio #{persistence-subtext}# usato
+in congiunzione con #{persistent}# permetterà supporti persistenti multipli
+ma univoci. Un esempio potrebbe essere un utente che vuole usare una
+partizione etichettata come #{persistence-sottotesto}#, userebbe:
+#{persistence}# #{persistence-subtext=sottotesto}#.
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index d8f0dd5..b8db715 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -53,11 +53,11 @@ Esaminare i contenuti della directory #{config/}#; si noterà uno scheletro
 di configurazione pronto per essere personalizzato o, in questo caso, usato
 immediatamente per costruire un'immagine predefinita.
 
-Ora, come super-utente, si generi l'immagine, salvando un log con #{tee}#.
+Ora, come utente root, si generi l'immagine salvando un log con #{tee}#.
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -96,12 +96,12 @@ oltre e fornire una configurazione predefinita per il browser web in
 di supporto per la fruizione di vari tipi di contenuti web, ma lasciamo
 questo come esercizio per il lettore.
 
-Si generi l'immagine, ancora come super-utente, conservando un log come in
+Si generi l'immagine, ancora come utente root, conservando un log come in
 {Tutorial 1}#tutorial-1:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -169,7 +169,7 @@ code{
 }code
 
 Si noti che diversamente dai primi due tutorial, non occorre più digitare
-#{2>&1 | tee binary.log}# dato che questo è ora incluso in #{auto/build}#.
+#{2>&1 | tee build.log}# dato che questo è ora incluso in #{auto/build}#.
 
 Una volta che l'immagine è stata collaudata (come in {Tutorial
 1}#tutorial-1) e che si è sicuri che funzioni correttamente, è il momento di
@@ -315,7 +315,7 @@ Costruire quindi l'immagine nel modo consueto:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/it/user_installation.ssi b/manual/it/user_installation.ssi
index 2e4eecd..197ff4f 100644
--- a/manual/it/user_installation.ssi
+++ b/manual/it/user_installation.ssi
@@ -7,7 +7,7 @@
 Per costruire immagini Debian Live i requisiti di sistema sono davvero
 pochi:
 
-_* Accesso come super-utente (root)
+_* Accesso come utente root
 
 _* Una versione aggiornata di live-build
 
@@ -106,7 +106,7 @@ Se non si desidera generare o installare live-build da sorgenti, è possibile
 usare le istantanee. Sono costruite automaticamente dall'ultima versione
 presente su Git e disponibili su http://live.debian.net/debian/.
 
-2~ live-boot e live-config
+2~ Installare live-boot e live-config
 
 *{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce. Se si vuole la documentazione è possibile installare i pacchetti /{live-boot-doc}/ e /{live-config-doc}/ separatamente.
 
diff --git a/manual/it/user_managing_a_configuration.ssi b/manual/it/user_managing_a_configuration.ssi
index bb14c0c..29d3d9d 100644
--- a/manual/it/user_managing_a_configuration.ssi
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -66,7 +66,7 @@ code{
  lb clean noauto "${@}"
  rm -f config/binary config/bootstrap \
      config/chroot config/common config/source
- rm -f binary.log
+ rm -f build.log
 
 }code
 
@@ -75,7 +75,7 @@ code{
 code{
 
  #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee binary.log
+ lb build noauto "${@}" 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index 4406b57..c244486 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -6,7 +6,7 @@ Questo capitolo contiene una panoramica dei tre principali strumenti
 utilizzati nella creazione dei sistemi Debian Live: live-build, live-boot e
 live-config.
 
-2~live-build live-build
+2~live-build Il pacchetto live-build
 
 live-build è una raccolta di script, chiamati anche "comandi", usati per
 creare sistemi Debian Live.
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/ca/about_manual.ssi.po
similarity index 64%
copy from manual/po/pt_BR/about_manual.ssi.po
copy to manual/po/ca/about_manual.ssi.po
index 6fd7ede..7cc33af 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/ca/about_manual.ssi.po
@@ -1,30 +1,28 @@
-# Brazilian Portuguese translations for live-manual package
-# 2010 Bruno Gurgel <bruno.gurgel at gmail.com>
+# Catalan translations for live-manual
 # This file is distributed under the same license as the live-manual package.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-18 19:35+0300\n"
-"PO-Revision-Date: 2012-04-14 22:31+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"POT-Creation-Date: 2012-06-24 19:21+0300\n"
+"PO-Revision-Date: 2012-06-24 19:41+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
-"Language: \n"
+"Language: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:2
 msgid ":B~ About this manual"
-msgstr ":B~ Sobre esse manual"
+msgstr ":B~ Sobre aquest manual"
 
 #. type: Plain text
 #: en/about_manual.ssi:4
 msgid "1~about-manual About this manual"
-msgstr "1~about-manual Sobre esse manual"
+msgstr "1~about-manual Sobre aquest manual"
 
 #. type: Plain text
 #: en/about_manual.ssi:6
@@ -34,6 +32,10 @@ msgid ""
 "by the project for the Debian 7.0 \"wheezy\" release. An up-to-date version "
 "can always be found at http://live.debian.net/"
 msgstr ""
+"Aquest manual serveix com a punt d'accés únic a tota la documentació "
+"relacionada amb el projecte Debian Live i en particular s'aplica al "
+"programari produït pel projecte per la versió Debian 7.0 \"wheezy\". Una "
+"versió actualitzada es pot trobar sempre a http://live.debian.net/"
 
 #. type: Plain text
 #: en/about_manual.ssi:8
@@ -46,6 +48,14 @@ msgid ""
 "prompt, such as selecting a keyboard layout and locale, and using "
 "persistence."
 msgstr ""
+"Si bé live-manual es centra principalment en ajudar a construir un sistema "
+"viu i no en temes dels usuaris finals, un usuari final pot trobar informació "
+"útil en aquestes seccions: {Conceptes bàsics}#the-basics abasta la "
+"preparació d'imatges per ser arrencadas des dels dispositius o la xarxa, i "
+"{Personalització dels comportaments en temps d'execució}#customizing-run-"
+"time-behaviours descriu algunes de les opcions que es poden especificar "
+"durant l'arrencada del sistema, com ara la selecció de la disposició del "
+"teclat, la configuració regional i l'us de la persistència."
 
 #. type: Plain text
 #: en/about_manual.ssi:10
@@ -57,17 +67,17 @@ msgid ""
 "prepended by #{$}# or #{#}# respectively. This symbol is not a part of the "
 "command."
 msgstr ""
-"Alguns comandos mencionados no texto devem ser executados com privilégios de "
-"super-usuário, que podem ser obtidos tornando-se usuário root via #{su}# ou "
-"usando #{sudo}#. Para distinção entre os comandos que talvez possam ser "
-"executados como usuário não privilegiado e aqueles que requerem privilégios "
-"de super usuário, os comandos são precididos por: #{$}# ou #{#}# "
-"respectivamente. Esse simbolo não é parte do comando."
+"Algunes de les ordres esmentades en el text s'han d'executar amb privilegis "
+"de superusuari que es poden obtenir esdevenint l'usuari root amb #{su}# o "
+"mitjançant l'ús de #{sudo}#. Per distingir entre les ordres que poden ser "
+"executades per un usuari sense privilegis i aquelles que requereixen "
+"privilegis de root, s'anteposa #{$}# o #{#}# respectivament. Aquest símbol "
+"no és part de l'ordre. "
 
 #. type: Plain text
 #: en/about_manual.ssi:12
 msgid "2~ For the impatient"
-msgstr ""
+msgstr "2~ Per als impacients"
 
 #. type: Plain text
 #: en/about_manual.ssi:14
@@ -77,6 +87,11 @@ msgid ""
 "may wish to experience early success using the software before delving into "
 "the details. Therefore, we suggest reading in the following order."
 msgstr ""
+"Si bé creiem que tot el que hi ha en aquest manual és important si més no "
+"per alguns dels nostres usuaris, ens adonem que hi ha una gran quantitat de "
+"material per cobrir i que és possible que es vulgui experimentar l'èxit amb "
+"el programari aviat, abans d'aprofundir en els detalls. Per tant, us "
+"recomanem llegir en el següent ordre."
 
 #. type: Plain text
 #: en/about_manual.ssi:16
@@ -90,6 +105,15 @@ msgid ""
 "personalized image}#tutorial-3. By the end of these tutorials, you will have "
 "a taste of what can be done with Debian Live."
 msgstr ""
+"En primer lloc, llegiu aquest capítol, {Sobre aquest manual}#about-manual, "
+"des del principi i acabant amb els {Termes}#terms. A continuació, saltar als "
+"tres tutorials abans dels {Exemples}#examples secció dissenyada per ensenyar "
+"la creació de la imatge i alguns aspectes bàsics de la personalització. "
+"Llegiu en primer lloc {Usant els exemples}#using-the-examples seguit per "
+"{Tutorial 1: Una imatge estàndard}#tutorial-1, {Tutorial 2: Una utilitat de "
+"navegador d'Internet}#tutorial-2 i finalment, {Tutorial 3: Una image "
+"personalitzada}#tutorial-3. Al final d'aquests tutorials, tindreu una idea "
+"del que es pot fer amb Debian Live."
 
 #. type: Plain text
 #: en/about_manual.ssi:18
@@ -102,11 +126,18 @@ msgid ""
 "with Debian Live and motivated to read the rest of the manual, cover-to-"
 "cover."
 msgstr ""
+"Us animem a tornar i a fer un estudi del manual en profunditat, la propera "
+"lectura pot ser {Conceptes bàsics}#the-basics, fregant o saltant "
+"{Construcció d'una imatge netboot}#building-netboot-image, i acabant per la "
+"lectura de la {Visió de conjunt de la personalització}#customization-"
+"overview i els capítols que la segueixen. En aquest punt, esperem que "
+"estigueu ben emocionats pel que es pot fer amb Debian Live i motivats per "
+"llegir la resta del manual, de principi a fi."
 
 #. type: Plain text
 #: en/about_manual.ssi:20
 msgid "2~terms Terms"
-msgstr "2~terms Terminologia"
+msgstr "2~terms Termes"
 
 #. type: Plain text
 #: en/about_manual.ssi:22
@@ -117,12 +148,12 @@ msgid ""
 "Live systems are typically booted from media such as CDs, DVDs or USB "
 "sticks. Some may also boot over the network."
 msgstr ""
-"_* *{Live system}*: Um sistema operacional que pode inicializar sem "
-"instalação em um disco rígido. Sistemas live não devem alterar o(s) sistema"
-"(s) operacional(s) local(is) ou arquivo(s) já instalados no disco rígido do "
-"computador a não ser que seja instruido para isso. Sistemas Live são "
-"tipicamente inicializados a partir de uma mídia como CDs, DVDs ou pendrive"
-"(s). Alguns também podem inicializar através da rede."
+"_* *{Sistema viu}*: Un sistema operatiu que pot arrencar sense necessitat "
+"d'instaŀlació en un disc dur. Els sistemes vius no alteren el sistema "
+"operatiu local(s) o els fitxer(s) ja instaŀlats al disc dur de l'ordinador a "
+"menys que així se'ls ho indiqui. Els sistemes vius normalment s'inician des "
+"de dispositius, com ara CD, DVD o memòries USB. Alguns també poden arrencar "
+"des de la xarxa."
 
 #. type: Plain text
 #: en/about_manual.ssi:24
@@ -130,8 +161,8 @@ msgid ""
 "_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
 "live-build, live-config, and live-manual packages."
 msgstr ""
-"_* *{Debian Live}*: O sub-projeto Debian que manten os pacotes live-boot, "
-"live-build, live-config, e live-manual."
+"_* *{Debian Live}*: Un subprojecte de Debian, que manté els paquets live-"
+"boot, live-build, live-config i live-manual. "
 
 #. type: Plain text
 #: en/about_manual.ssi:26
@@ -141,20 +172,23 @@ msgid ""
 "network (via netboot images), and over the Internet (via boot parameter #"
 "{fetch=URL}#)."
 msgstr ""
-"_* *{Debian Live system}*: Um sistema live que usa softwares do sistema "
-"operacional Debian que também pode ser inicializado a partir de CD's, DVDs, "
-"Discos USB, através da rede (via imagens netbook), e através da Internet "
-"(via parametro de boot #{fetch=URL}#)."
+"_* *{Sistema Debian Live}*: Un sistema viu que utilitza el programari del "
+"sistema operatiu Debian que es pot arrencar des d'un CD, DVD, memòries USB, "
+"o la xarxa (a través d'imatges netboot) i a través d'Internet (a través de "
+"paràmetre d'arrencada #{fetch=URL}#)."
 
 #. type: Plain text
 #: en/about_manual.ssi:28
 msgid "_* *{Host system}*: The environment used to create the live system."
-msgstr "_* *{Host system}*: O ambiente usado para criar o sistema live."
+msgstr ""
+"_* *{Sistema amfitrió}*: L'entorn utilitzat per crear el sistema en viu."
 
 #. type: Plain text
 #: en/about_manual.ssi:30
 msgid "_* *{Target system}*: The environment used to run the live system."
-msgstr "_* *{Target system}*: O ambiente usado para rodar o sistema live."
+msgstr ""
+"_* *{Sistema objectiu}*: L'entorn que s'utilitza per executar el sistema en "
+"viu."
 
 #. type: Plain text
 #: en/about_manual.ssi:32
@@ -162,8 +196,8 @@ msgid ""
 "_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
 "boot was formerly a part of /{live-initramfs}/."
 msgstr ""
-"_* *{live-boot}*: Uma coleção de scripts usados para inicializar sistemas "
-"live. live-boot era formalmente parte do /{live-initramfs}/."
+"_* *{live-boot}*: Una coŀlecció de scripts per arrencar els sistemes vius. "
+"live-boot abans havia estat part de /{live-initramfs}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:34
@@ -172,9 +206,9 @@ msgid ""
 "Live systems. live-build was formerly known as /{live-helper}/, and even "
 "earlier known as /{live-package}/."
 msgstr ""
-"_* *{live-build}*: Uma coleção de scripts usados para construir sistemas "
-"Debian live customizados. live-build era formalmente conhecido como /{live-"
-"helper}/, e ainda antes conhecido como /{live-package}/."
+"_* *{live-build}*: Una coŀlecció de scripts utilitzats per construir "
+"sistemes personalitzats de Debian Live. live-build era anteriorment conegut "
+"com /{live-helper}/ i fins i tot abans conegut com /{live-package}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:36
@@ -183,9 +217,9 @@ msgid ""
 "during the boot process. live-config was formerly a part of /{live-"
 "initramfs}/."
 msgstr ""
-"_* *{live-config}*: Uma coleção de scripts usados para configurar um sistema "
-"live durante o processo de boot. live-config era formalmente parte do /{live-"
-"initramfs}/."
+"_* *{live-config}*: Una coŀlecció de scripts utilitzats per configurar un "
+"sistema en viu durant el procés d'arrencada. live-config abans va ser part "
+"de /{live-initramfs}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:38
@@ -193,8 +227,8 @@ msgid ""
 "_* *{live-manual}*: This document is maintained in a package called live-"
 "manual."
 msgstr ""
-"_* *{live-manual}*: Esse documento é mantido em um pacote chamado live-"
-"manual."
+"_* *{live-manual}*: Aquest document és mantingut en un paquet anomenat live-"
+"manual"
 
 #. type: Plain text
 #: en/about_manual.ssi:40
@@ -202,8 +236,8 @@ msgid ""
 "_* *{Debian Installer (d-i)}*: The official installation system for the "
 "Debian distribution."
 msgstr ""
-"_* *{Debian Installer (d-i)}*: O sistema oficial de instalação para a "
-"distribuição Debian."
+"_* *{Instaŀlador de Debian (d-i)}*: El sistema oficial d'instaŀlació de la "
+"distribució Debian."
 
 #. type: Plain text
 #: en/about_manual.ssi:42
@@ -211,8 +245,8 @@ msgid ""
 "_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
 "prompt to influence the kernel or live-config."
 msgstr ""
-"_* *{Boot parameters}*: Parametros que podem ser entrados no prompt do "
-"bootloader para influenciar o kernel ou o live-config."
+"_* *{Paràmeters d'arrencada}*: Els paràmetres que es poden introduir a "
+"l'indicador del carregador d'arrencada per influir en el nucli o live-config"
 
 #. type: Plain text
 #: en/about_manual.ssi:44
@@ -221,9 +255,9 @@ msgid ""
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
-"_* *{chroot}*: O programa /{chroot}/, #{chroot(8)}#, nos habilita a rodar "
-"simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único "
-"sistema sem reinicialização."
+"_* *{chroot}*: El programa /{chroot}/, #{chroot(8)}#, ens permet executar "
+"diferentes instàncies d'un entorn GNU/Linux a la vegada en un sol sistema "
+"sense reiniciar."
 
 #. type: Plain text
 #: en/about_manual.ssi:46
@@ -231,8 +265,8 @@ msgid ""
 "_* *{Binary image}*: A file containing the live system, such as binary.iso "
 "or binary.img."
 msgstr ""
-"_* *{Binary image}*: Um arquivo contendo o sistema live, como binary.iso ou "
-"binary.img."
+"_* *{Imatge binaria}*: Un fitxer que conté el sistema en viu, com ara binary."
+"iso o binary.img."
 
 #. type: Plain text
 #: en/about_manual.ssi:48
@@ -240,20 +274,11 @@ msgid ""
 "_* *{Target distribution}*: The distribution upon which your live system "
 "will be based. This can differ from the distribution of your host system."
 msgstr ""
-"_* *{Target distribution}*: A distribuição em que o sistema live será "
-"baseado. Isso pode diferir da distribuição do seu sistema host."
+"_* *{Distribució objectiu}*: La distribució en què es basa el sistema en "
+"viu. Que pot diferir de la distribució del sistema amfitrió."
 
 #. type: Plain text
 #: en/about_manual.ssi:50
-#, fuzzy
-#| msgid ""
-#| "The *{stable}* distribution contains the latest officially released "
-#| "distribution of Debian. The *{testing}* distribution is the staging area "
-#| "for the next *{stable}* release. A major advantage of using this "
-#| "distribution is that it has more recent versions of software relative to "
-#| "the *{stable}* release. The *{unstable}* distribution is where active "
-#| "development of Debian occurs. Generally, this distribution is run by "
-#| "developers and those who like to live on the edge."
 msgid ""
 "_* *{stable/testing/unstable}*: The *{stable}* distribution contains the "
 "latest officially released distribution of Debian. The *{testing}* "
@@ -265,23 +290,25 @@ msgid ""
 "manual, we tend to use codenames for the releases, such as wheezy or sid, as "
 "that is what is supported by the tools themselves."
 msgstr ""
-"A distribuição estável (*{stable}*) contem a última versão oficial lançada "
-"do Debian. A distribuição *{testing}* é a ária de estágio para a próxima "
-"versão estável(stable). A maior vantagem de usar essa distribuição é que ela "
-"tem versões mais recentes de software relacionado com a versão estável (*"
-"{stable}*). A distribuição instável (*{unstable}*) é onde ocorre o "
-"desenvolvimento ativo do Debian. Geralmente, essa distribuição é mantida por "
-"desenvolvedores e aqueles que vivem no limite."
+"_* *{stable/testing/unstable}*: La distribució *{stable}* conté l'última "
+"distribució de Debian llençada oficialment. La distribució *{testing}* és "
+"l'àrea d'assaig per a la pròxima versió *{stable}*. Un avantatge important "
+"de l'ús d'aquesta distribució és que té versions més recents del programari "
+"en relació amb l'edició *{stable}*. La distribució *{unstable}* és on es "
+"produeix el desenvolupament actiu de Debian. En general, aquesta distribució "
+"és utilitzada pels desenvolupadors i els que els agrada viure en risc. Al "
+"llarg del manual, es tendeix a utilitzar els seus noms en clau, com ara "
+"wheezy or sid, ja que és el que fan servir les pròpies eines."
 
 #. type: Plain text
 #: en/about_manual.ssi:52
 msgid "2~ Authors"
-msgstr "2~Autores"
+msgstr "2~ Autors"
 
 #. type: Plain text
 #: en/about_manual.ssi:54
 msgid "A list of authors (in alphabetical order):"
-msgstr "A lista de autores (em ordem alfabética)"
+msgstr "Llistat d'autors (en ordre alfabètic)"
 
 #. type: Plain text
 #: en/about_manual.ssi:56
@@ -346,7 +373,7 @@ msgstr "_* Trent W. Buck"
 #. type: Plain text
 #: en/about_manual.ssi:80
 msgid "2~how-to-contribute Contributing to this document"
-msgstr "2~how-to-contribute Contribuindo com esse documento"
+msgstr "2~how-to-contribute Contribuir en aquest document"
 
 #. type: Plain text
 #: en/about_manual.ssi:82
@@ -356,6 +383,10 @@ msgid ""
 "submit a contribution is to send it to the mailing list. Please see the "
 "section {Contact}#contact for more information."
 msgstr ""
+"Aquest manual està pensat com un projecte comunitari i totes les propostes "
+"per millorar-lo i les contribucions són molt benvingudes. La millor forma "
+"d'enviar una contribució és enviar-la a la llista de correu. Si us plau, "
+"consulteu la secció {Contacte}#contact per més informació."
 
 #. type: Plain text
 #: en/about_manual.ssi:84
@@ -365,10 +396,11 @@ msgid ""
 "contribution must be licensed under the same license as the rest of the "
 "document, namely, GPL version 3 or later."
 msgstr ""
-"Quando estiver submetendo uma contribuição, por favor identificar claramente "
-"o seu titular de direitos autorais e incluir a declaração de licenciamento. "
-"Note que para ser aceita, a contribuição deve ser licenciada obre as mesmas "
-"licenças do resto do documento, ou seja, GPL versão 3 ou superior."
+"Quan es presenta una contribució, si us plau, identificar clarament el "
+"titular dels drets d'autor i s'ha d'incloure la declaració de concessió de "
+"llicències. Recordar que per ser acceptada, la contribució ha de tenir una "
+"llicencia igual que la resta del document, a saber, la versió de la GPL 3 o "
+"superior."
 
 #. type: Plain text
 #: en/about_manual.ssi:86
@@ -376,8 +408,8 @@ msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can check out the latest copy by executing:"
 msgstr ""
-"Os fontes para esse manail são mantidos usando o sistema de controle de "
-"versão Git. Você pode fazer o checkout da ultima cópia executando:"
+"Les fonts d'aquest manual es mantenen utilitzant el sistema de control de "
+"versions Git. Es pot obtenir còpia actualitzada mitjançant l'execució de:"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -426,8 +458,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -501,8 +533,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -531,15 +563,15 @@ msgid ""
 "preview the live-manual, ensure the packages needed for building are "
 "installed by executing:"
 msgstr ""
-"Antes de submeter sua contribuição, por favor pré-visualize seu trabalho. "
-"Para pré-visualizar o live-manual, tenha certeza que os pacotes necessários "
-"para contruir estão instalados executando:"
+"Abans de presentar una contribució, si us plau, previsualitzar el treball. "
+"Per previsualitzar el live-manual, assegurar-se que s'han instaŀlat els "
+"paquets necessaris per a la seva construcció  mitjançant l'execució de:"
 
 #. type: Plain text
 #: en/about_manual.ssi:98
 #, no-wrap
 msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
-msgstr ""
+msgstr "# apt-get install make po4a sisu-complete libnokogiri-ruby\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:102
@@ -547,14 +579,14 @@ msgid ""
 "You may build the live-manual from the top level directory of your Git "
 "checkout by executing:"
 msgstr ""
-"Você também pode construir o live-manual a partir do primeiro nível do "
-"diretório do seu Git checkout executando:"
+"Es pot crear el live-manual des del directori de nivell superior del arbre "
+"Git mitjançant l'execució de:"
 
 #. type: Plain text
 #: en/about_manual.ssi:106
 #, no-wrap
 msgid " $ make build\n"
-msgstr ""
+msgstr " $ make build\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:110
@@ -563,41 +595,42 @@ msgid ""
 "may find it convenient when proofing to build for only one language, e.g. by "
 "executing:"
 msgstr ""
+"Com es necessita un cert temps per construir el manual en tots els idiomes "
+"suportats, potser resulti convenient quan es fa una prova construir per a un "
+"sol idioma, per exemple, mitjançant l'execució de:"
 
 #. type: Plain text
 #: en/about_manual.ssi:114
 #, no-wrap
 msgid " $ make build LANGUAGES=en\n"
-msgstr ""
+msgstr "$ make build LANGUAGES=en\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:118
 msgid "It is also possible to build by document type, e.g:"
-msgstr ""
+msgstr "També es possible crear per tipus de document, per exemple: "
 
 #. type: Plain text
 #: en/about_manual.ssi:122
 #, no-wrap
 msgid " $ make build FORMATS=pdf\n"
-msgstr ""
+msgstr " $ make build FORMATS=pdf\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:126
 msgid "Or combine both, e.g:"
-msgstr ""
+msgstr "O combinar tot dos, per exemple:"
 
 #. type: Plain text
 #: en/about_manual.ssi:130
 #, no-wrap
-msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgid " $ make build LANGUAGES=it FORMATS=html\n"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:134
-#, fuzzy
-#| msgid "3~ Applying patches"
 msgid "3~ Applying changes"
-msgstr "3~ Aplicando patches"
+msgstr "3~ Aplicar canvis"
 
 #. type: Plain text
 #: en/about_manual.ssi:136
@@ -606,15 +639,15 @@ msgid ""
 "bigger changes to the mailing list to discuss them first. To push to the "
 "repository, you must follow this procedure:"
 msgstr ""
-"Diretamente cometer ao repoitório é possivel por qualquer um. No entanto, "
-"nós pedimo que você mande maiores mudanças para a lista de e-mail para "
-"discuti-las primeiro. Para enviar ao repositório, os seguintes passos são "
-"necessários:"
+"Qualsevol persona pot fer un commit directament al repositori. No obstant "
+"això, demanem que s'enviïn els canvis grans a la llista de correu per parlar-"
+"ne en primer lloc. Per fer un push al repositori, s'ha de seguir el següent "
+"procediment:"
 
 #. type: Plain text
 #: en/about_manual.ssi:138
 msgid "_* Fetch the public commit key:"
-msgstr "_* Obter a chave publica de commit:"
+msgstr "_* Obtenir la clau pública:"
 
 #. type: Plain text
 #: en/about_manual.ssi:147
@@ -627,11 +660,18 @@ msgid ""
 "     -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
 " $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
 msgstr ""
+" $ mkdir -p ~/.ssh/identity.d\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
+"     -O ~/.ssh/identity.d/git at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
+"     -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:151
 msgid "_* Add the following section to your openssh-client config:"
-msgstr "_* Adicione a seguinte sessão na configuração do seu openssh-client:"
+msgstr ""
+"_* Afegiu la següent secció a la configuració del vostre openssh-client:"
 
 #. type: Plain text
 #: en/about_manual.ssi:160
@@ -644,11 +684,17 @@ msgid ""
 "     IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
 " EOF\n"
 msgstr ""
+" $ cat >> ~/.ssh/config << EOF\n"
+" Host live.debian.net\n"
+"     Hostname live.debian.net\n"
+"     User git\n"
+"     IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
+" EOF\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:164
 msgid "_* Check out a clone of the manual through ssh:"
-msgstr "_* Fazer o checkout de um clone do manual por ssh:"
+msgstr "_* Fer una ullada a una còpia del manual a través de ssh:"
 
 #. type: Plain text
 #: en/about_manual.ssi:169
@@ -657,7 +703,7 @@ msgid ""
 " $ git clone git at live.debian.net:/live-manual.git\n"
 " $ cd live-manual && git checkout debian-next\n"
 msgstr ""
-" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git clone git at live.debian.net:/live-manual.git\n"
 " $ cd live-manual && git checkout debian-next\n"
 
 #. type: Plain text
@@ -666,6 +712,8 @@ msgid ""
 "_* Note that you should commit any changes on the debian-next branch, not on "
 "the debian branch."
 msgstr ""
+"_* Tenir en compte que s'han d'enviar els canvis a la branca debian-next, no "
+"a la branca debian."
 
 #. type: Plain text
 #: en/about_manual.ssi:175
@@ -675,81 +723,99 @@ msgid ""
 "translations in the same commit, but use separate commits for each. See the "
 "{Translation}#translation section for more details."
 msgstr ""
+"_* No fer un #{make commit}# a menys que s'actualitzen les traduccions al "
+"mateix temps, i en aquest cas, no barrejar els canvis al manual en anglès i "
+"les traduccions en el mateix commit, fer-ne un altre separat per cada un. "
+"Veure la secció {Traducció}#translation per a més detalls."
 
 #. type: Plain text
 #: en/about_manual.ssi:177
-#, fuzzy
-#| msgid ""
-#| "_* Write commit messages that consist of full, useful sentences in "
-#| "English, starting with a capital letter and ending with a full stop. "
-#| "Usually, these will start with the form 'Fixing/Adding/Removing/"
-#| "Correcting/Translating', e.g."
 msgid ""
 "_* Write commit messages that consist of complete, meaningful sentences in "
 "English, starting with a capital letter and ending with a full stop. "
 "Usually, these will start with the form 'Fixing/Adding/Removing/Correcting/"
 "Translating', e.g."
 msgstr ""
-"_* Escreva mensagens de submissão, que consistem em sentanças completas "
-"úteis, começando por letra maiuscula e acabando com uma parada total. "
-"Normalmente iniciando com as formas 'Fixing/Adding/Removing/Correcting/"
-"Translating'."
+"_* Escriure missatges de commit que consisteixen en oracions completes i "
+"significatives en anglès, començant amb una lletra majúscula i acabant amb "
+"un punt. En general, aquestes començaran amb la forma 'Fixing/Adding/"
+"Removing/Correcting/Translating', per exemple:"
 
 #. type: Plain text
 #: en/about_manual.ssi:181
 #, no-wrap
 msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
-msgstr ""
+msgstr " $ git commit -a -m \"Adding a section on applying patches.\"\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:185
 msgid "_* Push the commit to the server:"
-msgstr "_* Enviar as submissões para os servidor."
+msgstr "_* Fer un push al servidor:"
 
 #. type: Plain text
 #: en/about_manual.ssi:189
 #, no-wrap
 msgid " $ git push\n"
-msgstr ""
+msgstr " $ git push\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:193
 msgid "3~translation Translation"
-msgstr ""
+msgstr "3~translation Traducció"
 
 #. type: Plain text
 #: en/about_manual.ssi:195
-msgid "To submit a translation for a new language, follow these three steps:"
-msgstr ""
+msgid "To start a translation for a new language, follow these steps:"
+msgstr "Per començar la traducció d'un idioma nou, seguir aquests passos:"
 
 #. type: Plain text
 #: en/about_manual.ssi:197
 msgid ""
-"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as /"
-"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
-"your submission, we will add the new language to the manual (providing the "
-"po files) and will enable it in the autobuild."
+"_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and *"
+"{index.html.in.pot}* files to your language with your favourite editor (such "
+"as /{poedit}/). Send the translated #{.po}# files to the mailing list so "
+"that the translation team can check their integrity."
 msgstr ""
+"_* Traduir els fitxers *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* i "
+"*{index.html.in.pot}* a la vostra llengua amb el vostre editor favorit (per "
+"exemple /{poedit}/). Enviar els fitxers #{.po}# traduïts a la llista de "
+"correu perquè l'equip de traducció pugui comprovar la seva integritat."
 
 #. type: Plain text
 #: en/about_manual.ssi:199
 msgid ""
-"_* Once the new language is added, you can randomly start translating all po "
-"files in #{manual/po/}#."
+"_* To enable a new language in the autobuild it is enough to add the initial "
+"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
+"then edit #{manual/_sisu/home/index.html}#."
 msgstr ""
+"_* Per activar una nova llengua al autobuild, només cal afegir els arxius "
+"inicials traduïts a #{manual/po/${LANGUAGE}/}# i executar #{make commit}#. I "
+"llavors editar #{manual/_sisu/home/index.html}#."
 
 #. type: Plain text
 #: en/about_manual.ssi:201
 msgid ""
+"_* Once the new language is added, you can randomly continue translating the "
+"remaining po files in #{manual/po/}#."
+msgstr ""
+"_* Una vegada que s'ha afegit la nova llengua, es pot continuar traduint la "
+"resta de fitxers dins de #{manual/po/}# a l'atzar."
+
+#. type: Plain text
+#: en/about_manual.ssi:203
+msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
 "are updated from the po files and then you can review your changes launching "
 "#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
 "and #{git push}#."
 msgstr ""
+"_* No oblidar que es necessari fer #{make commit}# per garantir que els "
+"manuals traduïts s'actualitzen a partir del fitxers po i llavors es poden "
+"revisar els canvis executant #{make build}# abans de #{git add .}#, #{git "
+"commit -a -m \"Translating...\"}# i #{git push}#."
 
 #. type: Plain text
-#: en/about_manual.ssi:202
+#: en/about_manual.ssi:204
 #, no-wrap
-msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
-msgstr ""
+msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgstr "*{Nota:}* Es pot utilitzar #{make clean}# per netejar l'arbre git abans de fer un push.  Aquest  pas no és obligatori, gràcies al fitxer .gitignore, però és una bona pràctica per evitar enviar fitxers de forma involuntària.\n"
diff --git a/manual/po/ro/about_project.ssi.po b/manual/po/ca/about_project.ssi.po
similarity index 58%
copy from manual/po/ro/about_project.ssi.po
copy to manual/po/ca/about_project.ssi.po
index 1687674..6f4f30f 100644
--- a/manual/po/ro/about_project.ssi.po
+++ b/manual/po/ca/about_project.ssi.po
@@ -1,40 +1,38 @@
-# Romanian translations for live-manual package
-# 2010 Eugen Paiuc <linux51 at bluewin.ch>
+# Catalan translations for live-manual
 # This file is distributed under the same license as the live-manual package.
-# Creatura85 <creatura85 at opensuse.org>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual\n"
+"Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-05-25 14:30+0300\n"
-"PO-Revision-Date: 2011-12-03 16:06+0100\n"
-"Last-Translator: Creatura85 <creatura85 at opensuse.org>\n"
+"PO-Revision-Date: 2012-06-16 19:52+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
-"Language: ro\n"
+"Language: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_project.ssi:2
 msgid ":B~ About the Debian Live Project"
-msgstr ":B~ Despre Proiectul Debian Live"
+msgstr ":B~ Sobre el Projecte Debian Live"
 
 #. type: Plain text
 #: en/about_project.ssi:4
 msgid "1~about-project About the Debian Live Project"
-msgstr "1~about-project Despre Proiectul Debian Live"
+msgstr "1~about-project Sobre el Projecte Debian Live"
 
 #. type: Plain text
 #: en/about_project.ssi:6
 msgid "2~ Motivation"
-msgstr "2~ Motivatie"
+msgstr "2~ Motivació"
 
 #. type: Plain text
 #: en/about_project.ssi:8
 msgid "3~ What is wrong with current live systems"
-msgstr "3~ Ce nu e bine cu sistemele live actuale"
+msgstr "3~ Què passa amb els sistemes vius actuals"
 
 #. type: Plain text
 #: en/about_project.ssi:10
@@ -43,9 +41,9 @@ msgid ""
 "systems available and they are doing a great job. From the Debian "
 "perspective most of them have one or more of the following disadvantages:"
 msgstr ""
-"La momentul de inceput al proiectului Debian Live existau deja cateva "
-"sisteme Debian live si ele au depus o munca interesanta. Din perspectiva "
-"Debian marea majoritate a acestor sisteme au urmatoarele dezavantaje:"
+"Quan Debian Live va començar, ja hi havia diversos sistemes vius basats en "
+"Debian disponibles i que estaven fent una gran feina. Des de la perspectiva "
+"de Debian la majoria d'ells tenien una o més de les desavantatges següents:"
 
 #. type: Plain text
 #: en/about_project.ssi:12
@@ -53,19 +51,19 @@ msgid ""
 "_* They are not Debian projects and therefore lack support from within "
 "Debian."
 msgstr ""
-"_* Ele nu sunt proiecte Debian si drept urmare nu au suport din partea "
-"Comunitatii Debian"
+"_* No són projectes de Debian i per tant no tenen suport des de Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:14
 msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
 msgstr ""
-"_* Ele amalgameaza diferite distributii, ca *{testing}* si *{unstable}*."
+"_* Es barregen diferents distribucions, per exemple *{testing}* i *{unstable}"
+"*."
 
 #. type: Plain text
 #: en/about_project.ssi:16
 msgid "_* They support i386 only."
-msgstr "_* Ele suporta doar arhitectura i386."
+msgstr "_* Només donen suport a i386."
 
 #. type: Plain text
 #: en/about_project.ssi:18
@@ -73,13 +71,13 @@ msgid ""
 "_* They modify the behaviour and/or appearance of packages by stripping them "
 "down to save space."
 msgstr ""
-"_* Ele au modificat comportamentul si /sau aspectul programelor pentru a "
-"castuga spatiu."
+"_* Es modifique el comportament i/o l'aparença dels paquets, per estalviar "
+"espai."
 
 #. type: Plain text
 #: en/about_project.ssi:20
 msgid "_* They include packages from outside of the Debian archive."
-msgstr "_*  Acestea includ pachete din afara arhivelor Debian"
+msgstr "_* S'inclouen paquets de fora de l'arxiu de Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:22
@@ -87,7 +85,7 @@ msgid ""
 "_* They ship custom kernels with additional patches that are not part of "
 "Debian."
 msgstr ""
-"_* Ele folosesc kernele modificate care contin patch-uri ce nu fac parte din "
+"_* Inclouen nuclis personalitzats amb pedaços addicionals que no són part de "
 "Debian."
 
 #. type: Plain text
@@ -96,8 +94,8 @@ msgid ""
 "_* They are large and slow due to their sheer size and thus not suitable for "
 "rescue issues."
 msgstr ""
-"_* Ele sunt greoaie si lente datorete marimii lor si deci inapropiate pentru "
-"situatii de salvare/rescue."
+"_* Són grans i lents pel seu gran tamany i per tant no aptes com a sistemes "
+"de rescat."
 
 #. type: Plain text
 #: en/about_project.ssi:26
@@ -105,13 +103,13 @@ msgid ""
 "_* They are not available in different flavours, e.g. CDs, DVDs, USB-stick "
 "and netboot images."
 msgstr ""
-"_* Ele nu sunt disponibile in diferite sosuri ca CDs, DVDs, USB-stick si "
-"netboot images."
+"_* No estan disponibles en diferents formats, per exemple, CD, DVD, memòries "
+"USB i imatges netboot."
 
 #. type: Plain text
 #: en/about_project.ssi:28
 msgid "3~ Why create our own live system?"
-msgstr "3~ De ce e nevoie de propriul nostru sistem live ?"
+msgstr "3~ Per què crear el nostre pròpi sistema viu?"
 
 #. type: Plain text
 #: en/about_project.ssi:30
@@ -120,51 +118,50 @@ msgid ""
 "around and to accurately represent the Debian system with the following main "
 "advantages:"
 msgstr ""
-"Debian se considera Sistemul de Operare Universal: Are un mecanism live "
-"pentru a se promova in jur si de a prezenta cu acuratete sistemul de operare "
-"ce are urmatoarele mari avantaje:"
+"Debian és el sistema operatiu universal: Debian té un sistema viu per "
+"mostrar arreu i per representar acuradament el sistema Debian amb els "
+"següents avantatges:"
 
 #. type: Plain text
 #: en/about_project.ssi:32
-#, fuzzy
-#| msgid "_* It would be a subproject of Debian."
 msgid "_* It is a subproject of Debian."
-msgstr "_* Acesta va fi un subproiect Debian."
+msgstr "_* Es tracta d'un subprojecte de Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:34
 msgid "_* It reflects the (current) state of one distribution."
-msgstr "_* El reflecta starea (actuala) a distributiei."
+msgstr "_* Reflecteix l'estat (actual) d'una distribució."
 
 #. type: Plain text
 #: en/about_project.ssi:36
 msgid "_* It runs on as many architectures as possible."
-msgstr "_* Se poate utiliza pe maximum de arhitecturi posibile."
+msgstr "_* Funciona en tantes arquitectures com és possible."
 
 #. type: Plain text
 #: en/about_project.ssi:38
 msgid "_* It consists of unchanged Debian packages only."
-msgstr "_* Contine doar programe Debian."
+msgstr "_* Es tracta només de paquets Debian sense modificacions."
 
 #. type: Plain text
 #: en/about_project.ssi:40
 msgid "_* It does not contain any packages that are not in the Debian archive."
-msgstr "_* Nu contine nici un pachet care nu este din afara arhivelor Debian."
+msgstr "_* No conté paquets que no són a l'arxiu de Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:42
 msgid "_* It uses an unaltered Debian kernel with no additional patches."
-msgstr "_* Foloseste un kernel Debian nealterat, fara patch-uri aditionale."
+msgstr ""
+"_* S'utilitza un nucli Debian sense alteracions i sense pedaços addicionals."
 
 #. type: Plain text
 #: en/about_project.ssi:44
 msgid "2~ Philosophy"
-msgstr "2~ Filozofia"
+msgstr "2~ Filosofia"
 
 #. type: Plain text
 #: en/about_project.ssi:46
 msgid "3~ Only unchanged packages from Debian \"main\""
-msgstr "3~ Numai pachete neschimbate din Debian \"main\""
+msgstr "3~ Només paquets Debian sense modificacions de la secció \"main\" "
 
 #. type: Plain text
 #: en/about_project.ssi:48
@@ -173,9 +170,9 @@ msgid ""
 "section. The non-free section is not part of Debian and therefore cannot be "
 "used for official live system images."
 msgstr ""
-"Se vor folosi numai pachete din depozitul Debian sectiunea \"main\". "
-"Sectiunea non-free nu este parte a Debian drept urmare nu poate fi folosita "
-"nici un fel la construirea imaginilor live cu Debian."
+"Només farem servir els paquets des del repositori de Debian de la secció "
+"\"main\". La secció non-free no és part de Debian i per tant no es pot "
+"utilitzar per les imatges oficials del sistema viu."
 
 #. type: Plain text
 #: en/about_project.ssi:50
@@ -183,9 +180,8 @@ msgid ""
 "We will not change any packages. Whenever we need to change something, we "
 "will do that in coordination with its package maintainer in Debian."
 msgstr ""
-"Nu vor fi facute nici o schimbare in programe. Daca este nevoie de acest "
-"lucru, schimbarile vor fi facute in coordonare cu responsabilul de program "
-"din Debian."
+"No canviarem cap paquet. Cada vegada que hàgim de canviar alguna cosa, ho "
+"farem en coordinació amb el mantenidor del paquet a Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:52
@@ -195,15 +191,15 @@ msgid ""
 "reasons (e.g. to create development snapshots). They will be uploaded to "
 "Debian on a regular basis."
 msgstr ""
-"Ca o exceptie, programele specifice ca live-boot, live-build sau live-config "
-"pot fi folosite temporar din depozitele proprii live, pentru nevoi de "
-"dezvoltare. (de exemplu pentru creerea de development snapshots). Acestea "
-"vor fi upload-ate in Debian la date cuvenite."
+"Com a excepció, els nostres propis paquets, com ara live-boot, live-build o "
+"live-config poden ser utilitzats temporalment des del nostre propi "
+"repositori per raons de desenvolupament (per exemple, per crear instantànies "
+"de desenvolupament). Aquests paquets es pujaran a Debian de forma regular. "
 
 #. type: Plain text
 #: en/about_project.ssi:54
 msgid "3~ No package configuration of the live system"
-msgstr "3~ Nu vor fi programe de configurare pentru sistemul live."
+msgstr "3~ Paquets del sistema viu sense cap configuració"
 
 #. type: Plain text
 #: en/about_project.ssi:56
@@ -212,9 +208,9 @@ msgid ""
 "configurations. All packages are used in their default configuration as they "
 "are after a regular installation of Debian."
 msgstr ""
-"In aceasta faza nu vor fi propuse sau instalate example sau configuratii "
-"alternative. Toate programele sunt folosite cu configuratia default 'de "
-"baza', la fel ca in instalatia normaladin Debian."
+"En aquesta fase no es publicarà o s'instal.larà cap configuració alternativa "
+"o d'exemple. Tots els paquets són utilitzats en la seva configuració per "
+"defecte, tal com són després d'una instaŀlació normal de Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:58
@@ -222,8 +218,8 @@ msgid ""
 "Whenever we need a different default configuration, we will do that in "
 "coordination with its package maintainer in Debian."
 msgstr ""
-"In caz de nevoie a unei configuratii diferite, aceasta schimbare va fii "
-"facuta in coordonare cu responsabilui de program din Debian."
+"Cada vegada que ens calgui una configuració per defecte diferent, ho farem "
+"en coordinació amb el mantenidor del paquet Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:60
@@ -234,11 +230,11 @@ msgid ""
 "used. For more information, please see {Customization overview}"
 "#customization-overview."
 msgstr ""
-"Cu toate acestea un sistem de configurare a programelor este permisa "
-"folosind debconf, ce permite o particularizare a configurari programelor in "
-"sistemul live facur de dvs., insa imaginile oficiale live doar configurari "
-"de baza vot fi folosite. Pentru mai multe informatii, urmariti "
-"{Customization overview}#customization-overview."
+"S'hi inclou un sistema per configurar paquets mitjançant debconf que permet "
+"instal.lar paquets configurats de forma personalitzada dins d'una imatge "
+"Debian Live personalitzada, però per a les imatges en viu oficials només "
+"utilitzarem una configuració per defecte. Per obtenir més informació, veure "
+"{Visió de conjunt de la personalització}#customization-overview."
 
 #. type: Plain text
 #: en/about_project.ssi:62
@@ -247,14 +243,14 @@ msgid ""
 "to life. These essential changes have to be kept as minimal as possible and "
 "should be merged within the Debian repository if possible."
 msgstr ""
-"Exceptie: Sunt desigur necesare cateva necesare sa aducem 'la viata' un "
-"sistem live. Dar aceste schimbari esentiale trebuie minimizate la maximum si "
-"pastrate in concordanta cu depozitul Debian."
+"Excepció: Hi ha uns pocs canvis essencials necessaris per aconseguir que un "
+"sistema funcioni en viu. Aquests canvis essencials han de ser el més mínims "
+"possible i s'han de fusionar en el repositori de Debian si és possible."
 
 #. type: Plain text
 #: en/about_project.ssi:64
 msgid "2~contact Contact"
-msgstr "2~contact Contact"
+msgstr "2~contact Contacte"
 
 #. type: Plain text
 #: en/about_project.ssi:66
@@ -264,10 +260,10 @@ msgid ""
 "addressing your mail to debian-live at lists.debian.org. The list archives are "
 "available at http://lists.debian.org/debian-live/."
 msgstr ""
-"_* *{Mailing list}*: Principalul mod de contact din proiect este mailing "
-"list la http://lists.debian.org/debian-live/.Va pute-ti adresa in direct "
-"prin mail la debian-live at lists.debian.org. Arhiva listei o gasi-ti la http://"
-"lists.debian.org/debian-live/."
+"_* *{Llista de correu}*: El contacte principal del projecte és la llista de "
+"correu a http://lists.debian.org/debian-live/. Es pot enviar un correu "
+"directament a debian-live at lists.debian.org. Els arxius de la llista són a "
+"http://lists.debian.org/debian-live/."
 
 #. type: Plain text
 #: en/about_project.ssi:68
@@ -277,10 +273,10 @@ msgid ""
 "patient for an answer. If no answer is forthcoming, please email the mailing "
 "list."
 msgstr ""
-"_* *{IRC}*: Un numar de utilizatori si dezvoltatori sunt prezenti in canalul "
-"#debian-live pe n irc.debian.org (OFTC). Daca aveti o intrebare pentru IRC , "
-"fiti cu multa rabdare in asteptarea raspunsului. In caz de lipsa a unui "
-"raspuns , folositi mailing list."
+"_* *{IRC}*: Un nombre d'usuaris i desenvolupadors estan presents al canal "
+"#debian-live a irc.debian.org (OFTC). Quan es pregunta al IRC, s'ha de tenir "
+"paciència esperant una resposta, si no hi ha cap resposta, es pot enviar un "
+"correu a la llista."
 
 #. type: Plain text
 #: en/about_project.ssi:69
@@ -290,7 +286,8 @@ msgid ""
 "given a number, and is kept on file until it is marked as having been dealt "
 "with. For more information, please see {Reporting bugs}#bugs."
 msgstr ""
-"_* *{BTS}*: BTS adica {Debian Bug Tracking System}http://www.debian.org/"
-"Bugs/ contine detalii asupra rapoartelor de bug facute de utilizatorisau "
-"dezvoltatori. Fiecare bug are un numar, si este mentinut deschis pana la "
-"rezolvare. Alte informatii gasiti la {Reporting bugs}#bugs."
+"_* *{BTS}*:  El{Sistema de seguiment d'errors de Debian}http://www.debian."
+"org/Bugs/ (BTS) conté detalls d'errors notificats per usuaris i "
+"desenvolupadors. A cada error se li assigna un número i es manté a l'arxiu "
+"fins que es marca com tractat. Per obtenir més informació, vegeu {Informar "
+"d'errors}#bugs."
diff --git a/manual/po/pt_BR/index.html.in.po b/manual/po/ca/index.html.in.po
similarity index 67%
copy from manual/po/pt_BR/index.html.in.po
copy to manual/po/ca/index.html.in.po
index d324345..f629877 100644
--- a/manual/po/pt_BR/index.html.in.po
+++ b/manual/po/ca/index.html.in.po
@@ -1,31 +1,28 @@
-# Brazilian Portuguese translations for live-manual package
-# 2010 Bruno Gurgel <bruno.gurgel at gmail.com>
+# Catalan translations for live-manual
 # This file is distributed under the same license as the live-manual package.
-# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
+# Carlos Zuferri "chals" <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-02 18:16+0300\n"
-"PO-Revision-Date: 2011-12-26 19:10+0100\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"PO-Revision-Date: 2012-06-16 19:24+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
-"Language: \n"
+"Language: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <html><head><title>
 #: en/index.html.in:4
 msgid "Debian Live Project"
-msgstr "Projeto Debian Live"
+msgstr "Projecte Debian Live"
 
 #. type: Content of: <html><body><h2>
 #: en/index.html.in:9
 msgid "Debian Live Manual"
-msgstr "Manual do Debian Live"
+msgstr "Manual de Debian Live"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:12
@@ -34,6 +31,9 @@ msgid ""
 "translated into several languages. Keep in mind that some translations may "
 "be incomplete or may not be up to date."
 msgstr ""
+"<i>live-manual</i> està disponible en diferents formats de fitxer i està "
+"traduït a diversos idiomes. Tenir en compte que algunes de les traduccions "
+"poden estar incompletes o no estar al dia."
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:17
@@ -43,20 +43,20 @@ msgid ""
 "org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
 "\">how to contribute</a> to the manual."
 msgstr ""
-"Por favor reporte erros, omissões, patches e sugestões para nossa lista de "
-"discussão em <a href=\"mailto:debian-live at lists.debian.org\">debian-"
-"live at lists.debian.org</a> e leia sobre <a href=\"html/live-manual.pt_BR."
-"html#how-to-contribute\">como contribuir</a> com o manual."
+"Si us plau, informeu dels errors, omissions, pedaços i suggeriments a la "
+"llista de correu <a href=\"mailto:debian-live at lists.debian.org\">debian-"
+"live at lists.debian.org</a> i llegiu sobre com contribuir al manual <a href="
+"\"html/live-manual.ca.html#how-to-contribute\">com contribuir</a>"
 
 #. type: Content of: <html><body><h3>
 #: en/index.html.in:20
 msgid "Available Formats"
-msgstr "Formatos Disponíveis"
+msgstr "Formats disponibles"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:23
 msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
-msgstr "<a href=\"epub/live-manual.pt_BR.epub\">EPUB</a>"
+msgstr "<a href=\"epub/live-manual.ca.epub\">EPUB</a>"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:24
@@ -64,13 +64,13 @@ msgid ""
 "HTML: <a href=\"html/live-manual/toc.en.html\">multi page</a>, <a href="
 "\"html/live-manual.en.html\">single page</a>"
 msgstr ""
-"HTML: <a href=\"html/live-manual/toc.pt_BR.html\">Páginas multiplas</a>, <a "
-"href=\"html/live-manual.pt_BR.html\">Página única</a>"
+"HTML: <a href=\"html/live-manual/toc.ca.html\">varies pàgines</a>, <a href="
+"\"html/live-manual.ca.html\">una sola pàgina</a>"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:25
 msgid "<a href=\"odt/live-manual.en.odt\">ODF</a>"
-msgstr "<a href=\"odt/live-manual.pt_BR.odt\">ODF</a>"
+msgstr "<a href=\"odt/live-manual.ca.odt\">ODF</a>"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:26
@@ -80,30 +80,30 @@ msgid ""
 "\">letter portrait</a>, <a href=\"pdf/landscape.en.letter.pdf\">letter "
 "landscape</a>"
 msgstr ""
-"PDF: <a href=\"pdf/portrait.pt_BR.a4.pdf\">A4 retrato</a>, <a href=\"pdf/"
-"landscape.pt_BR.a4.pdf\">A4 paisagem</a>, <a href=\"pdf/portrait.pt_BR."
-"letter.pdf\">US retrato</a>, <a href=\"pdf/landscape.pt_BR.letter.pdf\">US "
-"paisagem</a>"
+"PDF: <a href=\"pdf/portrait.ca.a4.pdf\">retrat A4</a>, <a href=\"pdf/"
+"landscape.ca.a4.pdf\">A4 paisatge</a>, <a href=\"pdf/portrait.ca.letter.pdf"
+"\">carta retrat</a>, <a href=\"pdf/landscape.ca.letter.pdf\">carta paisatge</"
+"a>"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:27
 msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
-msgstr "<a href=\"txt/live-manual.pt_BR.txt\">Texto plano</a>"
+msgstr "<a href=\"txt/live-manual.ca.txt\">Text sense format</a>"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:31
 msgid "Last changed: @DATE_CHANGE@"
-msgstr "Última modificação: @DATE_CHANGE@"
+msgstr "Darrera modificació: @DATE_CHANGE@"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:32
 msgid "Last built: @DATE_BUILD@"
-msgstr "Última contrução: @DATE_BUILD@"
+msgstr "Darrera generació: @DATE_BUILD@"
 
 #. type: Content of: <html><body><h3>
 #: en/index.html.in:35
 msgid "Source"
-msgstr "Fonte"
+msgstr "Codi font"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:38
@@ -111,8 +111,8 @@ msgid ""
 "The sources for this manual are available in a <a href=\"http://git.or.cz/"
 "\">Git</a> repository at live.debian.net."
 msgstr ""
-"O fonte desse manual está diponível em um repositório <a href=\"http://git."
-"or.cz/\">Git</a> em live.debian.net."
+"Les fonts d'aquest manual estan disponibles en un repositori <a href="
+"\"http://git.or.cz/\">Git</a> a live.debian.net."
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:42
@@ -121,7 +121,7 @@ msgid ""
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
 "a>"
 msgstr ""
-"Navegue: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
+"Navegar:  <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
 "a>"
 
@@ -143,4 +143,4 @@ msgid ""
 msgstr ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
-"href=\"http://live.debian.net/legal.html\">Aviso legal</a>"
+"href=\"http://live.debian.net/legal.html\">Avís legal</a>"
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/ca/live-manual.ssm.po
similarity index 71%
copy from manual/po/de/live-manual.ssm.po
copy to manual/po/ca/live-manual.ssm.po
index 65bd4be..60e91fd 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/ca/live-manual.ssm.po
@@ -1,15 +1,15 @@
-# German translations for live-manual package
+# Catalan translations for live-manual
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-04 12:21+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
+"POT-Creation-Date: 2012-06-27 14:57+0300\n"
+"PO-Revision-Date: 2012-06-18 23:18+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: debian-live at lists.debian.org\n"
+"Language: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,17 +18,17 @@ msgstr ""
 #. type: Plain text
 #: en/live-manual.ssm:2
 msgid "% SiSU 2.0"
-msgstr ""
+msgstr "% SiSU 2.0"
 
 #. type: Plain text
 #: en/live-manual.ssm:4
 msgid "@title: Debian Live Manual"
-msgstr "@title: Debian Live Handbuch"
+msgstr "@title: Manual Debian Live"
 
 #. type: Plain text
 #: en/live-manual.ssm:6
 msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
-msgstr "@creator: Debian Live Projekt <debian-live at lists.debian.org>"
+msgstr "@creator: Projecte Debian Live <debian-live at lists.debian.org>"
 
 #. type: Plain text
 #: en/live-manual.ssm:10
@@ -39,23 +39,22 @@ msgid ""
 " :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
 msgstr ""
 "@rights:\n"
-" :copyright: Copyright (C) 2006-2012 Debian Live Projekt\n"
-" :license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
+" :license: Aquest programa és un programari lliure: es pot redistribuir i/o modificar sota els termes de la Llicència Pública General de la GNU com és publicada per la Free Software Foundation, ja sigui la versió 3 de la Llicència, o (si ho preferiu) qualsevol versió posterior.<br><br>Aquest programa es distribueix amb l'esperança que sigui útil, però sense cap garantia, fins i tot sense la garantia implícita de COMERCIALITZACIÓ o ADEQUACIÓ PER A PROPÒSITS DETERMINATS. Vegeu la Llicència General Pública de la GNU per a més detalls.<br><br>Haurieu de rebre una còpia de la Llicència Pública General de la GNU amb aquest programa. Si no és així, consulteu http://www.gnu.org/licenses/. <br><br>El text complet de la Llicència Pública General de la GNU es pot trobar a /usr/share/common-licenses/GPL-3.\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:13
-#, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-06-04\n"
+" :published: 2012-06-27\n"
 msgstr ""
 "@date:\n"
-" :published: 04.06.2012\n"
+" :published: 2012-06-16"
 
 #. type: Plain text
 #: en/live-manual.ssm:15
 msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
-msgstr "@publisher: Debian Live Projekt <debian-live at lists.debian.org>"
+msgstr "@publisher: Projecte Debian Live <debian-live at lists.debian.org>"
 
 #. type: Plain text
 #: en/live-manual.ssm:21
@@ -67,6 +66,11 @@ msgid ""
 " :num_top: 1\n"
 " :skin: skin_debian-live\n"
 msgstr ""
+"@make:\n"
+" :bold: /squeeze|wheezy|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :num_top: 1\n"
+" :skin: skin_debian-live"
 
 #. type: Plain text
 #: en/live-manual.ssm:23
@@ -76,7 +80,7 @@ msgstr ":A~ @title"
 #. type: Plain text
 #: en/live-manual.ssm:25
 msgid ":B~ About"
-msgstr ":B~ Über Debian Live"
+msgstr ":B~ Sobre aquest manual"
 
 #. type: Plain text
 #: en/live-manual.ssm:27
@@ -91,7 +95,7 @@ msgstr "<< about_project.ssi"
 #. type: Plain text
 #: en/live-manual.ssm:31
 msgid ":B~ User"
-msgstr ":B~ Benutzer"
+msgstr ":B~ Usuari"
 
 #. type: Plain text
 #: en/live-manual.ssm:33
@@ -146,7 +150,7 @@ msgstr "<< user_customization-installer.ssi"
 #. type: Plain text
 #: en/live-manual.ssm:53
 msgid ":B~ Project"
-msgstr ":B~ Projekt"
+msgstr ":B~ Projecte"
 
 #. type: Plain text
 #: en/live-manual.ssm:55
@@ -166,7 +170,7 @@ msgstr "<< project_procedures.ssi"
 #. type: Plain text
 #: en/live-manual.ssm:61 en/user_examples.ssi:2
 msgid ":B~ Examples"
-msgstr ":B~ Beispiele"
+msgstr ":B~ Exemples"
 
 #. type: Plain text
 #: en/live-manual.ssm:63
@@ -176,7 +180,7 @@ msgstr "<< user_examples.ssi"
 #. type: Plain text
 #: en/live-manual.ssm:65 en/style_guide.ssi:2
 msgid ":B~ Appendix"
-msgstr ":B~ Anhang"
+msgstr ":B~ Apèndix"
 
 #. type: Plain text
 #: en/live-manual.ssm:66
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/ca/project_bugs.ssi.po
similarity index 98%
copy from manual/po/de/project_bugs.ssi.po
copy to manual/po/ca/project_bugs.ssi.po
index 593b7da..a843383 100644
--- a/manual/po/de/project_bugs.ssi.po
+++ b/manual/po/ca/project_bugs.ssi.po
@@ -1,19 +1,18 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-04-08 12:15+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-04-08 12:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
@@ -84,7 +83,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
@@ -155,7 +154,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/project_bugs.ssi:2
@@ -179,7 +178,7 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:8
 msgid "For the impatient:"
-msgstr ""
+msgstr "Per als impacients"
 
 #. type: Plain text
 #: en/project_bugs.ssi:10
diff --git a/manual/po/de/project_coding-style.ssi.po b/manual/po/ca/project_coding-style.ssi.po
similarity index 98%
copy from manual/po/de/project_coding-style.ssi.po
copy to manual/po/ca/project_coding-style.ssi.po
index e781f17..85306fd 100644
--- a/manual/po/de/project_coding-style.ssi.po
+++ b/manual/po/ca/project_coding-style.ssi.po
@@ -1,19 +1,19 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-04-07 22:16+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-04-07 22:16+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
@@ -84,7 +84,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
@@ -155,7 +155,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/project_coding-style.ssi:2
diff --git a/manual/po/de/project_procedures.ssi.po b/manual/po/ca/project_procedures.ssi.po
similarity index 98%
copy from manual/po/de/project_procedures.ssi.po
copy to manual/po/ca/project_procedures.ssi.po
index 565227a..15bfd77 100644
--- a/manual/po/de/project_procedures.ssi.po
+++ b/manual/po/ca/project_procedures.ssi.po
@@ -1,19 +1,18 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-04-23 20:28+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-04-23 20:28+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -83,7 +82,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
@@ -153,7 +152,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/project_procedures.ssi:2
@@ -380,7 +379,7 @@ msgstr ""
 #: en/project_procedures.ssi:98
 #, no-wrap
 msgid " Debian Live project homepage:\n"
-msgstr ""
+msgstr "Pàgina web del Projecte Debian Live:\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:100
diff --git a/manual/po/fr/style_guide.ssi.po b/manual/po/ca/style_guide.ssi.po
similarity index 99%
copy from manual/po/fr/style_guide.ssi.po
copy to manual/po/ca/style_guide.ssi.po
index 416cfda..5d9721b 100644
--- a/manual/po/fr/style_guide.ssi.po
+++ b/manual/po/ca/style_guide.ssi.po
@@ -1,4 +1,4 @@
-# French translations for live-manual package
+# Catalan translations for live-manual package
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2012.
 #
@@ -6,19 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-06-03 17:04+0300\n"
-"PO-Revision-Date: 2012-02-11 16:42+0100\n"
+"PO-Revision-Date: 2012-06-03 17:04+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: fr\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:65 en/style_guide.ssi:2
 msgid ":B~ Appendix"
-msgstr ""
+msgstr ":B~ Apèndix"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/ca/user_basics.ssi.po
similarity index 65%
copy from manual/po/it/user_basics.ssi.po
copy to manual/po/ca/user_basics.ssi.po
index 47e4bc8..0c22c25 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/ca/user_basics.ssi.po
@@ -1,21 +1,18 @@
-# Italian translations for live-manual package
+# Catalan translations for live-manual
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
-# lillo sciascia <lillosciascia at gmail.com>, 2010.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual\n"
+"Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-06-03 19:00+0300\n"
-"PO-Revision-Date: 2012-04-03 17:59+0200\n"
-"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
-"Language-Team: Italian <tp at lists.linux.it>\n"
-"Language: it\n"
+"PO-Revision-Date: 2012-06-24 17:14+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team:  <debian-live at lists.debian.org>\n"
+"Language: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2: plural=(n !=1)\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -160,12 +157,12 @@ msgstr "}code"
 #. type: Plain text
 #: en/user_basics.ssi:2
 msgid ":B~ The basics"
-msgstr ":B~ Nozioni di base"
+msgstr ":B~ Conceptes bàsics"
 
 #. type: Plain text
 #: en/user_basics.ssi:4
 msgid "1~the-basics The basics"
-msgstr "1~the-basics Nozioni di base"
+msgstr "1~the-basics Conceptes bàsics"
 
 #. type: Plain text
 #: en/user_basics.ssi:6
@@ -182,19 +179,19 @@ msgid ""
 "very convenient way to test and deploy images for booting on the local "
 "network without the hassle of dealing with image media."
 msgstr ""
-"Questo capitolo contiene una breve panoramica del processo di generazione e "
-"le istruzioni per utilizzare i tre tipi di immagine più comunemente "
-"utilizzati. La tipologia di immagine più versatile, #{iso-hybrid}#, può "
-"essere usata su una macchina virtuale, supporto ottico o dispositivo di "
-"archiviazione portatile USB. In alcuni casi particolari, come l'utilizzo "
-"della persistenza, la #{hdd}# potrebbe essere più adatta per i dispositivi "
-"USB. Il capitolo termina con le istruzioni per costruire e usare un'immagine "
-"di tipo #{net}#, che è un poco più complessa a causa del setup richiesto sul "
-"server. Si tratta di un argomento leggermente avanzato per chi non ha "
-"familiarità con l'avvio da rete, ma è incluso qui perché, una volta che il "
-"setup è stato fatto, è un modo molto comodo per collaudare e distribuire "
-"immagini facendo il boot nella rete locale senza la seccatura di doversi "
-"occupare dei mezzi di divulgazione dell'immagine."
+"Aquest capítol conté una breu descripció del procés de construcció i les "
+"instruccions per a l'ús dels tres tipus d'imatge més comunes. El tipus "
+"d'imatge més versàtil #{iso-hybrid}# es pot utilitzar en una màquina "
+"virtual, en medis òptics o qualsevol altre dispositiu d'emmagatzematge USB "
+"portàtil. En certs casos especials, com ara l'ús de la persistència, el "
+"tipus #{hdd}# pot ser el més adequat per als dispositius USB. El capítol "
+"acaba amb instruccions per a la construcció d'una imatge tipus #{net}#, que "
+"és una mica més complicat a causa de la configuració necessària en el "
+"servidor. Aquest és un tema una mica avançat per a algú que no està "
+"familiaritzat ja amb l'arrencada en xarxa, però s'inclou aquí perquè un cop "
+"que la configuració es porta a terme, es tracta d'una forma molt convenient "
+"per provar i desplegar imatges per a l'arrencada en xarxa local sense la "
+"molèstia de tractar amb els dispositius de les imatges."
 
 #. type: Plain text
 #: en/user_basics.ssi:8
@@ -203,11 +200,14 @@ msgid ""
 "produced by live-build. If you are downloading a prebuilt image instead, the "
 "actual filenames may vary."
 msgstr ""
+"Al llarg del capítol, sovint es fa referència als noms dels fitxers produïts "
+"per defecte per live-build. Si es descarrega una imatge prefabricada, els "
+"noms dels fitxers poden ser direrents."
 
 #. type: Plain text
 #: en/user_basics.ssi:10
 msgid "2~what-is-live What is a live system?"
-msgstr "2~what-is-live Che cos'è un sistema live?"
+msgstr "2~what-is-live Què és un sistema viu?"
 
 #. type: Plain text
 #: en/user_basics.ssi:12
@@ -217,10 +217,10 @@ msgid ""
 "use without any installation on the usual drive(s), with auto-configuration "
 "done at run time (see {Terms}#terms)."
 msgstr ""
-"Per sistema live generalmente si intende un sistema operativo che può essere "
-"avviato da un supporto rimovibile, come un CD-ROM o una chiavetta USB oppure "
-"da una rete, pronto per l'uso senza alcuna installazione su hard disk con "
-"una configurazione automatica fatta durante l'esecuzione (vedere {Glossario}"
+"Un sistema viu és un sistema operatiu que arrenca en un equip des d'un "
+"dispositiu extraïble, com un CD-ROM o una memòria USB o des d'una xarxa, a "
+"punt per fer servir sense cap tipus d'instaŀlació en la unitat(s) habitual"
+"(s), amb una configuració automàtica feta en temps d'execució (veure {Termes}"
 "#terms)."
 
 #. type: Plain text
@@ -230,14 +230,14 @@ msgid ""
 "the supported architectures (currently amd64, i386, powerpc and sparc). It "
 "is made from the following parts:"
 msgstr ""
-"Con Debian Live, si tratta di un sistema operativo Debian GNU/Linux, "
-"generato per una delle architetture previste (attualmente amd64, i386, "
-"powerpc e sparc). È costituito dalle seguenti parti:"
+"Amb Debian Live, és un sistema operatiu Debian GNU/Linux, construït per una "
+"de les arquitectures suportades (actualment amd64, i386 powerpc i sparc). "
+"Conté les següents parts:"
 
 #. type: Plain text
 #: en/user_basics.ssi:16
 msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
-msgstr "_* *{Immagine del kernel Linux}*, comunemente chiamata #{vmlinuz*}#"
+msgstr "_* *{Imatge del nucli Linux}*, generalment s'anomena #{vmlinuz*}#"
 
 #. type: Plain text
 #: en/user_basics.ssi:18
@@ -246,9 +246,9 @@ msgid ""
 "boot, containing modules possibly needed to mount the System image and some "
 "scripts to do it."
 msgstr ""
-"_* *{Initial RAM disk image (initrd)}*: un disco RAM creato per il boot di "
-"Linux, contenente i moduli potenzialmente necessari per montare l'immagine "
-"di sistema e alcuni script per farlo."
+"_* *{Imatge del disc RAM inicial (initrd)}*: un disc RAM configurat per a "
+"l'arrencada de Linux, que conté els mòduls que possiblement es necessitaran "
+"per muntar la imatge del sistema i algunes seqüències d'ordres per fer-ho."
 
 #. type: Plain text
 #: en/user_basics.ssi:20
@@ -260,14 +260,14 @@ msgid ""
 "running system. However, all modifications will be lost upon shutdown unless "
 "optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
-"_* *{Immagine di sistema}*: l'immagine del filesystem del sistema operativo. "
-"Normalmente è usato un filesystem compresso SquashFS, per minimizzare le "
-"dimensioni dell'immagine Debian Live. Si noti che è in sola lettura. Dunque, "
-"durante il boot il sistema Debian Live userà un disco RAM e il meccanismo "
-"'unione' per attivare i file in scrittura all'interno del sistema in "
-"esecuzione. Ad ogni modo, tutte le modifiche verranno perse con lo "
-"spegnimento a meno che non si usi la persistenza opzionale (si veda "
-"{Persistenza}#persistence)."
+"_* *{Imatge del sistema}*: Imatge del sistema de fitxers del sistema "
+"operatiu. Normalment, s'utilitza un sistema de fitxers comprimit SquashFS "
+"per minimitzar la mida de la imatge Debian Live. Tenir en compte que és de "
+"només lectura. Així, durant l'arrencada, el sistema Debian Live utilitzarà "
+"el disc RAM i un mecanisme de \"unió\" per permetre l'escriptura de fitxers "
+"en el sistema en funcionament. No obstant això, totes les modificacions es "
+"perdran en tancar si no és que s'utilitza la persistència opcional (vegeu "
+"{Persistència}#persistence)."
 
 #. type: Plain text
 #: en/user_basics.ssi:22
@@ -282,15 +282,16 @@ msgid ""
 "ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 "
 "partitions, etc."
 msgstr ""
-"_* *{Bootloader}*: una piccola porzione di codice predisposto per l'avvio "
-"dal supporto scelto, che presenta un prompt o un menu per la selezione di "
-"opzioni/configurazioni. Carica il kernel Linux ed il suo initrd da eseguire "
-"con un filesystem associato. Possono essere usate diverse soluzioni, in base "
-"al supporto di destinazione ed al formato del filesystem contenenti le "
-"componenti precedentemente citate: isolinux per il boot da CD o DVD nel "
-"formato ISO9660, syslinux per supporti HDD o USB che si avviano da una "
-"partizione VFAT, extlinux per le partizioni ext/2/3/4 e btrfs, pxelinux per "
-"il netboot PXE, GRUB per partizioni ext2/3/4, ecc."
+"_* *{Carregador d'arrencada }*: Una petita peça de codi dissenyat per "
+"arrencar des del medi triat, possiblement presentant un indicador "
+"d'arrencada o un menú per permetre la selecció d'opcions/configuració. "
+"Carrega el nucli del Linux i el seu initrd per funcionar amb un sistema de "
+"fitxers del sistema associat. Es poden utilitzar diverses solucions, en "
+"funció dels medis de destinació i el format del sistema de fitxers que conté "
+"els components esmentats anteriorment: isolinux per arrencar des de CD o DVD "
+"en format ISO9660, syslinux per una unitat USB o HDD que s'iniciarà des de "
+"particions VFAT, extlinux per particions ext2/3/4 i btrfs, pxelinux per PXE "
+"netboot, GRUB per particions ext2/3/4, etc"
 
 #. type: Plain text
 #: en/user_basics.ssi:24
@@ -299,15 +300,16 @@ msgid ""
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
 "media-dependant format (ISO9660 image, disk image, etc.)."
 msgstr ""
-"È possibile usare live-build per creare l'immagine di sistema secondo le "
-"proprie specifiche, scegliere un kernel Linux, il suo initrd ed un "
-"bootloader per avviarli, tutto in un unico formato che dipende dal mezzo "
-"(immagini ISO9660, immagine disco, ecc.)"
+"Es pot utilitzar live-build per construir la imatge del sistema amb "
+"especificacions pròpies, configurar un nucli de Linux, el initrd, i un "
+"carregador d'arrencada per executar-los, tot això en un format depenent dels "
+"dispositius (imatge ISO9660, imatge de disc, etc.)"
 
 #. type: Plain text
 #: en/user_basics.ssi:26
 msgid "2~building-iso-hybrid First steps: building an ISO hybrid image"
-msgstr "2~building-iso-hybrid Primi passi: creare un'immagine ISO ibrida"
+msgstr ""
+"2~building-iso-hybrid Primers passos: construcció d'una imatge ISO híbrida"
 
 #. type: Plain text
 #: en/user_basics.ssi:28
@@ -318,12 +320,11 @@ msgid ""
 "containing just the Debian standard system without X.org. It is suitable for "
 "burning to CD or DVD media, and also to copy onto a USB stick."
 msgstr ""
-"Indipendentemente dal tipo di immagine, per crearne una è necessario "
-"eseguire ogni volta la stessa procedura. Come primo esempio si eseguirà la "
-"seguente sequenza di comandi di live-build per creare un'immagine ISO ibrida "
-"di base contenente soltanto il sistema Debian standard senza X.org. È adatta "
-"per essere masterizzata su CD o DVD e anche per essere copiata su una penna "
-"USB."
+"Independentment del tipus d'imatge, s'haurà de fer els mateixos passos "
+"bàsics per construir una imatge cada vegada. Com a primer exemple, executar "
+"la següent seqüència d'ordres live-build per crear una imatge ISO híbrida  "
+"de base que conté només el sistema estàndard de Debian sense X.org. És "
+"adequat per gravar en un CD o DVD, i també per copiar en una memòria USB."
 
 #. type: Plain text
 #: en/user_basics.ssi:30
@@ -331,9 +332,8 @@ msgid ""
 "First, run the #{lb config}# command. This will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
-"In primo luogo eseguire il comando #{lb config}#, il quale creerà una "
-"gerarchia \"config/\" nella directory corrente e che verrà utilizzata da "
-"altri comandi:"
+"En primer lloc, executar l'ordre #{lb config}#. Això crearà una jerarquia "
+"«config/» en el directori actual per ser utilitzada per altres ordres:"
 
 #. type: Plain text
 #: en/user_basics.ssi:34
@@ -348,9 +348,8 @@ msgid ""
 "various options will be used. See {The lb config command}#lb-config for more "
 "details."
 msgstr ""
-"Non viene passato alcun parametro a #{lb config}#, in modo da utilizzare le "
-"impostazioni predefinite per le varie opzioni, vedere {Il comando lb config}"
-"#lb-config) per maggiori dettagli."
+"Aquí no es passa cap paràmetre a #{lb config}#, per tant s'utilitzaran les "
+"opcions per defecte. Veure {L'ordre lb config}#lb-config per més detalls."
 
 #. type: Plain text
 #: en/user_basics.ssi:40
@@ -358,8 +357,8 @@ msgid ""
 "Now that the \"config/\" hierarchy exists, build the image with the #{lb "
 "build}# command:"
 msgstr ""
-"Ora che si ha una gerarchia \"config/\" si può generare l'immagine con il "
-"comando #{lb build}#:"
+"Ara que la jerarquia «config/» ja existeix, crear la imatge amb l'ordre #{lb "
+"build}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
@@ -375,14 +374,14 @@ msgid ""
 "connection. When it is complete, there should be a #{binary.hybrid.iso}# "
 "image file, ready to use, in the current directory."
 msgstr ""
-"Questo processo può richiedere tempo, a seconda della velocità della "
-"connessione di rete. Una volta completato, nell'attuale directory ci sarà un "
-"file immagine #{binary.hybrid.iso}# pronto da usare."
+"Aquest procés tardarà una mica, depenent de la velocitat de la connexió de "
+"la xarxa. Quan hagi acabat, ha d'haver un fitxer imatge #{binary.hybrid.iso}"
+"#, a punt per ser utilitzar, en el directori actual."
 
 #. type: Plain text
 #: en/user_basics.ssi:50
 msgid "2~using-iso-hybrid Using an ISO hybrid live image"
-msgstr "2~using-iso-hybrid Utilizzare un'immagine ISO live ibrida"
+msgstr "2~using-iso-hybrid Usar una imatge ISO híbrida en viu"
 
 #. type: Plain text
 #: en/user_basics.ssi:52
@@ -392,15 +391,15 @@ msgid ""
 "prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or "
 "a USB stick."
 msgstr ""
-"Dopo aver costruito o scaricato un'immagine ISO ibrida, ottenibile "
-"all'indirizzo http://www.debian.org/CD/live/, il passo successivo è "
-"preparare il supporto per l'avvio, che sia esso un CD-R(W), un DVD-R(W) o "
-"una penna USB."
+"Després de la construcció o la descàrrega d'una imatge ISO híbrida, que pot "
+"ser obtinguda a http://www.debian.org/CD/live/, el següent pas habitual és "
+"preparar els dispositius per a l'arrencada, ja sigui medis òptics com un CD-R"
+"(W) o DVD-R(W) o una memòria USB."
 
 #. type: Plain text
 #: en/user_basics.ssi:54
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
-msgstr "3~burning-iso-image Masterizzare un'immagine ISO su un supporto fisico"
+msgstr "3~burning-iso-image Gravar una imatge ISO en un medi físic"
 
 #. type: Plain text
 #: en/user_basics.ssi:56
@@ -408,8 +407,8 @@ msgid ""
 "Burning an ISO image is easy. Just install wodim and use it from the command-"
 "line to burn the image. For instance:"
 msgstr ""
-"Masterizzare un'immagine ISO è semplice, basta installare wodim e "
-"utilizzarlo da riga di comando; ad esempio:"
+"Gravar una imatge ISO és fàcil. Simplement cal instaŀlar i utilitzar wodim "
+"des de la línia d'ordres per gravar la imatge. Per exemple:"
 
 #. type: Plain text
 #: en/user_basics.ssi:60
@@ -427,7 +426,8 @@ msgstr ""
 #: en/user_basics.ssi:66
 msgid "3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick"
 msgstr ""
-"3~copying-iso-hybrid-to-usb Copiare un'immagine ISO ibrida su una penna USB"
+"3~copying-iso-hybrid-to-usb Còpiar una imatge ISO híbrida en un dispositiu "
+"USB"
 
 #. type: Plain text
 #: en/user_basics.ssi:68
@@ -441,15 +441,15 @@ msgid ""
 "can find the right device name by looking in #{dmesg}#'s output after "
 "plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
 msgstr ""
-"Le immagini ISO preparate con il comando #{isohybrid}#, come quelle prodotte "
-"in modo predefinito da #{iso-hybrid}#, possono essere semplicemente copiate "
-"su una penna USB con il programma #{dd}# o suo equivalente. Inserire una "
-"penna USB con una dimensione sufficiente a contenere l'immagine e "
-"determinare quale device sia, al quale in seguito si farà riferimento come #"
-"{${USBSTICK}}#.Questo è il device della penna, ad esempio #{/dev/sdb}#, non "
-"una partizione come #{/dev/sdb1}#! È possibile trovare il nome corretto "
-"controllando l'output di #{dmesg}# una volta inserita, o meglio ancora con "
-"il comando #{ls -l /dev/disk/by-id}#."
+"Les imatges ISO preparades amb l'ordre #{isohybrid}#, com les imatges "
+"binàries del tipus #{iso-hybrid}# produïdes per defecte és poden copiar "
+"directament a una memòria USB utilitzant el programa #{dd}# o un altre "
+"d'equivalent. Connectar una memòria USB amb una mida prou gran per al fitxer "
+"de la imatge i determinar quin dispositiu és, que d'ara endavant annomenarem "
+"#{${USBSTICK}}#. Aquest és el dispositiu de la memòria com per exemple #{/"
+"dev/sdb}#, no una partició, com ara #{/dev/sdb1}#! Es pot trobar el nom del "
+"dispositiu correcte mirant la sortida de #{dmesg}# després de connectar la "
+"memòria usb o encara millor, #{ls -l /dev/disk/by-id}#."
 
 #. type: Plain text
 #: en/user_basics.ssi:71
@@ -458,9 +458,9 @@ msgid ""
 "command to copy the image to the stick.  *{This will definitely overwrite "
 "any previous contents on your stick!}*"
 msgstr ""
-"Una volta che si è certi sul nome del device, usare il comando #{dd}# per "
-"copiare l'immagine sulla penna. *{Questo sovrascriverà qualsiasi dato "
-"presente su di essa!}*"
+"Quan s'estigui segur de tenir el nom del dispositiu correcte, utilitzar "
+"l'ordre #{dd}# per a copiar la imatge a la memòria. *{Fent això es perdran "
+"definitivament tots els continguts anteriors de la memòria usb!}*"
 
 #. type: Plain text
 #: en/user_basics.ssi:75
@@ -471,7 +471,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:80
 msgid "3~booting-live-media Booting the live media"
-msgstr "3~booting-live-media Avviare il supporto live"
+msgstr "3~booting-live-media Arrencar els medis en viu"
 
 #. type: Plain text
 #: en/user_basics.ssi:82
@@ -485,14 +485,15 @@ msgid ""
 "order to place the boot device for the live system before your normal boot "
 "device."
 msgstr ""
-"La prima volta che si avvia il supporto live, CD, DVD, penna USB o PXE, può "
-"essere necessario impostare il BIOS del computer, ma giacché questi variano "
-"parecchio in opzioni e scorciatoie, non siamo in grado di descriverli. "
-"Alcuni BIOS offrono un menu per selezionare il device in fase di boot, in "
-"caso sia disponibile nel vostro sistema è il modo più semplice. Altrimenti è "
-"necessario accedere alla sua configurazione e modificare l'ordine di avvio "
-"per posizionare la periferica di boot del sistema live prima di quella "
-"usuale."
+"La primera vegada que s'arrenqui els medis en viu, ja sigui des de CD, DVD, "
+"memòria USB, o PXE, pot ser necessaria alguna petita configuració al BIOS "
+"del ordinador en primer lloc. Atès que les BIOS varien molt en les seves "
+"funcions i dreceres de teclat, no podem entrar en el tema en profunditat "
+"aquí. Algunes BIOS proporcionen una tecla per obrir un menú de dispositius "
+"d'arrencada, que és la manera més fàcil si es troba disponible al sistema. "
+"En cas contrari, cal entrar al menú de configuració del BIOS i canviar "
+"l'ordre d'arrencada per situar el dispositiu del sistema en viu abans que el "
+"dispositiu d'arrencada normal."
 
 #. type: Plain text
 #: en/user_basics.ssi:84
@@ -503,10 +504,11 @@ msgid ""
 "\"help\" entry in the menu and also the live-boot and live-config man pages "
 "found within the live system."
 msgstr ""
-"Avviando il supporto si otterrà un menu, premendo il tasto enter il sistema "
-"partirà utilizzando la voce #{Live}# e le opzioni predefinite. Per ulteriori "
-"informazioni sulle opzioni di boot, si veda la voce \"help\" nel menu e le "
-"pagine di manuale di live-boot e live-config all'interno del sistema."
+"Després d'arrencar des del dispositiu, es veurà un menu d'inici. S'ha de "
+"prémer «entrer» i el sistema s'iniciarà amb l'entrada #{Live}# i les seves "
+"opcions per defecte. Per obtenir més informació sobre les opcions "
+"d'arrencada, llegir la «ajuda» (help) al menú i també les pàgines del manual "
+"de live-boot i live-config que es troben dins del sistema en viu."
 
 #. type: Plain text
 #: en/user_basics.ssi:86
@@ -518,17 +520,18 @@ msgid ""
 "images, you should be automatically logged in on the console to the #{user}# "
 "account and see a shell prompt, ready to use."
 msgstr ""
-"Supponendo di aver selezionato #{Live}# e avviato l'immagine desktop "
-"predefinita, dopo i messaggi di avvio si dovrebbe automaticamente accedere "
-"all'account #{user}# e avere il desktop pronto all'uso. Se invece si è "
-"avviata un'immagine per la sola console, come le preconfezionate #{standard}"
-"# o #{rescue}#, si accederà alla console dell'account #{user}# ed avere un "
-"prompt di shell pronto da usare."
+"Suposant que s'ha seleccionat #{Live}# i s'ha arrencat una imatge "
+"d'escriptori per defecte, després que els missatges d'arrencada hagin passat "
+"s'haurà iniciat una sessió com a usuari #{user}# i es veurà un escriptori, a "
+"punt per ser utilitzat. Si s'ha arrencat una imatge de la consola només, com "
+"les imatges preconfigurades #{standard}# o #{rescue}# s'iniciarà una sessió "
+"com a usuari #{user}# i es veurà el indicador de la shell, a punt per ser "
+"utilitzat."
 
 #. type: Plain text
 #: en/user_basics.ssi:88
 msgid "2~using-virtual-machine Using a virtual machine for testing"
-msgstr "2~using-virtual-machine Utilizzare una macchina virtuale per le prove"
+msgstr "2~using-virtual-machine Utilitzar una màquina virtual per fer proves"
 
 #. type: Plain text
 #: en/user_basics.ssi:90
@@ -536,9 +539,8 @@ msgid ""
 "It can be a great time-saver for the development of live images to run them "
 "in a virtual machine (VM). This is not without its caveats:"
 msgstr ""
-"Per lo sviluppo delle immagini live, può essere un notevole risparmio di "
-"tempo eseguirle in una macchina virtuale (VM). Non senza qualche "
-"raccomandazione:"
+"Pot ser un gran estalvi de temps per al desenvolupament d'imatges en viu "
+"executar-les en una màquina virtual (VM). Això no està exempt d'advertiments:"
 
 #. type: Plain text
 #: en/user_basics.ssi:92
@@ -546,9 +548,9 @@ msgid ""
 "_* Running a VM requires enough RAM for both the guest OS and the host and a "
 "CPU with hardware support for virtualization is recommended."
 msgstr ""
-"_* Eseguire una VM richiede un quantitativo sufficiente di RAM sia per il "
-"sistema ospitato che per quello ospitante; è consigliato un processore che "
-"gestisca la virtualizzazione a livello hardware."
+"_* L'execució d'una màquina virtual requereix de suficient memòria RAM, tant "
+"per al sistema operatiu convidat i l'amfitrió i es recomana una CPU amb "
+"maquinari amb suport per a la virtualització."
 
 #. type: Plain text
 #: en/user_basics.ssi:94
@@ -556,8 +558,9 @@ msgid ""
 "_* There are some inherent limitations to running on a VM, e.g. poor video "
 "performance, limited choice of emulated hardware."
 msgstr ""
-"_* Ci sono alcune limitazioni inerenti, quali uno scarso rendimento video e "
-"una scelta limitata di hardware emulato."
+"_* Hi ha algunes limitacions inherents a l'execució en una màquina virtual, "
+"per exemple, rendiment de vídeo pobre, opcions limitadades de maquinari "
+"emulat."
 
 #. type: Plain text
 #: en/user_basics.ssi:96
@@ -565,8 +568,8 @@ msgid ""
 "_* When developing for specific hardware, there is no substitute for running "
 "on the hardware itself."
 msgstr ""
-"_* Quando si sviluppa per un hardware specifico non vi è alcun sostituto "
-"migliore del proprio hardware."
+"_* En el desenvolupament per a un maquinari específic, no hi ha substitut "
+"per al propi maquinari."
 
 #. type: Plain text
 #: en/user_basics.ssi:98
@@ -574,8 +577,9 @@ msgid ""
 "_* Occasionally there are bugs that relate only to running in a VM. When in "
 "doubt, test your image directly on the hardware."
 msgstr ""
-"_* Occasionalmente possono esserci dei bug relativi al solo utilizzo di una "
-"VM. Nel dubbio si provi l'immagine direttamente sul proprio hardware."
+"_* De tant en tant hi ha errors que només sorgeixen durant l'execució en una "
+"màquina virtual. En cas de dubte, comprovar la imatge directament al "
+"maquinari."
 
 #. type: Plain text
 #: en/user_basics.ssi:100
@@ -583,14 +587,14 @@ msgid ""
 "Provided you can work within these constraints, survey the available VM "
 "software and choose one that is suitable for your needs."
 msgstr ""
-"A condizione che si possa lavorare entro questi vincoli, cercare il software "
-"disponibile per la virtualizzazione e scegliere quello adatto alle proprie "
-"necessità."
+"Sempre que es pugui treballar dins d'aquestes limitacions, examinar el "
+"programari de màquina virtual disponible i triar un que sigui adequat per a "
+"les necessitats pròpies."
 
 #. type: Plain text
 #: en/user_basics.ssi:102
 msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
-msgstr "3~testing-iso-with-qemu Provare un'immagine ISO con QEMU"
+msgstr "3~testing-iso-with-qemu Provar una imatge ISO amb QEMU"
 
 #. type: Plain text
 #: en/user_basics.ssi:104
@@ -599,9 +603,10 @@ msgid ""
 "support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
 "package description briefly lists the requirements."
 msgstr ""
-"Il programma più versatile in Debian è QEMU. Se il processore gestisce la "
-"virtualizzazione hardware utilizzare il pacchetto /{qemu-kvm}/; la "
-"descrizione elenca brevemente i requisiti."
+"La màquina virtual més versàtil dins Debian és QEMU. Si el processador té "
+"suport de maquinari per a la virtualització, utilitzar el paquet /{qemu-"
+"kvm}/; la descripció del paquet /{qemu-kvm}/ enumera breument els "
+"requeriments."
 
 #. type: Plain text
 #: en/user_basics.ssi:106
@@ -611,10 +616,10 @@ msgid ""
 "the following examples. The /{qemu-utils}/ package is also valuable for "
 "creating virtual disk images with #{qemu-img}#."
 msgstr ""
-"Per prima cosa installare /{qemu-kvm}/ o altrimenti /{qemu}/, nel qual caso "
-"il nome del programma nei successivi sarà #{qemu}# invece di #{kvm}#. Il "
-"pacchetto /{qemu-utils}/ è inoltre utile per creare immagini di dischi "
-"virtuali con #{qemu-img}#."
+"Primer, instaŀlar /{qemu-kvm}/ si el processador ho suporta. Si no, "
+"instaŀlar /{qemu}/, en aquest cas el nom del programa és #{qemu}# en lloc de "
+"#{kvm}# en els exemples següents. El paquet /{qemu-utils}/  també és valuós "
+"per a la creació d'imatges de disc virtuals amb #{qemu-img}#."
 
 #. type: Plain text
 #: en/user_basics.ssi:110
@@ -625,7 +630,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:114
 msgid "Booting an ISO image is simple:"
-msgstr "Avviare un'immagine ISO è semplice:"
+msgstr "Arrencar una imatge ISO és senzill:"
 
 #. type: Plain text
 #: en/user_basics.ssi:118
@@ -636,18 +641,17 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:122
 msgid "See the man pages for more details."
-msgstr "Per maggiori dettagli si vedano le pagine di manuale."
+msgstr "Veure les pàgines del manual per a més detalls"
 
 #. type: Plain text
 #: en/user_basics.ssi:124
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
-msgstr ""
-"3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose"
+msgstr "3~testing-iso-with-virtualbox Provar una imatge ISO amb virtualbox-ose"
 
 #. type: Plain text
 #: en/user_basics.ssi:126
 msgid "In order to test the ISO with /{virtualbox-ose}/:"
-msgstr "Per provare la ISO con /{virtualbox-ose}/:"
+msgstr "Per provar la ISO amb /{virtualbox-ose}/:"
 
 #. type: Plain text
 #: en/user_basics.ssi:130
@@ -667,15 +671,14 @@ msgid ""
 "Create a new virtual machine, change the storage settings to use #{binary."
 "hybrid.iso}# as the CD/DVD device, and start the machine."
 msgstr ""
-"Creare una nuova macchina virtuale, modificare le impostazione di "
-"archiviazione in modo da usare #{binary.hybrid.iso}# come dispositivo CD/"
-"DVD, e avviare la macchina."
+"Crear una nova màquina virtual, canviar els paràmetres d'emmagatzematge per "
+"utilitzar #{binary.hybrid.iso}# com  unitat de CD/DVD i arrencar la màquina."
 
 #. type: Plain text
 #: en/user_basics.ssi:138
 #, no-wrap
 msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
-msgstr "*{Nota:}* per sistemi live contenenti X.org che si vogliono provare con /{virtualbox-ose}/, si può voler includere il pacchetto dei driver per X.org di VirtualBox, /{virtualbox-ose-guest-x11}/, nella configurazione di live-build. In caso contrario la risoluzione è limitata a 800x600."
+msgstr "*{Nota:}* Per provar sistemes vius que contenen X.org amb /{virtualbox-ose}/, segurament es assenyat incloure el paquet del driver VirtualBox X.org, /{virtualbox-ose-guest-x11}/, en la configuració de live-build. En cas contrari, la resolució es limita a 800x600.\n"
 
 #. type: Plain text
 #: en/user_basics.ssi:142
@@ -686,7 +689,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:146
 msgid "2~building-hdd Building an HDD image"
-msgstr "2~building-hdd Creare un'immagine HDD"
+msgstr "2~building-hdd Construir una imatge HDD"
 
 #. type: Plain text
 #: en/user_basics.ssi:148
@@ -700,21 +703,21 @@ msgid ""
 "space on the media for some purpose, such as a persistence partition, you "
 "need an HDD image."
 msgstr ""
-"La creazione di un'immagine HDD è simile alla ISO ibrida sotto tutti gli "
-"aspetti ad eccezione della necessità di specificare l'opzione #{-b hdd}# e "
-"che il nome del file risultante è #{binary.img}# e non può essere "
-"masterizzato. È adatta per avviarsi da chiavette USB, dischi rigidi USB, e "
-"da svariati altri dispositivi di archiviazione portatili. In genere per "
-"questo scopo può essere usata un'immagine ISO ibrida, ma se si ha un BIOS "
-"che non supporta le immagini ibride, o si vuole usare lo spazio rimanente "
-"sul supporto per altri scopi, come una partizione persistente, allora "
-"occorre un'immagine HDD."
+"Construir una imatge HDD és similar a una ISO híbrida en tots els aspectes, "
+"excepte que s'especifiqua #{-b hdd}# que el nom del fitxer resultant és #"
+"{binary.img}# i que no es pot gravar en medis òptics. És adequada per "
+"arrencar des de dispositius USB, discs durs USB, i altres dispositius "
+"d'emmagatzematge portàtils. Normalment, una imatge ISO híbrida es pot "
+"utilitzar per aquest propòsit en el seu lloc, però si el BIOS no maneja "
+"adequadament les imatges híbrides, o es desitja utilitzar l'espai lliure en "
+"els medis per a algun propòsit, com una partició per a la persistència, cal "
+"una imatge HDD."
 
 #. type: Plain text
 #: en/user_basics.ssi:150
 #, no-wrap
 msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
-msgstr "*{Nota:}* se si è creata un'immagine ISO ibrida con gli esempi precedenti, occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il comando lb clean}#lb-clean):"
+msgstr "*{Nota:}* si s'ha creat una imatge ISO híbrida amb l'exemple anterior, s'haurà de netejar el directori de treball amb l'ordre #{lb clean}# (veure {L'ordre lb clean}#lb-clean):\n"
 
 #. type: Plain text
 #: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -728,8 +731,8 @@ msgid ""
 "Run the #{lb config}# command as before, except this time specifying the HDD "
 "image type:"
 msgstr ""
-"Eseguire il comando #{lb config}# come prima, questa volta specificando però "
-"il tipo di immagine HDD:"
+"Executar l'ordre #{lb config}# com abans, excepte que aquesta vegada "
+"especificant el tipus d'imatge HDD:"
 
 #. type: Plain text
 #: en/user_basics.ssi:162
@@ -740,7 +743,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:166 en/user_basics.ssi:234
 msgid "Now build the image with the #{lb build}# command:"
-msgstr "Si crei ora l'immagine con il comando #{lb build}#:"
+msgstr "Ara construir la imatge amb l'ordre #{lb build}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:174
@@ -748,13 +751,13 @@ msgid ""
 "When the build finishes, a #{binary.img}# file should be present in the "
 "current directory."
 msgstr ""
-"Quando la costruzione è terminata dovrebbe essere presente un file #{binary."
-"img}# nella directory corrente."
+"Quan la construcció acabi, hauria d'haver un fitxer #{binary.img}# al "
+"directori actual."
 
 #. type: Plain text
 #: en/user_basics.ssi:176
 msgid "2~using-hdd-image Using an HDD image"
-msgstr "2~using-hdd-image Utilizzare un'immagine HDD"
+msgstr "2~using-hdd-image Utilitzar una imatge HDD"
 
 #. type: Plain text
 #: en/user_basics.ssi:178
@@ -765,17 +768,17 @@ msgid ""
 "in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
 "filename #{binary.img}# instead of #{binary.hybrid.iso}#."
 msgstr ""
-"L'immagine binaria generata contiene una partizione VFAT e il bootloader "
-"syslinux, pronti per essere scritti direttamente su una penna USB. Dal "
-"momento che utilizzare un'immagine HDD è come utilizzare un'immagine ISO "
-"ibrida via USB, seguire le istruzioni contenute in {Utilizzare un'immagine "
-"live ISO ibrida}#using-iso-hybrid tenendo però conto che il nome del file "
-"sarà #{binary.img}# invece di #{binary.hybrid.iso}#."
+"La imatge binària generada conté una partició VFAT i el carregador "
+"d'arrencada syslinux, llestos per ser escrits directament a una memòria USB. "
+"Donat que l'ús d'una imatge HDD és com utilitzar una imatge ISO híbrida en "
+"un USB, seguir les instruccions de {Usar una imatge ISO híbrida en viu}"
+"#using-iso-hybrid, però amb el nom de fitxer #{binary.img}# en lloc de #"
+"{binary.hybrid.iso}#."
 
 #. type: Plain text
 #: en/user_basics.ssi:180
 msgid "3~testing-hdd-with-qemu Testing an HDD image with Qemu"
-msgstr "3~testing-hdd-with-qemu Provare un'immagine HDD con Qemu"
+msgstr "3~testing-hdd-with-qemu Provar una imatge HDD amb Qemu"
 
 #. type: Plain text
 #: en/user_basics.ssi:182
@@ -785,10 +788,10 @@ msgid ""
 "which version your host system needs, specifying #{binary.img}# as the first "
 "hard drive."
 msgstr ""
-"Installare /{qemu}/ come descritto in {Provare un'immagine ISO con QEMU}"
-"#testing-iso-with-qemu; quindi eseguire #{kvm}# o #{qemu}#, a seconda di "
-"quale versione è necessaria al sistema ospitante, specificando #{binary.img}"
-"# come disco rigido principale."
+"Primer, instaŀlar /{qemu}/ com s'ha descrit anteriorment a {Provar una "
+"imatge ISO amb QEMU}#testing-iso-with-qemu. A continuació, executar #{kvm}# "
+"o #{qemu}#, segons la versió instaŀlada al sistema amfitrió, especificant #"
+"{binary.img}# com a primer disc dur."
 
 #. type: Plain text
 #: en/user_basics.ssi:186
@@ -799,7 +802,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:190
 msgid "3~using-usb-extra-space Using the space left on a USB stick"
-msgstr "3~using-usb-extra-space Usare lo spazio rimanente su una penna USB"
+msgstr "3~using-usb-extra-space Utilitzar l'espai lliure en una memòria USB"
 
 #. type: Plain text
 #: en/user_basics.ssi:192
@@ -809,10 +812,10 @@ msgid ""
 "partition on the stick. The first partition will be used by the Debian Live "
 "system."
 msgstr ""
-"Per utilizzare lo spazio libero che rimane dopo aver copiato il file #"
-"{binary.img}# su una penna USB, usare uno strumento di partizionamento come /"
-"{gparted}/ o /{parted}/ per creare una nuova partizione. La prima partizione "
-"verrà utilizzata dal sistema Debian Live."
+"Per poder utilitzar l'espai que queda lliure després de copiar #{binary.img}"
+"# en un dispositiu USB, utilitzar una eina de particionament com /{gparted}/ "
+"o /{parted}/ per crear una nova partició. La primera partició serà "
+"utilitzada pel sistema Debian Live."
 
 #. type: Plain text
 #: en/user_basics.ssi:196
@@ -827,9 +830,9 @@ msgid ""
 "partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One "
 "possible choice would be ext4."
 msgstr ""
-"Dopo aver creato la partizione, dove #{${PARTITION}}# è il nome della "
-"partizione, ad esempio #{/dev/sdb2}#, si deve creare su di essa un "
-"filesystem. Una scelta possibile potrebbe essere ext4."
+"Després de crear la partició, on #{${PARTITION}}# és el nom de la partició, "
+"com ara #{/dev/sdb2}#, s'ha de crear un sistema de fitxers. Una opció "
+"possible seria ext4."
 
 #. type: Plain text
 #: en/user_basics.ssi:204
@@ -841,18 +844,18 @@ msgstr ""
 #: en/user_basics.ssi:208
 #, no-wrap
 msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
-msgstr "*{Nota:}* se si desidera utilizzare lo spazio extra con Windows pare che questo sistema operativo non possa accedere a nessuna partizione eccetto la prima. Alcune soluzioni a questo problema sono state discusse sulla nostra {mailing list}#contact, ma non sembrano esserci risposte semplici."
+msgstr "*{Nota:}* Si es vol utilitzar l'espai addicional amb Windows, pel que sembla, aquest sistema operatiu normalment no pot accedir a altres particions més que a la primera. Algunes solucions a aquest problema han estat discutides a la nostra {llista de correu}#contact, però sembla que no hi ha respostes fàcils.\n"
 
 #. type: Plain text
 #: en/user_basics.ssi:210
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*\n"
-msgstr "*{Ricorda: ogni volta che si installa un nuovo file binary.img sulla penna, tutti i dati sulla chiavetta saranno persi perché la tabella delle partizioni viene sovrascritta con i contenuti dell'immagine, per cui salvare prima la propria partizione extra in modo da ripristinarla dopo l'aggiornamento dell'immagine live.}*\n"
+msgstr "*{Recordar: Cada vegada que s'instaŀli una nova binary.img al dispositiu, es perdran totes les dades perquè la taula de particions se sobreescriu amb el contingut de la imatge, de manera que es assenyat fer una còpia de seguretat de la partició addicional per restaurar les dades de nou després d'actualitzar la imatge en viu.}*\n"
 
 #. type: Plain text
 #: en/user_basics.ssi:212
 msgid "2~building-netboot-image Building a netboot image"
-msgstr "2~building-netboot-image Creare un'immagine netboot"
+msgstr "2~building-netboot-image Construir una imatge netboot"
 
 #. type: Plain text
 #: en/user_basics.ssi:214
@@ -861,15 +864,15 @@ msgid ""
 "containing the Debian standard system without X.org. It is suitable for "
 "booting over the network."
 msgstr ""
-"La seguente sequenza di comandi creerà un'immagine netboot di base "
-"contenente il sistema Debian standard senza X.org. È adatta per il boot "
-"tramite rete."
+"La següent seqüència d'ordres crearà una imatge netboot bàsica que conté el "
+"sistema estàndard de Debian sense X.org. És adequada per a l'arrencada en "
+"xarxa."
 
 #. type: Plain text
 #: en/user_basics.ssi:216
 #, no-wrap
 msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
-msgstr "*{Nota:}* se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire la directory di lavoro con il comando #{lb clean}#:"
+msgstr "*{Nota:}* si s'ha realitzat algun dels exemples anteriors, s'haurà de netejar el directori de treball amb l'ordre #{lb clean}#:\n"
 
 #. type: Plain text
 #: en/user_basics.ssi:224
@@ -877,8 +880,7 @@ msgid ""
 "Run the #{lb config}# command as follows to configure your image for "
 "netbooting:"
 msgstr ""
-"Per configurare l'immagine per l'avvio da rete, eseguire il comando #{lb "
-"config}# come segue:"
+"Executar l'ordre següent per configurar la imatge per arrencar en xarxa:"
 
 #. type: Plain text
 #: en/user_basics.ssi:228
@@ -896,12 +898,12 @@ msgid ""
 "be located at boot time. Make sure these are set to suitable values for your "
 "network and server."
 msgstr ""
-"Diversamente dalle immagini ISO e HDD, il boot via rete non fornisce "
-"un'immagine del filesytem al client, perciò i file devono essere forniti via "
-"NFS. Le opzioni net-root-path e net-root-server specificano, "
-"rispettivamente, il percorso e il server del server NFS dove l'immagine del "
-"filesystem sarà situata all'avvio. Accertarsi che questi siano impostati su "
-"valori adeguati alla propria rete."
+"A diferència de les imatges ISO i HDD, l'arrencada en xarxa no serveix el "
+"sistema de fitxers al client, per tant els fitxers  han de ser servits a "
+"través de NFS. Les opcions #{--net-root-path}# y #{--net-root-server}# "
+"especifiquen la ubicació i el servidor, respectivament,  del servidor NFS on "
+"es troba la imatge de sistema de fitxers a l'hora d'arrencar. Assegurar-se "
+"que aquests s'ajusten als valors adequats per la xarxa i el servidor pròpis."
 
 #. type: Plain text
 #: en/user_basics.ssi:242
@@ -913,13 +915,12 @@ msgid ""
 "could be pxelinux, GRUB, or even boot directly to an operating system like "
 "Linux."
 msgstr ""
-"In un avvio tramite rete, il client esegue una piccola parte di software che "
-"normalmente risiede sulla EPROM della scheda Ethernet. Questo programma "
-"invia una richiesta DHCP per ottenere un indirizzo IP e le informazioni su "
-"cosa fare in seguito. In genere il passo successivo è ottenere un bootloader "
-"di di livello superiore attraverso il protocollo TFTP. Questi potrebbe "
-"essere pxelinux, GRUB, o anche avviare direttamente un sistema operativo "
-"come Linux."
+"En l'arrencada en xarxa, el client executa una petita peça de programari que "
+"normalment es troba a la EPROM de la targeta Ethernet. Aquest programa envia "
+"una petició DHCP per obtenir una adreça IP i la informació sobre què fer a "
+"continuació. Per regla general, el següent pas és aconseguir un carregador "
+"d'arrencada de més alt nivell a través del protocol TFTP. Podria ser GRUB, "
+"pxelinux o fins i tot arrencar directament a un sistema operatiu com Linux."
 
 #. type: Plain text
 #: en/user_basics.ssi:244
@@ -929,10 +930,10 @@ msgid ""
 "{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
 "in #{tftpboot/debian-live/i386}#."
 msgstr ""
-"Per esempio, estraendo l'archivio generato #{binary-net.tar.gz}# nella "
-"directory #{/srv/debian-live}#, si troverà l'immagine del filesystem in #"
-"{live/filesystem.squashfs}# mentre il kernel, initrd ed il bootloader "
-"pxelinux in #{tftpboot/debian-live/i386}#."
+"Per exemple, si es descomprimeix el arxiu #{binary-net.tar.gz}# generat al "
+"directori #{/srv/debian-live}#, es trobarà  la imatge del sistema de fitxers "
+"a #{live/filesystem.squashfs}# i el nucli, initrd i carregador d'arrencada "
+"pxelinux a #{tftpboot/debian-live/i386}#."
 
 #. type: Plain text
 #: en/user_basics.ssi:246
@@ -940,13 +941,13 @@ msgid ""
 "We must now configure three services on the server to enable netboot: the "
 "DHCP server, the TFTP server and the NFS server."
 msgstr ""
-"Per abilitare l'avvio tramite rete vanno ora configurati tre servizi:i "
-"server DHCP, TFTP e NFS."
+"Ara hem de configurar els tres serveis al servidor per l'arrencada en xarxa: "
+"el servidor DHCP, servidor TFTP i el servidor NFS."
 
 #. type: Plain text
 #: en/user_basics.ssi:248
 msgid "3~ DHCP server"
-msgstr "3~ Server DHCP"
+msgstr "3~ Servidor DHCP "
 
 #. type: Plain text
 #: en/user_basics.ssi:250
@@ -955,9 +956,9 @@ msgid ""
 "to the netbooting client system, and to advertise the location of the PXE "
 "bootloader."
 msgstr ""
-"Si deve configurare il server DHCP della rete per essere sicuri di fornire "
-"un indirizzo IP al sistema client che si avvia tramite rete, e notificare la "
-"posizione del bootloader PXE."
+"S'ha de configurar el servidor DHCP de la xarxa per assegurar-se que dona "
+"una adreça IP per al client del sistema d'arrencada en xarxa, i per anunciar "
+"la ubicació del carregador d'arrencada PXE."
 
 #. type: Plain text
 #: en/user_basics.ssi:252
@@ -965,8 +966,8 @@ msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
 msgstr ""
-"Ecco un esempio, scritto per un server DHCP ISC #{isc-dhcp-server}# nel file "
-"di configurazione #{/etc/dhcp/dhcpd.conf}#:"
+"Heus aquí un exemple per servir d'inspiració, escrit per al servidor ISC "
+"DHCP #{isc-dhcp-server}# al fitxer de configuració #{/etc/dhcp/dhcpd.conf}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:256
@@ -1016,13 +1017,14 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:276
 msgid "3~ TFTP server"
-msgstr "3~ Server TFTP"
+msgstr "3~ Servidor TFTP"
 
 #. type: Plain text
 #: en/user_basics.ssi:278
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
-"Fornisce al sistema il kernel e il ramdisk iniziale in fase di esecuzione."
+"Aquest serveix el nucli i el disc ram inicial per al sistema en temps "
+"d'execució."
 
 #. type: Plain text
 #: en/user_basics.ssi:280
@@ -1032,10 +1034,10 @@ msgid ""
 "files inside #{/srv/debian-live/tftpboot}#, run as root the following "
 "command:"
 msgstr ""
-"Si installi il pacchetto /{tftpd-hpa}/, che mette a disposizione tutti i "
-"file contenuti in una directory root, di solito #{/srv/tftp}#. Affinché si "
-"possa disporre dei file contenuti in #{/srv/debian-live/tftpboot}#, eseguire "
-"il seguente comando come utente root:"
+"S'ha d'instaŀlar el paquet /{tftpd-hpa}/. Aquest pot servir tots els arxius "
+"continguts dins d'un directori arrel, per regla general #{/srv/tftp}#. "
+"Perquè es serveixen els arxius dins de #{/srv/debian-live/tftpboot}#, s'ha "
+"d'executar com a root la següent ordre:"
 
 #. type: Plain text
 #: en/user_basics.ssi:284
@@ -1046,12 +1048,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:288
 msgid "and fill in the new tftp server directory when being asked about it."
-msgstr "e inserire la nuova directory del server tftp quando viene richiesto."
+msgstr "i omplir el nou directori del servidor tftp quan ho hàgim de fer."
 
 #. type: Plain text
 #: en/user_basics.ssi:290
 msgid "3~ NFS server"
-msgstr "3~ Server NFS"
+msgstr "3~ Servidor NFS"
 
 #. type: Plain text
 #: en/user_basics.ssi:292
@@ -1060,14 +1062,14 @@ msgid ""
 "its initrd, it will try to mount the Live filesystem image through a NFS "
 "server."
 msgstr ""
-"Una volta che il computer ospite ha scaricato e avviato un kernel Linux e "
-"caricato il suo initrd, cercherà di montare l'immagine del filesystem Live "
-"tramite un server NFS."
+"Un cop l'ordinador ha descarregat, ha arrencat el nucli de Linux i ha "
+"carregat el initrd, intentarà muntar la imatge del sistema de fitxers en viu "
+"a través d'un servidor NFS."
 
 #. type: Plain text
 #: en/user_basics.ssi:294
 msgid "You need to install the /{nfs-kernel-server}/ package."
-msgstr "Bisogna installare il pacchetto /{nfs-kernel-server}/."
+msgstr "S'ha d'instaŀlar el paquet /{nfs-kernel-server}/"
 
 #. type: Plain text
 #: en/user_basics.ssi:296
@@ -1075,8 +1077,8 @@ msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to #{/etc/exports}#:"
 msgstr ""
-"Quindi, rendere disponibile l'immagine del filesystem via NFS aggiungendo "
-"una riga come la seguente in #{/etc/exports}#:"
+"Llavors, fer que la imatge del sistema de fitxers estigui disponible a "
+"través de NFS afegint una línia com la següent a #{/etc/exports}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:300
@@ -1088,7 +1090,9 @@ msgstr ""
 #: en/user_basics.ssi:304
 msgid ""
 "and tell the NFS server about this new export with the following command:"
-msgstr "e comunicare il nuovo export al server NFS con il seguente comando:"
+msgstr ""
+"i informar al servidor NFS sobre aquesta nova exportació amb la següent "
+"ordre:"
 
 #. type: Plain text
 #: en/user_basics.ssi:308
@@ -1106,17 +1110,18 @@ msgid ""
 "debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
 "are very similar."
 msgstr ""
-"Configurare questi tre servizi può essere un po' problematico. Serve un po' "
-"di pazienza per farli funzionare assieme. Per ulteriori informazioni, si "
-"veda il wiki syslinux http://syslinux.zytor.com/wiki/index.php/PXELINUX o il "
-"manuale del Debian Installer alla sezione per l'avvio TFTP da rete  http://d-"
-"i.alioth.debian.org/manual/en.i386/ch04s05.html. Ciò può essere d'aiuto, "
-"considerato che il procedimento è molto simile."
+"La configuració d'aquests tres serveis pot ser una mica difícil. És possible "
+"que es necessiti una mica de paciència per aconseguir que tots tres "
+"funcionin plegats. Per obtenir més informació, veure el wiki de syslinux a "
+"http://syslinux.zytor.com/wiki/index.php/PXELINUX o la secció TFTP Net "
+"Booting al Manual del Instaŀlador de Debian a http://d-i.alioth.debian.org/"
+"manual/en.i386/ch04s05.html. Això pot ajudar, ja que els seus processos són "
+"molt similars."
 
 #. type: Plain text
 #: en/user_basics.ssi:314
 msgid "3~ Netboot testing HowTo"
-msgstr "3~ Come provare una netboot"
+msgstr "3~ Com provar l'arrencada en xarxa"
 
 #. type: Plain text
 #: en/user_basics.ssi:316
@@ -1124,17 +1129,16 @@ msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
-"La creazione di immagini netboot è resa semplice dal potere di live-build, "
-"ma provare le immagini su una macchina reale può essere davvero dispendioso "
-"in termini di tempo."
+"La creació d'imatges d'arrencada en xarxa es fa fàcil amb la màgia de live-"
+"build, però provar les imatges en màquines físiques pot costar molt de temps."
 
 #. type: Plain text
 #: en/user_basics.ssi:318
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
-"Per semplificarsi la vita, si può usare la virtualizzazione. Ci sono due "
-"soluzioni."
+"Per fer la nostra vida més fàcil, podem utilitzar la virtualització. Hi ha "
+"dues solucions."
 
 #. type: Plain text
 #: en/user_basics.ssi:320
@@ -1144,12 +1148,12 @@ msgstr "3~ Qemu"
 #. type: Plain text
 #: en/user_basics.ssi:322
 msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
-msgstr "_* Installare /{qemu}/, /{bridge-utils}/, /{sudo}/."
+msgstr "_* Instaŀlar /{qemu}/, /{bridge-utils}/, /{sudo}/."
 
 #. type: Plain text
 #: en/user_basics.ssi:324
 msgid "Edit #{/etc/qemu-ifup}#:"
-msgstr "Modificare #{/etc/qemu-ifup}#:"
+msgstr "Editar #{/etc/qemu-ifup}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:335
@@ -1168,24 +1172,24 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:339
 msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
-msgstr "Procurarsi o compilare #{grub-floppy-netboot}# (su svn)."
+msgstr "Descarregar o crear un #{grub-floppy-netboot}# (al svn)."
 
 #. type: Plain text
 #: en/user_basics.ssi:341
 msgid ""
 "Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
 msgstr ""
-"Lanciare #{qemu}# con \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
+"Llançar #{qemu}# amb \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
 
 #. type: Plain text
 #: en/user_basics.ssi:343
 msgid "3~ VMWare Player"
-msgstr ""
+msgstr "3~ VMWare Player"
 
 #. type: Plain text
 #: en/user_basics.ssi:345
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
-msgstr "_* Installare VMWare Player (edizione \"free as in beer\")"
+msgstr "_* Instaŀlar VMWare Player (edició gratuïta «free as in beer»)"
 
 #. type: Plain text
 #: en/user_basics.ssi:347
@@ -1193,13 +1197,13 @@ msgid ""
 "_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
 "inside"
 msgstr ""
-"_* Creare una directory PXETester, e crearvi all'interno un file di testo "
-"chiamato #{pxe.vwx}#"
+"_* Crear un directory PXETester amb un fitxer de text dins anomenat #{pxe."
+"vwx}#"
 
 #. type: Plain text
 #: en/user_basics.ssi:349
 msgid "_* Paste this text inside:"
-msgstr "_* Vi si copi dentro questo testo:"
+msgstr "_* Enganxar aquest text dins:"
 
 #. type: Plain text
 #: en/user_basics.ssi:357
@@ -1255,20 +1259,20 @@ msgid ""
 "_* You can play with this configuration file (e.g. change memory limit to "
 "256)"
 msgstr ""
-"_* Si può modificare a piacimento questo file di configurazione (ad esempio "
-"portando a 256 il limite della memoria)"
+"_* Es pot jugar amb aquest fitxer de configuració (per exemple, canviar el "
+"limit de memòria a 256)"
 
 #. type: Plain text
 #: en/user_basics.ssi:380
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
-"_* Fare doppio click su questo file (o avviare il player VMWare e "
-"selezionare questo file)."
+"_* Fer doble clic sobre aquest fitxer (o executar VMWare player i "
+"seleccionar aquest fitxer)."
 
 #. type: Plain text
 #: en/user_basics.ssi:381
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
-"_* Se viene posta qualche strana domanda durante l'esecuzione premere il "
-"tasto spazio..."
+"_* Quan està en execució només cal prémer «espai» si sorgeix aquella "
+"pregunta estranya ..."
diff --git a/manual/po/de/user_customization-binary.ssi.po b/manual/po/ca/user_customization-binary.ssi.po
similarity index 98%
copy from manual/po/de/user_customization-binary.ssi.po
copy to manual/po/ca/user_customization-binary.ssi.po
index a6ed050..9cdf3d2 100644
--- a/manual/po/de/user_customization-binary.ssi.po
+++ b/manual/po/ca/user_customization-binary.ssi.po
@@ -1,19 +1,19 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-04-08 12:15+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-04-08 12:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
@@ -84,7 +84,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
@@ -155,7 +155,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:2
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/ca/user_customization-contents.ssi.po
similarity index 98%
copy from manual/po/de/user_customization-contents.ssi.po
copy to manual/po/ca/user_customization-contents.ssi.po
index 3c2636f..00fbf50 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/ca/user_customization-contents.ssi.po
@@ -1,19 +1,19 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-04-14 16:13+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -84,7 +84,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
@@ -155,7 +155,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/ca/user_customization-installer.ssi.po
similarity index 98%
copy from manual/po/de/user_customization-installer.ssi.po
copy to manual/po/ca/user_customization-installer.ssi.po
index 24b3c5b..ce511a6 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/ca/user_customization-installer.ssi.po
@@ -1,19 +1,19 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-06-03 19:00+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-06-03 19:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -83,7 +83,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
@@ -153,7 +153,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:2
diff --git a/manual/po/de/user_customization-overview.ssi.po b/manual/po/ca/user_customization-overview.ssi.po
similarity index 96%
copy from manual/po/de/user_customization-overview.ssi.po
copy to manual/po/ca/user_customization-overview.ssi.po
index f5ae3ff..b99eea0 100644
--- a/manual/po/de/user_customization-overview.ssi.po
+++ b/manual/po/ca/user_customization-overview.ssi.po
@@ -1,19 +1,19 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-04-14 16:13+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/ca/user_customization-packages.ssi.po
similarity index 99%
copy from manual/po/de/user_customization-packages.ssi.po
copy to manual/po/ca/user_customization-packages.ssi.po
index 1c160b1..c6db1b4 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/ca/user_customization-packages.ssi.po
@@ -1,19 +1,19 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-04-14 22:45+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-04-14 22:45+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -83,7 +83,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
@@ -153,7 +153,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:2
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/ca/user_customization-runtime.ssi.po
similarity index 78%
copy from manual/po/de/user_customization-runtime.ssi.po
copy to manual/po/ca/user_customization-runtime.ssi.po
index 5ab405a..b5b7eb5 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/ca/user_customization-runtime.ssi.po
@@ -1,19 +1,19 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 20:02+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-06-09 20:31+0300\n"
+"PO-Revision-Date: 2012-06-09 20:31+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -62,8 +62,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -83,7 +83,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
@@ -132,8 +132,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -153,7 +153,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:2
@@ -377,8 +377,8 @@ msgstr ""
 msgid ""
 "'Persistence' is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
+"understand how it works it would be handy to know that even if the system is "
+"booted and run from read-only media, modifications to the files and "
 "directories are written on writable media, typically a ram disk (tmpfs) and "
 "ram disks' data do not survive reboots."
 msgstr ""
@@ -398,8 +398,9 @@ msgstr ""
 msgid ""
 "If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
 "set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistence volumes during boot. A persistence volume is any of the "
-"following:"
+"persistence volumes during boot. It is possible to restrict which types of "
+"persistence volumes to use by specifying certain boot parameters described "
+"in the live-boot(7) man page. A persistence volume is any of the following:"
 msgstr ""
 
 #. type: Plain text
@@ -415,117 +416,89 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:106
 msgid ""
-"_* an image/archive file located on the root of any readable filesystem "
-"(even an NTFS partition of a foreign OS), identified by its file name. In "
-"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext4\"."
+"_* an image file located on the root of any readable filesystem (even an "
+"NTFS partition of a foreign OS), identified by its file name. In this case "
+"the file name must also use the containing filesystem as the file extension, "
+"e.g. \"persistence.ext4\"."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:108
 msgid ""
-"It is possible to restrict which types of persistence volumes to use by "
-"specifying certain boot parameters described in the live-boot(7) man page. "
-"The \"identifying labels\" referred to above can be any of the following:"
+"The volume label for overlays must be #{persistence}#. And in order to fully "
+"customize the volume's persistence there must be a file named #{live-"
+"persistence.conf}#. See {The live-persistence.conf file}#live-persistence-"
+"conf"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistence overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:112
-msgid "_* #{custom-ov}# for custom overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:114
-msgid "_* #{live-sn}# for full system snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:116
-msgid "_* #{home-sn}# for /home snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistence overlays"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:120
 msgid ""
-"By 'full persistence' it is meant that instead of using a tmpfs for storing "
-"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistence volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
-"hard disk or on a usb key created with, e.g.:"
+"Here are some examples of how to prepare a volume to be used for "
+"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
+"a usb key created with, e.g.:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:114
 #, no-wrap
-msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:118
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:124
 #, no-wrap
-msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:128
 msgid ""
-"Here's an example of how to create an ext4-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for "
 "persistence:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:133
 #, no-wrap
 msgid ""
-" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext4 -F full-ov\n"
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:147
-msgid ""
-"Then copy the #{full-ov}# file to the root of a writable partition and "
-"reboot."
+#: en/user_customization-runtime.ssi:137
+msgid "Then copy the #{persistence}# file to the root of a writable partition."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:149
-msgid "3~ Custom overlays"
+#: en/user_customization-runtime.ssi:139
+msgid "3~live-persistence-conf The live-persistence.conf file"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:151
+#: en/user_customization-runtime.ssi:141
 msgid ""
-"A volume with the label #{custom-ov}# can be configured to make arbitrary "
+"A volume with the label #{persistence}# can be configured to make arbitrary "
 "directories persistent. The file #{live-persistence.conf}#, located on the "
 "volume's filesystem root, controls which directories it makes persistent, "
 "and in which way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:153
+#: en/user_customization-runtime.ssi:143
 msgid ""
 "How custom overlay mounts are configured is described in full detail in the "
 "live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -534,17 +507,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:160
+#: en/user_customization-runtime.ssi:150
 #, no-wrap
 msgid ""
-" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mkfs.ext4 -L persistence /dev/sdb1\n"
 " $ mount -t ext4 /dev/sdb1 /mnt\n"
 " $ echo \"/home\" >> /mnt/live-persistence.conf\n"
 " $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:164
+#: en/user_customization-runtime.ssi:154
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -552,12 +525,11 @@ msgid ""
 "note that any paths listed in the #{live-persistence.conf}# file cannot "
 "contain white spaces or the special #{.}# and #{..}# path components. Also, "
 "neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
-"persistent using custom mounts (for the latter, use the #{full-ov}# type "
-"persistence described above)."
+"persistent using custom mounts."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:166
+#: en/user_customization-runtime.ssi:156
 msgid ""
 "Several different custom overlay volumes (with their own #{live-persistence."
 "conf}# files) can be used at the same time, but if several volumes make the "
@@ -570,64 +542,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:168
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:170
-msgid ""
-"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistence volume to the system "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
-"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
-"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
-"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistence media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems, but it occupies as "
-"much RAM as the size of the uncompressed snapshot."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:172
-msgid ""
-"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
-"works the same as the main snapshot but it is only applied to /home."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:174
-msgid "Snapshots cannot currently handle file deletion."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:176
+#: en/user_customization-runtime.ssi:158
 msgid "3~ Persistence SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:178
+#: en/user_customization-runtime.ssi:159
 msgid ""
 "If a user would need multiple persistence storage of the same type for "
-"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
-"the boot parameter #{persistence}# will allow for multiple but unique "
-"persistence media. An example would be if a user wanted to use a persistence "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistence}# #{persistence-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:180
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:181
-msgid ""
-"The run-time modification of the tmpfs could be collected using live-"
-"snapshot in a squashfs and added to the cd by remastering the iso in the "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
+"different locations or testing, such as #{persistence-nonwork}# and #"
+"{persistence-work}#, the boot parameter #{persistence-subtext}# used in "
+"conjunction with the boot parameter #{persistence}# will allow for multiple "
+"but unique persistence media. An example would be if a user wanted to use a "
+"persistence partition labeled #{persistence-subText}# they would use the "
+"boot parameters of: #{persistence}# #{persistence-subtext=subText}#."
 msgstr ""
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/ca/user_examples.ssi.po
similarity index 98%
copy from manual/po/de/user_examples.ssi.po
copy to manual/po/ca/user_examples.ssi.po
index 20b9f9d..b88aa94 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/ca/user_examples.ssi.po
@@ -1,24 +1,23 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-06-07 08:43+0300\n"
+"PO-Revision-Date: 2012-06-07 08:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:61 en/user_examples.ssi:2
 msgid ":B~ Examples"
-msgstr ":B~ Beispiele"
+msgstr ":B~ Exemples"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -88,7 +87,7 @@ msgstr ":B~ Beispiele"
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
@@ -158,6 +157,13 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:234
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -268,12 +274,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
-#, no-wrap
-msgid " # lb build 2>&1 | tee binary.log\n"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
@@ -420,7 +420,7 @@ msgstr ""
 #: en/user_examples.ssi:123
 msgid ""
 "Note that unlike in the first two tutorials, we no longer have to type #"
-"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/ca/user_installation.ssi.po
similarity index 73%
copy from manual/po/de/user_installation.ssi.po
copy to manual/po/ca/user_installation.ssi.po
index 2fdbaaa..fcd49d0 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/ca/user_installation.ssi.po
@@ -1,26 +1,25 @@
-# German translations for live-manual package
+# Catalan translations for live-manual
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"PO-Revision-Date: 2012-06-20 00:12+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: debian-live at lists.debian.org\n"
+"Language: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -63,8 +62,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -84,14 +83,13 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -134,8 +132,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -155,7 +153,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
@@ -166,47 +164,47 @@ msgstr ""
 #. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
-msgstr ""
+msgstr ":B~ Instaŀlació"
 
 #. type: Plain text
 #: en/user_installation.ssi:4
 msgid "1~installation Installation"
-msgstr ""
+msgstr "1~installation Instaŀlació"
 
 #. type: Plain text
 #: en/user_installation.ssi:6
 msgid "2~requirements Requirements"
-msgstr ""
+msgstr "2~requirements Requeriments"
 
 #. type: Plain text
 #: en/user_installation.ssi:8
 msgid "Building Debian Live images has very few system requirements:"
-msgstr ""
+msgstr "La construcció d'imatges Debian Live té molts pocs requeriments."
 
 #. type: Plain text
 #: en/user_installation.ssi:10
 msgid "_* Super user (root) access"
-msgstr ""
+msgstr "_* Accés de superusuari (root)"
 
 #. type: Plain text
 #: en/user_installation.ssi:12
 msgid "_* An up-to-date version of live-build"
-msgstr ""
+msgstr "_* Una versió actualitzada de live-build"
 
 #. type: Plain text
 #: en/user_installation.ssi:14
 msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
-msgstr ""
+msgstr "_* Una shell compatible amb POSIX, com ara /{bash}/ o /{dash}/."
 
 #. type: Plain text
 #: en/user_installation.ssi:16
 msgid "_* /{debootstrap}/ or /{cdebootstrap}/"
-msgstr ""
+msgstr "_* /{debootstrap}/ o /{cdebootstrap}/"
 
 #. type: Plain text
 #: en/user_installation.ssi:18
 msgid "_* Linux 2.6.x"
-msgstr ""
+msgstr "_* Linux 2.6.x"
 
 #. type: Plain text
 #: en/user_installation.ssi:20
@@ -214,31 +212,34 @@ msgid ""
 "Note that using Debian or a Debian-derived distribution is not required - "
 "live-build will run on almost any distribution with the above requirements."
 msgstr ""
+"Tenir en compte que no cal usar Debian o una distribució derivada de Debian "
+"ja que live-build funcionarà en gairebé qualsevol distribució amb els "
+"requisits anteriors."
 
 #. type: Plain text
 #: en/user_installation.ssi:22
 msgid "2~installing-live-build Installing live-build"
-msgstr ""
+msgstr "2~installing-live-build Instaŀlació de live-build"
 
 #. type: Plain text
 #: en/user_installation.ssi:24
 msgid "You can install live-build in a number of different ways:"
-msgstr ""
+msgstr "Es pot instaŀlar live-build en un nombre de maneres diferentes:"
 
 #. type: Plain text
 #: en/user_installation.ssi:26
 msgid "_* From the Debian repository"
-msgstr ""
+msgstr "_* Des del repositori Debian"
 
 #. type: Plain text
 #: en/user_installation.ssi:28
 msgid "_* From source"
-msgstr ""
+msgstr "_* À partir del codi font"
 
 #. type: Plain text
 #: en/user_installation.ssi:30
 msgid "_* From snapshots"
-msgstr ""
+msgstr "_* À partir d'instantànies"
 
 #. type: Plain text
 #: en/user_installation.ssi:32
@@ -246,16 +247,18 @@ msgid ""
 "If you are using Debian, the recommended way is to install live-build via "
 "the Debian repository."
 msgstr ""
+"Si s'utilitza Debian, la manera recomanada és instaŀlar live-build des del "
+"repositori de Debian."
 
 #. type: Plain text
 #: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
-msgstr ""
+msgstr "3~ Des del repositori de Debian"
 
 #. type: Plain text
 #: en/user_installation.ssi:36
 msgid "Simply install live-build like any other package:"
-msgstr ""
+msgstr "Només cal instaŀlar live-build com qualsevol altre paquet:"
 
 #. type: Plain text
 #: en/user_installation.ssi:40
@@ -266,7 +269,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_installation.ssi:44
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. type: Plain text
 #: en/user_installation.ssi:48
@@ -277,7 +280,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
-msgstr ""
+msgstr "3~ À partir del codi font"
 
 #. type: Plain text
 #: en/user_installation.ssi:54
@@ -286,6 +289,9 @@ msgid ""
 "based systems, this is provided by the /{git}/ package. To check out the "
 "latest code, execute:"
 msgstr ""
+"live-build es desenvolupa utilitzant el sistema de control de versions Git.  "
+"En els sistemes basats en Debian, això és proporcionat pel paquet git. Per "
+"comprovar l'últim codi, executar:"
 
 #. type: Plain text
 #: en/user_installation.ssi:58
@@ -297,6 +303,7 @@ msgstr ""
 #: en/user_installation.ssi:62
 msgid "You can build and install your own Debian package by executing:"
 msgstr ""
+"Es pot construir i instaŀlar un paquet Debian pròpi mitjançant l'execució de:"
 
 #. type: Plain text
 #: en/user_installation.ssi:68
@@ -313,6 +320,8 @@ msgid ""
 "Now install whichever of the freshly built #{.deb}# files you were "
 "interested in, e.g."
 msgstr ""
+"Ara instaŀlar qualsevol dels fitxers #{.deb}# recent construïts que ens "
+"interessen, per exemple,"
 
 #. type: Plain text
 #: en/user_installation.ssi:76
@@ -324,6 +333,7 @@ msgstr ""
 #: en/user_installation.ssi:80
 msgid "You can also install live-build directly to your system by executing:"
 msgstr ""
+"Es pot instaŀlar live-build directament al sistema mitjançant l'execució de:"
 
 #. type: Plain text
 #: en/user_installation.ssi:84
@@ -334,7 +344,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_installation.ssi:88
 msgid "and uninstall it with:"
-msgstr ""
+msgstr "i desinstaŀlar amb:"
 
 #. type: Plain text
 #: en/user_installation.ssi:92
@@ -345,7 +355,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
-msgstr ""
+msgstr "3~ A partir d'instantànies"
 
 #. type: Plain text
 #: en/user_installation.ssi:98
@@ -354,17 +364,21 @@ msgid ""
 "snapshots. These are built automatically from the latest version in Git and "
 "are available on http://live.debian.net/debian/."
 msgstr ""
+"Si no es desitja construir o instaŀlar live-build a partir de les fonts, es "
+"pot utilitzar les instantànies. Aquestes es construeixen automàticament a "
+"partir de l'última versió del Git, i estan disponibles a http://live.debian."
+"net/debian/."
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot and live-config"
-msgstr ""
+msgid "2~ Installing live-boot and live-config"
+msgstr "2~ Instal.lació de live-boot i live-config"
 
 #. type: Plain text
 #: en/user_installation.ssi:102
 #, no-wrap
 msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.\n"
-msgstr ""
+msgstr "*{Nota:}* No cal instaŀlar live-boot o live-config en el sistema per crear sistemes personalitzats de Debian Live. No obstant, això no farà cap mal i és útil per a fins de referència. Si només es vol la documentació, ara es poden instaŀlar els paquets /{live-boot-doc}/ i /{live-config-doc}/ per separat.\n"
 
 #. type: Plain text
 #: en/user_installation.ssi:106
@@ -372,6 +386,8 @@ msgid ""
 "Both live-boot and live-config are available from the Debian repository as "
 "per {Installing live-build}#installing-live-build."
 msgstr ""
+"Tots dos, live-boot i live-config, estan disponibles al arxiu de Debian, "
+"d'una manera similar a {Instaŀlació de live-build}#installing-live-build."
 
 #. type: Plain text
 #: en/user_installation.ssi:110
@@ -379,11 +395,13 @@ msgid ""
 "To use the latest source from git, you can follow the process below. Please "
 "ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
+"Per utilitzar les darreres fonts del git, es pot seguir el procés seguent. "
+"Assegurar-se d'estar familiaritzat amb els termes esmentats a {Termes}#terms."
 
 #. type: Plain text
 #: en/user_installation.ssi:112
 msgid "_* Checkout the live-boot and live-config source"
-msgstr ""
+msgstr "_* Clonar les fonts de live-boot i live-config"
 
 #. type: Plain text
 #: en/user_installation.ssi:117
@@ -399,11 +417,14 @@ msgid ""
 "Consult the live-boot and live-config man pages for details on customizing "
 "if that is your reason for building these packages from source."
 msgstr ""
+"Consultar les pàgines del manual de live-boot i live-config per més detalls "
+"sobre la seva personalització si aquesta és la raó per construir aquests "
+"paquets a partir de les fonts."
 
 #. type: Plain text
 #: en/user_installation.ssi:123
 msgid "_* Build live-boot and live-config .deb files"
-msgstr ""
+msgstr "_* Crear els fitxers .deb de live-boot i live-config "
 
 #. type: Plain text
 #: en/user_installation.ssi:125
@@ -412,6 +433,9 @@ msgid ""
 "your target platform: this means if your target is wheezy then you should "
 "build against wheezy."
 msgstr ""
+"S'ha de crear ja sigui en la distribució de destinació o en un chroot que "
+"contingui la plataforma de destinació: és a dir, si el objectiu és wheezy "
+"llavors s'ha de construir contra wheezy."
 
 #. type: Plain text
 #: en/user_installation.ssi:127
@@ -423,6 +447,13 @@ msgid ""
 "distribution, you may build directly on the build system using #{dpkg-"
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
 msgstr ""
+"Es pot utilitzar un constructor personal, com ara /{pbuilder}/ o /{sbuild}/  "
+"si es necessita crear live-boot per a una distribució de destinació "
+"diferenta del sistema de construcció. Per exemple, per a les imatges en viu "
+"de wheezy, crear live-boot en un chroot wheezy. Si la distribució de "
+"destinació per casualitat coincideix amb la distribució del sistema de "
+"construcció, es pot construir directament en el sistema de construcció amb #"
+"{dpkg-buildpackage}# (proporcionat pel paquet /{dpkg-dev}/):"
 
 #. type: Plain text
 #: en/user_installation.ssi:134
@@ -437,7 +468,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_installation.ssi:138
 msgid "_* Use all generated .deb files"
-msgstr ""
+msgstr "_* Utilitzar tots el fitxers .deb generats"
 
 #. type: Plain text
 #: en/user_installation.ssi:140
@@ -449,6 +480,12 @@ msgid ""
 "You should pay particular attention to {Additional repositories}#additional-"
 "repositories."
 msgstr ""
+"Com live-boot i live-config són instaŀlats pel sistema live-build, instaŀlar "
+"els paquets en el sistema amfitrió no és suficient: S'han de tractar tots "
+"els fitxers .deb generats igual que qualsevol altre paquet personalitzat. Si "
+"us plau veure {Personalització de l'instaŀlació de paquets}#customizing-"
+"package-installation per a més informació. S'ha de prestar especial atenció "
+"a {Repositoris addicionals}#additional-repositories."
 
 #. type: Plain text
 #: en/user_installation.ssi:144
@@ -458,3 +495,7 @@ msgid ""
 "configuration directory. Assuming you have already created a configuration "
 "tree in the current directory with #{lb config}#:"
 msgstr ""
+"Es pot deixar que live-build utilitzi les darreres instantànies de live-boot "
+"i live-config configurant un repositori de tercers en el directori de "
+"configuració de live-build. Suposant que ja s'ha creat un arbre de "
+"configuració del directori actual amb #{lb config}#:"
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/ca/user_managing_a_configuration.ssi.po
similarity index 97%
copy from manual/po/de/user_managing_a_configuration.ssi.po
copy to manual/po/ca/user_managing_a_configuration.ssi.po
index a131226..9fccadf 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/ca/user_managing_a_configuration.ssi.po
@@ -1,19 +1,19 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-04-14 16:13+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -84,7 +84,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
@@ -155,7 +155,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:2
@@ -269,7 +269,7 @@ msgid ""
 " lb clean noauto \"${@}\"\n"
 " rm -f config/binary config/bootstrap \\\n"
 "     config/chroot config/common config/source\n"
-" rm -f binary.log\n"
+" rm -f build.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -282,7 +282,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
+" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/ca/user_overview.ssi.po
similarity index 94%
copy from manual/po/de/user_overview.ssi.po
copy to manual/po/ca/user_overview.ssi.po
index 40ed412..27a5175 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/ca/user_overview.ssi.po
@@ -1,26 +1,25 @@
-# German translations for live-manual package
+# Catalan translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"PO-Revision-Date: 2012-06-16 18:50+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -63,8 +62,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -84,14 +83,13 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -134,8 +132,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -155,7 +153,7 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
 #: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_overview.ssi:2
@@ -176,7 +174,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~live-build live-build"
+msgid "2~live-build The live-build package"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 2e70288..6f5281f 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-18 19:35+0300\n"
+"POT-Creation-Date: 2012-06-24 19:21+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -387,8 +387,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -462,8 +462,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -545,7 +545,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:130
 #, no-wrap
-msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgid " $ make build LANGUAGES=it FORMATS=html\n"
 msgstr ""
 
 #. type: Plain text
@@ -657,29 +657,36 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:195
-msgid "To submit a translation for a new language, follow these three steps:"
+msgid "To start a translation for a new language, follow these steps:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:197
 msgid ""
-"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as /"
-"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
-"your submission, we will add the new language to the manual (providing the "
-"po files) and will enable it in the autobuild."
+"_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and *"
+"{index.html.in.pot}* files to your language with your favourite editor (such "
+"as /{poedit}/). Send the translated #{.po}# files to the mailing list so "
+"that the translation team can check their integrity."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:199
 msgid ""
-"_* Once the new language is added, you can randomly start translating all po "
-"files in #{manual/po/}#."
+"_* To enable a new language in the autobuild it is enough to add the initial "
+"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
+"then edit #{manual/_sisu/home/index.html}#."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:201
 msgid ""
+"_* Once the new language is added, you can randomly continue translating the "
+"remaining po files in #{manual/po/}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:203
+msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
 "are updated from the po files and then you can review your changes launching "
 "#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
@@ -687,7 +694,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:202
+#: en/about_manual.ssi:204
 #, no-wrap
-msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
 msgstr ""
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 65bd4be..bea151d 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-04 12:21+0300\n"
+"POT-Creation-Date: 2012-06-27 14:57+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -44,13 +44,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:13
-#, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-06-04\n"
+" :published: 2012-06-27\n"
 msgstr ""
 "@date:\n"
-" :published: 04.06.2012\n"
+" :published: 27.06.2012\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:15
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index 5ab405a..8d2d7b4 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 20:02+0300\n"
+"POT-Creation-Date: 2012-06-09 20:31+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -62,8 +62,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -132,8 +132,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -377,8 +377,8 @@ msgstr ""
 msgid ""
 "'Persistence' is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
+"understand how it works it would be handy to know that even if the system is "
+"booted and run from read-only media, modifications to the files and "
 "directories are written on writable media, typically a ram disk (tmpfs) and "
 "ram disks' data do not survive reboots."
 msgstr ""
@@ -398,8 +398,9 @@ msgstr ""
 msgid ""
 "If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
 "set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistence volumes during boot. A persistence volume is any of the "
-"following:"
+"persistence volumes during boot. It is possible to restrict which types of "
+"persistence volumes to use by specifying certain boot parameters described "
+"in the live-boot(7) man page. A persistence volume is any of the following:"
 msgstr ""
 
 #. type: Plain text
@@ -415,117 +416,89 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:106
 msgid ""
-"_* an image/archive file located on the root of any readable filesystem "
-"(even an NTFS partition of a foreign OS), identified by its file name. In "
-"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext4\"."
+"_* an image file located on the root of any readable filesystem (even an "
+"NTFS partition of a foreign OS), identified by its file name. In this case "
+"the file name must also use the containing filesystem as the file extension, "
+"e.g. \"persistence.ext4\"."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:108
 msgid ""
-"It is possible to restrict which types of persistence volumes to use by "
-"specifying certain boot parameters described in the live-boot(7) man page. "
-"The \"identifying labels\" referred to above can be any of the following:"
+"The volume label for overlays must be #{persistence}#. And in order to fully "
+"customize the volume's persistence there must be a file named #{live-"
+"persistence.conf}#. See {The live-persistence.conf file}#live-persistence-"
+"conf"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistence overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:112
-msgid "_* #{custom-ov}# for custom overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:114
-msgid "_* #{live-sn}# for full system snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:116
-msgid "_* #{home-sn}# for /home snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistence overlays"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:120
 msgid ""
-"By 'full persistence' it is meant that instead of using a tmpfs for storing "
-"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistence volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
-"hard disk or on a usb key created with, e.g.:"
+"Here are some examples of how to prepare a volume to be used for "
+"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
+"a usb key created with, e.g.:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:114
 #, no-wrap
-msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:118
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:124
 #, no-wrap
-msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:128
 msgid ""
-"Here's an example of how to create an ext4-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for "
 "persistence:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:133
 #, no-wrap
 msgid ""
-" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext4 -F full-ov\n"
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:147
-msgid ""
-"Then copy the #{full-ov}# file to the root of a writable partition and "
-"reboot."
+#: en/user_customization-runtime.ssi:137
+msgid "Then copy the #{persistence}# file to the root of a writable partition."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:149
-msgid "3~ Custom overlays"
+#: en/user_customization-runtime.ssi:139
+msgid "3~live-persistence-conf The live-persistence.conf file"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:151
+#: en/user_customization-runtime.ssi:141
 msgid ""
-"A volume with the label #{custom-ov}# can be configured to make arbitrary "
+"A volume with the label #{persistence}# can be configured to make arbitrary "
 "directories persistent. The file #{live-persistence.conf}#, located on the "
 "volume's filesystem root, controls which directories it makes persistent, "
 "and in which way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:153
+#: en/user_customization-runtime.ssi:143
 msgid ""
 "How custom overlay mounts are configured is described in full detail in the "
 "live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -534,17 +507,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:160
+#: en/user_customization-runtime.ssi:150
 #, no-wrap
 msgid ""
-" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mkfs.ext4 -L persistence /dev/sdb1\n"
 " $ mount -t ext4 /dev/sdb1 /mnt\n"
 " $ echo \"/home\" >> /mnt/live-persistence.conf\n"
 " $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:164
+#: en/user_customization-runtime.ssi:154
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -552,12 +525,11 @@ msgid ""
 "note that any paths listed in the #{live-persistence.conf}# file cannot "
 "contain white spaces or the special #{.}# and #{..}# path components. Also, "
 "neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
-"persistent using custom mounts (for the latter, use the #{full-ov}# type "
-"persistence described above)."
+"persistent using custom mounts."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:166
+#: en/user_customization-runtime.ssi:156
 msgid ""
 "Several different custom overlay volumes (with their own #{live-persistence."
 "conf}# files) can be used at the same time, but if several volumes make the "
@@ -570,64 +542,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:168
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:170
-msgid ""
-"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistence volume to the system "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
-"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
-"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
-"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistence media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems, but it occupies as "
-"much RAM as the size of the uncompressed snapshot."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:172
-msgid ""
-"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
-"works the same as the main snapshot but it is only applied to /home."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:174
-msgid "Snapshots cannot currently handle file deletion."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:176
+#: en/user_customization-runtime.ssi:158
 msgid "3~ Persistence SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:178
+#: en/user_customization-runtime.ssi:159
 msgid ""
 "If a user would need multiple persistence storage of the same type for "
-"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
-"the boot parameter #{persistence}# will allow for multiple but unique "
-"persistence media. An example would be if a user wanted to use a persistence "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistence}# #{persistence-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:180
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:181
-msgid ""
-"The run-time modification of the tmpfs could be collected using live-"
-"snapshot in a squashfs and added to the cd by remastering the iso in the "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
+"different locations or testing, such as #{persistence-nonwork}# and #"
+"{persistence-work}#, the boot parameter #{persistence-subtext}# used in "
+"conjunction with the boot parameter #{persistence}# will allow for multiple "
+"but unique persistence media. An example would be if a user wanted to use a "
+"persistence partition labeled #{persistence-subText}# they would use the "
+"boot parameters of: #{persistence}# #{persistence-subtext=subText}#."
 msgstr ""
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 20b9f9d..75e23b1 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-06-07 08:43+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -161,6 +161,13 @@ msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:234
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
 #: en/user_examples.ssi:119 en/user_examples.ssi:211
 #, no-wrap
@@ -268,12 +275,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
-#, no-wrap
-msgid " # lb build 2>&1 | tee binary.log\n"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
@@ -420,7 +421,7 @@ msgstr ""
 #: en/user_examples.ssi:123
 msgid ""
 "Note that unlike in the first two tutorials, we no longer have to type #"
-"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 2fdbaaa..cda02f5 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,11 +16,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -63,8 +62,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -87,11 +86,10 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -134,8 +132,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -357,7 +355,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot and live-config"
+msgid "2~ Installing live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index a131226..9a98c39 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -269,7 +269,7 @@ msgid ""
 " lb clean noauto \"${@}\"\n"
 " rm -f config/binary config/bootstrap \\\n"
 "     config/chroot config/common config/source\n"
-" rm -f binary.log\n"
+" rm -f build.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -282,7 +282,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
+" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 40ed412..697fc77 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,8 +19,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -63,8 +62,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -90,8 +89,7 @@ msgstr ""
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -134,8 +132,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -176,7 +174,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~live-build live-build"
+msgid "2~live-build The live-build package"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 0cb3adc..10bcc9d 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-18 19:35+0300\n"
-"PO-Revision-Date: 2012-04-23 20:31+0100\n"
+"POT-Creation-Date: 2012-06-24 19:21+0300\n"
+"PO-Revision-Date: 2012-06-24 19:49+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -485,8 +485,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -560,8 +560,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -652,7 +652,7 @@ msgstr "O combinar ambos, por ejemplo:"
 #. type: Plain text
 #: en/about_manual.ssi:130
 #, no-wrap
-msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgid " $ make build LANGUAGES=it FORMATS=html\n"
 msgstr ""
 
 #. type: Plain text
@@ -782,39 +782,48 @@ msgstr "3~translation Traducción"
 
 #. type: Plain text
 #: en/about_manual.ssi:195
-msgid "To submit a translation for a new language, follow these three steps:"
+msgid "To start a translation for a new language, follow these steps:"
 msgstr ""
-"Para enviar una traducción para un nuevo idioma, se deben seguir los "
+"Para comenzar la traducción de un idioma nuevo, se deben seguir los "
 "siguientes pasos:"
 
 #. type: Plain text
 #: en/about_manual.ssi:197
 msgid ""
-"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as /"
-"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
-"your submission, we will add the new language to the manual (providing the "
-"po files) and will enable it in the autobuild."
+"_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and *"
+"{index.html.in.pot}* files to your language with your favourite editor (such "
+"as /{poedit}/). Send the translated #{.po}# files to the mailing list so "
+"that the translation team can check their integrity."
 msgstr ""
-"_* Traducir los ficheros about_manual.ssi.pot, about_project.ssi.pot e index."
-"html.in.pot al idioma deseado con cualquier editor (como puede ser /"
-"{poedit}/) y enviarlos a la lista de correos. Una vez hayan sido revisados, "
-"el idioma será añadido al manual, (añadiendo los ficheros .po) y se activará "
-"en el autobuild."
+"_* Traducir los ficheros *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* "
+"y *{index.html.in.pot}* al idioma deseado con cualquier editor (como puede "
+"ser /{poedit}/). Enviar los ficheros #{.po}# traducidos a la lista de correo "
+"para que el equipo de traducción pueda revisar su integridad."
 
 #. type: Plain text
 #: en/about_manual.ssi:199
 msgid ""
-"_* Once the new language is added, you can randomly start translating all po "
-"files in #{manual/po/}#."
+"_* To enable a new language in the autobuild it is enough to add the initial "
+"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
+"then edit #{manual/_sisu/home/index.html}#."
 msgstr ""
-"_* Una vez que el nuevo idioma haya sido añadido, se puede comenzar la "
-"traducción de todos los ficheros .po exisitentes en #{manual/po/}# de manera "
-"aleatoria."
+"_* Para activar una nueva lengua en el autobuild basta con añadir los "
+"ficheros traducidos inicialmente a #{manual/po/${LANGUAGE}/}# y ejecutar #"
+"{make commit}#. Y entonces editar #{manual/_sisu/home/index.html}#."
 
 #. type: Plain text
 #: en/about_manual.ssi:201
 msgid ""
+"_* Once the new language is added, you can randomly continue translating the "
+"remaining po files in #{manual/po/}#."
+msgstr ""
+"_* Una vez que el nuevo idioma haya sido añadido, se puede continuar la "
+"traducción de los ficheros po restantes en #{manual/po/}# de manera "
+"aleatoria."
+
+#. type: Plain text
+#: en/about_manual.ssi:203
+msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
 "are updated from the po files and then you can review your changes launching "
 "#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
@@ -827,7 +836,7 @@ msgstr ""
 "\"Translating...\"}# y #{git push}#."
 
 #. type: Plain text
-#: en/about_manual.ssi:202
+#: en/about_manual.ssi:204
 #, no-wrap
-msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
-msgstr "*{Nota:}* Tener en cuenta que a pesar de que tanto #{make commit}# como #{make build}# borran el directorio «build», si se crea el manual para revisar los cambios tal y como se recomienda, es posible que se desee limpiar el árbol git antes de enviar los cambios. Para hacer esto, se puede usar #{make clean}#. Este último paso no es obligatorio, gracias al fichero .gitignore, pero es una buena práctica para evitar enviar ficheros involuntariamente.\n"
+msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgstr "*{Nota:}* Se puede utilizar #{make clean}# para limpiar el árbol git antes de enviar los cambios. Este paso no es obligatorio, gracias al fichero .gitignore, pero es una buena práctica para evitar enviar ficheros involuntariamente.\n"
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 9e6092d..815ab91 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -1,61 +1,14 @@
-# Spanish translations for live-manual package
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
-# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-04 12:21+0300\n"
-"PO-Revision-Date: 2011-03-12 08:00-0000\n"
-"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
-"<jlz.3008 at gmail.com> <chals at altorricon.com\n"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/live-manual.ssm:2
-msgid "% SiSU 2.0"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:4
-msgid "@title: Debian Live Manual"
-msgstr "@title: Manual Debian Live "
-
-#. type: Plain text
-#: en/live-manual.ssm:6
-msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
-msgstr "@creator: Proyecto Debian Live <debian-live at lists.debian.org>"
-
-#. type: Plain text
-#: en/live-manual.ssm:10
-#, no-wrap
-msgid ""
-"@rights:\n"
-" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
-" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
-msgstr ""
-"@rights:\n"
 " :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
 " :license: Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:13
-#, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-06-04\n"
+" :published: 2012-06-27\n"
 msgstr ""
 "@date:\n"
-" :published: 04.06.2012\n"
+" :published: 27.06.2012\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:15
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 49bd693..b6f5dd8 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -266,7 +266,7 @@ msgid ""
 "running system. However, all modifications will be lost upon shutdown unless "
 "optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
-"_* *{Imagen del sistema}*: La imagen del sistema de ficheros raiz. Por lo "
+"_* *{Imagen del sistema}*: La imagen del sistema de ficheros raíz. Por lo "
 "general, se utiliza un sistema de ficheros comprimido SquashFS para reducir "
 "al mínimo el tamaño de la imagen de Debian Live. Hay que tener en cuenta que "
 "es de sólo lectura. Por lo tanto, durante el arranque del sistema Debian "
diff --git a/manual/po/es/user_customization-contents.ssi.po b/manual/po/es/user_customization-contents.ssi.po
index 88c4f39..b96bb25 100644
--- a/manual/po/es/user_customization-contents.ssi.po
+++ b/manual/po/es/user_customization-contents.ssi.po
@@ -288,7 +288,7 @@ msgid ""
 msgstr ""
 "Para incluir ficheros solamente hace falta añadirlos al directorio de "
 "configuración #{config/includes.chroot}#. Habrá una relación directa entre "
-"este directorio y el directorio raiz #{/}# del sistema en vivo. Por ejemplo, "
+"este directorio y el directorio raíz #{/}# del sistema en vivo. Por ejemplo, "
 "si se desea añadir un fichero para que sea el fichero #{/var/www/index.html}"
 "# del sistema en vivo se puede hacer lo siguiente:"
 
@@ -367,7 +367,7 @@ msgstr ""
 #: en/user_customization-contents.ssi:60
 msgid "These files will now appear in the root directory of the live media."
 msgstr ""
-"Los ficheros aparecerán en el directorio raiz del medio desde el que se "
+"Los ficheros aparecerán en el directorio raíz del medio desde el que se "
 "instalará el sistema en vivo."
 
 #. type: Plain text
diff --git a/manual/po/es/user_customization-overview.ssi.po b/manual/po/es/user_customization-overview.ssi.po
index 1c80ed2..345c539 100644
--- a/manual/po/es/user_customization-overview.ssi.po
+++ b/manual/po/es/user_customization-overview.ssi.po
@@ -134,9 +134,9 @@ msgstr ""
 "configuración y material adicional. En esta etapa se utiliza la mayoría de "
 "las personalizaciones de contenido. La etapa *{binary}* es la etapa final en "
 "la que se prepara la imagen del sistema en vivo utilizando el contenido del "
-"directorio chroot para construir el sistema de ficheros raiz del futuro "
+"directorio chroot para construir el sistema de ficheros raíz del futuro "
 "sistema en vivo, se incluye el instalador y cualquier otro material "
-"adicional de la imagen que no es parte el sistema de fichero raiz, como "
+"adicional de la imagen que no es parte el sistema de fichero raíz, como "
 "puede ser el gestor de arranque (bootloader) o ficheros de documentación. "
 "Posteriormente, en la etapa opcional *{source}* se creará el fichero "
 "comprimido (tarball) que contiene los ficheros de código fuente de los "
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index d7ed337..7278526 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 20:02+0300\n"
+"POT-Creation-Date: 2012-06-09 20:31+0300\n"
 "PO-Revision-Date: 2012-03-24 13:18+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -67,8 +67,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -137,8 +137,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -449,8 +449,8 @@ msgstr ""
 msgid ""
 "'Persistence' is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
+"understand how it works it would be handy to know that even if the system is "
+"booted and run from read-only media, modifications to the files and "
 "directories are written on writable media, typically a ram disk (tmpfs) and "
 "ram disks' data do not survive reboots."
 msgstr ""
@@ -483,13 +483,17 @@ msgstr ""
 msgid ""
 "If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
 "set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistence volumes during boot. A persistence volume is any of the "
-"following:"
+"persistence volumes during boot. It is possible to restrict which types of "
+"persistence volumes to use by specifying certain boot parameters described "
+"in the live-boot(7) man page. A persistence volume is any of the following:"
 msgstr ""
 "Si se usa el parámetro de arranque #{persistence}# (y no se usa la opción #"
 "{nopersistence}#), se busca en los medios de almacenamiento locales (p.ej. "
-"discos duros, llaves USB) volúmenes con persistencia durante el arranque. Un "
-"volumen persistente es cualquiera de los siguientes: "
+"discos duros, llaves USB) volúmenes con persistencia durante el arranque. Es "
+"posible restringir qué tipos de volúmenes persistentes se pueden usar "
+"especificando ciertos parámetros de arranque descritos en la página del "
+"manual de live-boot(7). Un volumen persistente es cualquiera de los "
+"siguientes: "
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:102
@@ -506,85 +510,55 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:106
 msgid ""
-"_* an image/archive file located on the root of any readable filesystem "
-"(even an NTFS partition of a foreign OS), identified by its file name. In "
-"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext4\"."
+"_* an image file located on the root of any readable filesystem (even an "
+"NTFS partition of a foreign OS), identified by its file name. In this case "
+"the file name must also use the containing filesystem as the file extension, "
+"e.g. \"persistence.ext4\"."
 msgstr ""
-"_* una fichero imagen/archivo situado en el sistema raiz de cualquier "
-"sistema de ficheros que pueda ser leido (incluso una partición NTFS de otro "
-"sistema operativo), identificado por su nombre de fichero. En este caso el "
-"nombre del fichero debe contener el nombre el sistema de ficheros como "
-"extensión, p.ej. \"<label>.ext4\"."
+"_* una fichero imagen situado en la raíz de cualquier sistema de ficheros "
+"que pueda ser leido (incluso una partición NTFS de otro sistema operativo), "
+"identificado por su nombre de fichero. En este caso el nombre del fichero "
+"debe contener el nombre el sistema de ficheros como extensión, p.ej. "
+"\"persistence.ext4\"."
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:108
 msgid ""
-"It is possible to restrict which types of persistence volumes to use by "
-"specifying certain boot parameters described in the live-boot(7) man page. "
-"The \"identifying labels\" referred to above can be any of the following:"
+"The volume label for overlays must be #{persistence}#. And in order to fully "
+"customize the volume's persistence there must be a file named #{live-"
+"persistence.conf}#. See {The live-persistence.conf file}#live-persistence-"
+"conf"
 msgstr ""
-"Es posible restringir qué tipos de volúmenes persistentes se pueden usar "
-"especificando ciertos parámetros de arranque descritos en la página del "
-"manual de live-boot(7). Las \"etiquetas identificadoras\" referidas "
-"anteriormente pueden ser cualquiera de las siguientes:"
+"La etiqueta del volumen para las capas de persistencia debe ser #"
+"{persistence}#. Y para poder personalizar de forma completa la persistencia "
+"del volumen tiene que haber un fichero llamado #{live-persistence.conf}#. "
+"Ver {El fichero live-persistence.conf}#live-persistence-conf"
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistence overlays."
-msgstr "_* #{full-ov}# para capas de persistencia total."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:112
-msgid "_* #{custom-ov}# for custom overlays."
-msgstr "_* #{custom-ov}# para capas personalizadas."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:114
-msgid "_* #{live-sn}# for full system snapshots."
-msgstr "_* #{live-sn}# para instantáneas del sistema entero."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:116
-msgid "_* #{home-sn}# for /home snapshots."
-msgstr "_* #{home-sn}# para instantáneas de /home."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistence overlays"
-msgstr "3~ Capas de persistencia total "
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:120
 msgid ""
-"By 'full persistence' it is meant that instead of using a tmpfs for storing "
-"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistence volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
-"hard disk or on a usb key created with, e.g.:"
+"Here are some examples of how to prepare a volume to be used for "
+"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
+"a usb key created with, e.g.:"
 msgstr ""
-"Por «Persistencia total» se entiende la utilización de una partición de "
-"escritura en lugar de usar un tmpfs (sistema de ficheros temporal) para "
-"guardar los cambios realizados en los medios de sólo lectura (con el sistema "
-"copiar-al-escribir o COW «copy-on-write» N. del T.). Para utilizar este tipo "
-"de persistencia la etiqueta del volumen debe ser #{full-ov}#. Esta podría "
-"ser, por ejemplo, una partición ext4 o un disco duro o una llave usb creada "
-"con. p.ej:"
+"He aquí algunos ejemplos de cómo preparar un volumen para ser usado para la "
+"persistencia. Puede ser, por ejemplo, una partición en un disco duro o en "
+"una llave usb creada con, p.ej."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:114
 #, no-wrap
-msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:118
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 "Ver {Usar el espacio libre en el dispositivo USB}#using-usb-extra-space."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
@@ -593,57 +567,55 @@ msgstr ""
 "etiqueta con uno de los siguientes:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:124
 #, no-wrap
-msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:128
 msgid ""
-"Here's an example of how to create an ext4-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for "
 "persistence:"
 msgstr ""
-"Un ejemplo de cómo crear un fichero imagen basado en ext4 usando "
-"persistencia total."
+"Un ejemplo de cómo crear un fichero imagen basado en ext4 usado para la "
+"persistencia:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:133
 #, no-wrap
 msgid ""
-" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext4 -F full-ov\n"
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:147
-msgid ""
-"Then copy the #{full-ov}# file to the root of a writable partition and "
-"reboot."
+#: en/user_customization-runtime.ssi:137
+msgid "Then copy the #{persistence}# file to the root of a writable partition."
 msgstr ""
-"A continuación, copiar el fichero #{full-ov}# en una partición grabable y "
-"reiniciar el sistema."
+"A continuación, copiar el fichero #{persistence}# en la raíz de una "
+"partición grabable."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:149
-msgid "3~ Custom overlays"
-msgstr "3~ Capas personalizadas"
+#: en/user_customization-runtime.ssi:139
+msgid "3~live-persistence-conf The live-persistence.conf file"
+msgstr "3~live-persistence-conf El fichero live-persistence.conf"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:151
+#: en/user_customization-runtime.ssi:141
 msgid ""
-"A volume with the label #{custom-ov}# can be configured to make arbitrary "
+"A volume with the label #{persistence}# can be configured to make arbitrary "
 "directories persistent. The file #{live-persistence.conf}#, located on the "
 "volume's filesystem root, controls which directories it makes persistent, "
 "and in which way."
 msgstr ""
-"Un volumen con la etiqueta #{custom-ov}# puede ser personalizado para crear "
+"Un volumen con la etiqueta #{persistence}# puede ser configurado para crear "
 "arbitrariamente directorios persistentes. El fichero #{live-persistence.conf}"
-"#, situado en el sistema de ficheros raiz del volumen, controla que "
+"#, situado en el sistema de ficheros raíz del volumen, controla que "
 "directorios hace persistentes y también de que manera."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:153
+#: en/user_customization-runtime.ssi:143
 msgid ""
 "How custom overlay mounts are configured is described in full detail in the "
 "live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -657,17 +629,17 @@ msgstr ""
 "ext4 en la partición /dev/sdb1:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:160
+#: en/user_customization-runtime.ssi:150
 #, no-wrap
 msgid ""
-" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mkfs.ext4 -L persistence /dev/sdb1\n"
 " $ mount -t ext4 /dev/sdb1 /mnt\n"
 " $ echo \"/home\" >> /mnt/live-persistence.conf\n"
 " $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:164
+#: en/user_customization-runtime.ssi:154
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -675,8 +647,7 @@ msgid ""
 "note that any paths listed in the #{live-persistence.conf}# file cannot "
 "contain white spaces or the special #{.}# and #{..}# path components. Also, "
 "neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
-"persistent using custom mounts (for the latter, use the #{full-ov}# type "
-"persistence described above)."
+"persistent using custom mounts."
 msgstr ""
 "Entonces reiniciamos. Durante el primer arranque los contenidos de #{/home}# "
 "y #{/var/cache/apt}# se copiarán en el volumen persistente y a partir de ese "
@@ -684,11 +655,10 @@ msgstr ""
 "cuenta que las rutas listadas en el fichero #{live-persistence.conf}# no "
 "pueden contener espacios en blanco ni los componentes especiales #{.}# y #"
 "{..}#. Además, ni #{/live}# (o ninguno de sus sub-directorios) ni #{/}# "
-"pueden hacerse persistentes montándolos de forma personalizada. Para esto "
-"último, usar el tipo de persistencia #{full-ov}# descrito anteriormente."
+"pueden hacerse persistentes montándolos de forma personalizada."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:166
+#: en/user_customization-runtime.ssi:156
 msgid ""
 "Several different custom overlay volumes (with their own #{live-persistence."
 "conf}# files) can be used at the same time, but if several volumes make the "
@@ -711,91 +681,26 @@ msgstr ""
 "necesario. (aclaración: normalmente no lo es)."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:168
-msgid "3~ Snapshots"
-msgstr "3~ Instantáneas"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:170
-msgid ""
-"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistence volume to the system "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
-"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
-"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
-"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistence media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems, but it occupies as "
-"much RAM as the size of the uncompressed snapshot."
-msgstr ""
-"Las instantáneas son colecciones de ficheros y directorios que no se montan "
-"durante la ejecución, pero que se copian desde un volumen persistente al "
-"sistema (tmpfs) en el arranque y que se resincroniza en el reinicio/apagado "
-"del sistema.  El volumen debe tener la etiqueta #{live-sn}#, y su valor "
-"predeterminado es un simple archivo cpio denominado #{live-sn.cpio.gz}#. Una "
-"interrupción del suministro eléctrico en tiempo de ejecución podría conducir "
-"a la pérdida de datos, por lo tanto, se puede usar la herramienta #{live-"
-"snapshot --refresh}# para sincronizar cambios importantes. Este tipo de "
-"persistencia es la menos agresiva con los dispositivos tipo flash y el más "
-"rápido de todos los sistemas de persistencia, ya que no escribe "
-"continuamente en los medios de almacenamiento, pero ocupa tanta RAM como el "
-"tamaño de la instantánea sin comprimir."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:172
-msgid ""
-"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
-"works the same as the main snapshot but it is only applied to /home."
-msgstr ""
-"Existe también una versión de la instantánea /home y su etiqueta es #{home-"
-"sn.*}#; que funciona igual que la instantánea principal, pero sólo se aplica "
-"a /home."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:174
-msgid "Snapshots cannot currently handle file deletion."
-msgstr "Las instantáneas no pueden manejar el borrado de ficheros."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:176
+#: en/user_customization-runtime.ssi:158
 msgid "3~ Persistence SubText"
 msgstr "3~ SubText persistente"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:178
+#: en/user_customization-runtime.ssi:159
 msgid ""
 "If a user would need multiple persistence storage of the same type for "
-"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
-"the boot parameter #{persistence}# will allow for multiple but unique "
-"persistence media. An example would be if a user wanted to use a persistence "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistence}# #{persistence-subtext=subText}#."
+"different locations or testing, such as #{persistence-nonwork}# and #"
+"{persistence-work}#, the boot parameter #{persistence-subtext}# used in "
+"conjunction with the boot parameter #{persistence}# will allow for multiple "
+"but unique persistence media. An example would be if a user wanted to use a "
+"persistence partition labeled #{persistence-subText}# they would use the "
+"boot parameters of: #{persistence}# #{persistence-subtext=subText}#."
 msgstr ""
 "Si un usuario necesita un almacenamiento persistente múltiple del mismo tipo "
-"para diferentes lugares o pruebas, tales como #{full-ov-nonwork}# y #{full-"
-"ov-work}#, el parámetro de arranque #{persistence-subtext}# usado junto con "
-"el parámetro de arranque #{persistence}# permitirá medios de almacenamiento "
-"persistentes múltiples pero únicos. Un ejemplo sería, si un usuario desea "
-"utilizar una partición persistente etiquetada #{live-sn-subText}# usaría los "
-"parámetros de arranque: #{persistence}# #{persistence-subtext=subText}#."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:180
-msgid "3~ Partial remastering"
-msgstr "3~ Remasterización parcial"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:181
-msgid ""
-"The run-time modification of the tmpfs could be collected using live-"
-"snapshot in a squashfs and added to the cd by remastering the iso in the "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
-msgstr ""
-"La modificación en tiempo de ejecución de la tmpfs podría ser guardada "
-"usando una instantánea en vivo en un squashfs y añadirla a un cd "
-"remasterizando la iso en el caso de un cd-r o añadiendo una sesión a un cd/"
-"dvd(rw) multisesión; live-boot monta todo el sistema de ficheros /live en "
-"orden o con el parámetro del módulo de arranque."
+"para diferentes lugares o pruebas, tales como #{persistence-nonwork}# y #"
+"{persistence-work}#, el parámetro de arranque #{persistence-subtext}# usado "
+"junto con el parámetro de arranque #{persistence}# permitirá medios de "
+"almacenamiento persistentes múltiples pero únicos. Un ejemplo sería, si un "
+"usuario desea utilizar una partición persistente etiquetada #{persistence-"
+"subText}# usaría los parámetros de arranque: #{persistence}# #{persistence-"
+"subtext=subText}#."
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index bb1fc64..e76cc84 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-06-07 08:43+0300\n"
 "PO-Revision-Date: 2012-02-19 18:29+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -166,6 +166,13 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
+#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:234
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
 #: en/user_examples.ssi:119 en/user_examples.ssi:211
 #, no-wrap
@@ -302,12 +309,6 @@ msgstr ""
 "mientras se crea."
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
-#, no-wrap
-msgid " # lb build 2>&1 | tee binary.log\n"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
@@ -490,11 +491,11 @@ msgstr "Ahora, crear la imagen:"
 #: en/user_examples.ssi:123
 msgid ""
 "Note that unlike in the first two tutorials, we no longer have to type #"
-"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
 msgstr ""
 "Tener en cuenta que a diferencia de los dos primeros tutoriales, ya no se "
-"tiene que escribir #{2>&1 | tee binary.log}# ya que esto se incluye ahora en "
-"#{auto/build}#."
+"tiene que escribir #{2>&1 | tee build.log}# ya que esto se incluye ahora en #"
+"{auto/build}#."
 
 #. type: Plain text
 #: en/user_examples.ssi:125
diff --git a/manual/po/es/user_installation.ssi.po b/manual/po/es/user_installation.ssi.po
index 20f4c9c..188424c 100644
--- a/manual/po/es/user_installation.ssi.po
+++ b/manual/po/es/user_installation.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2012-02-19 21:35+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -20,11 +20,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -67,8 +66,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -91,11 +90,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -138,8 +136,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -379,8 +377,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot and live-config"
-msgstr "2~ live-boot y live-config"
+msgid "2~ Installing live-boot and live-config"
+msgstr "2~ Instalación de live-boot y live-config"
 
 #. type: Plain text
 #: en/user_installation.ssi:102
diff --git a/manual/po/es/user_managing_a_configuration.ssi.po b/manual/po/es/user_managing_a_configuration.ssi.po
index f8a2055..9273550 100644
--- a/manual/po/es/user_managing_a_configuration.ssi.po
+++ b/manual/po/es/user_managing_a_configuration.ssi.po
@@ -321,7 +321,7 @@ msgid ""
 " lb clean noauto \"${@}\"\n"
 " rm -f config/binary config/bootstrap \\\n"
 "     config/chroot config/common config/source\n"
-" rm -f binary.log\n"
+" rm -f build.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -334,7 +334,7 @@ msgstr "#{auto/build}#"
 #, no-wrap
 msgid ""
 " #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
+" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index 248f25f..923cdd5 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2011-11-07 14:47+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -24,8 +24,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -68,8 +67,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -95,8 +94,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -139,8 +137,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -184,8 +182,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~live-build live-build"
-msgstr "2~live-build live-build"
+msgid "2~live-build The live-build package"
+msgstr "2~live-build El paquete live-build"
 
 #. type: Plain text
 #: en/user_overview.ssi:10
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 8b93731..187f0b6 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-18 19:35+0300\n"
-"PO-Revision-Date: 2012-04-18 19:53+0200\n"
+"POT-Creation-Date: 2012-06-24 19:21+0300\n"
+"PO-Revision-Date: 2012-06-24 20:12+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
 "Language: fr\n"
@@ -192,7 +192,7 @@ msgstr ""
 #: en/about_manual.ssi:30
 msgid "_* *{Target system}*: The environment used to run the live system."
 msgstr ""
-"_* *{Système objectif}*: L'environnement utilisé pour faire fonctionner le "
+"_* *{Système cible}*: L'environnement utilisé pour faire fonctionner le "
 "système live."
 
 #. type: Plain text
@@ -279,9 +279,9 @@ msgid ""
 "_* *{Target distribution}*: The distribution upon which your live system "
 "will be based. This can differ from the distribution of your host system."
 msgstr ""
-"_* *{Distribution objectif}*: La distribution sur laquelle votre système "
-"live sera basée. Ceci peut être diffèrent de la distribution de votre "
-"système hôte."
+"_* *{Distribution cible}*: La distribution sur laquelle votre système live "
+"sera basée. Ceci peut être diffèrent de la distribution de votre système "
+"hôte."
 
 #. type: Plain text
 #: en/about_manual.ssi:50
@@ -464,8 +464,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -539,8 +539,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -631,7 +631,7 @@ msgstr "Ou combiner les deux, par exemple:"
 #. type: Plain text
 #: en/about_manual.ssi:130
 #, no-wrap
-msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgid " $ make build LANGUAGES=it FORMATS=html\n"
 msgstr ""
 
 #. type: Plain text
@@ -718,7 +718,7 @@ msgstr ""
 "_* Ne pas utiliser #{make commit}# à moins que vous mettez à jour les "
 "traductions dans le commit, et dans ce cas, ne pas mélanger les "
 "modifications apportées au manuel en anglais et les traductions dans la même "
-"livraison, mais utiliser commits séparées. Voir la section {Traduction}"
+"livraison, mais utiliser commits séparés. Voir la section {Traduction}"
 "#translation pour plus de détails."
 
 #. type: Plain text
@@ -757,50 +757,57 @@ msgstr "3~translation Traduction"
 
 #. type: Plain text
 #: en/about_manual.ssi:195
-msgid "To submit a translation for a new language, follow these three steps:"
-msgstr ""
-"Pour soumettre une traduction pour une nouvelle langue, suivez ces trois "
-"étapes:"
+msgid "To start a translation for a new language, follow these steps:"
+msgstr "Pour commencer la traduction d'une nouvelle langue, suivez ces étapes:"
 
 #. type: Plain text
 #: en/about_manual.ssi:197
 msgid ""
-"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as /"
-"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
-"your submission, we will add the new language to the manual (providing the "
-"po files) and will enable it in the autobuild."
+"_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and *"
+"{index.html.in.pot}* files to your language with your favourite editor (such "
+"as /{poedit}/). Send the translated #{.po}# files to the mailing list so "
+"that the translation team can check their integrity."
 msgstr ""
-"_* Traduire les fichiers about_manual.ssi.pot, about_project.ssi.pot et "
-"index.html.in.pot à votre langue avec votre éditeur préféré (comme /"
-"{poedit}/). Envoyer les fichiers traduits à la liste de diffusion. Une fois "
-"que nous avons examiné votre livraison, nous allons ajouter une nouvelle "
-"langue au manuel (avec les fichiers po) et l'activer dans l'autobuild."
+"_* Traduire les fichiers *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* "
+"et *{index.html.in.pot}* à votre langue avec votre éditeur préféré (comme /"
+"{poedit}/). Envoyer les fichiers #{.po}# traduits à la liste de diffusion "
+"afin que l'équipe de traduction puisse vérifier leur intégrité."
 
 #. type: Plain text
 #: en/about_manual.ssi:199
 msgid ""
-"_* Once the new language is added, you can randomly start translating all po "
-"files in #{manual/po/}#."
+"_* To enable a new language in the autobuild it is enough to add the initial "
+"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
+"then edit #{manual/_sisu/home/index.html}#."
 msgstr ""
-"_* Une fois la nouvelle langue est ajoutée, vous pouvez commencer à traduire "
-"de façon aléatoire tous les fichiers po dans #{manual/po/}#."
+"_* Pour activer une nouvelle langue dans l'autobuild il suffit d'ajouter les "
+"premiers fichiers traduits à #{manual/po/${LANGUAGE}/}# et lancer #{make "
+"commit}#.  Et alors modifier #{manual/_sisu/home/index.html}#."
 
 #. type: Plain text
 #: en/about_manual.ssi:201
 msgid ""
+"_* Once the new language is added, you can randomly continue translating the "
+"remaining po files in #{manual/po/}#."
+msgstr ""
+"_* Une fois la nouvelle langue est ajoutée,  vous pouvez continuer avec la "
+"traduction des fichiers po dans #{manual/po/}# de façon aléatoire."
+
+#. type: Plain text
+#: en/about_manual.ssi:203
+msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
 "are updated from the po files and then you can review your changes launching "
 "#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
 "and #{git push}#."
 msgstr ""
 "_* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la "
-"traduction des manuels sont mis à jour à partir des fichiers po, alors vous "
+"traduction des manuels est mise à jour à partir des fichiers po, alors vous "
 "pouvez réviser vos modifications avec #{make build}# avant #{git add .}#, #"
 "{git commit -a -m \"Translating...\"}# et #{git push}#."
 
 #. type: Plain text
-#: en/about_manual.ssi:202
+#: en/about_manual.ssi:204
 #, no-wrap
-msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
-msgstr "*{Remarque:}* S'il vous plaît soyez conscients que même si les deux #{make commit}#  et  #{make build}# suppriment votre répertoire de construction, si vous construisez le manuel pour examiner vos modifications comme il est recommandé, et vous voulez nettoyer votre arbre git avant de les envoyer, vous pouvez utiliser #{make clean}#. Cette dernière étape n'est pas obligatoire grâce au fichier .gitignore mais il est une bonne pratique pour éviter d'envoyer certains fichiers involontairement.\n"
+msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgstr "*{Remarque:}* Vous pouvez utiliser #{make clean}# pour nettoyer votre arbre git avant de faire un push. Cette étape n'est pas obligatoire grâce au fichier .gitignore mais c'est une bonne pratique pour éviter d'envoyer certains fichiers involontairement.\n"
diff --git a/manual/po/fr/about_project.ssi.po b/manual/po/fr/about_project.ssi.po
index 34cc9e1..0126c78 100644
--- a/manual/po/fr/about_project.ssi.po
+++ b/manual/po/fr/about_project.ssi.po
@@ -251,7 +251,7 @@ msgid ""
 msgstr ""
 "Exception: Il y a quelques changements essentiels nécessaires pour mettre un "
 "système live en marche. Ces changements essentiels doivent être maintenus "
-"aussi minimes que possible et devraient être fusionnées au sein du dépôt "
+"aussi minimes que possible et devraient être fusionnés au sein du dépôt "
 "Debian s'il est possible."
 
 #. type: Plain text
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index fe64495..bbd2ab7 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -113,8 +113,8 @@ msgid ""
 "The sources for this manual are available in a <a href=\"http://git.or.cz/"
 "\">Git</a> repository at live.debian.net."
 msgstr ""
-"Les sources de ce manuel sont disponibles dans un répertoire <a href="
-"\"http://git.or.cz/\">Git</a> sur live.debian.net."
+"Les sources de ce manuel sont disponibles dans un dépôt <a href=\"http://git."
+"or.cz/\">Git</a> sur live.debian.net."
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:42
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 868662e..fe80549 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -1,12 +1,7 @@
-# French translations for live-manual package
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-04 12:21+0300\n"
+"POT-Creation-Date: 2012-06-27 14:57+0300\n"
 "PO-Revision-Date: 2011-06-19 16:32+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -45,13 +40,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:13
-#, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-06-04\n"
+" :published: 2012-06-27\n"
 msgstr ""
 "@date:\n"
-" :published: 04.06.2012\n"
+" :published: 27.06.2012\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:15
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index eed7739..db8a5cb 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -232,7 +232,7 @@ msgid ""
 msgstr ""
 "Parce que les distributions Debian *{testing}* et Debian *{unstable}* sont "
 "une cible mouvante, quand vous les spécifiez comme les distributions du "
-"système objectif, une construction avec succès n'est pas toujours possible."
+"système cible, une construction avec succès n'est pas toujours possible."
 
 #. type: Plain text
 #: en/project_bugs.ssi:20
@@ -272,10 +272,10 @@ msgstr ""
 "Il est hors cadre de ce manuel vous former correctement à identifier et "
 "corriger les problèmes dans les paquets des distributions de développement, "
 "cependant, il y a deux choses que vous pouvez toujours essayer:  Si une "
-"construction échoue lorsque la distribution objectif est *{testing}*, "
-"essayez *{unstable}*. Si *{unstable}* ne fonctionne pas non plus, revenir à *"
-"{testing}* et fixer la nouvelle version du paquet qui échoue de *{unstable}* "
-"(voir {APT pinning}#apt-pinning pour plus de détails)."
+"construction échoue lorsque la distribution cible est *{testing}*, essayez *"
+"{unstable}*. Si *{unstable}* ne fonctionne pas non plus, revenir à *{testing}"
+"* et fixer la nouvelle version du paquet qui échoue de *{unstable}* (voir "
+"{APT pinning}#apt-pinning pour plus de détails)."
 
 #. type: Plain text
 #: en/project_bugs.ssi:28
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
index fe1f2ad..b9e1d61 100644
--- a/manual/po/fr/user_customization-overview.ssi.po
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -125,7 +125,7 @@ msgstr ""
 "préparation de l'image live est l'étape *{binary}*, qui construit une image "
 "démarrable, en utilisant le contenu du répertoire chroot pour construire le "
 "système de fichiers racine pour le système Live, il comprend l'installateur "
-"et tout autre matériel supplémentaire sur les supports objectif en dehors du "
+"et tout autre matériel supplémentaire sur les supports cibles en dehors du "
 "système de fichiers du système live. Après l'image live est construite, s'il "
 "est activé, le tarball des sources est construit dans l'étape *{source}*."
 
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 8ba3b76..d5619e2 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -413,7 +413,7 @@ msgid ""
 "when running the live system."
 msgstr ""
 "Vous pouvez ajouter d'autres dépôts, élargissant votre choix de paquets au-"
-"delà ceux disponibles dans votre distribution objectif. Il peut être, par "
+"delà ceux disponibles dans votre distribution cible. Il peut être, par "
 "exemple, pour backports, expérimentaux ou des paquets personnalisés. Pour "
 "configurer des dépôts supplémentaires, créer les fichiers #{config/archives/"
 "your-repository.list.chroot}#, et/ou #{config/archives/your-repository.list."
@@ -1322,7 +1322,7 @@ msgstr ""
 "moment de la construction. Vous devez ajouter sid à votre APT sources et le "
 "fixer de sorte que seulement les paquets que vous voulez sont installés au "
 "temps de construction et tous les autres sont de la distribution du système "
-"objectif, wheezy. Ce qui suit devrait accomplir ça:"
+"cible, wheezy. Ce qui suit devrait accomplir ça:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:322
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index e87400d..6c40958 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 20:02+0300\n"
+"POT-Creation-Date: 2012-06-09 20:31+0300\n"
 "PO-Revision-Date: 2012-04-29 15:48+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -63,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -133,8 +133,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -442,19 +442,19 @@ msgstr ""
 msgid ""
 "'Persistence' is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
+"understand how it works it would be handy to know that even if the system is "
+"booted and run from read-only media, modifications to the files and "
 "directories are written on writable media, typically a ram disk (tmpfs) and "
 "ram disks' data do not survive reboots."
 msgstr ""
 "La «persistance» est un nom commun pour les différents types de solutions "
 "pour sauver, après un redémarrage, certaines ou toutes les données, de cette "
 "évolution pendant l'exécution du système. Pour comprendre comment cela "
-"pourrait fonctionner il pourrait être utile de savoir que même si le système "
-"est démarré et exécuté à partir d'un support en lecture seule, la "
-"modification des fichiers et répertoires sont écrits sur des supports "
-"inscriptibles, typiquement un disque ram (tmpfs) et aux disques RAM les "
-"données ne survivent pas à un redémarrage."
+"fonctionne il peut être utile de savoir que même si le système est démarré "
+"et exécuté à partir d'un support en lecture seule, la modification des "
+"fichiers et répertoires sont écrits sur des supports inscriptibles, "
+"typiquement un disque ram (tmpfs) et aux disques RAM les données ne "
+"survivent pas à un redémarrage."
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:98
@@ -477,13 +477,16 @@ msgstr ""
 msgid ""
 "If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
 "set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistence volumes during boot. A persistence volume is any of the "
-"following:"
+"persistence volumes during boot. It is possible to restrict which types of "
+"persistence volumes to use by specifying certain boot parameters described "
+"in the live-boot(7) man page. A persistence volume is any of the following:"
 msgstr ""
 "Si le paramètre de démarrage #{persistence}# est réglé (et #{nopersistence}# "
 "n'est pas utilisé), les supports de stockage locaux (par exemple les disques "
 "durs, clés USB) seront examinés pour trouver des volumes persistants pendant "
-"le démarrage. Un volume persistant est un des éléments suivants:"
+"le démarrage. Il est possible de limiter les types de volumes persistants à "
+"utiliser en spécifiant certains paramètres de démarrage décrits dans la page "
+"de manuel live-boot(7). Un volume persistant est un des éléments suivants:"
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:102
@@ -500,85 +503,55 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:106
 msgid ""
-"_* an image/archive file located on the root of any readable filesystem "
-"(even an NTFS partition of a foreign OS), identified by its file name. In "
-"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext4\"."
+"_* an image file located on the root of any readable filesystem (even an "
+"NTFS partition of a foreign OS), identified by its file name. In this case "
+"the file name must also use the containing filesystem as the file extension, "
+"e.g. \"persistence.ext4\"."
 msgstr ""
-"_* un fichier image/archive situé sur la racine de tout système de fichiers "
-"en lecture (même une partition NTFS d'un système d'exploitation étranger), "
-"identifié par son nom de fichier. Dans ce cas, le nom du fichier doit "
-"contenir le nom du système de fichiers comme extension, par exemple, "
-"\"<label>.ext4\"."
+"_* un fichier image situé sur la racine d'un système de fichiers en lecture "
+"(même une partition NTFS d'un système d'exploitation étranger), identifié "
+"par son nom de fichier. Dans ce cas, le nom du fichier doit contenir le nom "
+"du système de fichiers comme extension, par exemple, \"persistence.ext4\"."
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:108
 msgid ""
-"It is possible to restrict which types of persistence volumes to use by "
-"specifying certain boot parameters described in the live-boot(7) man page. "
-"The \"identifying labels\" referred to above can be any of the following:"
+"The volume label for overlays must be #{persistence}#. And in order to fully "
+"customize the volume's persistence there must be a file named #{live-"
+"persistence.conf}#. See {The live-persistence.conf file}#live-persistence-"
+"conf"
 msgstr ""
-"Il est possible de limiter les types de volumes persistants à utiliser en "
-"spécifiant certains paramètres de démarrage décrits dans la page de manuel "
-"live-boot(7). Les \"étiquettes d'identification\" mentionnées ci-dessus "
-"peuvent être un des éléments suivants:"
+"L'étiquette du volume pour les couches de persistence doit être #"
+"{persistence}#. Et afin de personnaliser entièrement la persistance du "
+"volume il doit y avoir un fichier nommé #{live-persistence.conf}#. Voir {Le "
+"fichier live-persistence.conf}#live-persistence-conf"
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistence overlays."
-msgstr "_* #{full-ov}# pour couches de persistance pleine."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:112
-msgid "_* #{custom-ov}# for custom overlays."
-msgstr "_* #{custom-ov}# pour couches personalisées"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:114
-msgid "_* #{live-sn}# for full system snapshots."
-msgstr "_* #{live-sn}# pour instantanés du système complet."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:116
-msgid "_* #{home-sn}# for /home snapshots."
-msgstr "_* #{home-sn}# pour instantanés du /home."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistence overlays"
-msgstr "3~ Couches de persistance pleine"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:120
 msgid ""
-"By 'full persistence' it is meant that instead of using a tmpfs for storing "
-"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistence volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
-"hard disk or on a usb key created with, e.g.:"
+"Here are some examples of how to prepare a volume to be used for "
+"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
+"a usb key created with, e.g.:"
 msgstr ""
-"Par «persistance pleine» on entend que au lieu d'utiliser un tmpfs pour le "
-"stockage des modifications dans le support en lecture seule (avec le système "
-"copy-on-write, COW) une partition accessible en écriture est utilisée. Pour "
-"ce type de persistance le nom du volume doit être #{full-ov}#. Cela "
-"pourrait, par exemple, être une partition ext4 sur un disque dur ou sur une "
-"clé usb créée avec, par exemple:"
+"Voici quelques exemples de comment préparer un volume à utiliser pour la "
+"persistance. Il peut être, par exemple, une partition ext4 sur un disque dur "
+"ou sur une clé usb créée avec, par exemple:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:114
 #, no-wrap
-msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:118
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 "Voir aussi {Utilisation de l'espace disponible sur une clé USB}#using-usb-"
 "extra-space."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
@@ -587,57 +560,55 @@ msgstr ""
 "modifier l'étiquette avec l'un des suivants:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:124
 #, no-wrap
-msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:128
 msgid ""
-"Here's an example of how to create an ext4-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for "
 "persistence:"
 msgstr ""
 "Voici un exemple de comment créer un fichier image ext4 utilisé pour la "
-"persistance pleine:"
+"persistance:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:133
 #, no-wrap
 msgid ""
-" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext4 -F full-ov\n"
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:147
-msgid ""
-"Then copy the #{full-ov}# file to the root of a writable partition and "
-"reboot."
+#: en/user_customization-runtime.ssi:137
+msgid "Then copy the #{persistence}# file to the root of a writable partition."
 msgstr ""
-"Ensuite, copiez le fichier #{full-ov}# sur une partition accessible en "
-"écriture et redémarrer."
+"Ensuite, copiez le fichier #{persistence}# à la racine d'une partition "
+"accessible en écriture."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:149
-msgid "3~ Custom overlays"
-msgstr "3~ Couches personnalisées"
+#: en/user_customization-runtime.ssi:139
+msgid "3~live-persistence-conf The live-persistence.conf file"
+msgstr "3~live-persistence-conf Le fichier live-persistence.conf"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:151
+#: en/user_customization-runtime.ssi:141
 msgid ""
-"A volume with the label #{custom-ov}# can be configured to make arbitrary "
+"A volume with the label #{persistence}# can be configured to make arbitrary "
 "directories persistent. The file #{live-persistence.conf}#, located on the "
 "volume's filesystem root, controls which directories it makes persistent, "
 "and in which way."
 msgstr ""
-"Un volume avec l'étiquette #{custom-ov}# peut être configuré pour créer des "
-"répertoires persistants arbitraires. Le fichier #{live-persistence.conf}#, "
-"situé sur le système de fichiers racine du volume, contrôle quels "
+"Un volume avec l'étiquette #{persistence}# peut être configuré pour créer "
+"des répertoires persistants arbitraires. Le fichier #{live-persistence.conf}"
+"#, situé sur le système de fichiers racine du volume, contrôle quels "
 "répertoires il fait persistants, et de quelle manière."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:153
+#: en/user_customization-runtime.ssi:143
 msgid ""
 "How custom overlay mounts are configured is described in full detail in the "
 "live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -651,17 +622,17 @@ msgstr ""
 "système de fichiers ext4 sur la partition /dev/sdb1:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:160
+#: en/user_customization-runtime.ssi:150
 #, no-wrap
 msgid ""
-" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mkfs.ext4 -L persistence /dev/sdb1\n"
 " $ mount -t ext4 /dev/sdb1 /mnt\n"
 " $ echo \"/home\" >> /mnt/live-persistence.conf\n"
 " $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:164
+#: en/user_customization-runtime.ssi:154
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -669,21 +640,19 @@ msgid ""
 "note that any paths listed in the #{live-persistence.conf}# file cannot "
 "contain white spaces or the special #{.}# and #{..}# path components. Also, "
 "neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
-"persistent using custom mounts (for the latter, use the #{full-ov}# type "
-"persistence described above)."
+"persistent using custom mounts."
 msgstr ""
 "Alors nous redémarrons. Lors du premier démarrage les contenus du #{/home}# "
 "et #{/var/cache/apt}# seront copiés dans le volume persistant, et à partir "
 "de ce moment tous les changements dans ces répertoires seront stockés dans "
 "le volume persistant. S'il vous plaît souligner que les chemins d'accès aux "
 "répertoriés dans le fichier #{live-persistence.conf}# ne peuvent pas "
-"contenir d'espaces blancs ou les éléments spéciaux #{.}# et #{..}#. En "
+"contenir des espaces blancs ou les éléments spéciaux #{.}# et #{..}#. En "
 "outre, ni #{/live}# (ou un de ses sous-répertoires), ni #{/}#  peuvent être "
-"rendus persistants en utilisant custom mounts (pour ce dernier, utilisez la "
-"persistance #{full-ov}# décrite ci-dessus)."
+"rendus persistants en utilisant montages personnalisés."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:166
+#: en/user_customization-runtime.ssi:156
 msgid ""
 "Several different custom overlay volumes (with their own #{live-persistence."
 "conf}# files) can be used at the same time, but if several volumes make the "
@@ -695,104 +664,37 @@ msgid ""
 "to handle that case if you really need it (hint: you usually don't)."
 msgstr ""
 "Plusieurs volumes de couches personnalisées différents (avec leurs propres "
-"fichiers #{live-persistence.conf}#) peuvent être utilisées au même temps, "
+"fichiers #{live-persistence.conf}#) peuvent être utilisés au même temps, "
 "mais si plusieurs volumes font le même répertoire persistant, un seul "
 "d'entre eux sera utilisé. Si les deux sont «imbriqués» (un est un sous-"
 "répertoire de l'autre) le premier sera monté avant que le secondaire de "
-"sorte que aucun sera caché par l'autre. Monter  des éléments personnalisés "
+"sorte que aucun sera caché par l'autre. Monter des éléments personnalisés "
 "imbriqués est problématique s'ils sont énumérés dans le même fichier #{live-"
 "persistence.conf}#. Voir la page de manuel live-persistence.conf(5) pour "
 "savoir comment gérer ce cas, si vous avez vraiment besoin (remarque: vous "
 "n'avez généralement pas)."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:168
-msgid "3~ Snapshots"
-msgstr "3~ Instantanés"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:170
-msgid ""
-"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistence volume to the system "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
-"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
-"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
-"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistence media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems, but it occupies as "
-"much RAM as the size of the uncompressed snapshot."
-msgstr ""
-"Les instantanés sont des collections de fichiers et de répertoires qui ne "
-"sont pas montés lors de l'exécution, mais qui sont copiés à partir d'un "
-"périphérique persistant à le système (tmpfs) au démarrage et qui sont "
-"resynchronisés au redémarrage/arrêt du système. Le volume doit être étiqueté "
-"#{live-sn}#. Il est par défaut une simple archive cpio appelée #{live-sn."
-"cpio.gz}#. Une coupure de courant pendant l'exécution pourrait conduire à la "
-"perte de données, donc un outil appelé #{live-snapshot --refresh}# pourrait "
-"être appelé pour synchroniser des changements importants. Ce type de "
-"persistance, car elle n'écrit pas continuellement dans les supports "
-"persistants, est la plus respectuese avec les dispositifs flash et la plus "
-"rapide de tous les systèmes de persistance, mais elle occupe autant RAM que "
-"la taille de l'instantané non compressée."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:172
-msgid ""
-"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
-"works the same as the main snapshot but it is only applied to /home."
-msgstr ""
-"Une version d'instantané de /home existe aussi, et son étiquette est #{home-"
-"sn.*}#; elle fonctionne le même que l'instantané principal, mais c'est "
-"seulement appliqué à /home."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:174
-msgid "Snapshots cannot currently handle file deletion."
-msgstr ""
-"Les instantanés ne peuvent pas actuellement gérer la suppression de fichiers."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:176
+#: en/user_customization-runtime.ssi:158
 msgid "3~ Persistence SubText"
 msgstr "3~ SubText persistant"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:178
+#: en/user_customization-runtime.ssi:159
 msgid ""
 "If a user would need multiple persistence storage of the same type for "
-"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
-"the boot parameter #{persistence}# will allow for multiple but unique "
-"persistence media. An example would be if a user wanted to use a persistence "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistence}# #{persistence-subtext=subText}#."
+"different locations or testing, such as #{persistence-nonwork}# and #"
+"{persistence-work}#, the boot parameter #{persistence-subtext}# used in "
+"conjunction with the boot parameter #{persistence}# will allow for multiple "
+"but unique persistence media. An example would be if a user wanted to use a "
+"persistence partition labeled #{persistence-subText}# they would use the "
+"boot parameters of: #{persistence}# #{persistence-subtext=subText}#."
 msgstr ""
 "Si un utilisateur a besoin de stockages persistants multiples du même type "
-"pour différents endroits ou l'essai, tel que #{full-ov-nonwork}# et #{full-"
-"ov-work}#, le paramètre de démarrage #{persistence-subtext}# utilisé en "
-"conjonction avec le paramètre de démarrage #{persistence}# permettra "
-"multiples, mais uniques, supports persistants. Un exemple serait le cas si "
-"un utilisateur voudrait utiliser une partition persistante étiquetée #{live-"
-"sn-subText}# il utiliserait les paramètres de démarrage: #{persistence}# #"
-"{persistence-subtext=subText}#."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:180
-msgid "3~ Partial remastering"
-msgstr "3~ Remasterisation partielle"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:181
-msgid ""
-"The run-time modification of the tmpfs could be collected using live-"
-"snapshot in a squashfs and added to the cd by remastering the iso in the "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
-msgstr ""
-"Les modifications de l'exécution du tmpfs pourraient être recueillies à "
-"l'aide de live-snapshot dans une squashfs et ajoutées au CD en remasterisant "
-"l'ISO dans le cas des CD-R ou en ajoutant une session à un cd/dvd(rw) "
-"multisession; live-boot monte tous les systèmes de fichiers /live dans "
-"l'ordre ou avec le paramètre de démarrage du module."
+"pour différents endroits ou l'essai, tel que #{persistence-nonwork}# et #"
+"{persistence-work}#, le paramètre de démarrage #{persistence-subtext}# "
+"utilisé en conjonction avec le paramètre de démarrage #{persistence}# "
+"permettra multiples, mais uniques, supports persistants. Un exemple serait "
+"le cas si un utilisateur voudrait utiliser une partition persistante "
+"étiquetée #{persistence-subText}# il utiliserait les paramètres de "
+"démarrage: #{persistence}# #{persistence-subtext=subText}#."
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index e353f71..1a13446 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-06-07 08:43+0300\n"
 "PO-Revision-Date: 2012-03-17 18:13+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -162,6 +162,13 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
+#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:234
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
 #: en/user_examples.ssi:119 en/user_examples.ssi:211
 #, no-wrap
@@ -298,12 +305,6 @@ msgstr ""
 "un journal avec #{tee}#."
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
-#, no-wrap
-msgid " # lb build 2>&1 | tee binary.log\n"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
@@ -487,10 +488,10 @@ msgstr "Maintenant, construire l'image:"
 #: en/user_examples.ssi:123
 msgid ""
 "Note that unlike in the first two tutorials, we no longer have to type #"
-"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
 msgstr ""
 "Notez que contrairement aux deux premiers tutoriels, nous n'avons plus "
-"besoin de taper #{2>&1 | tee binary.log}# parce que cela est maintenant "
+"besoin de taper #{2>&1 | tee build.log}# parce que cela est maintenant "
 "inclus dans #{auto/build}#."
 
 #. type: Plain text
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index 3f162bb..84a7473 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2012-03-17 20:00+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -17,11 +17,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -64,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -88,11 +87,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -135,8 +133,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -377,8 +375,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot and live-config"
-msgstr "2~ live-boot et live-config"
+msgid "2~ Installing live-boot and live-config"
+msgstr "2~ Installation de live-boot et live-config"
 
 #. type: Plain text
 #: en/user_installation.ssi:102
@@ -440,9 +438,9 @@ msgid ""
 "your target platform: this means if your target is wheezy then you should "
 "build against wheezy."
 msgstr ""
-"Vous devez créer sur votre distribution objectif ou en chroot contenant "
-"votre plateforme objectif: cela signifie que si votre objectif est wheezy "
-"alors vous devez créer sur wheezy."
+"Vous devez créer sur votre distribution cible ou en chroot contenant votre "
+"plateforme cible: cela signifie que si votre cible est wheezy alors vous "
+"devez créer sur wheezy."
 
 #. type: Plain text
 #: en/user_installation.ssi:127
@@ -456,9 +454,9 @@ msgid ""
 msgstr ""
 "Utilisez un système de construction automatique personnel tel que /"
 "{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer live-boot pour une "
-"distribution objectif qui diffère de votre système de construction. Par "
+"distribution cible qui diffère de votre système de construction. Par "
 "exemple, pour les images live de wheezy, créez live-boot dans un chroot "
-"wheezy. Si votre distribution objectif correspond à votre distribution vous "
+"wheezy. Si votre distribution cible correspond à votre distribution vous "
 "pouvez créer directement sur le système de construction en utilisant #{dpkg-"
 "buildpackage}# (fourni par le paquet /{dpkg-dev}/):"
 
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index 87a551c..69e856d 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -308,7 +308,7 @@ msgid ""
 " lb clean noauto \"${@}\"\n"
 " rm -f config/binary config/bootstrap \\\n"
 "     config/chroot config/common config/source\n"
-" rm -f binary.log\n"
+" rm -f build.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -321,7 +321,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
+" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index f652de7..78a2847 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2012-03-17 20:12+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -20,8 +20,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -64,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -91,8 +90,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -135,8 +133,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -179,8 +177,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~live-build live-build"
-msgstr "2~live-build live-build"
+msgid "2~live-build The live-build package"
+msgstr "2~live-build Le paquet live-build"
 
 #. type: Plain text
 #: en/user_overview.ssi:10
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index 4123594..1d717db 100644
--- a/manual/po/it/about_manual.ssi.po
+++ b/manual/po/it/about_manual.ssi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-18 19:35+0300\n"
-"PO-Revision-Date: 2012-04-03 20:21+0200\n"
+"POT-Creation-Date: 2012-06-24 19:21+0300\n"
+"PO-Revision-Date: 2012-06-07 07:01+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: it\n"
@@ -28,11 +28,6 @@ msgstr "1~about-manual A proposito di questo manuale"
 
 #. type: Plain text
 #: en/about_manual.ssi:6
-#, fuzzy
-#| msgid ""
-#| "This manual serves as a single access point to all documentation related "
-#| "to the Debian Live project and in particular applies to the software "
-#| "produced by the project for the Debian 7.0 \"wheezy\" release."
 msgid ""
 "This manual serves as a single access point to all documentation related to "
 "the Debian Live project and in particular applies to the software produced "
@@ -41,7 +36,8 @@ msgid ""
 msgstr ""
 "Questo manuale funge da unico punto d'accesso a tutta la documentazione "
 "relativa al progetto Debian Live e si applica in particolare al software "
-"prodotto per il rilascio di Debian 7.0 \"wheezy\"."
+"prodotto per il rilascio di Debian 7.0 \"wheezy\". Si può trovare una "
+"versione aggiornata all'indirizzo http://live.debian.net/"
 
 #. type: Plain text
 #: en/about_manual.ssi:8
@@ -93,6 +89,10 @@ msgid ""
 "may wish to experience early success using the software before delving into "
 "the details. Therefore, we suggest reading in the following order."
 msgstr ""
+"Sebbene crediamo che ogni cosa in questo manuale sia importante almeno per "
+"alcuni dei nostri utenti, ci rendiamo conto che c'è tanto materiale da "
+"trattare e che si potrebbe voler provare il software prima di entrare nei "
+"dettagli; pertanto suggeriamo di leggerlo nel seguente ordine."
 
 #. type: Plain text
 #: en/about_manual.ssi:16
@@ -106,6 +106,15 @@ msgid ""
 "personalized image}#tutorial-3. By the end of these tutorials, you will have "
 "a taste of what can be done with Debian Live."
 msgstr ""
+"Per iniziare leggere questo capitolo, {A proposito di questo manuale}#about-"
+"manual, da cima a fondo insieme alla sezione {Glossario}#terms, quindi "
+"passare ai tre tutorial all'inizio della sezione {Esempi}#examples "
+"progettati per insegnare le basi della costruzione e della personalizzazione "
+"delle immagini. Si legga innanzitutto {Usare gli esempi}#using-the-examples, "
+"seguito da {Tutorial 1: un'immagine standard}#tutorial-1, {Tutorial 2: un "
+"programma di utilità web browser}#tutorial-2 e, infine, {Tutorial 3: "
+"un'immagine personalizzata}#tutorial-3. Alla fine di queste esercitazioni, "
+"si avrà un assaggio di ciò che si può fare con Debian Live."
 
 #. type: Plain text
 #: en/about_manual.ssi:18
@@ -118,6 +127,13 @@ msgid ""
 "with Debian Live and motivated to read the rest of the manual, cover-to-"
 "cover."
 msgstr ""
+"Ti invitiamo ad uno studio più approfondito del manuale, magari leggendo in "
+"seguito le {Nozioni di base}#the-basics, sfogliando o saltando {Creare "
+"un'immagine netboot}#building-netboot-image, e finendo con la lettura di "
+"{Panoramica sulla personalizzazione}#customization-overview e dei capitoli "
+"che lo seguono. A questo punto, ci auguriamo che tu sia davvero stimolato da "
+"ciò che si può fare con Debian Live e motivato a leggere il resto del "
+"manuale per intero."
 
 #. type: Plain text
 #: en/about_manual.ssi:20
@@ -261,15 +277,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:50
-#, fuzzy
-#| msgid ""
-#| "The *{stable}* distribution contains the latest officially released "
-#| "distribution of Debian. The *{testing}* distribution is the staging area "
-#| "for the next *{stable}* release. A major advantage of using this "
-#| "distribution is that it has more recent versions of software relative to "
-#| "the *{stable}* release. The *{unstable}* distribution is where active "
-#| "development of Debian occurs. Generally, this distribution is run by "
-#| "developers and those who like to live on the edge."
 msgid ""
 "_* *{stable/testing/unstable}*: The *{stable}* distribution contains the "
 "latest officially released distribution of Debian. The *{testing}* "
@@ -281,12 +288,15 @@ msgid ""
 "manual, we tend to use codenames for the releases, such as wheezy or sid, as "
 "that is what is supported by the tools themselves."
 msgstr ""
-"La distribuzione *{stable}* contiene l'ultima distribuzione ufficialmente "
-"rilasciata da Debian; la *{testing}* è il punto di raccolta per i pacchetti "
-"della prossima *{stable}*. Uno dei principali vantaggi nell'uso di questa "
-"distribuzione sta nell'avere software più recente rispetto alla *{stable}*. "
-"La distribuzione *{unstable}* è dove avviene lo sviluppo attivo di Debian; "
-"viene generalmente usata dagli sviluppatori o da coloro che amano l'azzardo."
+"_* *{stable/testing/unstable}*: La distribuzione *{stable}* contiene "
+"l'ultima distribuzione ufficialmente rilasciata da Debian; la *{testing}* è "
+"il punto di raccolta per i pacchetti della prossima *{stable}*. Uno dei "
+"principali vantaggi nell'uso di questa distribuzione sta nell'avere software "
+"più recente rispetto alla *{stable}*. La distribuzione *{unstable}* è dove "
+"avviene lo sviluppo attivo di Debian; viene generalmente usata dagli "
+"sviluppatori o da coloro che amano l'azzardo. In tutto il manuale tendiamo a "
+"usare i nomi in codice dei rilasci, ad esempio wheezy o sid, in quanto è "
+"quanto supportato dagli strumenti stessi."
 
 #. type: Plain text
 #: en/about_manual.ssi:52
@@ -445,8 +455,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -520,8 +530,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -611,7 +621,7 @@ msgstr "O entrambi:"
 #. type: Plain text
 #: en/about_manual.ssi:130
 #, no-wrap
-msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgid " $ make build LANGUAGES=it FORMATS=html\n"
 msgstr ""
 
 #. type: Plain text
@@ -699,27 +709,23 @@ msgid ""
 "translations in the same commit, but use separate commits for each. See the "
 "{Translation}#translation section for more details."
 msgstr ""
+"_* Non usare #{make commit}# a meno che nel commit non si stiano aggiornando "
+"delle traduzioni, in tal caso non mescolare nello stesso le modifiche al "
+"manuale inglese e le traduzioni ma eseguire un commit per ognuna. Per "
+"maggiori dettagli vedere la sezione {Traduzione}#translation."
 
 #. type: Plain text
 #: en/about_manual.ssi:177
-#, fuzzy
-#| msgid ""
-#| "_* After sanitizing and adding the files, commit the changes. Write "
-#| "commit messages that consist of full, useful sentences in English, "
-#| "starting with a capital letter and ending with a full stop. Usually, "
-#| "these will start with the form 'Fixing/Adding/Removing/Correcting/"
-#| "Translating', e.g."
 msgid ""
 "_* Write commit messages that consist of complete, meaningful sentences in "
 "English, starting with a capital letter and ending with a full stop. "
 "Usually, these will start with the form 'Fixing/Adding/Removing/Correcting/"
 "Translating', e.g."
 msgstr ""
-"_* Dopo aver pulito e aggiunto i file è possibile eseguire il commit delle "
-"modifiche. Si scrivano messaggi costituiti da frasi in inglese esaurienti e "
-"utili, inizianti con una lettera maiuscola e terminanti con un punto. "
-"Solitamente cominceranno con la forma \"Fixing/Adding/Removing/Correcting/"
-"Translating\", ad esempio:"
+"_* Si scrivano messaggi costituiti da frasi in inglese esaurienti e utili, "
+"inizianti con una lettera maiuscola e terminanti con un punto. Solitamente "
+"cominceranno con la forma \"Fixing/Adding/Removing/Correcting/Translating\", "
+"ad esempio:"
 
 #. type: Plain text
 #: en/about_manual.ssi:181
@@ -745,18 +751,27 @@ msgstr "3~translation Traduzione"
 
 #. type: Plain text
 #: en/about_manual.ssi:195
-msgid "To submit a translation for a new language, follow these three steps:"
+#, fuzzy
+#| msgid ""
+#| "To submit a translation for a new language, follow these three steps:"
+msgid "To start a translation for a new language, follow these steps:"
 msgstr ""
 "Per inviare una traduzione per una nuova lingua, seguire questi tre passi:"
 
 #. type: Plain text
 #: en/about_manual.ssi:197
+#, fuzzy
+#| msgid ""
+#| "_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index."
+#| "html.in.pot files to your language with your favourite editor (such as /"
+#| "{poedit}/). Send translated files to the mailing list. Once we have "
+#| "reviewed your submission, we will add the new language to the manual "
+#| "(providing the po files) and will enable it in the autobuild."
 msgid ""
-"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as /"
-"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
-"your submission, we will add the new language to the manual (providing the "
-"po files) and will enable it in the autobuild."
+"_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and *"
+"{index.html.in.pot}* files to your language with your favourite editor (such "
+"as /{poedit}/). Send the translated #{.po}# files to the mailing list so "
+"that the translation team can check their integrity."
 msgstr ""
 "_* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e index.html."
 "in.pot nella propria lingua con il proprio editor preferito (tipo /"
@@ -767,15 +782,27 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:199
 msgid ""
-"_* Once the new language is added, you can randomly start translating all po "
-"files in #{manual/po/}#."
+"_* To enable a new language in the autobuild it is enough to add the initial "
+"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
+"then edit #{manual/_sisu/home/index.html}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:201
+#, fuzzy
+#| msgid ""
+#| "_* Once the new language is added, you can randomly start translating all "
+#| "po files in #{manual/po/}#."
+msgid ""
+"_* Once the new language is added, you can randomly continue translating the "
+"remaining po files in #{manual/po/}#."
 msgstr ""
 "_* Una volta che la nuova lingua è stata aggiunta, si può iniziare a "
 "tradurre tutti i file po situati in #{manual/po/}#, nell'ordine che si "
 "preferisce."
 
 #. type: Plain text
-#: en/about_manual.ssi:201
+#: en/about_manual.ssi:203
 msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
 "are updated from the po files and then you can review your changes launching "
@@ -788,7 +815,8 @@ msgstr ""
 "{git commit -a -m \"Translating...\"}# e #{git push}#."
 
 #. type: Plain text
-#: en/about_manual.ssi:202
-#, no-wrap
-msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+#: en/about_manual.ssi:204
+#, fuzzy, no-wrap
+#| msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
 msgstr "*{Nota:}* anche se #{make commit}# e #{make build}# rimuovono entrambi la directory di compilazione, se si compila il manuale per rivedere le modifiche come consigliato, si consiglia di pulire l'albero git prima del push; per fare ciò si puà usare il comando #{make clean}#. Grazie al file .gitignore, quest'ultimo passaggio non è obbligatorio ma è una buona abitudine che evita di fare involontariamente il commit di certi file.\n"
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 3cfc006..5b1b25a 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -1,45 +1,3 @@
-# Italian translations for live-manual package
-# This file is distributed under the same license as the live-manual package.
-# lillo sciascia <lillosciascia at gmail.com>, 2010.
-# Carlo Stemberger <carlo.stemberger at gmail.com>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-04 12:21+0300\n"
-"PO-Revision-Date: 2011-03-11 10:33+0100\n"
-"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
-"Language-Team: Italian <tp at lists.linux.it>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/live-manual.ssm:2
-msgid "% SiSU 2.0"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:4
-msgid "@title: Debian Live Manual"
-msgstr "@title: Manuale di Debian Live"
-
-#. type: Plain text
-#: en/live-manual.ssm:6
-msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:10
-#, no-wrap
-msgid ""
-"@rights:\n"
-" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
-" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
-msgstr ""
-"@rights:\n"
 " :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
 " :license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.\n"
 
@@ -48,10 +6,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-06-04\n"
+" :published: 2012-06-27\n"
 msgstr ""
-"@date:\n"
-" :published: 04.06.2012\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:15
diff --git a/manual/po/it/project_coding-style.ssi.po b/manual/po/it/project_coding-style.ssi.po
index 5411538..a41cffa 100644
--- a/manual/po/it/project_coding-style.ssi.po
+++ b/manual/po/it/project_coding-style.ssi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
 "POT-Creation-Date: 2012-04-07 22:16+0300\n"
-"PO-Revision-Date: 2010-12-17 14:41+0100\n"
+"PO-Revision-Date: 2012-06-07 07:41+0200\n"
 "Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: it\n"
@@ -206,7 +206,7 @@ msgstr ""
 #. type: Plain text
 #: en/project_coding-style.ssi:16
 msgid "_* Make sure all shell code runs with 'set -e'."
-msgstr ""
+msgstr "Assicurarsi che tutto il codice giri con 'set -e'."
 
 #. type: Plain text
 #: en/project_coding-style.ssi:18
@@ -439,3 +439,5 @@ msgid ""
 "_* Use capitalized names for functions to limit messing with the users "
 "environment."
 msgstr ""
+"_* Per le funzioni utilizzare nomi che iniziano con la maiuscola per "
+"limitare i problemi con le variabili d'ambiente dell'utente."
diff --git a/manual/po/it/project_procedures.ssi.po b/manual/po/it/project_procedures.ssi.po
index 50f8b6e..44d2480 100644
--- a/manual/po/it/project_procedures.ssi.po
+++ b/manual/po/it/project_procedures.ssi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
 "POT-Creation-Date: 2012-04-23 20:28+0300\n"
-"PO-Revision-Date: 2010-12-17 17:13+0100\n"
+"PO-Revision-Date: 2012-06-07 07:13+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: it\n"
@@ -258,10 +258,6 @@ msgstr "2~ Rilasci minori"
 
 #. type: Plain text
 #: en/project_procedures.ssi:36
-#, fuzzy
-#| msgid ""
-#| "_* Again, we need updated mirror of debian, debian-security and debian-"
-#| "volatile."
 msgid ""
 "_* Again, we need updated mirrors of debian, debian-security and debian-"
 "volatile."
@@ -276,10 +272,8 @@ msgstr "_* Inviare email di annuncio."
 
 #. type: Plain text
 #: en/project_procedures.ssi:42
-#, fuzzy
-#| msgid "3~ Point release announcement template"
 msgid "3~ Last Point Release of a Debian Release"
-msgstr "3~ Modello per l'annuncio di un rilascio minore."
+msgstr "3~ Ultimo rilascio minore di un rilascio di Debian."
 
 #. type: Plain text
 #: en/project_procedures.ssi:47
@@ -289,6 +283,11 @@ msgid ""
 "org to archive.debian.org. That way, old prebuilt live images are still "
 "useful without user modifications."
 msgstr ""
+"Quando si crea l'ultima serie di immagini per un rilascio di Debian che è "
+"stato spostato da ftp.debian.org a archive.debian.org, ricordarsi di "
+"sistemare i mirror del chroot e dei binari. In questo modo le vecchie "
+"immagini live create saranno ancora utili senza la necessità di modifiche da "
+"parte dell'utente."
 
 #. type: Plain text
 #: en/project_procedures.ssi:49
diff --git a/manual/po/it/style_guide.ssi.po b/manual/po/it/style_guide.ssi.po
index 41852c5..ff1e7b4 100644
--- a/manual/po/it/style_guide.ssi.po
+++ b/manual/po/it/style_guide.ssi.po
@@ -1,6 +1,8 @@
 # Italian translations for live-manual package
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2012.
+# Note for translators: those are the guidelines to improve the English manual,
+# translate this file is not necessary.  skizzhg Thu Jun  7 07:46:45 CEST 2012
 #
 msgid ""
 msgstr ""
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 47e4bc8..898a429 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -203,6 +203,9 @@ msgid ""
 "produced by live-build. If you are downloading a prebuilt image instead, the "
 "actual filenames may vary."
 msgstr ""
+"In tutto il capitolo faremo spesso riferimento ai nomi dei file predefiniti "
+"creati da live-build. Se si scarica invece un'immagine precompilata, i nomi "
+"possono variare."
 
 #. type: Plain text
 #: en/user_basics.ssi:10
diff --git a/manual/po/it/user_customization-binary.ssi.po b/manual/po/it/user_customization-binary.ssi.po
index d055a09..2824012 100644
--- a/manual/po/it/user_customization-binary.ssi.po
+++ b/manual/po/it/user_customization-binary.ssi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
 "POT-Creation-Date: 2012-04-08 12:15+0300\n"
-"PO-Revision-Date: 2011-03-11 10:57+0100\n"
+"PO-Revision-Date: 2012-06-07 07:57+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: it\n"
@@ -183,6 +183,12 @@ msgid ""
 "examples of customization make use of different methods, like {includes}"
 "#includes or {hooks}#hooks."
 msgstr ""
+"live-build usa /{syslinux}/ e alcuni dei suoi derivati (a seconda del tipo "
+"di immagine) come bootloader predefiniti. Si possono facilmente "
+"personalizzare in vari modi che vanno dal fornire un tema completo per "
+"modificare il timeout d'avvio o semplicemente per aggiungere un'immagine "
+"splash personalizzata. Alcuni dei seguenti esempi di personalizzazione fanno "
+"uso di metodi diversi, come {include}#includes o {hook}#hooks."
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:10
@@ -191,6 +197,9 @@ msgid ""
 "option (see man #{lb_config}#). live-build will then retrieve the theme from "
 "the mirror and install it."
 msgstr ""
+"Se si desidera utilizzare un tema completo è possibile specificare l'opzione "
+"#{--syslinux-theme}# (vedere man #{lb_config}#). live-build recupera quindi "
+"il tema dal mirror e lo installa."
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:12
@@ -199,6 +208,9 @@ msgid ""
 "the server's theme because you want to have the help menu. Then you would "
 "launch #{lb config}# as follows:"
 msgstr ""
+"Si immagini di voler creare un client progress ma si preferisce includere il "
+"tema del server per avere il menù di aiuto. Si lancerà #{lb config}# come "
+"segue:"
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:16
@@ -213,6 +225,10 @@ msgid ""
 "you do not have a mirror, you can add the package to #{config/packages."
 "chroot}#. In this case it is not necessary to specify any option."
 msgstr ""
+"È inoltre possibile creare il proprio tema o modificarne uno già esistente, "
+"e se non si dispone di un mirror si può aggiungere il pacchetto #{config/"
+"packages.chroot}#. In questo caso non è necessario specificare alcuna "
+"opzione."
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:22
@@ -222,6 +238,10 @@ msgid ""
 "which means that they will pause indefinitely at their splash screen until "
 "you press a key."
 msgstr ""
+"Si può anche fare piccole modifiche. Per esempio i derivati di syslinux sono "
+"configurati con un timeout impostato a 0 (zero) in modo predefinito, "
+"significa che resteranno in pausa al loro splash screen fino a quando non si "
+"preme un tasto."
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:24
@@ -230,6 +250,9 @@ msgid ""
 "default *{isolinux.cfg}* file specifying the timeout in units of seconds and "
 "add it to #{config/includes.binary/isolinux/}#"
 msgstr ""
+"Per modificare il timeout di avvio di un'immagine #{iso-hybrid}# si può "
+"modificare un file *{isolinux.cfg}* predefinito specificando il timeout in "
+"unità di secondi e aggiungerlo a #{config/includes.binary/isolinux/}#"
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:26
@@ -237,6 +260,8 @@ msgid ""
 "A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
 "this:"
 msgstr ""
+"Un file *{isolinux.cfg}* modificato per fare il boot dopo cinque secondi "
+"sarà simile a questo:"
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:33
@@ -255,6 +280,9 @@ msgid ""
 "adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run "
 "in the binary stage. A proposed example:"
 msgstr ""
+"Un modo alternativo per raggiungere lo stesso obiettivo potrebbe essere "
+"scrivere un hook e aggiungerlo a #{config/hooks/}# Ricordarsi di aggiungere "
+"il suffisso #{.binary}# per eseguirsi nella fase binaria. Ecco un esempio:"
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
@@ -274,6 +302,9 @@ msgid ""
 "Likewise, if you want to use a personalized splash.png image you can add a "
 "picture of 640x480 pixels to #{config/includes.binary/isolinux/}#"
 msgstr ""
+"Allo stesso modo, se si vuole utilizzare un'immagine splash.png "
+"personalizzata basta aggiungerne una di 640x480 pixel a #{config/includes."
+"binary/isolinux/}#"
 
 #. type: Plain text
 #: en/user_customization-binary.ssi:49
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index 425e904..880ad32 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 20:02+0300\n"
-"PO-Revision-Date: 2012-04-02 23:25+0100\n"
+"POT-Creation-Date: 2012-06-09 20:31+0300\n"
+"PO-Revision-Date: 2012-06-18 19:35+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: it\n"
@@ -63,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -133,8 +133,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -434,8 +434,8 @@ msgstr ""
 msgid ""
 "'Persistence' is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
+"understand how it works it would be handy to know that even if the system is "
+"booted and run from read-only media, modifications to the files and "
 "directories are written on writable media, typically a ram disk (tmpfs) and "
 "ram disks' data do not survive reboots."
 msgstr ""
@@ -467,13 +467,16 @@ msgstr ""
 msgid ""
 "If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
 "set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistence volumes during boot. A persistence volume is any of the "
-"following:"
+"persistence volumes during boot. It is possible to restrict which types of "
+"persistence volumes to use by specifying certain boot parameters described "
+"in the live-boot(7) man page. A persistence volume is any of the following:"
 msgstr ""
 "Se il parametro di boot #{persistence}# è impostato (e non lo è #"
 "{nopersistence}#), i supporti di memorizzazione locali (hard disk, "
-"dispositivi USB) saranno rilevati come volumi persistenti durante l'avvio. "
-"Un volume persistente è uno dei seguenti:"
+"dispositivi USB) saranno rilevati come volumi persistenti durante l'avvio. È "
+"possibile selezionare quali tipi utilizzare specificando certi parametri di "
+"avvio descritti nella manpage di live-boot(7). Un volume persistente è uno "
+"dei seguenti:"
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:102
@@ -489,84 +492,49 @@ msgstr "_* un filesystem, identificato dalla sua label."
 #. type: Plain text
 #: en/user_customization-runtime.ssi:106
 msgid ""
-"_* an image/archive file located on the root of any readable filesystem "
-"(even an NTFS partition of a foreign OS), identified by its file name. In "
-"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext4\"."
+"_* an image file located on the root of any readable filesystem (even an "
+"NTFS partition of a foreign OS), identified by its file name. In this case "
+"the file name must also use the containing filesystem as the file extension, "
+"e.g. \"persistence.ext4\"."
 msgstr ""
-"_* un file immagine o archivio situato nella directory radice di un "
-"qualsiasi filesystem leggibile (anche una partizione NTFS di un sistema "
-"estraneo), identificato dal nome del file. In questo caso il nome del file "
-"deve contenere anche il tipo di filesystem come estensione, ad esempio "
-"\"<label>.ext4\"."
+"_* un file immagine situato nella directory radice di un qualsiasi "
+"filesystem leggibile (anche una partizione NTFS di un sistema estraneo), "
+"identificato dal nome del file. In questo caso il nome del file deve "
+"contenere anche il tipo di filesystem come estensione, ad esempio \"<label>."
+"ext4\"."
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:108
 msgid ""
-"It is possible to restrict which types of persistence volumes to use by "
-"specifying certain boot parameters described in the live-boot(7) man page. "
-"The \"identifying labels\" referred to above can be any of the following:"
+"The volume label for overlays must be #{persistence}#. And in order to fully "
+"customize the volume's persistence there must be a file named #{live-"
+"persistence.conf}#. See {The live-persistence.conf file}#live-persistence-"
+"conf"
 msgstr ""
-"È possibile limitare i tipi di volume persistenti da usare specificando "
-"certi parametri di boot descritti nella manpage di live-boot(7). Le \"label "
-"identificative\" di cui sopra possono essere una delle seguenti:"
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistence overlays."
-msgstr "_* #{full-ov}# per strati di persistenza completa."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:112
-msgid "_* #{custom-ov}# for custom overlays."
-msgstr "_* #{custom-ov}# per strati personalizzati."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:114
-msgid "_* #{live-sn}# for full system snapshots."
-msgstr "_* #{live-sn}# per istantanee del sistema completo."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:116
-msgid "_* #{home-sn}# for /home snapshots."
-msgstr "_* #{home-sn}# per istantanee della /home."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistence overlays"
-msgstr "3~ Strati di persistenza completa"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:120
 msgid ""
-"By 'full persistence' it is meant that instead of using a tmpfs for storing "
-"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistence volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
-"hard disk or on a usb key created with, e.g.:"
+"Here are some examples of how to prepare a volume to be used for "
+"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
+"a usb key created with, e.g.:"
 msgstr ""
-"Con \"persistenza completa\" si intende l'uso di un volume persistente "
-"invece di un filesystem temporaneo (tmpfs) per salvare le modifiche al "
-"supporto in sola lettura (con il sistema COW, copy-on-write). Per questo "
-"tipo di persistenza la label deve essere #{full-ov}#, che potrebbe essere "
-"una partizione di tipo ext4 su un hard disk o una penna USB creata ad "
-"esempio con:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:114
 #, no-wrap
-msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:118
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
-"Vedee anche {Usare lo spazio rimanente su una penna USB}#using-usb-extra-"
+"Vedere anche {Usare lo spazio rimanente su una penna USB}#using-usb-extra-"
 "space."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
@@ -575,59 +543,57 @@ msgstr ""
 "l'etichetta con una delle seguenti:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:124
 #, no-wrap
-msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
-msgstr " $ tune2fs -L full-ov /dev/sdb1 # per filesystems ext2,3,4\n"
+msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgstr " $ tune2fs -L persistence /dev/sdb1 # per filesystem ext2,3,4\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:128
 msgid ""
-"Here's an example of how to create an ext4-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for "
 "persistence:"
 msgstr ""
 "Ecco un esempio di come creare un file immagine ext4 da utilizzare per la "
-"persistenza completa:"
+"persistenza:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:133
 #, no-wrap
 msgid ""
-" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext4 -F full-ov\n"
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
 msgstr ""
-" $ dd if=/dev/null of=full-ov bs=1G seek=1 # per un file immagine da 1GB\n"
-" $ /sbin/mkfs.ext4 -F full-ov\n"
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # per un file immagine da 1GB\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:147
-msgid ""
-"Then copy the #{full-ov}# file to the root of a writable partition and "
-"reboot."
+#: en/user_customization-runtime.ssi:137
+msgid "Then copy the #{persistence}# file to the root of a writable partition."
 msgstr ""
-"Quindi copiare il file #{full-ov}# nella directory radice di una partizione "
-"scrivibile e riavviare."
+"Quindi copiare il file #{persistence}# nella directory radice di una "
+"partizione scrivibile e riavviare."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:149
-msgid "3~ Custom overlays"
-msgstr "3~ Strati personalizzati"
+#: en/user_customization-runtime.ssi:139
+msgid "3~live-persistence-conf The live-persistence.conf file"
+msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:151
+#: en/user_customization-runtime.ssi:141
 msgid ""
-"A volume with the label #{custom-ov}# can be configured to make arbitrary "
+"A volume with the label #{persistence}# can be configured to make arbitrary "
 "directories persistent. The file #{live-persistence.conf}#, located on the "
 "volume's filesystem root, controls which directories it makes persistent, "
 "and in which way."
 msgstr ""
-"Un volume con una label #{custom-ov}# può essere configurato per creare "
+"Un volume con una label #{persistence}# può essere configurato per creare "
 "directory persistenti arbitrarie. Il file #{live-persistence.conf}#, situato "
 "nella directory radice del filesystem del volume, controlla quali rendere "
 "persistenti e in che modo."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:153
+#: en/user_customization-runtime.ssi:143
 msgid ""
 "How custom overlay mounts are configured is described in full detail in the "
 "live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -641,17 +607,17 @@ msgstr ""
 "persistente in un filesystem ext4 sulla partizione /dev/sdb1:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:160
+#: en/user_customization-runtime.ssi:150
 #, no-wrap
 msgid ""
-" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mkfs.ext4 -L persistence /dev/sdb1\n"
 " $ mount -t ext4 /dev/sdb1 /mnt\n"
 " $ echo \"/home\" >> /mnt/live-persistence.conf\n"
 " $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:164
+#: en/user_customization-runtime.ssi:154
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -659,8 +625,7 @@ msgid ""
 "note that any paths listed in the #{live-persistence.conf}# file cannot "
 "contain white spaces or the special #{.}# and #{..}# path components. Also, "
 "neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
-"persistent using custom mounts (for the latter, use the #{full-ov}# type "
-"persistence described above)."
+"persistent using custom mounts."
 msgstr ""
 "Quindi riavviare. Durante il primo avvio il contenuto di #{/home}# e #{/var/"
 "cache/apt}# saranno copiati nel volume persistente e da allora tutte le "
@@ -668,11 +633,10 @@ msgstr ""
 "C'è da considerare che tutti i path elencati nel file #{live-persistence."
 "conf}# non possono contenere spazi o i caratteri speciali #{.}# e #{..}#; "
 "inoltre, né #{/live}# (o nessuna delle sue sottodirectory) né #{/}# può "
-"essere resa persistente tramite i mount personalizzati (per l'ultimo usare "
-"la tipologia #{full-ov}# descritta prima)."
+"essere resa persistente tramite i mount personalizzati."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:166
+#: en/user_customization-runtime.ssi:156
 msgid ""
 "Several different custom overlay volumes (with their own #{live-persistence."
 "conf}# files) can be used at the same time, but if several volumes make the "
@@ -694,90 +658,25 @@ msgstr ""
 "manpage di live-persistence.conf(5) per sapere come gestire questo caso."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:168
-msgid "3~ Snapshots"
-msgstr "3~ Istantanee"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:170
-msgid ""
-"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistence volume to the system "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
-"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
-"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
-"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistence media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems, but it occupies as "
-"much RAM as the size of the uncompressed snapshot."
-msgstr ""
-"Le istantanee sono raccolte di file e directory che non vengono montate "
-"durante l'esecuzione ma copiate all'avvio da un volume persistente al "
-"sistema (tmpfs) e risincronizzate al riavvio e spegnimento. Il volume deve "
-"essere etichettato come #{live-sn}# sotto forma di un semplice archivio cpio "
-"nominato #{live-sn.cpio.gz}#. Un'interruzione di corrente durante "
-"l'esecuzione potrebbe portare ad una perdita di dati, se son state fatte "
-"modifiche importanti si può usare usare #{live-snapshot --refresh}# tante "
-"volte quanto necessario.Giacché non scrive continuamente sul dispositivo, "
-"questo tipo di persistenza è il sistema più comodo e veloce per dispositivi "
-"basati su memoria flash ma occupa tanta RAM quanta è la dimensione "
-"dell'istantanea decompressa."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:172
-msgid ""
-"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
-"works the same as the main snapshot but it is only applied to /home."
-msgstr ""
-"Esiste anche un'istantanea della /home con etichetta #{home-sn.*}#; funziona "
-"come la principale ma viene applicata solo ad /home."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:174
-msgid "Snapshots cannot currently handle file deletion."
-msgstr ""
-"Attualmente le istantanee non possono gestire la cancellazione dei file."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:176
+#: en/user_customization-runtime.ssi:158
 msgid "3~ Persistence SubText"
 msgstr "3~ Sottotesto persistente"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:178
+#: en/user_customization-runtime.ssi:159
 msgid ""
 "If a user would need multiple persistence storage of the same type for "
-"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
-"the boot parameter #{persistence}# will allow for multiple but unique "
-"persistence media. An example would be if a user wanted to use a persistence "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistence}# #{persistence-subtext=subText}#."
+"different locations or testing, such as #{persistence-nonwork}# and #"
+"{persistence-work}#, the boot parameter #{persistence-subtext}# used in "
+"conjunction with the boot parameter #{persistence}# will allow for multiple "
+"but unique persistence media. An example would be if a user wanted to use a "
+"persistence partition labeled #{persistence-subText}# they would use the "
+"boot parameters of: #{persistence}# #{persistence-subtext=subText}#."
 msgstr ""
 "Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per "
-"differenti posti o per test, come #{full-ov-casa}# e #{full-ov-lavoro}#, il "
-"parametro d'avvio #{persistence-subtext}# usato in congiunzione con #"
-"{persistent}# permetterà supporti persistenti multipli ma univoci. Un "
+"differenti posti o per test, come #{persistence-casa}# e #{persistence-"
+"lavoro}#, il parametro d'avvio #{persistence-subtext}# usato in congiunzione "
+"con #{persistent}# permetterà supporti persistenti multipli ma univoci. Un "
 "esempio potrebbe essere un utente che vuole usare una partizione etichettata "
-"come #{live-sn-sottotesto}#, userebbe: #{persistence}# #{persistence-"
+"come #{persistence-sottotesto}#, userebbe: #{persistence}# #{persistence-"
 "subtext=sottotesto}#."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:180
-msgid "3~ Partial remastering"
-msgstr "3~ Rimasterizzazione parziale"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:181
-msgid ""
-"The run-time modification of the tmpfs could be collected using live-"
-"snapshot in a squashfs and added to the cd by remastering the iso in the "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
-msgstr ""
-"Le modifiche in fase di esecuzione del tmpfs possono essere incluse in uno "
-"squashfs usando live-snapshot e aggiunte al cd per rimasterizzare la iso nel "
-"caso di un cd riscrivibile o aggiunto ad una sessione di un cd/dvd(rw) "
-"multisessione; live-boot monta tutti i filesystem /live in ordine o con il "
-"modulo del parametro d'avvio."
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 12feec7..aa5b4ae 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-06-07 08:43+0300\n"
 "PO-Revision-Date: 2012-03-04 18:43+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -163,6 +163,13 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
+#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:234
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
 #: en/user_examples.ssi:119 en/user_examples.ssi:211
 #, no-wrap
@@ -292,13 +299,7 @@ msgstr ""
 msgid ""
 "Now, as superuser, build the image, saving a log as you build with #{tee}#."
 msgstr ""
-"Ora, come super-utente, si generi l'immagine, salvando un log con #{tee}#."
-
-#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
-#, no-wrap
-msgid " # lb build 2>&1 | tee binary.log\n"
-msgstr ""
+"Ora, come utente root, si generi l'immagine salvando un log con #{tee}#."
 
 #. type: Plain text
 #: en/user_examples.ssi:46
@@ -377,7 +378,7 @@ msgid ""
 "Build the image, again as superuser, keeping a log as in {Tutorial 1}"
 "#tutorial-1:"
 msgstr ""
-"Si generi l'immagine, ancora come super-utente, conservando un log come in "
+"Si generi l'immagine, ancora come utente root, conservando un log come in "
 "{Tutorial 1}#tutorial-1:"
 
 #. type: Plain text
@@ -484,10 +485,10 @@ msgstr "Costruire quindi l'immagine:"
 #: en/user_examples.ssi:123
 msgid ""
 "Note that unlike in the first two tutorials, we no longer have to type #"
-"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
 msgstr ""
 "Si noti che diversamente dai primi due tutorial, non occorre più digitare #"
-"{2>&1 | tee binary.log}# dato che questo è ora incluso in #{auto/build}#."
+"{2>&1 | tee build.log}# dato che questo è ora incluso in #{auto/build}#."
 
 #. type: Plain text
 #: en/user_examples.ssi:125
diff --git a/manual/po/it/user_installation.ssi.po b/manual/po/it/user_installation.ssi.po
index 732452d..f151fe8 100644
--- a/manual/po/it/user_installation.ssi.po
+++ b/manual/po/it/user_installation.ssi.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
-"PO-Revision-Date: 2011-06-21 13:11+0200\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"PO-Revision-Date: 2012-06-18 19:49+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: it\n"
@@ -18,11 +18,10 @@ msgstr ""
 "Plural-Forms: nplurals=2: plural=(n !=1)\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -65,8 +64,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -89,11 +88,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -136,8 +134,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -189,7 +187,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_installation.ssi:10
 msgid "_* Super user (root) access"
-msgstr "_* Accesso come super-utente (root)"
+msgstr "_* Accesso come utente root"
 
 #. type: Plain text
 #: en/user_installation.ssi:12
@@ -376,8 +374,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot and live-config"
-msgstr "2~ live-boot e live-config"
+msgid "2~ Installing live-boot and live-config"
+msgstr "2~ Installare live-boot e live-config"
 
 #. type: Plain text
 #: en/user_installation.ssi:102
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 28e39b3..8e6ddce 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -305,7 +305,7 @@ msgid ""
 " lb clean noauto \"${@}\"\n"
 " rm -f config/binary config/bootstrap \\\n"
 "     config/chroot config/common config/source\n"
-" rm -f binary.log\n"
+" rm -f build.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -318,7 +318,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
+" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index 4bcd0bc..b6e6cce 100644
--- a/manual/po/it/user_overview.ssi.po
+++ b/manual/po/it/user_overview.ssi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2011-12-05 23:53+0100\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"PO-Revision-Date: 2012-06-18 19:53+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: it\n"
@@ -20,8 +20,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -64,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -91,8 +90,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -135,8 +133,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -180,8 +178,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~live-build live-build"
-msgstr ""
+msgid "2~live-build The live-build package"
+msgstr "2~live-build Il pacchetto live-build"
 
 #. type: Plain text
 #: en/user_overview.ssi:10
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 6fd7ede..11a0032 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-18 19:35+0300\n"
+"POT-Creation-Date: 2012-06-24 19:21+0300\n"
 "PO-Revision-Date: 2012-04-14 22:31+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -426,8 +426,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -501,8 +501,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -589,7 +589,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:130
 #, no-wrap
-msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgid " $ make build LANGUAGES=it FORMATS=html\n"
 msgstr ""
 
 #. type: Plain text
@@ -719,29 +719,36 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:195
-msgid "To submit a translation for a new language, follow these three steps:"
+msgid "To start a translation for a new language, follow these steps:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:197
 msgid ""
-"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as /"
-"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
-"your submission, we will add the new language to the manual (providing the "
-"po files) and will enable it in the autobuild."
+"_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and *"
+"{index.html.in.pot}* files to your language with your favourite editor (such "
+"as /{poedit}/). Send the translated #{.po}# files to the mailing list so "
+"that the translation team can check their integrity."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:199
 msgid ""
-"_* Once the new language is added, you can randomly start translating all po "
-"files in #{manual/po/}#."
+"_* To enable a new language in the autobuild it is enough to add the initial "
+"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
+"then edit #{manual/_sisu/home/index.html}#."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:201
 msgid ""
+"_* Once the new language is added, you can randomly continue translating the "
+"remaining po files in #{manual/po/}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:203
+msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
 "are updated from the po files and then you can review your changes launching "
 "#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
@@ -749,7 +756,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:202
+#: en/about_manual.ssi:204
 #, no-wrap
-msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
 msgstr ""
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 46c26c3..23b96d0 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-04 12:21+0300\n"
+"POT-Creation-Date: 2012-06-27 14:57+0300\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -41,13 +41,16 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2012-06-24\n"
 msgid ""
 "@date:\n"
-" :published: 2012-06-04\n"
+" :published: 2012-06-27\n"
 msgstr ""
 "@date:\n"
-" :published: 04-06-2012\n"
+" :published: 27-06-2012\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:15
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index 105b3bb..8b476e5 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 20:02+0300\n"
+"POT-Creation-Date: 2012-06-09 20:31+0300\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -62,8 +62,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -132,8 +132,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -377,8 +377,8 @@ msgstr ""
 msgid ""
 "'Persistence' is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
+"understand how it works it would be handy to know that even if the system is "
+"booted and run from read-only media, modifications to the files and "
 "directories are written on writable media, typically a ram disk (tmpfs) and "
 "ram disks' data do not survive reboots."
 msgstr ""
@@ -398,8 +398,9 @@ msgstr ""
 msgid ""
 "If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
 "set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistence volumes during boot. A persistence volume is any of the "
-"following:"
+"persistence volumes during boot. It is possible to restrict which types of "
+"persistence volumes to use by specifying certain boot parameters described "
+"in the live-boot(7) man page. A persistence volume is any of the following:"
 msgstr ""
 
 #. type: Plain text
@@ -415,117 +416,89 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:106
 msgid ""
-"_* an image/archive file located on the root of any readable filesystem "
-"(even an NTFS partition of a foreign OS), identified by its file name. In "
-"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext4\"."
+"_* an image file located on the root of any readable filesystem (even an "
+"NTFS partition of a foreign OS), identified by its file name. In this case "
+"the file name must also use the containing filesystem as the file extension, "
+"e.g. \"persistence.ext4\"."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:108
 msgid ""
-"It is possible to restrict which types of persistence volumes to use by "
-"specifying certain boot parameters described in the live-boot(7) man page. "
-"The \"identifying labels\" referred to above can be any of the following:"
+"The volume label for overlays must be #{persistence}#. And in order to fully "
+"customize the volume's persistence there must be a file named #{live-"
+"persistence.conf}#. See {The live-persistence.conf file}#live-persistence-"
+"conf"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistence overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:112
-msgid "_* #{custom-ov}# for custom overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:114
-msgid "_* #{live-sn}# for full system snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:116
-msgid "_* #{home-sn}# for /home snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistence overlays"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:120
 msgid ""
-"By 'full persistence' it is meant that instead of using a tmpfs for storing "
-"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistence volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
-"hard disk or on a usb key created with, e.g.:"
+"Here are some examples of how to prepare a volume to be used for "
+"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
+"a usb key created with, e.g.:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:114
 #, no-wrap
-msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:118
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:124
 #, no-wrap
-msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:128
 msgid ""
-"Here's an example of how to create an ext4-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for "
 "persistence:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:133
 #, no-wrap
 msgid ""
-" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext4 -F full-ov\n"
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:147
-msgid ""
-"Then copy the #{full-ov}# file to the root of a writable partition and "
-"reboot."
+#: en/user_customization-runtime.ssi:137
+msgid "Then copy the #{persistence}# file to the root of a writable partition."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:149
-msgid "3~ Custom overlays"
+#: en/user_customization-runtime.ssi:139
+msgid "3~live-persistence-conf The live-persistence.conf file"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:151
+#: en/user_customization-runtime.ssi:141
 msgid ""
-"A volume with the label #{custom-ov}# can be configured to make arbitrary "
+"A volume with the label #{persistence}# can be configured to make arbitrary "
 "directories persistent. The file #{live-persistence.conf}#, located on the "
 "volume's filesystem root, controls which directories it makes persistent, "
 "and in which way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:153
+#: en/user_customization-runtime.ssi:143
 msgid ""
 "How custom overlay mounts are configured is described in full detail in the "
 "live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -534,17 +507,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:160
+#: en/user_customization-runtime.ssi:150
 #, no-wrap
 msgid ""
-" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mkfs.ext4 -L persistence /dev/sdb1\n"
 " $ mount -t ext4 /dev/sdb1 /mnt\n"
 " $ echo \"/home\" >> /mnt/live-persistence.conf\n"
 " $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:164
+#: en/user_customization-runtime.ssi:154
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -552,12 +525,11 @@ msgid ""
 "note that any paths listed in the #{live-persistence.conf}# file cannot "
 "contain white spaces or the special #{.}# and #{..}# path components. Also, "
 "neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
-"persistent using custom mounts (for the latter, use the #{full-ov}# type "
-"persistence described above)."
+"persistent using custom mounts."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:166
+#: en/user_customization-runtime.ssi:156
 msgid ""
 "Several different custom overlay volumes (with their own #{live-persistence."
 "conf}# files) can be used at the same time, but if several volumes make the "
@@ -570,64 +542,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:168
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:170
-msgid ""
-"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistence volume to the system "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
-"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
-"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
-"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistence media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems, but it occupies as "
-"much RAM as the size of the uncompressed snapshot."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:172
-msgid ""
-"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
-"works the same as the main snapshot but it is only applied to /home."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:174
-msgid "Snapshots cannot currently handle file deletion."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:176
+#: en/user_customization-runtime.ssi:158
 msgid "3~ Persistence SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:178
+#: en/user_customization-runtime.ssi:159
 msgid ""
 "If a user would need multiple persistence storage of the same type for "
-"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
-"the boot parameter #{persistence}# will allow for multiple but unique "
-"persistence media. An example would be if a user wanted to use a persistence "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistence}# #{persistence-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:180
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:181
-msgid ""
-"The run-time modification of the tmpfs could be collected using live-"
-"snapshot in a squashfs and added to the cd by remastering the iso in the "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
+"different locations or testing, such as #{persistence-nonwork}# and #"
+"{persistence-work}#, the boot parameter #{persistence-subtext}# used in "
+"conjunction with the boot parameter #{persistence}# will allow for multiple "
+"but unique persistence media. An example would be if a user wanted to use a "
+"persistence partition labeled #{persistence-subText}# they would use the "
+"boot parameters of: #{persistence}# #{persistence-subtext=subText}#."
 msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 1594f89..6e5ebc2 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-06-07 08:43+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -161,6 +161,13 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
+#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:234
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
 #: en/user_examples.ssi:119 en/user_examples.ssi:211
 #, no-wrap
@@ -268,12 +275,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
-#, no-wrap
-msgid " # lb build 2>&1 | tee binary.log\n"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
@@ -420,7 +421,7 @@ msgstr ""
 #: en/user_examples.ssi:123
 msgid ""
 "Note that unlike in the first two tutorials, we no longer have to type #"
-"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index 137ee80..5e6ea81 100644
--- a/manual/po/pt_BR/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2010-10-16 20:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,11 +16,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -63,8 +62,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -87,11 +86,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -134,8 +132,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -357,7 +355,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot and live-config"
+msgid "2~ Installing live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
index 501779d..2f46979 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -269,7 +269,7 @@ msgid ""
 " lb clean noauto \"${@}\"\n"
 " rm -f config/binary config/bootstrap \\\n"
 "     config/chroot config/common config/source\n"
-" rm -f binary.log\n"
+" rm -f build.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -282,7 +282,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
+" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index 60fdbf2..925f104 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,8 +19,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -63,8 +62,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -90,8 +89,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -134,8 +132,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -176,7 +174,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~live-build live-build"
+msgid "2~live-build The live-build package"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 841e950..5e7e64b 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -1,12 +1,11 @@
 # Romanian translations for live-manual package
 # 2010 Eugen Paiuc <linux51 at bluewin.ch>
 # This file is distributed under the same license as the live-manual package.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-18 19:35+0300\n"
+"POT-Creation-Date: 2012-06-24 19:21+0300\n"
 "PO-Revision-Date: 2012-04-14 22:32+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -427,8 +426,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -502,8 +501,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -590,7 +589,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:130
 #, no-wrap
-msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgid " $ make build LANGUAGES=it FORMATS=html\n"
 msgstr ""
 
 #. type: Plain text
@@ -718,29 +717,36 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:195
-msgid "To submit a translation for a new language, follow these three steps:"
+msgid "To start a translation for a new language, follow these steps:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:197
 msgid ""
-"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as /"
-"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
-"your submission, we will add the new language to the manual (providing the "
-"po files) and will enable it in the autobuild."
+"_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and *"
+"{index.html.in.pot}* files to your language with your favourite editor (such "
+"as /{poedit}/). Send the translated #{.po}# files to the mailing list so "
+"that the translation team can check their integrity."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:199
 msgid ""
-"_* Once the new language is added, you can randomly start translating all po "
-"files in #{manual/po/}#."
+"_* To enable a new language in the autobuild it is enough to add the initial "
+"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
+"then edit #{manual/_sisu/home/index.html}#."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:201
 msgid ""
+"_* Once the new language is added, you can randomly continue translating the "
+"remaining po files in #{manual/po/}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:203
+msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
 "are updated from the po files and then you can review your changes launching "
 "#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
@@ -748,7 +754,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:202
+#: en/about_manual.ssi:204
 #, no-wrap
-msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
 msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index ee73ffc..eac3191 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-04 12:21+0300\n"
+"POT-Creation-Date: 2012-06-27 14:57+0300\n"
 "PO-Revision-Date: 2010-10-23 00:04+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,13 +42,16 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2012-06-24\n"
 msgid ""
 "@date:\n"
-" :published: 2012-06-04\n"
+" :published: 2012-06-27\n"
 msgstr ""
 "@date:\n"
-" :published: 04.06.2012\n"
+" :published: 27.06.2012\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:15
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index b18fcac..2b31020 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 20:02+0300\n"
+"POT-Creation-Date: 2012-06-09 20:31+0300\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -63,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -133,8 +133,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -378,8 +378,8 @@ msgstr ""
 msgid ""
 "'Persistence' is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
+"understand how it works it would be handy to know that even if the system is "
+"booted and run from read-only media, modifications to the files and "
 "directories are written on writable media, typically a ram disk (tmpfs) and "
 "ram disks' data do not survive reboots."
 msgstr ""
@@ -399,8 +399,9 @@ msgstr ""
 msgid ""
 "If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
 "set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistence volumes during boot. A persistence volume is any of the "
-"following:"
+"persistence volumes during boot. It is possible to restrict which types of "
+"persistence volumes to use by specifying certain boot parameters described "
+"in the live-boot(7) man page. A persistence volume is any of the following:"
 msgstr ""
 
 #. type: Plain text
@@ -416,117 +417,89 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:106
 msgid ""
-"_* an image/archive file located on the root of any readable filesystem "
-"(even an NTFS partition of a foreign OS), identified by its file name. In "
-"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext4\"."
+"_* an image file located on the root of any readable filesystem (even an "
+"NTFS partition of a foreign OS), identified by its file name. In this case "
+"the file name must also use the containing filesystem as the file extension, "
+"e.g. \"persistence.ext4\"."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:108
 msgid ""
-"It is possible to restrict which types of persistence volumes to use by "
-"specifying certain boot parameters described in the live-boot(7) man page. "
-"The \"identifying labels\" referred to above can be any of the following:"
+"The volume label for overlays must be #{persistence}#. And in order to fully "
+"customize the volume's persistence there must be a file named #{live-"
+"persistence.conf}#. See {The live-persistence.conf file}#live-persistence-"
+"conf"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistence overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:112
-msgid "_* #{custom-ov}# for custom overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:114
-msgid "_* #{live-sn}# for full system snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:116
-msgid "_* #{home-sn}# for /home snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistence overlays"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:120
 msgid ""
-"By 'full persistence' it is meant that instead of using a tmpfs for storing "
-"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistence volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
-"hard disk or on a usb key created with, e.g.:"
+"Here are some examples of how to prepare a volume to be used for "
+"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
+"a usb key created with, e.g.:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:114
 #, no-wrap
-msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:118
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:124
 #, no-wrap
-msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:128
 msgid ""
-"Here's an example of how to create an ext4-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for "
 "persistence:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:133
 #, no-wrap
 msgid ""
-" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext4 -F full-ov\n"
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:147
-msgid ""
-"Then copy the #{full-ov}# file to the root of a writable partition and "
-"reboot."
+#: en/user_customization-runtime.ssi:137
+msgid "Then copy the #{persistence}# file to the root of a writable partition."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:149
-msgid "3~ Custom overlays"
+#: en/user_customization-runtime.ssi:139
+msgid "3~live-persistence-conf The live-persistence.conf file"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:151
+#: en/user_customization-runtime.ssi:141
 msgid ""
-"A volume with the label #{custom-ov}# can be configured to make arbitrary "
+"A volume with the label #{persistence}# can be configured to make arbitrary "
 "directories persistent. The file #{live-persistence.conf}#, located on the "
 "volume's filesystem root, controls which directories it makes persistent, "
 "and in which way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:153
+#: en/user_customization-runtime.ssi:143
 msgid ""
 "How custom overlay mounts are configured is described in full detail in the "
 "live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -535,17 +508,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:160
+#: en/user_customization-runtime.ssi:150
 #, no-wrap
 msgid ""
-" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mkfs.ext4 -L persistence /dev/sdb1\n"
 " $ mount -t ext4 /dev/sdb1 /mnt\n"
 " $ echo \"/home\" >> /mnt/live-persistence.conf\n"
 " $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:164
+#: en/user_customization-runtime.ssi:154
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -553,12 +526,11 @@ msgid ""
 "note that any paths listed in the #{live-persistence.conf}# file cannot "
 "contain white spaces or the special #{.}# and #{..}# path components. Also, "
 "neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
-"persistent using custom mounts (for the latter, use the #{full-ov}# type "
-"persistence described above)."
+"persistent using custom mounts."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:166
+#: en/user_customization-runtime.ssi:156
 msgid ""
 "Several different custom overlay volumes (with their own #{live-persistence."
 "conf}# files) can be used at the same time, but if several volumes make the "
@@ -571,64 +543,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:168
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:170
-msgid ""
-"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistence volume to the system "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
-"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
-"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
-"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistence media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems, but it occupies as "
-"much RAM as the size of the uncompressed snapshot."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:172
-msgid ""
-"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
-"works the same as the main snapshot but it is only applied to /home."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:174
-msgid "Snapshots cannot currently handle file deletion."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:176
+#: en/user_customization-runtime.ssi:158
 msgid "3~ Persistence SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:178
+#: en/user_customization-runtime.ssi:159
 msgid ""
 "If a user would need multiple persistence storage of the same type for "
-"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
-"the boot parameter #{persistence}# will allow for multiple but unique "
-"persistence media. An example would be if a user wanted to use a persistence "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistence}# #{persistence-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:180
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:181
-msgid ""
-"The run-time modification of the tmpfs could be collected using live-"
-"snapshot in a squashfs and added to the cd by remastering the iso in the "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
+"different locations or testing, such as #{persistence-nonwork}# and #"
+"{persistence-work}#, the boot parameter #{persistence-subtext}# used in "
+"conjunction with the boot parameter #{persistence}# will allow for multiple "
+"but unique persistence media. An example would be if a user wanted to use a "
+"persistence partition labeled #{persistence-subText}# they would use the "
+"boot parameters of: #{persistence}# #{persistence-subtext=subText}#."
 msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index aab8dbd..92faa78 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-06-07 08:43+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -162,6 +162,13 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
+#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:234
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
 #: en/user_examples.ssi:119 en/user_examples.ssi:211
 #, no-wrap
@@ -269,12 +276,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
-#, no-wrap
-msgid " # lb build 2>&1 | tee binary.log\n"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
@@ -421,7 +422,7 @@ msgstr ""
 #: en/user_examples.ssi:123
 msgid ""
 "Note that unlike in the first two tutorials, we no longer have to type #"
-"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index e39e393..cba13d6 100644
--- a/manual/po/ro/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,11 +17,10 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -64,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -88,11 +87,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -135,8 +133,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -358,7 +356,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot and live-config"
+msgid "2~ Installing live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index 842b295..b85adf5 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -270,7 +270,7 @@ msgid ""
 " lb clean noauto \"${@}\"\n"
 " rm -f config/binary config/bootstrap \\\n"
 "     config/chroot config/common config/source\n"
-" rm -f binary.log\n"
+" rm -f build.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,7 +283,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
+" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index a701159..864e14e 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,8 +20,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -64,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -91,8 +90,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -135,8 +133,8 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -177,7 +175,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~live-build live-build"
+msgid "2~live-build The live-build package"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index d033996..dd14f99 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -1,4 +1,4 @@
-[po4a_langs] de es fr it pt_BR ro
+[po4a_langs] ca de es fr it pt_BR ro
 [po4a_paths] pot/$master.pot $lang:po/$lang/$master.po
 [type: text] en/live-manual.ssm $lang:$lang/live-manual.ssm
 [type: text] en/about_manual.ssi $lang:$lang/about_manual.ssi
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index a18e6ff..f7258f4 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-18 19:35+0300\n"
+"POT-Creation-Date: 2012-06-24 19:21+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -365,8 +365,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -440,8 +440,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -523,7 +523,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:130
 #, no-wrap
-msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgid " $ make build LANGUAGES=it FORMATS=html\n"
 msgstr ""
 
 #. type: Plain text
@@ -635,29 +635,36 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:195
-msgid "To submit a translation for a new language, follow these three steps:"
+msgid "To start a translation for a new language, follow these steps:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:197
 msgid ""
-"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as /"
-"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
-"your submission, we will add the new language to the manual (providing the "
-"po files) and will enable it in the autobuild."
+"_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and *"
+"{index.html.in.pot}* files to your language with your favourite editor (such "
+"as /{poedit}/). Send the translated #{.po}# files to the mailing list so "
+"that the translation team can check their integrity."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:199
 msgid ""
-"_* Once the new language is added, you can randomly start translating all po "
-"files in #{manual/po/}#."
+"_* To enable a new language in the autobuild it is enough to add the initial "
+"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
+"then edit #{manual/_sisu/home/index.html}#."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:201
 msgid ""
+"_* Once the new language is added, you can randomly continue translating the "
+"remaining po files in #{manual/po/}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:203
+msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
 "are updated from the po files and then you can review your changes launching "
 "#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
@@ -665,7 +672,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:202
+#: en/about_manual.ssi:204
 #, no-wrap
-msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
 msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index d775315..b57108c 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-04 12:21+0300\n"
+"POT-Creation-Date: 2012-06-27 14:57+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-06-04\n"
+" :published: 2012-06-27\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index 92728c7..6a075f6 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 20:02+0300\n"
+"POT-Creation-Date: 2012-06-09 20:31+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -63,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -133,8 +133,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -378,8 +378,8 @@ msgstr ""
 msgid ""
 "'Persistence' is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
+"understand how it works it would be handy to know that even if the system is "
+"booted and run from read-only media, modifications to the files and "
 "directories are written on writable media, typically a ram disk (tmpfs) and "
 "ram disks' data do not survive reboots."
 msgstr ""
@@ -399,8 +399,9 @@ msgstr ""
 msgid ""
 "If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
 "set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistence volumes during boot. A persistence volume is any of the "
-"following:"
+"persistence volumes during boot. It is possible to restrict which types of "
+"persistence volumes to use by specifying certain boot parameters described "
+"in the live-boot(7) man page. A persistence volume is any of the following:"
 msgstr ""
 
 #. type: Plain text
@@ -416,117 +417,89 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:106
 msgid ""
-"_* an image/archive file located on the root of any readable filesystem "
-"(even an NTFS partition of a foreign OS), identified by its file name. In "
-"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext4\"."
+"_* an image file located on the root of any readable filesystem (even an "
+"NTFS partition of a foreign OS), identified by its file name. In this case "
+"the file name must also use the containing filesystem as the file extension, "
+"e.g. \"persistence.ext4\"."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:108
 msgid ""
-"It is possible to restrict which types of persistence volumes to use by "
-"specifying certain boot parameters described in the live-boot(7) man page. "
-"The \"identifying labels\" referred to above can be any of the following:"
+"The volume label for overlays must be #{persistence}#. And in order to fully "
+"customize the volume's persistence there must be a file named #{live-"
+"persistence.conf}#. See {The live-persistence.conf file}#live-persistence-"
+"conf"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistence overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:112
-msgid "_* #{custom-ov}# for custom overlays."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:114
-msgid "_* #{live-sn}# for full system snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:116
-msgid "_* #{home-sn}# for /home snapshots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistence overlays"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:120
 msgid ""
-"By 'full persistence' it is meant that instead of using a tmpfs for storing "
-"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistence volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
-"hard disk or on a usb key created with, e.g.:"
+"Here are some examples of how to prepare a volume to be used for "
+"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
+"a usb key created with, e.g.:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:114
 #, no-wrap
-msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:118
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:124
 #, no-wrap
-msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:128
 msgid ""
-"Here's an example of how to create an ext4-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for "
 "persistence:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:133
 #, no-wrap
 msgid ""
-" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext4 -F full-ov\n"
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:147
-msgid ""
-"Then copy the #{full-ov}# file to the root of a writable partition and "
-"reboot."
+#: en/user_customization-runtime.ssi:137
+msgid "Then copy the #{persistence}# file to the root of a writable partition."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:149
-msgid "3~ Custom overlays"
+#: en/user_customization-runtime.ssi:139
+msgid "3~live-persistence-conf The live-persistence.conf file"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:151
+#: en/user_customization-runtime.ssi:141
 msgid ""
-"A volume with the label #{custom-ov}# can be configured to make arbitrary "
+"A volume with the label #{persistence}# can be configured to make arbitrary "
 "directories persistent. The file #{live-persistence.conf}#, located on the "
 "volume's filesystem root, controls which directories it makes persistent, "
 "and in which way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:153
+#: en/user_customization-runtime.ssi:143
 msgid ""
 "How custom overlay mounts are configured is described in full detail in the "
 "live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -535,17 +508,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:160
+#: en/user_customization-runtime.ssi:150
 #, no-wrap
 msgid ""
-" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mkfs.ext4 -L persistence /dev/sdb1\n"
 " $ mount -t ext4 /dev/sdb1 /mnt\n"
 " $ echo \"/home\" >> /mnt/live-persistence.conf\n"
 " $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:164
+#: en/user_customization-runtime.ssi:154
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -553,12 +526,11 @@ msgid ""
 "note that any paths listed in the #{live-persistence.conf}# file cannot "
 "contain white spaces or the special #{.}# and #{..}# path components. Also, "
 "neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
-"persistent using custom mounts (for the latter, use the #{full-ov}# type "
-"persistence described above)."
+"persistent using custom mounts."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:166
+#: en/user_customization-runtime.ssi:156
 msgid ""
 "Several different custom overlay volumes (with their own #{live-persistence."
 "conf}# files) can be used at the same time, but if several volumes make the "
@@ -571,64 +543,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:168
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:170
-msgid ""
-"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistence volume to the system "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
-"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
-"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
-"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistence media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems, but it occupies as "
-"much RAM as the size of the uncompressed snapshot."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:172
-msgid ""
-"A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
-"works the same as the main snapshot but it is only applied to /home."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:174
-msgid "Snapshots cannot currently handle file deletion."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:176
+#: en/user_customization-runtime.ssi:158
 msgid "3~ Persistence SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:178
+#: en/user_customization-runtime.ssi:159
 msgid ""
 "If a user would need multiple persistence storage of the same type for "
-"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
-"the boot parameter #{persistence}# will allow for multiple but unique "
-"persistence media. An example would be if a user wanted to use a persistence "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistence}# #{persistence-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:180
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:181
-msgid ""
-"The run-time modification of the tmpfs could be collected using live-"
-"snapshot in a squashfs and added to the cd by remastering the iso in the "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
+"different locations or testing, such as #{persistence-nonwork}# and #"
+"{persistence-work}#, the boot parameter #{persistence-subtext}# used in "
+"conjunction with the boot parameter #{persistence}# will allow for multiple "
+"but unique persistence media. An example would be if a user wanted to use a "
+"persistence partition labeled #{persistence-subText}# they would use the "
+"boot parameters of: #{persistence}# #{persistence-subtext=subText}#."
 msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 161036d..d44e4f8 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-06-07 08:43+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -162,6 +162,13 @@ msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:234
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
 #: en/user_examples.ssi:119 en/user_examples.ssi:211
 #, no-wrap
@@ -269,12 +276,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
-#, no-wrap
-msgid " # lb build 2>&1 | tee binary.log\n"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
@@ -421,7 +422,7 @@ msgstr ""
 #: en/user_examples.ssi:123
 msgid ""
 "Note that unlike in the first two tutorials, we no longer have to type #"
-"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index b169e71..f6f919b 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,11 +17,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -64,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -88,11 +87,10 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -135,8 +133,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -358,7 +356,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot and live-config"
+msgid "2~ Installing live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 6f93f4a..2750197 100644
--- a/manual/pot/user_managing_a_configuration.ssi.pot
+++ b/manual/pot/user_managing_a_configuration.ssi.pot
@@ -270,7 +270,7 @@ msgid ""
 " lb clean noauto \"${@}\"\n"
 " rm -f config/binary config/bootstrap \\\n"
 "     config/chroot config/common config/source\n"
-" rm -f binary.log\n"
+" rm -f build.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,7 +283,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
+" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index 29f62be..e23d228 100644
--- a/manual/pot/user_overview.ssi.pot
+++ b/manual/pot/user_overview.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-16 18:50+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,8 +20,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -64,8 +63,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
 #: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
 #: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -91,8 +90,7 @@ msgstr ""
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -135,8 +133,8 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
 #: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
 #: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
@@ -177,7 +175,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~live-build live-build"
+msgid "2~live-build The live-build package"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 31e38bc..612f894 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -198,7 +198,7 @@ Or combine both, e.g:
 
 code{
 
- $ make build FORMATS=html LANGUAGES=it
+ $ make build LANGUAGES=it FORMATS=html
 
 }code
 
@@ -273,20 +273,23 @@ code{
 
 3~translation Translation
 
-To submit a translation for a new language, follow these three steps:
+To start a translation for a new language, follow these steps:
 
-_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
-index.html.in.pot files to your language with your favourite editor (such as
-/{poedit}/). Send translated files to the mailing list. Once we have
-reviewed your submission, we will add the new language to the manual
-(providing the po files) and will enable it in the autobuild.
+_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and
+*{index.html.in.pot}* files to your language with your favourite editor
+(such as /{poedit}/). Send the translated #{.po}# files to the mailing list
+so that the translation team can check their integrity.
 
-_* Once the new language is added, you can randomly start translating all po
-files in #{manual/po/}#.
+_* To enable a new language in the autobuild it is enough to add the initial
+translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And
+then edit #{manual/_sisu/home/index.html}#.
+
+_* Once the new language is added, you can randomly continue translating the
+remaining po files in #{manual/po/}#.
 
 _* Don't forget you need #{make commit}# to ensure the translated manuals
 are updated from the po files and then you can review your changes launching
 #{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
 and #{git push}#.
 
-*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
+*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index a8cf171..4137e6e 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 04-06-2012
+ :published: 2012-06-27
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index a5dc96b..5d83783 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -132,8 +132,8 @@ are lost at shutdown.
 
 'Persistence' is a common name for different kinds of solutions for saving
 across reboots some, or all, of this run-time evolution of the system. To
-understand how it could work it could be handy to know that even if the
-system is booted and run from read-only media, modification to the files and
+understand how it works it would be handy to know that even if the system is
+booted and run from read-only media, modifications to the files and
 directories are written on writable media, typically a ram disk (tmpfs) and
 ram disks' data do not survive reboots.
 
@@ -145,42 +145,31 @@ parameter to be specified at boot time: #{persistence}#.
 
 If the boot parameter #{persistence}# is set (and #{nopersistence}# is not
 set), local storage media (e.g. hard disks, USB drives) will be probed for
-persistence volumes during boot. A persistence volume is any of the
-following:
+persistence volumes during boot. It is possible to restrict which types of
+persistence volumes to use by specifying certain boot parameters described
+in the live-boot(7) man page. A persistence volume is any of the following:
 
 _* a partition, identified by its GPT name.
 
 _* a filesystem, identified by its filesystem label.
 
-_* an image/archive file located on the root of any readable filesystem
-(even an NTFS partition of a foreign OS), identified by its file name. In
-this case the file name must also use the containing filesystem as the file
-extension, e.g. "<label>.ext4".
+_* an image file located on the root of any readable filesystem (even an
+NTFS partition of a foreign OS), identified by its file name. In this case
+the file name must also use the containing filesystem as the file extension,
+e.g. "persistence.ext4".
 
-It is possible to restrict which types of persistence volumes to use by
-specifying certain boot parameters described in the live-boot(7) man
-page. The "identifying labels" referred to above can be any of the
-following:
+The volume label for overlays must be #{persistence}#. And in order to fully
+customize the volume's persistence there must be a file named
+#{live-persistence.conf}#. See {The live-persistence.conf
+file}#live-persistence-conf
 
-_* #{full-ov}# for full persistence overlays.
-
-_* #{custom-ov}# for custom overlays.
-
-_* #{live-sn}# for full system snapshots.
-
-_* #{home-sn}# for /home snapshots.
-
-3~ Full persistence overlays
-
-By 'full persistence' it is meant that instead of using a tmpfs for storing
-modifications to the read-only media (with the copy-on-write, COW, system) a
-persistence volume is used. For this type of persistence the volume label
-must be #{full-ov}#. This could, for instance, be an ext4 partition on a
-hard disk or on a usb key created with, e.g.:
+Here are some examples of how to prepare a volume to be used for
+persistence. It can be, for instance, an ext4 partition on a hard disk or on
+a usb key created with, e.g.:
 
 code{
 
- # mkfs.ext4 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L persistence /dev/sdb1
 
 }code
 
@@ -191,26 +180,25 @@ label with one of the following:
 
 code{
 
- $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
 
 }code
 
-Here's an example of how to create an ext4-based image file used for full
+Here's an example of how to create an ext4-based image file used for
 persistence:
 
 code{
 
- $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext4 -F full-ov
+ $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext4 -F persistence
 
 }code
 
-Then copy the #{full-ov}# file to the root of a writable partition and
-reboot.
+Then copy the #{persistence}# file to the root of a writable partition.
 
-3~ Custom overlays
+3~live-persistence-conf The live-persistence.conf file
 
-A volume with the label #{custom-ov}# can be configured to make arbitrary
+A volume with the label #{persistence}# can be configured to make arbitrary
 directories persistent. The file #{live-persistence.conf}#, located on the
 volume's filesystem root, controls which directories it makes persistent,
 and in which way.
@@ -222,7 +210,7 @@ persistent in an ext4 filesystem on the /dev/sdb1 partition:
 
 code{
 
- $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mkfs.ext4 -L persistence /dev/sdb1
  $ mount -t ext4 /dev/sdb1 /mnt
  $ echo "/home" >> /mnt/live-persistence.conf
  $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
@@ -235,8 +223,7 @@ on all changes to these directories will live in the persistence
 volume. Please note that any paths listed in the #{live-persistence.conf}#
 file cannot contain white spaces or the special #{.}# and #{..}# path
 components. Also, neither #{/live}# (or any of its sub-directories) nor
-#{/}# can be made persistent using custom mounts (for the latter, use the
-#{full-ov}# type persistence described above).
+#{/}# can be made persistent using custom mounts.
 
 Several different custom overlay volumes (with their own
 #{live-persistence.conf}# files) can be used at the same time, but if
@@ -248,37 +235,12 @@ in the same #{live-persistence.conf}# file. See the live-persistence.conf(5)
 man page for how to handle that case if you really need it (hint: you
 usually don't).
 
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistence volume to the system
-(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
-volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive
-named #{live-sn.cpio.gz}#. A power interruption during run time could lead
-to data loss, hence, if you have important changes, invoke #{live-snapshot
---refresh}# as often as needed. This type of persistence, since it does not
-write continuously to the persistence media, is the most flash-based device
-friendly and the fastest of all the persistence systems, but it occupies as
-much RAM as the size of the uncompressed snapshot.
-
-A /home version of snapshot exists too and its label is #{home-sn.*}#; it
-works the same as the main snapshot but it is only applied to /home.
-
-Snapshots cannot currently handle file deletion.
-
 3~ Persistence SubText
 
 If a user would need multiple persistence storage of the same type for
-different locations or testing, such as #{full-ov-nonwork}# and
-#{full-ov-work}#, the boot parameter #{persistence-subtext}# used in
+different locations or testing, such as #{persistence-nonwork}# and
+#{persistence-work}#, the boot parameter #{persistence-subtext}# used in
 conjunction with the boot parameter #{persistence}# will allow for multiple
 but unique persistence media. An example would be if a user wanted to use a
-persistence partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistence}# #{persistence-subtext=subText}#.
-
-3~ Partial remastering
-
-The run-time modification of the tmpfs could be collected using
-live-snapshot in a squashfs and added to the cd by remastering the iso in
-the case of cd-r or adding a session to multisession cd/dvd(rw); live-boot
-mounts all /live filesystem in order or with the module boot parameter.
+persistence partition labeled #{persistence-subText}# they would use the
+boot parameters of: #{persistence}# #{persistence-subtext=subText}#.
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index aa406ad..2108b14 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -55,7 +55,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -97,7 +97,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -162,7 +162,7 @@ code{
 }code
 
 Note that unlike in the first two tutorials, we no longer have to type
-#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+#{2>&1 | tee build.log}# as that is now included in #{auto/build}#.
 
 Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
 satisfied it works, it's time to initialize our #{git}# repository, adding
@@ -301,7 +301,7 @@ Now, build the image in the usual way:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index c5aa801..2a28091 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -103,7 +103,7 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot and live-config
+2~ Installing live-boot and live-config
 
 *{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.
 
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index 8f6089a..6deb8ad 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -65,7 +65,7 @@ code{
  lb clean noauto "${@}"
  rm -f config/binary config/bootstrap \
      config/chroot config/common config/source
- rm -f binary.log
+ rm -f build.log
 
 }code
 
@@ -74,7 +74,7 @@ code{
 code{
 
  #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee binary.log
+ lb build noauto "${@}" 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index c0e59b5..04578d4 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -5,7 +5,7 @@
 This chapter contains an overview of the three main tools used in building
 Debian Live systems: live-build, live-boot and live-config.
 
-2~live-build live-build
+2~live-build The live-build package
 
 live-build is a collection of scripts to build Debian Live systems. These
 scripts are also referred to as "commands".
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index 9155256..2470e22 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -195,7 +195,7 @@ Or combine both, e.g:
 
 code{
 
- $ make build FORMATS=html LANGUAGES=it
+ $ make build LANGUAGES=it FORMATS=html
 
 }code
 
@@ -269,20 +269,23 @@ code{
 
 3~translation Translation
 
-To submit a translation for a new language, follow these three steps:
+To start a translation for a new language, follow these steps:
 
-_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
-index.html.in.pot files to your language with your favourite editor (such as
-/{poedit}/). Send translated files to the mailing list. Once we have
-reviewed your submission, we will add the new language to the manual
-(providing the po files) and will enable it in the autobuild.
+_* Translate the *{about_manual.ssi.pot}*, *{about_project.ssi.pot}* and
+*{index.html.in.pot}* files to your language with your favourite editor
+(such as /{poedit}/). Send the translated #{.po}# files to the mailing list
+so that the translation team can check their integrity.
 
-_* Once the new language is added, you can randomly start translating all po
-files in #{manual/po/}#.
+_* To enable a new language in the autobuild it is enough to add the initial
+translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And
+then edit #{manual/_sisu/home/index.html}#.
+
+_* Once the new language is added, you can randomly continue translating the
+remaining po files in #{manual/po/}#.
 
 _* Don't forget you need #{make commit}# to ensure the translated manuals
 are updated from the po files and then you can review your changes launching
 #{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
 and #{git push}#.
 
-*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
+*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 3412459..4137e6e 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 04.06.2012
+ :published: 2012-06-27
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index a5dc96b..5d83783 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -132,8 +132,8 @@ are lost at shutdown.
 
 'Persistence' is a common name for different kinds of solutions for saving
 across reboots some, or all, of this run-time evolution of the system. To
-understand how it could work it could be handy to know that even if the
-system is booted and run from read-only media, modification to the files and
+understand how it works it would be handy to know that even if the system is
+booted and run from read-only media, modifications to the files and
 directories are written on writable media, typically a ram disk (tmpfs) and
 ram disks' data do not survive reboots.
 
@@ -145,42 +145,31 @@ parameter to be specified at boot time: #{persistence}#.
 
 If the boot parameter #{persistence}# is set (and #{nopersistence}# is not
 set), local storage media (e.g. hard disks, USB drives) will be probed for
-persistence volumes during boot. A persistence volume is any of the
-following:
+persistence volumes during boot. It is possible to restrict which types of
+persistence volumes to use by specifying certain boot parameters described
+in the live-boot(7) man page. A persistence volume is any of the following:
 
 _* a partition, identified by its GPT name.
 
 _* a filesystem, identified by its filesystem label.
 
-_* an image/archive file located on the root of any readable filesystem
-(even an NTFS partition of a foreign OS), identified by its file name. In
-this case the file name must also use the containing filesystem as the file
-extension, e.g. "<label>.ext4".
+_* an image file located on the root of any readable filesystem (even an
+NTFS partition of a foreign OS), identified by its file name. In this case
+the file name must also use the containing filesystem as the file extension,
+e.g. "persistence.ext4".
 
-It is possible to restrict which types of persistence volumes to use by
-specifying certain boot parameters described in the live-boot(7) man
-page. The "identifying labels" referred to above can be any of the
-following:
+The volume label for overlays must be #{persistence}#. And in order to fully
+customize the volume's persistence there must be a file named
+#{live-persistence.conf}#. See {The live-persistence.conf
+file}#live-persistence-conf
 
-_* #{full-ov}# for full persistence overlays.
-
-_* #{custom-ov}# for custom overlays.
-
-_* #{live-sn}# for full system snapshots.
-
-_* #{home-sn}# for /home snapshots.
-
-3~ Full persistence overlays
-
-By 'full persistence' it is meant that instead of using a tmpfs for storing
-modifications to the read-only media (with the copy-on-write, COW, system) a
-persistence volume is used. For this type of persistence the volume label
-must be #{full-ov}#. This could, for instance, be an ext4 partition on a
-hard disk or on a usb key created with, e.g.:
+Here are some examples of how to prepare a volume to be used for
+persistence. It can be, for instance, an ext4 partition on a hard disk or on
+a usb key created with, e.g.:
 
 code{
 
- # mkfs.ext4 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L persistence /dev/sdb1
 
 }code
 
@@ -191,26 +180,25 @@ label with one of the following:
 
 code{
 
- $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
 
 }code
 
-Here's an example of how to create an ext4-based image file used for full
+Here's an example of how to create an ext4-based image file used for
 persistence:
 
 code{
 
- $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext4 -F full-ov
+ $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext4 -F persistence
 
 }code
 
-Then copy the #{full-ov}# file to the root of a writable partition and
-reboot.
+Then copy the #{persistence}# file to the root of a writable partition.
 
-3~ Custom overlays
+3~live-persistence-conf The live-persistence.conf file
 
-A volume with the label #{custom-ov}# can be configured to make arbitrary
+A volume with the label #{persistence}# can be configured to make arbitrary
 directories persistent. The file #{live-persistence.conf}#, located on the
 volume's filesystem root, controls which directories it makes persistent,
 and in which way.
@@ -222,7 +210,7 @@ persistent in an ext4 filesystem on the /dev/sdb1 partition:
 
 code{
 
- $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mkfs.ext4 -L persistence /dev/sdb1
  $ mount -t ext4 /dev/sdb1 /mnt
  $ echo "/home" >> /mnt/live-persistence.conf
  $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
@@ -235,8 +223,7 @@ on all changes to these directories will live in the persistence
 volume. Please note that any paths listed in the #{live-persistence.conf}#
 file cannot contain white spaces or the special #{.}# and #{..}# path
 components. Also, neither #{/live}# (or any of its sub-directories) nor
-#{/}# can be made persistent using custom mounts (for the latter, use the
-#{full-ov}# type persistence described above).
+#{/}# can be made persistent using custom mounts.
 
 Several different custom overlay volumes (with their own
 #{live-persistence.conf}# files) can be used at the same time, but if
@@ -248,37 +235,12 @@ in the same #{live-persistence.conf}# file. See the live-persistence.conf(5)
 man page for how to handle that case if you really need it (hint: you
 usually don't).
 
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistence volume to the system
-(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
-volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive
-named #{live-sn.cpio.gz}#. A power interruption during run time could lead
-to data loss, hence, if you have important changes, invoke #{live-snapshot
---refresh}# as often as needed. This type of persistence, since it does not
-write continuously to the persistence media, is the most flash-based device
-friendly and the fastest of all the persistence systems, but it occupies as
-much RAM as the size of the uncompressed snapshot.
-
-A /home version of snapshot exists too and its label is #{home-sn.*}#; it
-works the same as the main snapshot but it is only applied to /home.
-
-Snapshots cannot currently handle file deletion.
-
 3~ Persistence SubText
 
 If a user would need multiple persistence storage of the same type for
-different locations or testing, such as #{full-ov-nonwork}# and
-#{full-ov-work}#, the boot parameter #{persistence-subtext}# used in
+different locations or testing, such as #{persistence-nonwork}# and
+#{persistence-work}#, the boot parameter #{persistence-subtext}# used in
 conjunction with the boot parameter #{persistence}# will allow for multiple
 but unique persistence media. An example would be if a user wanted to use a
-persistence partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistence}# #{persistence-subtext=subText}#.
-
-3~ Partial remastering
-
-The run-time modification of the tmpfs could be collected using
-live-snapshot in a squashfs and added to the cd by remastering the iso in
-the case of cd-r or adding a session to multisession cd/dvd(rw); live-boot
-mounts all /live filesystem in order or with the module boot parameter.
+persistence partition labeled #{persistence-subText}# they would use the
+boot parameters of: #{persistence}# #{persistence-subtext=subText}#.
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index aa406ad..2108b14 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -55,7 +55,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -97,7 +97,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
@@ -162,7 +162,7 @@ code{
 }code
 
 Note that unlike in the first two tutorials, we no longer have to type
-#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+#{2>&1 | tee build.log}# as that is now included in #{auto/build}#.
 
 Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
 satisfied it works, it's time to initialize our #{git}# repository, adding
@@ -301,7 +301,7 @@ Now, build the image in the usual way:
 
 code{
 
- # lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index c5aa801..2a28091 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -103,7 +103,7 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot and live-config
+2~ Installing live-boot and live-config
 
 *{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.
 
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index 8f6089a..6deb8ad 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -65,7 +65,7 @@ code{
  lb clean noauto "${@}"
  rm -f config/binary config/bootstrap \
      config/chroot config/common config/source
- rm -f binary.log
+ rm -f build.log
 
 }code
 
@@ -74,7 +74,7 @@ code{
 code{
 
  #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee binary.log
+ lb build noauto "${@}" 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index c0e59b5..04578d4 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -5,7 +5,7 @@
 This chapter contains an overview of the three main tools used in building
 Debian Live systems: live-build, live-boot and live-config.
 
-2~live-build live-build
+2~live-build The live-build package
 
 live-build is a collection of scripts to build Debian Live systems. These
 scripts are also referred to as "commands".

-- 
live-manual



More information about the debian-live-changes mailing list