# HG changeset patch # User Dominique Corbex # Date 1313440436 -7200 # Node ID 2b69f8b15b5af1453189892966bf7b64e26905d9 # Parent aba8290691e2b1ff2231df39565f2dfc06834219 tazinst: lock file added, doc updated diff -r aba8290691e2 -r 2b69f8b15b5a Makefile --- a/Makefile Sun Aug 14 10:51:11 2011 +0100 +++ b/Makefile Mon Aug 15 22:33:56 2011 +0200 @@ -6,7 +6,7 @@ DESTDIR?= PROJECTS=slitaz-tools slitaz-boxes tazbox tazinst tazdrop -LINGUAS=fr pt_BR +LINGUAS=es_AR fr pt_BR all: msgfmt @@ -106,13 +106,14 @@ install -m 0644 messages/en/installer.msg \ $(DESTDIR)$(PREFIX)/share/slitaz/messages/en # tazinst - install -m 0755 installer/tazinst $(DESTDIR)$(PREFIX)/bin - for l in fr; \ - do \ - install -m 0777 -d $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ - install -m 0644 po/mo/$$l/tazinst.mo \ - $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ - done; + install -m 0755 installer/tazinst $(DESTDIR)$(PREFIX)/sbin + for l in $(LINGUAS); do \ + for i in `ls po/mo/$$l/tazinst.mo` ; do \ + install -m 0777 -d $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ + install -m 0644 po/mo/$$l/tazinst.mo \ + $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ + done \ + done # slitaz-tools i18n for l in $(LINGUAS); \ do \ diff -r aba8290691e2 -r 2b69f8b15b5a doc/tazinst.en.html --- a/doc/tazinst.en.html Sun Aug 14 10:51:11 2011 +0100 +++ b/doc/tazinst.en.html Mon Aug 15 22:33:56 2011 +0200 @@ -23,167 +23,201 @@

SYNTAX

-tazinst [command] [configuration file]
+tazinst [command] [option]

DESCRIPTION

- Tazinst is a lightweight SliTaz HDD installer (~ 29 KB). It installs SliTaz to a hard drive from a - Live-CD, LiveUSB key, a SliTaz ISO image, or from the web by downloading a stable - version, a cooking version or by giving the http link of another iso (eg: Development ISO). + Tazinst is a lightweight SliTaz HDD installer (~ 31 KB). It installs SliTaz + to a hard drive from a Live-CD, LiveUSB key, a SliTaz ISO image, or from + the web by downloading a stable, cooking or rolling version or by giving + the http link of another iso (eg: Development ISO).

- Tazinst can format the target partition to ext2, ext3, ext4 or other formats if the - matching packages are installed. The home partition can be installed on another - partition and if need be formatted before installation into any one of the available - formats. Tazinst may upon request install the Grub bootloader in the MBR of the target - disk. A dual-boot with an existing Windows© partition is possible, finding the Windows© - partition can either be done automatically or manually specified. + Tazinst can format the target partition to ext2, ext3, ext4 or other formats + if the matching packages are installed. The home partition can be installed + on another partition and if need be formatted before installation into any + one of the available formats. Tazinst may upon request install the Grub + bootloader in the MBR of the target disk. A dual-boot with an existing + Windows© partition is possible, finding the Windows© partition can either be + done automatically or manually specified.

- Tazinst can also update SliTaz installed on a hard disk partition which is handy - in case of version changes. In this case, Slitaz is updated, data in /home is - preserved and additional packages are reinstalled on to the new version. + Tazinst can also update SliTaz installed on a hard disk partition which is + handy in case of version changes. In this case, Slitaz is updated, data in + /home is preserved and additional packages are reinstalled on to the new + version.

- Tazinst was created independently for the needs of the SliTaz GNU/Linux mini distribution. + Tazinst was created independently for the needs of the SliTaz GNU/Linux mini + distribution.

- Tazinst is written from scratch in shell script and is compatible with Busybox Ash and Bash. - Tazinst is licensed under the GNU Free gpl v3. + Tazinst is written from scratch in shell script and is compatible with + Busybox Ash and Bash. Tazinst is licensed under the GNU Free gpl v3.

-

COMMANDS

- -

config

+

SETUP FILE

- Generates a self-documenting configuration file which when edited as required by the user - will install or update SliTaz to a hard drive using tazinst install [filename]. + Tazinst installer is able to perform an installation automatically based on + a simple setup file with clear variables such as: + INST_TYPE="iso", TGT_PARTITION="/dev/hda1". + + With this way, it allows developpers to create a different kind of frontend: + Dialog, GTK and CGI/web in TazPanel. The frontend just has to create a + setup file and start the cmdline installer and report steps in a nice way + (progress bar or/and messages).

-
-tazinst config /var/lib/tazinst.conf
-
-

- The configuration file contains the following variables: + The setup file contains the following variables:

+
  • + The variables describing the installation source:
      -
    1. * INST_TYPE: the type of media containing - the SliTaz source files, either: cdrom (SliTaz LiveCD), usb - (SliTaz LiveUSB), iso (ISO image of SliTaz), web (ISO image on the Web), - weboot, ex: INST_TYPE=web
      -
      2. -
    2. * SRC_FILE: the name of the source file containing - SliTaz. It depends on the type of support: +
    3. + *INST_TYPE: the type of media containing the SliTaz source + files, either: cdrom (SliTaz LiveCD), usb + (SliTaz LiveUSB), iso (ISO image of SliTaz), + web (ISO image on the Web), weboot, + ex: INST_TYPE=web +
      4. +
    4. + SRC_FILE: the name of the source file containing SliTaz. + It depends on the type of support:
      • cdrom (SliTaz LiveCD): - unused
        -
        • + unused +
    5. usb (SliTaz LiveUSB): name of the partition on the host USB device, ex: SRC_FILE=/dev/sdb1 -
      -
      6. +
  • iso (ISO image of SliTaz): name of the - ISO file, ex: SRC_FILE=~/slitaz.3.0.iso
    -
    • + ISO file, ex: SRC_FILE=~/slitaz.3.0.iso +
  • web (ISO image on the Web): name of the URL, ex: SRC_FILE=http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso. Note that 3 URLs are predefined: 'stable', 'cooking, 'rolling', ex: SRC_FILE=cooking downloads the latest cooking available - from the web
    -
    • -
  • weboot: unused
    • - - + from the web + +
  • weboot: unused +
    • + + + -
      -
    1. TGT_HOSTNAME: name of the system, ex: - TGT_HOSTNAME=hd-slitaz, by default TGT_HOSTNAME=slitaz -
      -
      2. -
    2. TGT_ROOT_PWD: superuser password, ex: - TGT_ROOT_PWD=toor, by default - TGT_ROOT_PWD=root
      -
      3. -
    3. TGT_USER: user name, - ex: TGT_USER=toto, by default TGT_USER=tux
      -
      4. -
    4. TGT_USER_PWD: user password, - ex: TGT_USER_PWD=titi, by default - TGT_USER_PWD=tux
      -
      5. -
    - - - -
      -
    1. TGT_GRUB: install the GRUB bootloader (yes or no), ex: - TGT_GRUB=yes, by default TGT_GRUB=no -
      2. -
    2. TGT_WINBOOT: if this variable is entered, - it indicates the partition containing Windows© to implement a dual-boot. It can - also be set to 'auto', in this case the dual-boot will be on the first partition - Windows© detected, - ex: TGT_WINBOOT=auto
      -
      3. -
    -

    - Note that only variables preceded by a asterisk are mandatory, others are optional. Thus a minimal configuration file can be: + Note that only variables preceded by a asterisk are mandatory, others are + optional. Thus a minimal setup file can be: 

     INST_TYPE=cdrom
 TGT_PARTITION=/dev/hda3

    - This file will install SliTaz on /dev/hda3 formatting the partition from a LiveCD. + This file will install SliTaz on /dev/hda3 formatting the partition from a + LiveCD.

    +

    COMMANDS

    + + +

    new

    +

    + Generates a new self-documenting setup file which when edited as required + by the user will install or update SliTaz to a hard drive. +

    +
    +tazinst new /var/lib/tazinst.conf
+
    + +

    install

    - Launch the SliTaz installer based on data in the configuration file. + Performs a SliTaz install on a HDD based on data in the setup file. + If you decide to format your HDD, all data will be lost. If you do not + format, all data but an existing /home directory will be removed, the + home directory will be kept as is. 

     tazinst install /var/lib/tazinst.conf
@@ -192,7 +226,10 @@
 
 
    upgrade
    
 
    
-	Launch and upgrade SliTaz based on data in the configuration file.
+	Upgrade an existing SliTaz system on a HDD based on data in the setup file.
+	Your /home /etc /var/www directories will be kept, all other directories
+	will be removed. Any additional package added to your old Slitaz system
+	will be updated as long you have an active internet connection.
 
    
 
     tazinst upgrade /var/lib/tazinst.conf
@@ -200,24 +237,106 @@
 
 
 
    showurl
    
-
    Display the full URL of the predefined shortcuts: 'stable', 'cooking, 'rolling'.
    
-
    You may overwrite these shortcuts in the /etc/slitaz/tazinst.conf file:
    
-
      
-
    • URL_STABLE="http://mirror.slitaz.org/iso/stable/slitaz...." for 'stable'
      • 
-
    • URL_COOKING="http://mirror.slitaz.org/iso/cooking/slitaz..." for 'cooking'
      • 
-
    • URL_ROLLING="http://mirror.slitaz.org/iso/rolling/slitaz..." for 'rolling'
      • 
-
    
+
    
+	Display the full URL of the predefined shortcuts: 'stable', 'cooking, 
+	'rolling'.
+
    
+
    
+	Note: You may overwrite these shortcuts in the system file:
+	/etc/slitaz/tazinst.conf.
+
    
 
     tazinst showurl stable
 
    
 
 
 
    check
    
-
    Check a configuration file for errors.
    
+
    
+	Check a setup file for errors.
+
    
 
     tazinst check /var/lib/tazinst.conf
 
    
 
+
+
    log
    
+
    
+	Display the last log file contents and exit.
+
    
+
    +tazinst log
+
    
+
+
+
    version
    
+
    
+	Print the version information and exit.
+
    
+
    +tazinst version
+
    
+
+
    SYSTEM FILE
    
+
    
+	The /etc/slitaz/tazinst.conf configuration file allows you to change default
+	settings of tazinst, if you want to use custom values for URL, directories
+	and files, you'll have to create it and modify the following variables:
+
    
+
+
      
+
    • Predefined urls:
+
+
        
+	
      1. URL of the current stable version:
        
+	URL_STABLE="http://mirror.slitaz.org/iso/stable/slitaz-4.0.iso"
+	
+	
        2. 
+	
      2. URL of the current cooking version:
        
+	URL_COOKING="http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso"
+	
+	
        3. 
+	
      3. URL of the current rolling version:
        
+	URL_ROLLING="http://mirror.slitaz.org/iso/rolling/slitaz-core.iso"
+	
+	
        4. 
+
      
+
    
+
+
+
      
+
    • Mount points:
+
+
        
+	
      1. 
+	Source partition mount point:
        
+	SOURCE_ROOT="/media/source"
+	
        2. 
+	
      2. 
+	Target partition mount point:
        
+	TARGET_ROOT="/mnt/target"
+	
        3. 
+
      
+
      • 
+
    
+
+
      
+
    • Log and Debug:
+
+
        
+	
      1. Log File Location:
        
+	LOG="/var/log/tazinst.log"
+	
        2. 
+	
      2. Debugging: (quiet => 0, debug => 1)
        
+	DEBUG=0
+	
        3. 
+	
        
+		It is highly recommended to set DEBUG=1 and join the
+		content of the resulting Log file when sending a bug report to
+		developpers.
+	
        
+
      
+
      • 
+
    
 
 
    MAINTAINERS
    
 
    
diff -r aba8290691e2 -r 2b69f8b15b5a doc/tazinst.fr.html
--- a/doc/tazinst.fr.html	Sun Aug 14 10:51:11 2011 +0100
+++ b/doc/tazinst.fr.html	Mon Aug 15 22:33:56 2011 +0200
@@ -1,7 +1,7 @@
 
 
 
-	Tazinst Manual - Manuel de l'installeur 'tazinst'
+	Tazinst Manual - Manuel de l'installateur 'tazinst'
 	
 	
 	
@@ -10,7 +10,7 @@
 
 
 
    
 
 
@@ -23,12 +23,12 @@
 
 
    SYNTAXE
    
 
    -tazinst [commande] [fichier de configuration]
+tazinst [commande] [option]
 
    
 
 
    DESCRIPTION
    
 
    
-	Tazinst est l'installateur ultra léger (~29 Ko) de SliTaz sur disque dur.
+	Tazinst est l'installateur ultra léger (~31 Ko) de SliTaz sur disque dur.
 	Il permet d'installer SliTaz au choix à partir du Live-CD, d'une clé
 	LiveUSB, d'une image ISO de SliTaz, ou depuis le web en téléchargeant la
 	version stable, la version cooking ou en donnant le lien http d'une autre
@@ -61,135 +61,143 @@
 	libre GNU gpl v3.
 
    
 
-
    COMMANDES
    
-
-
    config
    
+
    FICHIER DE PARAMÈTRES
    
 
    
-	Génère un fichier de configuration autodocumenté, qui une fois édité 
-	suivant	les besoins de l'utilisateur, permettra d'installer ou mettre 
-	à jour SliTaz sur disque dur, en utilisant tazinst install 
-	[nom du fichier].
+	L'installateur Tazinst permet de réaliser une installation automatiquement
+	à l'aide d'un simple fichier de paramètres contenant des variables
+	significatives telles que :
+	INST_TYPE="iso", TGT_PARTITION="/dev/hda1".
+
+	De cette manière, cela permet aux développeurs de créer différents types de
+	frontend : Dialog, GTK et CGI/web dans TazPanel. Le frontend doit juste
+	créer un fichier de paramètres, puis lancer tazinst en ligne de commande et
+	afficher un rapport d'avancement des différentes étapes (Jauges et/ou
+	messages).
 
    
-
    -tazinst config /var/lib/tazinst.conf
-
    
-
 
    
-	Le fichier de configuration contient les variables suivantes :
+	Le fichier de paramètres contient les variables suivantes :
 
    
 
      
-	
    • Les variables décrivant la source d'installation :
      • 
-
    
+	
  • 
+	Les variables décrivant la source d'installation :
 
 
      
-
    1.  * INST_TYPE : le type du support contenant 
-les fichiers sources de SliTaz, au choix : cdrom (LiveCD de SliTaz), usb 
-(LiveUSB de SliTaz), iso (Image ISO de SliTaz), web (Image ISO sur le Web), 
-weboot, ex : INST_TYPE=web
      
-
      2. 
-
    2.  * SRC_FILE : le nom de la source contenant 
-SliTaz. Il dépend du type de support :
+	
    3. 
+	*INST_TYPE : le type du support contenant les fichiers
+	sources de SliTaz, au choix : cdrom (LiveCD de SliTaz),
+	usb (LiveUSB de SliTaz), iso (Image ISO
+	de SliTaz), web (Image ISO sur le Web), 
+	weboot,
+	ex : INST_TYPE=web
+	
      4. 
+	
    4. 
+	*SRC_FILE : le nom de la source contenant SliTaz. Il dépend
+	du type de support :
 	
        
 	
      • cdrom (LiveCD de SliTaz) : 
-	inutilisé
        
-	
        • 
+	inutilisé
+	
      5. 
 	
    5. usb (LiveUSB de SliTaz) : Nom de la 
 	partition hôte de périphérique USB, ex : SRC_FILE=/dev/sdb1
-	
      
-	
      6. 
+	
    • 
 	
  • iso (Image ISO de SliTaz) : Nom du 
-	fichier ISO, ex : SRC_FILE=~/slitaz.3.0.iso
    
-	
    • 
+	fichier ISO, ex : SRC_FILE=~/slitaz.3.0.iso
+	
 	
  • web (Image ISO sur le Web) : Nom de 
 	l'URL, ex : 
 	SRC_FILE=http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso. 
 	À noter que 3 URL sont prédéfinies : 'stable', 'cooking, 'rolling', ex : 
 	SRC_FILE=cooking téléchargera la dernière cooking disponible 
-	sur le web
    
-	
    • 
-	
  • weboot : inutilisé
    •  
-	
-
+	sur le web
+	
+	
  • weboot : inutilisé
+	
    •  
 
+
+
 
 
      
-
    •  Les variables décrivant la partition 
-cible : 
      
-
      • 
+	
    •  Les variables décrivant la partition
+	cible :
+
+	
        
+	
      1. 
+	*TGT_PARTITION : Le nom de la partition cible sur laquelle
+	SliTaz sera installé ou mis à jour,
+	ex : TGT_PARTITION=/dev/hda3
+	
        2. 
+	
      2. 
+	TGT_FS : Si cette variable est renseignée, la partition
+	cible sera formatée dans le système de fichiers indiqué, sinon, la partition
+	sera nettoyée et le répertoire /home sera conservé,
+	ex : TGT_FS=ext3
+	
        3. 
+	
      3. 
+	TGT_HOME : Cette variable indique, si besoin est, le nom de
+	la partition recevant le répertoire /home,
+	ex : TGT_HOME=/dev/hda5
+	
        4. 
+	
      4. 
+	TGT_HOME_FS : Si cette variable est renseignée, la
+	partition /home sera formatée dans le système de fichiers indiqué,
+	ex : TGT_HOME_FS=ext2
+	
        5. 
+
      
+
      • 
 
    
 
+
      
+	
    •  Les paramètres du système :
+
 
        
-
      1.  * TGT_PARTITION : Le nom de la partition 
-cible sur laquelle SliTaz sera insallé ou mis à jour, ex : TGT_PARTITION=
-/dev/hda3
        
-
        2. 
-
      2. TGT_FS : Si cette variable est renseignée, 
-la partition cible sera formatée dans le système de fichiers indiqué, sinon, 
-la partition sera nettoyée et le répertoire /home sera conservé, ex : 
-TGT_FS=ext3
        
-
        3. 
-
      3. TGT_HOME : Cette variable indique, si 
-besoin est, le nom de la partition recevant le répertoire /home, ex : 
-TGT_HOME=/dev/hda5
        
-
        4. 
-
      4. TGT_HOME_FS : Si cette variable est 
-renseignée, la partition/home sera formatée dans le système de fichiers 
-indiqué, ex : TGT_HOME_FS=ext2
        
-
        5. 
+	
      5. 
+	TGT_HOSTNAME : Nom du système,
+	ex : TGT_HOSTNAME=hd-slitaz, par défaut
+	TGT_HOSTNAME=slitaz
+	
        6. 
+	
      6. 
+	TGT_ROOT_PWD : Mot de passe du super-utilisateur,
+	ex : TGT_ROOT_PWD=toor, par défaut
+	TGT_ROOT_PWD=root
+	
        7. 
+	
      7. 
+	TGT_USER : Nom de l'utitisateur par défaut, 
+	ex : TGT_USER=toto, par défaut
+	TGT_USER=tux
+	
        8. 
+	
      8. 
+	TGT_USER_PWD : Mot de passe de l'utilisateur par défaut,
+	ex : TGT_USER_PWD=titi, par défaut 
+	TGT_USER_PWD=tux
+	
        9. 
 
      
+
      • 
+
    
 
 
      
-
    •  Les variables de configuration de Slitaz : 
-
      
-
      • 
-
    
+	
  •  Les variables de configuration du chargeur 
+	de démarrage (bootloader) :
 
 
      
-
    1. TGT_HOSTNAME : Nom du système, ex : 
-TGT_HOSTNAME=hd-slitaz, par défaut TGT_HOSTNAME=slitaz
-
      
-
      2. 
-
    2. TGT_ROOT_PWD : Mot de passe du super-
-utilisateur, ex : TGT_ROOT_PWD=toor, par défaut 
-TGT_ROOT_PWD=root
      
-
      3. 
-
    3. TGT_USER : Nom de l'utitisateur par défaut, 
-ex : TGT_USER=toto, par défaut TGT_USER=tux
      
-
      4. 
-
    4. TGT_USER_PWD : Mot de passe de 
-l'utilisateur par défaut, ex : TGT_USER_PWD=titi, par défaut 
-TGT_USER_PWD=tux
      
-
      5. 
+	
    5. 
+	TGT_GRUB : Installation de GRUB (yes ou no),
+	ex : TGT_GRUB=yes, par défaut TGT_GRUB=no
+	
      6. 
+	
    6. 
+	TGT_WINBOOT : Si cette variable est renseignée, elle
+	indique la partition contenant Windows© pour mettre en place un Dual-boot.
+	Elle peut être aussi positionnée à 'auto', dans ce cas le dual-boot se
+	fera sur la première partition Windows© détectée, 
+	ex : TGT_WINBOOT=auto
+	
      7. 
 
    
-
-
      
-
    •  Les variables de configuration du chargeur 
-de démarrage (bootloader) : 
      
-
      • 
+
    • 
 
 
-
      
-	
    1. TGT_GRUB : Installation de GRUB (yes ou no), ex : 
-		TGT_GRUB=yes, par défaut TGT_GRUB=no
-	
      2. 
-	
    2. TGT_MENU_PARTITION: Nom de la partition 
-	où le fichier de configuration de GRUB est installé. Normalement, cette 
-	variable n'est pas renseignée, elle peut servir dans le cas où GRUB est 
-	installé dans une partition dédiée, ou dans une configuration multi-os, 
-	ex : TGT_MENU_PARTITION=/dev/hda4
      
-	
      3. 
-	
    3. TGT_WINBOOT : Si cette variable est 
-	renseignée, elle indique la partition contenant Windows© pour mettre en 
-	place un Dual-boot. Elle peut être aussi positionnée à 'auto', dans ce 
-	cas le dual-boot se fera sur la première partition Windows© détectée, 
-	ex : TGT_WINBOOT=auto
      
-	
      4. 
-
    
-
 
    
 	À noter que seules les variables précédées d'une atérisque sont 
 	obligatoires, les autres sont optionnelles. Ainsi un fichier de 
-	configuration minimaliste peut être le suivant:
+	paramètres minimaliste peut être le suivant:
 
    
 
     INST_TYPE=cdrom
@@ -200,11 +208,27 @@
 	formatter la partition, à partir d'un LiveCD.
 
    
 
+
    COMMANDES
    
+
+
+
    new
    
+
    
+	Génère un fichier de paramètres autodocumenté, qui une fois édité 
+	suivant	les besoins de l'utilisateur, permettra d'installer ou mettre 
+	à jour SliTaz sur disque dur.
+
    
+
    +tazinst new /var/lib/tazinst.conf
+
    
+
 
 
    install
    
 
    
 	Lance l'installation de SliTaz en fonction des données présentes dans le
-	fichier de configuration.
+	fichier de paramètres. Si le formattage de la partition est demandé,
+	toutes les données seront perdues. Si le disque n'est pas formatté, toutes
+	les données sauf un répertoire /home existant seront effacées, ce répertoire
+	/home sera gardé tel quel. 
 
    
 
     tazinst install /var/lib/tazinst.conf
@@ -214,15 +238,122 @@
 
    upgrade
    
 
    
 	Lance la mise à jour de SliTaz en fonction des données présentes dans le
-	fichier de configuration.
+	fichier de paramètres. Les répertoires /home /etc /var/www seront
+	conservés, tous les autres répertoires seront supprimés. Tout paquet ajouté
+	à la configuration de votre ancien système SliTaz sera mis à jour à la
+	condition qu'une connexion internet soit active.
 
    
 
     tazinst upgrade /var/lib/tazinst.conf
 
    
 
-
    MAINTENEUR
    
+
+
    showurl
    
 
    
-	Christophe Lincoln <pankso at slitaz.org>
+	Affiche l'URL complète des raccourcis prédéfinis : 'stable', 'cooking, 
+	'rolling'.
+
    
+
    
+	Note: Vous pouvez redéfinir ces raccourcis dans le fichier système :
+	/etc/slitaz/tazinst.conf.
+
    
+
    +tazinst showurl stable
+
    
+
+
+
    check
    
+
    
+	Vérifie que le fichier de paramètres ne contient pas d'erreurs.
+
    
+
    +tazinst check /var/lib/tazinst.conf
+
    
+
+
+
    log
    
+
    
+	Affiche le contenu du fichier journal.
+
    
+
    +tazinst log
+
    
+
+
+
    version
    
+
    
+	Affiche les informations de version.
+
    
+
    +tazinst version
+
    
+
+
    FICHIER SYSTÈME DE CONFIGURATION
    
+
    
+	Le fichier système de configuration /etc/slitaz/tazinst.conf permet de
+	changer les paramètres par défaut de tazinst. Pour utiliser des valeurs
+	personnalisées pour les URL, répertoires et fichiers, ce fichier doit être
+	créé et les variables suivantes modifiées :
+
    
+
+
      
+	
    • URLs prédéfinies :
+
+
        
+	
      1. URL de la version stable actuelle :
        
+	URL_STABLE="http://mirror.slitaz.org/iso/stable/slitaz-4.0.iso"
+	
+	
        2. 
+	
      2. URL de la version cooking :
        
+	URL_COOKING="http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso"
+	
+	
        3. 
+	
      3. URL de la version rolling :
        
+	URL_ROLLING="http://mirror.slitaz.org/iso/rolling/slitaz-core.iso"
+	
+	
        4. 
+
      
+
    
+
+
+
      
+
    • Points de montage :
+
+
        
+	
      1. 
+	Point de montage de la partition Source :
        
+	SOURCE_ROOT="/media/source"
+	
        2. 
+	
      2. 
+	Point de montage de la partition Cible :
        
+	TARGET_ROOT="/mnt/target"
+	
        3. 
+
      
+
      • 
+
    
+
+
      
+
    • Debug et journal :
+
+
        
+	
      1. Emplacement du fichier journal :
        
+	LOG="/var/log/tazinst.log"
+	
        2. 
+	
      2. Debugging: (non => 0, debug => 1)
        
+	DEBUG=0
+	
        3. 
+	
        
+		Il est chaudement recommandé de définir DEBUG=1 et de
+		joindre le fichier journal resultant lors de l'envoi d'un rapport de
+		bogue aux développeurs.
+	
        
+
      
+
      • 
+
    
+
+
    MAINTENEURS
    
+
    
+	Christophe Lincoln <pankso at slitaz.org> 
    
 	Dominique Corbex <domcox at slitaz.org>
 
    
 
diff -r aba8290691e2 -r 2b69f8b15b5a installer/README
--- a/installer/README	Sun Aug 14 10:51:11 2011 +0100
+++ b/installer/README	Mon Aug 15 22:33:56 2011 +0200
@@ -14,7 +14,7 @@
 
 With this way, it allows developpers to create a different kind of frontend: 
 Dialog, GTK and CGI/web in TazPanel. The frontend just has to create a config 
-file and start the cmdline installer and report steps in a nice way (progess 
+file and start the cmdline installer and report steps in a nice way (progress 
 bar or/and messages).
 
 
diff -r aba8290691e2 -r 2b69f8b15b5a installer/tazinst
--- a/installer/tazinst	Sun Aug 14 10:51:11 2011 +0100
+++ b/installer/tazinst	Mon Aug 15 22:33:56 2011 +0200
@@ -12,14 +12,15 @@
 #
 # Exit codes:
 # 1: Parameters error 
-# 2: Configuration file error
+# 2: Setup file error
 # 3: Source error
 # 4: Cancelled by user
 # 5: Target partition error
 # 6: SliTaz system to upgrade not found
+# 7: Another instance is running
 # 8: Internal error
 
-VERSION=3.22
+VERSION=3.30
 
 # Internationalization
 . /usr/bin/gettext.sh
@@ -29,6 +30,7 @@
 SOURCE_ROOT=/media/source
 TARGET_ROOT=/mnt/target
 LOG=/var/log/tazinst.log
+LOCK=/run/tazinst.pid
 BACKLIST="SliTaz GNU/Linux installer"
 
 # DEBUG=1: Enable debug msgs
@@ -39,34 +41,28 @@
 URL_COOKING="http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso"
 URL_ROLLING="http://mirror.slitaz.org/iso/rolling/slitaz-core.iso"
 
-# Config
+# Tazinst conf
 [ -r /etc/slitaz/tazinst.conf ] && . /etc/slitaz/tazinst.conf
 
 # Print a short help
 usage()
 {
-	echo -e "\n`gettext \"Tazinst - SliTaz installer - Version\"`: $VERSION\n"
-	echo -e "\033[1m`gettext \"Usage\"`:"
-	echo -e "\033[0m `gettext \"tazinst [command] [config-file|url|options]\"`\n"
-	echo -e "\033[1m`gettext \"Commands\"`: \033[0m"
-	echo -e "usage         `gettext \"Print this short usage.\"`"
-	echo -e "install       `gettext \"Install SliTaz on HDD using a configuration file.\"`"
-	echo -e "upgrade       `gettext \"Upgrade SliTaz on HDD using a configuration file.\"`"
-	echo -e "config        `gettext \"Generate a configuration file.\"`"
-	echo -e "check         `gettext \"Check validity of the configuration file.\"`"
-	echo -e "showurl       `gettext \"Show the full URL of a predefined URL (stable|cooking|rolling).\"`"
-	echo -e "log           `gettext \"Display log file contents.\"`"
-	echo -e "cli           `gettext \"Install or upgrade using command line options:\"`"
-	echo -e "  -i             `gettext \"Full Install (not upgrading, all present data will be lost).\"`"
-	echo -e "  -u             `gettext \"Upgrade (Needs an active internet connection).\"`"
-	echo -e "  -t       `gettext \"Install type (cdrom|usb|iso|web|weboot).\"`"
-	echo -e "  -s     `gettext \"Source media (ex: file.iso|usb partition|web url).\"`"
-	echo -e "  -p  `gettext \"Partition where SliTaz will be installed (ex:/dev/hda3).\"`"
-	echo -e "  -f         `gettext \"Partition to be formatted (fs=ext2|ext3|ext4|etc..).\"`"
-	echo -e "  -g             `gettext \"Install Grub.\"`"
-	echo -e "  -w             `gettext \"Dual-boot a Windows partition (auto|hd, ex:hd0,0).\"`"
-	echo -e "  -d             `gettext \"Debug mode.\"`"
-	exit 0
+	cat <     $(gettext "Install SliTaz on HDD using setup file contents.")
+  upgrade      $(gettext "Upgrade SliTaz on HDD using setup file contents.")
+  new          $(gettext "Create a new setup file.")
+  check        $(gettext "Check validity of settings in a setup file.")
+  showurl  $(gettext "Show full URL of a predefined shortcut (stable|cooking|rolling).")
+  log                $(gettext "Display log file contents and exit.")
+  version            $(gettext "Print version and exit.")
+EOT
+	exit 1
 }
 
 # Print an error msg & exit
@@ -81,7 +77,10 @@
 	if mount | grep -q $TARGET_ROOT; then
 		umount $TARGET_ROOT 2>>$LOG
 	fi
-	echo -e "`gettext \"Error\"` $@"
+	# rm lock
+	rm -f $LOCK
+
+	echo -e "$(gettext "Error") $@"
 	test $(id -u) = 0 && echo "Installation cancelled on error $@" >> $LOG
 	exit $1
 }
@@ -89,36 +88,37 @@
 # Print a warning msg
 warning()
 {
-	echo -e "`gettext \"Warning:\"` $@" | tee -a $LOG
+	echo -e "$(gettext "Warning:") $@" | tee -a $LOG
 }
 
 # Print a debug msg
 debug()
 {
-	[ $DEBUG -gt 0 ] && echo -e "\033[1mDEBUG: \033[0m$1" 
-	echo "DEBUG: $1" >>$LOG
+	[ $DEBUG -gt 0 ] && echo -e "\033[1mDEBUG:\033[0m $1" 
+	[ $DEBUG -gt 0 ] && echo "DEBUG: $1" >>$LOG
 }
 
-# print a msg
+# Print a simple msg
 msg()
 {
 	STEP=$(($STEP+1))
 	echo "$STEP. $@" | tee -a $LOG
+	sleep 1
 }
 
-########################
-# Gen-config functions #
-########################
+#######################
+# New setup functions #
+#######################
 
-# Generate a config file
-# $1: Configuration file
-gen_config()
+# Generate a setup file
+# $1: Setup file
+gen_setup()
 {
-	CONFILE=$1
-	touch $CONFILE || abort 2 `gettext "Can't write config file"`
-	if [ -r "$CONFILE" ]; then
-		cat > $CONFILE << _EOF_
-# tazinst.conf: SliTaz Installer configuration file.
+	SETUP=$1
+	touch $SETUP || abort 2 $(gettext "Can't write setup file")
+	if [ -r "$SETUP" ]; then
+		cat > $SETUP << _EOF_
+# SliTaz Installer setup file.
 #
 
 # Install type : [cdrom|usb|iso|web|weboot]
@@ -174,7 +174,7 @@
 _EOF_
 
 	else
-		abort 2 `gettext "Config file not found"`
+		abort 2 $(gettext "Setup file not found")
 	fi
 }
 
@@ -186,6 +186,14 @@
 # $@ : 
 init()
 {
+	# Check if another instance of tazinst is running
+	if [ -e "$LOCK" ]; then
+		echo $(gettext "Another instance of tazinst is running.")
+		exit 7
+	else
+		echo $$ > $LOCK
+	fi
+
 	echo "=== Tazinst: start at `date` ===" >$LOG
 	echo "Command: $0 $@" >>$LOG
 	debug $(fdisk -l | grep \/dev)
@@ -202,54 +210,25 @@
 	TGT_GRUB=no
 }
 
-# Read Conf
-# $1: conf file
-read_configuration_file()
+# Read setup
+# $1: setup file
+read_setup_file()
 {
-	CONFILE=$1
-	if [ -n "$CONFILE" ]; then
-		if [ -r "$CONFILE" ]; then
-			debug "Using config-file=$CONFILE"
+	SETUP=$1
+	if [ -n "$SETUP" ]; then
+		if [ -r "$SETUP" ]; then
+			debug "Using setup-file=$SETUP"
 			# source doesn't like file without a path
-			[ $(echo "$CONFILE" | grep -c "/") == "0" ] && CONFILE="./$CONFILE"
-			source $CONFILE || abort 2 `gettext "Unable to read config file"`
+			[ $(echo "$SETUP" | grep -c "/") == "0" ] && SETUP="./$SETUP"
+			source $SETUP || abort 2 $(gettext "Unable to read setup file")
 		else
-			abort 2 `gettext "Config file not found"`
+			abort 2 $(gettext "Setup file not found")
 		fi
 	else
-		abort 2 `gettext "No configuration file provided"`
+		abort 2 $(gettext "No setup file provided")
 	fi
 }
 
-# Cli options
-# $@: tazinst parms
-check_cli_options()
-{
-	shift
-	while getopts "c:df:ghip:s:t:uw:" opt ; do
-		case $opt in
-			d) DEBUG=1 ;;
-			f) TGT_FS=$OPTARG ;;
-			g) TGT_GRUB="yes" ;;
-			h) usage ;;
-			i) INSTALL="install" ;;
-			p) TGT_PARTITION=$OPTARG ;;
-			s) SRC_FILE=$OPTARG ;;
-			t) INST_TYPE=$OPTARG ;;
-			u) UPGRADE="upgrade" ;;
-			w) TGT_WINBOOT=$OPTARG ;;
-			[?]) abort 1 ;;
-		esac
-	done
-
-	# Duplicate install modes are forbidden
-	[ -n "$INSTALL" ] && [ -n "$UPGRADE" ] && abort 1 `gettext "Mismatched parameters"`
-	INST_ACTION="$INSTALL$UPGRADE"
-	# Don't allow formatting on upgrades
-	[ "$INST_ACTION" == "upgrade" ] && [ -n "$TGT_FS" ] && \
-		warning "$TGT_PARTITION: `gettext "will not be formatted during upgrade"`"
-}
-
 # check main vars
 check_vars()
 {
@@ -277,7 +256,7 @@
 	# Check Action
 	case $INST_ACTION in
 		install|upgrade|check) ;;
-		*) msg "INST_ACTION=$INST_ACTION: `gettext "Invalid setting"`"; error=yes ;;
+		*) msg "$INST_ACTION: $(gettext "Unknown install mode")"; error=yes ;;
 	esac
 
 	# Check Type
@@ -286,9 +265,9 @@
 		usb|iso|web)
 			# We need a valid source 
 			if [ -z "$SRC_FILE" ]; then
-				msg "INST_TYPE=$INST_TYPE, `gettext "but no source file is provided"`"; error=yes
+				msg "$INST_TYPE: $(gettext "No source file provided")"; error=yes
 			fi ;;
-		*) msg "INST_TYPE=$INST_TYPE: `gettext "Invalid setting"`"; error=yes ;;
+		*) msg "$INST_TYPE: $(gettext "Unknown source type")"; error=yes ;;
 	esac
 
 	# Check Source file
@@ -302,11 +281,11 @@
 	case $INST_TYPE in
 		iso)
 			if [ ! -r "$SRC_FILE" ]; then
-				msg "SRC_FILE=$SRC_FILE: `gettext "file not found"`"; error=yes
+				msg "$SRC_FILE: $(gettext "Source file not found")"; error=yes
 			fi ;;
 		web)
 			if ! wget -sq "$SRC_FILE" 2> /dev/null ; then
-				msg "SRC_FILE=$SRC_FILE: `gettext "file not found on the web"`"; error=yes
+				msg "$SRC_FILE: $(gettext "URL not found")"; error=yes
 			fi ;;
 	esac
 
@@ -317,10 +296,10 @@
 		[ "$partition" == "$TGT_PARTITION" ] && found="yes"
 	done
 	if [ "$found" != "yes" ]; then
-		msg "TGT_PARTITION=$TGT_PARTITION: `gettext "Partition not found"`"; error=yes
+		msg "$TGT_PARTITION: $(gettext "Partition for / not found")"; error=yes
 	fi
 	if [ "$TGT_PARTITION" == "$SRC_FILE" ]; then
-		msg $(gettext "Target and source partitions should be different."); error=yes
+		msg $(gettext "Target and source partitions should be different"); error=yes
 	fi
 
 	# Check Filesystem
@@ -332,9 +311,9 @@
 				[ -x "$xdir/mkfs.$TGT_FS" ] && found=yes
 			done
 			if [ "$found" == "no" ]; then
-				msg "$TGT_FS: mkfs.$TGT_FS `gettext "is not installed."`"; error=yes
+				msg "$TGT_FS: mkfs.$TGT_FS $(gettext "is not installed")"; error=yes
 			fi ;;
-		*) msg "TGT_FS=$TGT_FS: `gettext "Unknown filesystem"`"; error=yes ;;
+		*) msg "$TGT_FS: $(gettext "Unknown filesystem (/)")"; error=yes ;;
 	esac
 
 	# Check Home partition
@@ -344,13 +323,13 @@
 			[ "$partition" == "$TGT_HOME" ] && found=yes
 		 done
 		if [ "$found" != "yes" ]; then
-			msg "TGT_HOME=$TGT_HOME: `gettext "Partition not found"`"; error=yes
+			msg "$TGT_HOME: $(gettext "Partition for /home not found")"; error=yes
 		fi
 		if [ "$TGT_HOME" == "$SRC_FILE" ]; then
-			msg $(gettext "/home and source partitions should be different."); error=yes
+			msg $(gettext "/home and source partitions should be different"); error=yes
 		fi
 		if [ "$TGT_HOME" == "$TGT_PARTITION" ]; then
-			msg $(gettext "main and /home partitions should be different."); error=yes
+			msg $(gettext "/ and /home partitions should be different"); error=yes
 		fi
 	fi
 
@@ -363,15 +342,15 @@
 				[ -x "$xdir/mkfs.$TGT_FS" ] && found=yes
 			done
 			if [ "$found" == "no" ]; then
-				msg "$TGT_FS: mkfs.$TGT_FS `gettext "is not installed."`"; error=yes
+				msg "$TGT_FS: mkfs.$TGT_FS $(gettext "is not installed")"; error=yes
 			fi ;;
-		*) msg "TGT_HOME_FS=$TGT_HOME_FS: `gettext "Unknown filesystem"`"; error=yes ;;
+		*) msg "$TGT_HOME_FS: $(gettext "Unknown filesystem (/home)")"; error=yes ;;
 	esac
 
 	# Check Grub
 	case $TGT_GRUB in
 		yes|no) ;;
-		*) msg "TGT_GRUB=$TGT_GRUB: `gettext "Invalid setting"`"; error=yes ;;
+		*) msg $(gettext "Bootloader (grub): Invalid settings"); error=yes ;;
 	esac
 
 	# Check Winboot
@@ -379,7 +358,7 @@
 		"") ;;
 		auto) ;;
 		hd[[:digit:]],[[:digit:]]) ;;
-		*) msg "TGT_WINBOOT=$TGT_WINBOOT: `gettext "Invalid format"`"; error=yes ;;
+		*) msg $(gettext "Windows Dual-Boot: Invalid settings"); error=yes ;;
 	esac
 
 	# Stop on error
@@ -390,8 +369,8 @@
 check_root()
 {
 	if test $(id -u) != 0 ; then
-		echo -e "`gettext \"You must be the root user (system administrator) to install SliTaz, \
-please use 'su' to get a root SHell and restart installation.\"`"
+		gettext "You must be the root user (system administrator) to install SliTaz, \
+please use 'su' to get a root SHell and restart installation."
 		exit 0
 	fi
 }
@@ -407,7 +386,7 @@
 		debug "Using files from cdrom ($CDROM)..."
 		sleep 2
 	else
-		warning "$CDROM: `gettext "Failed to mount"`"
+		warning "$CDROM: $(gettext "Mount failed")"
 	fi
 }
 
@@ -426,7 +405,7 @@
 			debug "Using files from USB device ($SRC_FILE)..."
 			SOURCE_STATUS="mount"
 		else
-			warning "$SRC_FILE: `gettext "Failed to mount USB device"`"
+			warning "$SRC_FILE: $(gettext "Failed to mount USB device")"
 		fi
 	fi
 }
@@ -439,16 +418,16 @@
 	src_md5=$(echo $SRC_FILE | sed 's/.iso$/.md5/')
 	if [ -r "$src_md5" ]; then
 		[ $(md5sum $SRC_FILE | cut -d' ' -f1) == $(cat "$src_md5" | cut -d' ' -f1) ] || \
-			abort 3 "$SRC-FILE `gettext "corrupted"`"
+			abort 3 "$SRC-FILE: $(gettext "md5sum mismatch, file corrupted")"
 	else
-		warning "$SRC_FILE: `gettext "md5 file not found, unable to check integrity."`"
+		warning "$SRC_FILE: $(gettext "md5 file not found, unable to check integrity.")"
 	fi
 	# Try to mount ISO
 	if mount -o loop -t iso9660 $SRC_FILE $SOURCE_ROOT 2>>$LOG; then
 		debug "Using files from ISO ($SRC_FILE)..."
 		sleep 2
 	else
-		warning "$SRC_FILE: `gettext "Failed to mount ISO."`"
+		warning "$SRC_FILE: $(gettext "Failed to mount ISO.")"
 	fi
 }
 
@@ -460,11 +439,11 @@
 	if wget $SRC_FILE -P /tmp; then
 		debug "Download completed."
 	else
-		warning "$SRC_FILE: `gettext "Failed to download."`"
+		warning "$SRC_FILE: $(gettext "File download failed.")"
 	fi
 	src_md5=$(echo $SRC_FILE | sed 's/.iso$/.md5/')
 	debug "Downloading $src_md5"
-	wget $src_md5 -P /tmp || warning "$src_md5: `gettext "Failed to download."`"
+	wget $src_md5 -P /tmp || warning "$src_md5: $(gettext "File download failed.")"
 	tmpfile=$(echo $SRC_FILE | awk 'BEGIN{RS="/"}{out=$1}END{printf"%s",out}')
 	SRC_FILE="/tmp/$tmpfile"
 	check_iso
@@ -478,7 +457,7 @@
 		ln -s $SRC_FILE/boot $SOURCE_ROOT/boot
 		sleep 2
 	else
-		abort 3 `gettext "Web boot files not found"`
+		abort 3 $(gettext "Web boot files not found")
 	fi
 }
 
@@ -501,59 +480,19 @@
 		check_cdrom
 		check_web ;;
 	*)
-		abort 8 `gettext "Internal"` ;;
+		abort 8 $(gettext "Internal") ;;
 	esac
 
 	# Exit with error msg if no rootfs.gz found.
 	debug "Checking installation media..."
 	if [ ! -f $SOURCE_ROOT/boot/rootfs.gz -a \
 		 ! -f $SOURCE_ROOT/boot/rootfs1.gz ]; then
-		abort 3 `gettext "Invalid source"`
+		abort 3 $(gettext "Invalid source")
 	else
 		debug "Installation media checked ok"
 	fi
 }
 
-# Tiny summary
-summary()
-{
-	echo -e "`gettext \"Installation settings summary:\"`"
-	STEP=0
-
-	if [ "$INST_ACTION" == "install" ]; then
-		if [ -n "$TGT_FS" ]; then
-			msg "`gettext "Format root partition"` '$TGT_PARTITION' ($TGT_FS)"
-		fi
-		if [ -n "$TGT_HOME_FS" ]; then
-			msg "`gettext "Format /home partition"` '$TGT_HOME' ($TGT_HOME_FS)"
-		fi	
-		msg "`gettext "Install SliTaz on"` '$TGT_PARTITION'. `gettext "Source:"` $INST_TYPE"
-		[ -n "$TGT_HOME" ] && msg "`gettext "Set Home partition to" `'$TGT_HOME'"
-		msg "`gettext "Set Hostname as"` '$TGT_HOSTNAME'"
-		msg "`gettext "Set Default user as"` '$TGT_USER'"
-	else
-		msg "`gettext "Check"` '$TGT_PARTITION'"
-		msg `gettext "Backup /etc, /home and the packages list"`
-		msg "`gettext "Upgrade SliTaz on"` '$TGT_PARTITION'. `gettext "Source:"` $INST_TYPE"
-		msg `gettext "Restore /etc, /home"`
-		msg `gettext "Upgrade additional packages."`
-	fi
-	if [ -n "$TGT_WINBOOT" ]; then
-		msg "`gettext "Enable Windows dual-boot"` ($TGT_WINBOOT)"
-	fi
-	if [ "$TGT_GRUB" == "yes" ]; then
-		msg `gettext "Install Grub"`
-	fi
-
-	echo -ne "`gettext \"Continue:(y/n)\"`"
-	read answer
-	case $answer in
-		[oOyY]) echo -e "`gettext \"Running $BACKLIST..\"`" ;;
-		*) abort 4 `gettext "Cancelled by user"` ;;
-	esac
-	STEP=0
-}
-
 #######################
 # Installer functions #
 #######################
@@ -564,7 +503,7 @@
 	debug "Preparing target partition..."
 	# Target may be used
 	mount | grep -q $TGT_PARTITION && \
-		abort 5 "$TGT_PARTITION: `gettext "Partition in use"`"
+		abort 5 "$TGT_PARTITION: $(gettext "Partition in use")"
 	# Mount point can be already used.
 	if mount | grep -q $TARGET_ROOT; then
 		umount $TARGET_ROOT 2>>$LOG
@@ -578,7 +517,7 @@
 #			ROOT_FS=$(parted /dev/hda5 print -m | grep "^1:" | cut -d':' -f5) ;;
 			ROOT_FS=auto ;;
 		*)
-			msg "`gettext "Formatting main partition:"` $TGT_PARTITION ($TGT_FS)"
+			msg "$(gettext "Formatting / partition:") $TGT_PARTITION ($TGT_FS)"
 			mkfs.$TGT_FS $TGT_PARTITION >>$LOG 2>>$LOG
 			ROOT_FS=$TGT_FS ;;
 	esac
@@ -590,7 +529,7 @@
 			"")
 				debug "The partition ($TGT_HOME) will be kept..." ;;
 			*)
-				msg "`gettext "Formatting /home partition:"` $TGT_HOME ($TGT_HOME_FS)"
+				msg "$(gettext "Formatting /home partition:") $TGT_HOME ($TGT_HOME_FS)"
 				mkfs.$TGT_HOME_FS -L "Home" $TGT_HOME >>$LOG 2>>$LOG ;;
 		esac
 		sleep 2
@@ -603,7 +542,7 @@
 
 	mount -t $ROOT_FS $TGT_PARTITION $TARGET_ROOT >>$LOG 2>>$LOG
 	if [ $(mount | grep -c "mnt/target") == "0" ]; then
-		abort 5 "$TGT_PARTITION: `gettext "Can't mount"`"
+		abort 5 "$TGT_PARTITION: $(gettext "Unable to mount partition")"
 	fi
 }
 
@@ -614,7 +553,7 @@
 		# partition was not formatted
 		debug "Cleaning the root partition ($TGT_PARTITION)..."
 		# Keep /home in case of reinstall.
-		cd $TARGET_ROOT || abort 8 `gettext "Internal"`
+		cd $TARGET_ROOT || abort 8 $(gettext "Internal")
 		for dir in *
 		do
 			case "$dir" in
@@ -642,8 +581,8 @@
 		KERNEL=$(ls /$TARGET_ROOT/lib/modules | tail -1)
 		KERNEL="vmlinuz-$KERNEL"
 	else
-		warning `gettext "Falling back to running kernel name.."`
 		KERNEL=vmlinuz-`uname -r`
+		warning "$(gettext "Kernel name not found, falling back to:") $(uname -r)"
 	fi
 	mkdir -p $TARGET_ROOT/boot
 	cp $SOURCE_ROOT/boot/bzImage $TARGET_ROOT/boot/$KERNEL
@@ -707,7 +646,7 @@
 {
 	local isloramfs
 	isloramfs=
-	cd $TARGET_ROOT || abort 8 `gettext "Internal"`
+	cd $TARGET_ROOT || abort 8 $(gettext "Internal")
 	if [ -d $1/../fs/etc ]; then
 		# This is a tazlitobox loram (cdrom)
 		cp -a $1/../fs/. .
@@ -742,7 +681,7 @@
 # Pre configure freshly installed system (60 - 80%).
 pre_config_system()
 {
-	cd $TARGET_ROOT || abort 8 `gettext "Internal"`
+	cd $TARGET_ROOT || abort 8 $(gettext "Internal")
 	# Restore backup of existing /home if exists.
 	# (created by prepare_target_dev)
 	if [ -d home.bak ]; then
@@ -757,7 +696,7 @@
 	sed -i s#'CHECK_FS=\"\"'#"CHECK_FS=\"$TGT_PARTITION\""# etc/rcS.conf
 	sleep 2
 	# Set hostname.
-	msg "`gettext "Configuring host name:"` $TGT_HOSTNAME"
+	msg "$(gettext "Configuring host name:") $TGT_HOSTNAME"
 	echo $TGT_HOSTNAME > etc/hostname
 }
 
@@ -766,7 +705,7 @@
 {
 	cat > $TARGET_ROOT/users.sh << _EOF_
 #!/bin/sh
-echo "root:$TGT_ROOT_PWD" | chpasswd > /etc/null
+echo "root:$TGT_ROOT_PWD" | chpasswd
 adduser -D -H $TGT_USER
 
 for grp in audio cdrom floppy dialout disk kmem tape tty video; do
@@ -775,7 +714,7 @@
  fi
 done
 
-echo "$TGT_USER:$TGT_USER_PWD" | chpasswd > /etc/null
+echo "$TGT_USER:$TGT_USER_PWD" | chpasswd
 if [ ! -d /home/$TGT_USER ]; then
 	cp -a /etc/skel /home/$TGT_USER
 	[ -e /root/.xinitrc ] && cp /root/.xinitrc /home/$TGT_USER
@@ -810,7 +749,7 @@
 home_config()
 {
 	debug "home_config: $TGT_HOME"
-	cd $TARGET_ROOT || abort 8 `gettext "Internal"`
+	cd $TARGET_ROOT || abort 8 $(gettext "Internal")
 	mv home/$TGT_USER tmp
 	mount $TGT_HOME home
 	if [ -d $TARGET_ROOT/home/$TGTUSER ]; then
@@ -826,7 +765,7 @@
 # Search for a Windows partition
 win_partition()
 {
-#	msg `gettext "Searching for Windows"`
+	debug "Searching for Windows"
 	if [ "$TGT_WINBOOT" == "auto" ];then
 		WINBOOT=$(fdisk -l | awk '
 BEGIN{disk=-1,	found=-1,	winboot=""}
@@ -846,7 +785,7 @@
 }
 END{printf "%s", winboot}')
 		if [ -z "$WINBOOT" ]; then
-			warning `gettext "No windows partition found. Dual-boot disabled"`
+			warning $(gettext "No windows partition found. Dual-boot disabled")
 			TGT_WINBOOT=""
 		fi
 	fi
@@ -903,7 +842,7 @@
 
 _EOF_
 	if [ -n "$TGT_WINBOOT" ]; then
-		msg `gettext "Enabling Windows dual-boot"`
+		msg $(gettext "Enabling Windows dual-boot")
 		cat >> $TARGET_ROOT/boot/grub/menu.lst << _EOF_
 # For booting Windows :
 #
@@ -924,7 +863,7 @@
 # Files install, calling for functions or with cmds.
 install_files()
 {
-	msg "`gettext "Installing SliTaz on"` $TGT_PARTITION"
+	msg "$(gettext "Installing SliTaz on:") $TGT_PARTITION"
 	# saving pwd
 	local save_pwd=$(pwd)
 
@@ -943,11 +882,11 @@
 	debug "Preconfiguring the system..."
 	pre_config_system
 
-	msg "`gettext "Configuring root and default user account:"` $TGT_USER"
+	msg "$(gettext "Configuring root and default user account:") $TGT_USER"
 	users_settings
 
 	if [ "$TGT_HOME" != "" ]; then
-		msg "$TGT_HOME: `gettext "Configuring partition to be used as /home..."`"
+		msg "$(gettext "Configuring partition to be used as /home:") $TGT_HOME"
 		home_config
 		sleep 2
 	fi
@@ -966,7 +905,7 @@
 {
 	if [ "$TGT_GRUB" == "yes" ]; then
 		TARGET_DISK=`echo $TGT_PARTITION | sed s/"[0-9]"/''/`
-		msg "`gettext "Running grub-install on:"` $TARGET_DISK"
+		msg "$(gettext "Running grub-install on:") $TARGET_DISK"
 		grub-install --no-floppy \
 				--root-directory=$TARGET_ROOT $TARGET_DISK 2>>$LOG
 		debug "Grub installation done..."
@@ -980,32 +919,34 @@
 {
 	# Umount target
 	if mount | grep -q $TARGET_ROOT; then
-		echo -e "`gettext \"Unmounting target\"` ($TGT_PARTITION)..."
+		echo "$(gettext "Unmounting target partition:") $TGT_PARTITION"
 	umount $TARGET_ROOT 2>>$LOG
 	fi
 
 	# Umount source
 	if mount | grep -q $SOURCE_ROOT; then
-		echo -e "`gettext \"Unmounting\"` $SOURCE_ROOT"
+		echo "$(gettext "Unmounting:") $SOURCE_ROOT"
 		umount $SOURCE_ROOT
 	fi
 
 	# Eject cd
 	if [ "$INST_TYPE" == "cdrom" ]; then
-		echo -e "`gettext \"Ejecting cdrom...\"`"
+		gettext "Ejecting cdrom..."
 		eject
 	fi
+	# Remove lock file
+	rm -f $LOCK
 	sleep 2
 }
 
 # End of installation.
 end_of_install()
 {
-	echo -e "`gettext \"Installation complete. You can now restart (reboot) \"`"
-	echo -e "`gettext \"from your SliTaz GNU/Linux system.\"`"
+	msg $(gettext "Installation complete. You can now restart (reboot)")
+	echo "   $(gettext "from your SliTaz GNU/Linux system.")"
 	echo "=== Tazinst end at `date` ===" >>$LOG
 	# Log files
-	echo -e "`gettext \"Copying log files\"` ($LOG)..."
+	echo "$(gettext "Copying log files") ($LOG)..."
 	cp -a $LOG $TARGET_ROOT/var/log
 	sleep 2
 	# umount
@@ -1022,7 +963,7 @@
 	debug "Preparing the target partition..."
 	# Target may be used
 	mount | grep -q $TGT_PARTITION && \
-		abort 5 "$TGT_PARTITION: `gettext "Partition in use"`"
+		abort 5 "$TGT_PARTITION: $(gettext "Partition in use")"
 	# Mount point can be already used.
 	if mount | grep -q $TARGET_ROOT; then
 		umount $TARGET_ROOT 2>>$LOG
@@ -1031,7 +972,7 @@
 	# Mount target.
 	mount $TGT_PARTITION $TARGET_ROOT >>$LOG 2>>$LOG
 	if [ $(mount | grep -c "mnt/target") == "0" ]; then
-		abort 5 "$TGT_PARTITION `gettext "Can't mount"`"
+		abort 5 "$TGT_PARTITION $(gettext "Unable to mount partition")"
 	fi
 }
 
@@ -1040,17 +981,17 @@
 {
 	if [ -f $TARGET_ROOT/etc/slitaz-release ]; then
 		release=`cat $TARGET_ROOT/etc/slitaz-release`
-		msg "`gettext "Preparing upgrade of SliTaz release:"` $release"
+		msg "$(gettext "Preparing upgrade of SliTaz release:") $release"
 	else
-		abort 6 "'$TGT_PARTITION': `gettext "This partition doesn't appear to contain \
-a valid SliTaz system, the file: /etc/slitaz-release doesn't exist."`"
+		abort 6 "$TGT_PARTITION: $(gettext "This partition doesn't appear to contain \
+a valid SliTaz system, the file: /etc/slitaz-release doesn't exist.")"
 	fi && sleep 2
 }
 
 # Backup target packages list.
 backup_files()
 {
-	cd $TARGET_ROOT || abort 8 `gettext "Internal"`
+	cd $TARGET_ROOT || abort 8 $(gettext "Internal")
 	ls -1 var/lib/tazpkg/installed > home/packages-selection.list
 	for dir in *
 	do
@@ -1147,7 +1088,7 @@
 # Search for added pkgs
 update_pkgs()
 {
-	cd $TARGET_ROOT/var/lib/tazinst || abort 8 `gettext "Internal"`
+	cd $TARGET_ROOT/var/lib/tazinst || abort 8 $(gettext "Internal")
 	# LiveCD packages list.
 	debug "Creating package lists..."
 	ls -1 $TARGET_ROOT/var/lib/tazpkg/installed > packages-source.list || exit 1
@@ -1162,10 +1103,10 @@
 		install_pkgs
 	else
 		touch packages-to-install.list
-		warning `gettext "The list of available packages on the mirror could not be \
+		warning $(gettext "The list of available packages on the mirror could not be \
 downloaded. No missing packages will be reinstalled now, but \
 you can do so later by looking at the following list: \
-/var/lib/tazinst/packages-selection.diff"`
+/var/lib/tazinst/packages-selection.diff")
 	fi
 	sleep 2
 }
@@ -1175,7 +1116,7 @@
 {
 	# Backup and create a new grub menu.lst.
 	if [ "$TGT_GRUB" == "yes" ]; then
-		msg `gettext "Grub update"`
+		msg $(gettext "Grub update")
 		mv $TARGET_ROOT/boot/grub/menu.lst \
 			$TARGET_ROOT/boot/grub/menu.lst.bak 2>/dev/null
 		grub_config
@@ -1188,15 +1129,15 @@
 {
 	# saving pwd
 	local save_pwd=$(pwd)
-	cd $TARGET_ROOT || abort 8 `gettext "Internal"`
+	cd $TARGET_ROOT || abort 8 $(gettext "Internal")
 
 	debug "Searching for /etc/slitaz-release"
 	check_release
 
-	msg `gettext "Backup /etc, /home and the packages list..."`
+	msg $(gettext "Backup /etc, /home and the packages list...")
 	backup_files
 
-	msg "`gettext "Upgrading SliTaz on:"` $TGT_PARTITION"
+	msg "$(gettext "Upgrading SliTaz on:") $TGT_PARTITION"
 
 	debug "Copying the bootloader syslinux/isolinux..."
 	copy_bootloaders
@@ -1204,13 +1145,13 @@
 	debug "Extracting the root system..."
 	extract_rootfs $SOURCE_ROOT/boot
 
-	msg `gettext "Restoring configuration files..."`
+	msg $(gettext "Restoring configuration files...")
 	restore_files
 
 	debug "Installing the kernel..."
 	install_kernel
 
-	msg `gettext "Upgrading added packages..."`
+	msg $(gettext "Upgrading added packages...")
 	update_pkgs
 
 	# restoring pwd
@@ -1222,9 +1163,10 @@
 {
 	pkgscd=`cat $TARGET_ROOT/var/lib/tazinst/packages-source.list | wc -l`
 	pkginst=`cat $TARGET_ROOT/var/lib/tazinst/packages-to-install.list | wc -l`
-	echo -e "`gettext \"Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux system.\"`"
-	echo -e "`gettext \"Packages on the cdrom :\"`" $pkgscd
-	echo -e "`gettext \"Packages installed from the mirror :\"`" $pkginst
+	msg $(gettext "Upgrade finished. You can now restart (reboot)")
+	echo $(gettext "from your SliTaz GNU/Linux system.")
+	echo "$(gettext "Packages on the cdrom :") $pkgscd"
+	echo "$(gettext "Packages installed from the mirror :") $pkginst"
 	echo "=== Tazinst end at `date` ===" >>$LOG
 	umount_devices
 }
@@ -1238,7 +1180,7 @@
 		INST_ACTION=install
 		check_root
 		init $@
-		read_configuration_file $2
+		read_setup_file $2
 		check_vars
 		check_source
 		prepare_install
@@ -1249,34 +1191,15 @@
 		INST_ACTION=upgrade
 		check_root
 		init $@
-		read_configuration_file $2
+		read_setup_file $2
 		check_vars
 		check_source
 		prepare_upgrade
 		upgrade_files
 		grub_update
 		end_of_upgrade ;;
-	config)
-		gen_config $2 ;;
-	cli)
-		check_root
-		init $@
-		check_cli_options $@
-		check_vars
-		check_source
-		summary
-		case $INST_ACTION in
-			upgrade)
-				prepare_upgrade
-				upgrade_files
-				grub_update
-				end_of_upgrade ;;
-			install)
-				prepare_install
-				install_files
-				grub_install
-				end_of_install ;;
-		esac ;;
+	new)
+		gen_setup $2 ;;
 	showurl)
 		case $2 in
 			stable)
@@ -1291,10 +1214,11 @@
 		INST_ACTION=check
 		check_root
 		init $@
-		read_configuration_file $2
-		check_vars ;;
+		read_setup_file $2
+		check_vars
+		rm -f $LOCK ;;
 	log)
-		cat $LOG ;;
+		[ -r "$LOG" ] && cat $LOG ;;
 	version)
 		echo $VERSION ;;
 	usage|*)
diff -r aba8290691e2 -r 2b69f8b15b5a po/tazinst/es_AR.po
--- a/po/tazinst/es_AR.po	Sun Aug 14 10:51:11 2011 +0100
+++ b/po/tazinst/es_AR.po	Mon Aug 15 22:33:56 2011 +0200
@@ -7,93 +7,68 @@
 msgstr ""
 "Project-Id-Version: Tazinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 10:00+0200\n"
+"POT-Creation-Date: 2011-08-14 16:42+0200\n"
 "PO-Revision-Date: 2011-08-11 20:52-0300\n"
 "Last-Translator: Lucas Gioia \n"
 "Language-Team: LANGUAGE \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: installer/tazinst:48
+#: installer/tazinst:51
 msgid "Tazinst - SliTaz installer - Version"
 msgstr "Tazinst - Instalador SliTaz - Versión"
 
-#: installer/tazinst:49
+#: installer/tazinst:53
 msgid "Usage"
 msgstr "Uso"
 
-#: installer/tazinst:50
-msgid "tazinst [command] [config-file|url|options]"
+#: installer/tazinst:53
+#, fuzzy
+msgid "tazinst [command] [setup-file|url-shortcut]"
 msgstr "tazinst [commando] [config-file|url|optiones]"
 
-#: installer/tazinst:51
+#: installer/tazinst:55
 msgid "Commands"
 msgstr "Comandos"
 
-#: installer/tazinst:52
+#: installer/tazinst:56
 msgid "Print this short usage."
 msgstr "Imprime este corto uso."
 
-#: installer/tazinst:53
-msgid "Install SliTaz on HDD using a configuration file."
+#: installer/tazinst:57
+#, fuzzy
+msgid "Install SliTaz on HDD using setup file contents."
 msgstr "Instala SliTaz en un disco duro usando un archivo de configuración."
 
-#: installer/tazinst:54
-msgid "Upgrade SliTaz on HDD using a configuration file."
+#: installer/tazinst:58
+#, fuzzy
+msgid "Upgrade SliTaz on HDD using setup file contents."
 msgstr "Actualiza SliTaz en un disco duro usando un archivo de configuración."
 
-#: installer/tazinst:55
-msgid "Generate a configuration file."
-msgstr "Generar un archivo de configuración"
+#: installer/tazinst:59
+msgid "Create a new setup file."
+msgstr ""
 
-#: installer/tazinst:56
-msgid "Check validity of the configuration file."
+#: installer/tazinst:60
+#, fuzzy
+msgid "Check validity of settings in a setup file."
 msgstr "Comprobar validez del archivo de configuración."
 
-#: installer/tazinst:57
-msgid "Show the full URL of a predefined URL (stable|cooking|rolling)."
-msgstr "Mostrar el URL completo de un URL predefinido (stable|cooking|rolling)."
-
-#: installer/tazinst:58
-msgid "Install or upgrade using command line options:"
-msgstr "Instalar o actualizar usando las opciónes en la línea de comandos:"
-
-#: installer/tazinst:59
-msgid "Full Install (not upgrading, all present data will be lost)."
-msgstr "Instalación completa (no actualiza, todo dato presente será perdido)."
-
-#: installer/tazinst:60
-msgid "Upgrade (Needs an active internet connection)."
-msgstr "Actualizar (necesita una conexión de internet activa)."
-
 #: installer/tazinst:61
-msgid "Install type (cdrom|usb|iso|web|weboot)."
-msgstr "Tipo de instalación (cdrom|usb|web|webroot)."
+#, fuzzy
+msgid "Show full URL of a predefined shortcut (stable|cooking|rolling)."
+msgstr ""
+"Mostrar el URL completo de un URL predefinido (stable|cooking|rolling)."
 
 #: installer/tazinst:62
-msgid "Source media (ex: file.iso|usb partition|web url)."
-msgstr "Fuente de datos (ej: archivo.iso| partición usb| web url)."
+msgid "Display log file contents and exit."
+msgstr ""
 
 #: installer/tazinst:63
-msgid "Partition where SliTaz will be installed (ex:/dev/hda3)."
-msgstr "Partición donde SliTaz será instalada (ej: /dev/hda3)."
-
-#: installer/tazinst:64
-msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)."
-msgstr "Partición a ser fomateada (fs=ext2|ext3|ext4|etc...)."
-
-#: installer/tazinst:65
-msgid "Install Grub."
-msgstr "Instalar Grub."
-
-#: installer/tazinst:66
-msgid "Dual-boot a Windows partition (auto|hd, ex:hd0,0)."
-msgstr "Inicio dual en partición Windows (auto|hd, ej: hd0,0)."
-
-#: installer/tazinst:67
-msgid "Debug mode."
-msgstr "Modo debug."
+msgid "Print version and exit."
+msgstr ""
 
 #: installer/tazinst:83
 msgid "Error"
@@ -103,304 +78,396 @@
 msgid "Warning:"
 msgstr "Precaución"
 
-#: installer/tazinst:117
-msgid "Can't write config file"
+#: installer/tazinst:118
+#, fuzzy
+msgid "Can't write setup file"
 msgstr "No se puede escribir el archivo de configuración"
 
-#: installer/tazinst:176
-#: installer/tazinst:215
-msgid "Config file not found"
-msgstr "Archivo de configuración no encontrado"
+#: installer/tazinst:177 installer/tazinst:225
+#, fuzzy
+msgid "Setup file not found"
+msgstr "Archivo no encontrado"
 
-#: installer/tazinst:213
-msgid "Unable to read config file"
+#: installer/tazinst:191
+msgid "Another instance of tazinst is running."
+msgstr ""
+
+#: installer/tazinst:223
+#, fuzzy
+msgid "Unable to read setup file"
 msgstr "Incapaz de leer el archivo de configuración"
 
-#: installer/tazinst:218
-msgid "No configuration file provided"
+#: installer/tazinst:228
+#, fuzzy
+msgid "No setup file provided"
 msgstr "No provista de un archivo de configuración"
 
-#: installer/tazinst:244
-msgid "Mismatched parameters"
-msgstr "Los parámetros no coinciden"
+#: installer/tazinst:259
+#, fuzzy
+msgid "Unknown install mode"
+msgstr "Sistema de archivos desconocido"
 
-#: installer/tazinst:248
-msgid "will not be formatted during upgrade"
-msgstr "no se formateará durante la actualización"
+#: installer/tazinst:268
+#, fuzzy
+msgid "No source file provided"
+msgstr "No provista de un archivo de configuración"
 
-#: installer/tazinst:278
-#: installer/tazinst:289
-#: installer/tazinst:363
-#, sh-format
-msgid "Invalid setting"
+#: installer/tazinst:270
+msgid "Unknown source type"
+msgstr ""
+
+#: installer/tazinst:284
+#, fuzzy
+msgid "Source file not found"
+msgstr "Archivo no encontrado"
+
+#: installer/tazinst:288
+#, fuzzy
+msgid "URL not found"
+msgstr "Archivo no encontrado"
+
+#: installer/tazinst:299
+#, fuzzy
+msgid "Partition for / not found"
+msgstr "Partición no encontrada"
+
+#: installer/tazinst:302
+msgid "Target and source partitions should be different"
+msgstr ""
+
+#: installer/tazinst:314 installer/tazinst:345
+#, fuzzy
+msgid "is not installed"
+msgstr "No está instalado."
+
+#: installer/tazinst:316
+#, fuzzy
+msgid "Unknown filesystem (/)"
+msgstr "Sistema de archivos desconocido"
+
+#: installer/tazinst:326
+#, fuzzy
+msgid "Partition for /home not found"
+msgstr "Partición no encontrada"
+
+#: installer/tazinst:329
+msgid "/home and source partitions should be different"
+msgstr ""
+
+#: installer/tazinst:332
+msgid "/ and /home partitions should be different"
+msgstr ""
+
+#: installer/tazinst:347
+#, fuzzy
+msgid "Unknown filesystem (/home)"
+msgstr "Sistema de archivos desconocido"
+
+#: installer/tazinst:353
+#, fuzzy
+msgid "Bootloader (grub): Invalid settings"
 msgstr "Configuraciónes inválidas"
 
-#: installer/tazinst:287
-msgid "but SRC_FILE is not set"
-msgstr "pero SRC_FILE no está establecido"
+#: installer/tazinst:361
+#, fuzzy
+msgid "Windows Dual-Boot: Invalid settings"
+msgstr "Configuraciónes inválidas"
 
-#: installer/tazinst:303
-msgid "file not found"
-msgstr "Archivo no encontrado"
+#: installer/tazinst:372
+msgid ""
+"You must be the root user (system administrator) to install SliTaz, please "
+"use 'su' to get a root SHell and restart installation."
+msgstr ""
+"Debes ser usuario root (administrador del sistema) para instalar SliTaz. Por "
+"favor usa el comando 'su' para tener un SHell root y reiniciar la "
+"instalación."
 
-#: installer/tazinst:307
-msgid "file not found on the web"
-msgstr "Archivo no encontrado en el web"
+#: installer/tazinst:389
+msgid "Mount failed"
+msgstr ""
 
-#: installer/tazinst:318
-#: installer/tazinst:342
-msgid "Partition not found"
-msgstr "Partición no encontrada"
-
-#: installer/tazinst:330
-#: installer/tazinst:355
-msgid "is not installed."
-msgstr "No está instalado."
-
-#: installer/tazinst:332
-#: installer/tazinst:357
-#, sh-format
-msgid "Unknown filesystem"
-msgstr "Sistema de archivos desconocido"
-
-#: installer/tazinst:371
-#, sh-format
-msgid "Invalid format"
-msgstr "Formato inválido"
-
-#: installer/tazinst:382
-msgid "You must be the root user (system administrator) to install SliTaz, please use 'su' to get a root SHell and restart installation."
-msgstr "Debes ser usuario root (administrador del sistema) para instalar SliTaz. Por favor usa el comando 'su' para tener un SHell root y reiniciar la instalación."
-
-#: installer/tazinst:399
-msgid "Failed to mount"
-msgstr "Falló el montaje"
-
-#: installer/tazinst:418
+#: installer/tazinst:408
 msgid "Failed to mount USB device"
 msgstr "Falló el montaje del dispositivo USB"
 
-#: installer/tazinst:431
-msgid "corrupted"
-msgstr "corrupto"
+#: installer/tazinst:421
+msgid "md5sum mismatch, file corrupted"
+msgstr ""
 
-#: installer/tazinst:433
+#: installer/tazinst:423
 msgid "md5 file not found, unable to check integrity."
 msgstr "archivo md5 no encontrado. Incapaz de comprobar integridad."
 
-#: installer/tazinst:440
+#: installer/tazinst:430
 msgid "Failed to mount ISO."
 msgstr "Falló al montar ISO."
 
-#: installer/tazinst:452
-#: installer/tazinst:456
-#, sh-format
-msgid "Failed to download."
+#: installer/tazinst:442 installer/tazinst:446
+#, fuzzy
+msgid "File download failed."
 msgstr "Falló al descargar."
 
-#: installer/tazinst:470
+#: installer/tazinst:460
 msgid "Web boot files not found"
 msgstr "Archivos boot web no encontrados"
 
-#: installer/tazinst:493
-#: installer/tazinst:606
-#: installer/tazinst:699
-#: installer/tazinst:734
-#: installer/tazinst:802
-#: installer/tazinst:1042
-#: installer/tazinst:1139
-#: installer/tazinst:1180
+#: installer/tazinst:483 installer/tazinst:556 installer/tazinst:649
+#: installer/tazinst:684 installer/tazinst:752 installer/tazinst:994
+#: installer/tazinst:1091 installer/tazinst:1132
 msgid "Internal"
 msgstr "Interno"
 
-#: installer/tazinst:500
+#: installer/tazinst:490
 msgid "Invalid source"
 msgstr "Fuente inválida"
 
-#: installer/tazinst:509
-msgid "Installation settings summary:"
-msgstr "Sumario de configuraciónes de instalación."
-
-#: installer/tazinst:514
-msgid "Format root partition"
-msgstr "Formato partición root"
-
-#: installer/tazinst:517
-msgid "Format /home partition"
-msgstr "Formato partición /home"
-
-#: installer/tazinst:519
-msgid "Install SliTaz on"
-msgstr "Instalar SliTaz en"
-
-#: installer/tazinst:519
-#: installer/tazinst:526
-msgid "Source:"
-msgstr "Fuente:"
-
-#: installer/tazinst:520
-msgid "Set Home partition to"
-msgstr "Establecer partición Home a"
-
-#: installer/tazinst:521
-msgid "Set Hostname as"
-msgstr "Establecer Hostname como"
-
-#: installer/tazinst:522
-msgid "Set Default user as"
-msgstr "Configurar usuario predeterminado a"
-
-#: installer/tazinst:524
-msgid "Check"
-msgstr "Comprobar"
-
-#: installer/tazinst:525
-msgid "Backup /etc, /home and the packages list"
-msgstr "Hacer copias de seguridad de /etc, /home y la lista de paquetes"
-
-#: installer/tazinst:526
-msgid "Upgrade SliTaz on"
-msgstr "Actualizando SliTaz en"
-
-#: installer/tazinst:527
-msgid "Restore /etc, /home"
-msgstr "Restaurando /etc, /home"
-
-#: installer/tazinst:528
-msgid "Upgrade additional packages."
-msgstr "Actualizando paquetes adicionales."
-
-#: installer/tazinst:531
-msgid "Enable Windows dual-boot"
-msgstr "Activar dual-boot Windows"
-
-#: installer/tazinst:534
-msgid "Install Grub"
-msgstr "Instalar Grub"
-
-#: installer/tazinst:537
-msgid "Continue:(y/n)"
-msgstr "Continuar:(y/n)"
-
-#: installer/tazinst:541
-msgid "Cancelled by user"
-msgstr "Cancelado por usuario"
-
-#: installer/tazinst:556
-#: installer/tazinst:1014
+#: installer/tazinst:506 installer/tazinst:966
 msgid "Partition in use"
 msgstr "Partición en uso"
 
-#: installer/tazinst:570
-msgid "Formatting main partition:"
-msgstr "Formatear partición principal:"
+#: installer/tazinst:520
+#, fuzzy
+msgid "Formatting / partition:"
+msgstr "Formateando partición /home:"
 
-#: installer/tazinst:582
+#: installer/tazinst:532
 msgid "Formatting /home partition:"
 msgstr "Formateando partición /home:"
 
-#: installer/tazinst:595
-#: installer/tazinst:1023
-msgid "Can't mount"
-msgstr "No se puede montar"
+#: installer/tazinst:545 installer/tazinst:975
+#, fuzzy
+msgid "Unable to mount partition"
+msgstr "Formato partición root"
 
-#: installer/tazinst:634
-msgid "Falling back to running kernel name.."
-msgstr "Volviendo a correr el nombre del kernel..."
+#: installer/tazinst:585
+msgid "Kernel name not found, falling back to:"
+msgstr ""
 
-#: installer/tazinst:749
+#: installer/tazinst:699
 msgid "Configuring host name:"
 msgstr "Configurando el nombre de host:"
 
-#: installer/tazinst:838
+#: installer/tazinst:788
 msgid "No windows partition found. Dual-boot disabled"
 msgstr "No se encontraron particiónes windows. boot-dual desactivado"
 
-#: installer/tazinst:895
+#: installer/tazinst:845
 msgid "Enabling Windows dual-boot"
 msgstr "Activando inicio dual Windows"
 
-#: installer/tazinst:916
-msgid "Installing SliTaz on"
+#: installer/tazinst:866
+#, fuzzy
+msgid "Installing SliTaz on:"
 msgstr "Instalando SliTaz en"
 
-#: installer/tazinst:935
+#: installer/tazinst:885
 msgid "Configuring root and default user account:"
 msgstr "Configurando root y cuenta de usuario predeterminada..."
 
-#: installer/tazinst:939
-msgid "Configuring partition to be used as /home..."
+#: installer/tazinst:889
+#, fuzzy
+msgid "Configuring partition to be used as /home:"
 msgstr "Configurando partición para ser usada como /home..."
 
-#: installer/tazinst:958
+#: installer/tazinst:908
 msgid "Running grub-install on:"
 msgstr "Corriendo grub-install en:"
 
-#: installer/tazinst:972
-msgid "Unmounting target"
+#: installer/tazinst:922
+#, fuzzy
+msgid "Unmounting target partition:"
 msgstr "Desmontando objetivo"
 
-#: installer/tazinst:978
-msgid "Unmounting"
+#: installer/tazinst:928
+#, fuzzy
+msgid "Unmounting:"
 msgstr "Desmontando"
 
-#: installer/tazinst:984
+#: installer/tazinst:934
 msgid "Ejecting cdrom..."
 msgstr "eyectando cdrom..."
 
-#: installer/tazinst:993
-msgid "Installation complete. You can now restart (reboot) "
+#: installer/tazinst:945
+#, fuzzy
+msgid "Installation complete. You can now restart (reboot)"
 msgstr "Instalación completa. Puede reiniciar"
 
-#: installer/tazinst:994
+#: installer/tazinst:946 installer/tazinst:1167
 msgid "from your SliTaz GNU/Linux system."
 msgstr "de su sistema SliTaz GNU/Linux"
 
-#: installer/tazinst:997
+#: installer/tazinst:949
 msgid "Copying log files"
 msgstr "Copiando archivos log"
 
-#: installer/tazinst:1032
+#: installer/tazinst:984
 msgid "Preparing upgrade of SliTaz release:"
 msgstr "Preparando actualización de SliTaz, versión:"
 
-#: installer/tazinst:1034
-msgid "This partition doesn't appear to contain a valid SliTaz system, the file: /etc/slitaz-release doesn't exist."
-msgstr "Esta partición no parece contener un sistema válido SliTaz. La fila: /etc/slitaz-release no existe."
+#: installer/tazinst:986
+msgid ""
+"This partition doesn't appear to contain a valid SliTaz system, the file: /"
+"etc/slitaz-release doesn't exist."
+msgstr ""
+"Esta partición no parece contener un sistema válido SliTaz. La fila: /etc/"
+"slitaz-release no existe."
 
-#: installer/tazinst:1154
-msgid "The list of available packages on the mirror could not be downloaded. No missing packages will be reinstalled now, but you can do so later by looking at the following list: /var/lib/tazinst/packages-selection.diff"
-msgstr "La lista de los paquetes disponibles en el espejo, no pueden ser descargados. No missing packages will be reinstalled now, pero puedes luego mirar en la siguiente lista: /var/lib/tazinst/packages-selection.diff"
+#: installer/tazinst:1106
+msgid ""
+"The list of available packages on the mirror could not be downloaded. No "
+"missing packages will be reinstalled now, but you can do so later by looking "
+"at the following list: /var/lib/tazinst/packages-selection.diff"
+msgstr ""
+"La lista de los paquetes disponibles en el espejo, no pueden ser "
+"descargados. No missing packages will be reinstalled now, pero puedes luego "
+"mirar en la siguiente lista: /var/lib/tazinst/packages-selection.diff"
 
-#: installer/tazinst:1167
+#: installer/tazinst:1119
 msgid "Grub update"
 msgstr "Actualizar Grub"
 
-#: installer/tazinst:1185
+#: installer/tazinst:1137
 msgid "Backup /etc, /home and the packages list..."
 msgstr "Creando copia de seguridad /etc, /home y la lista de paquetes..."
 
-#: installer/tazinst:1188
+#: installer/tazinst:1140
 msgid "Upgrading SliTaz on:"
 msgstr "Actualizando SliTaz en :"
 
-#: installer/tazinst:1196
+#: installer/tazinst:1148
 msgid "Restoring configuration files..."
 msgstr "Restaurando archivos de configuración..."
 
-#: installer/tazinst:1202
+#: installer/tazinst:1154
 msgid "Upgrading added packages..."
 msgstr "Actualizando paquetes agregados..."
 
-#: installer/tazinst:1214
-msgid "Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux system."
-msgstr "Actualización completa. Puede ahora reiniciar su sistema operativo SliTaz GNU/Linux."
+#: installer/tazinst:1166
+#, fuzzy
+msgid "Upgrade finished. You can now restart (reboot)"
+msgstr ""
+"Actualización completa. Puede ahora reiniciar su sistema operativo SliTaz "
+"GNU/Linux."
 
-#: installer/tazinst:1215
+#: installer/tazinst:1168
 msgid "Packages on the cdrom :"
 msgstr "Paquetes en cdrom :"
 
-#: installer/tazinst:1216
+#: installer/tazinst:1169
 msgid "Packages installed from the mirror :"
 msgstr "Paquetes instalados desde el espejo :"
 
+#~ msgid "Generate a configuration file."
+#~ msgstr "Generar un archivo de configuración"
+
+#~ msgid "Install or upgrade using command line options:"
+#~ msgstr "Instalar o actualizar usando las opciónes en la línea de comandos:"
+
+#~ msgid "Full Install (not upgrading, all present data will be lost)."
+#~ msgstr ""
+#~ "Instalación completa (no actualiza, todo dato presente será perdido)."
+
+#~ msgid "Upgrade (Needs an active internet connection)."
+#~ msgstr "Actualizar (necesita una conexión de internet activa)."
+
+#~ msgid "Install type (cdrom|usb|iso|web|weboot)."
+#~ msgstr "Tipo de instalación (cdrom|usb|web|webroot)."
+
+#~ msgid "Source media (ex: file.iso|usb partition|web url)."
+#~ msgstr "Fuente de datos (ej: archivo.iso| partición usb| web url)."
+
+#~ msgid "Partition where SliTaz will be installed (ex:/dev/hda3)."
+#~ msgstr "Partición donde SliTaz será instalada (ej: /dev/hda3)."
+
+#~ msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)."
+#~ msgstr "Partición a ser fomateada (fs=ext2|ext3|ext4|etc...)."
+
+#~ msgid "Install Grub."
+#~ msgstr "Instalar Grub."
+
+#~ msgid "Dual-boot a Windows partition (auto|hd, ex:hd0,0)."
+#~ msgstr "Inicio dual en partición Windows (auto|hd, ej: hd0,0)."
+
+#~ msgid "Debug mode."
+#~ msgstr "Modo debug."
+
+#~ msgid "Config file not found"
+#~ msgstr "Archivo de configuración no encontrado"
+
+#~ msgid "Mismatched parameters"
+#~ msgstr "Los parámetros no coinciden"
+
+#~ msgid "will not be formatted during upgrade"
+#~ msgstr "no se formateará durante la actualización"
+
+#~ msgid "but SRC_FILE is not set"
+#~ msgstr "pero SRC_FILE no está establecido"
+
+#~ msgid "file not found on the web"
+#~ msgstr "Archivo no encontrado en el web"
+
+#~ msgid "Invalid format"
+#~ msgstr "Formato inválido"
+
+#~ msgid "Failed to mount"
+#~ msgstr "Falló el montaje"
+
+#~ msgid "corrupted"
+#~ msgstr "corrupto"
+
+#~ msgid "Installation settings summary:"
+#~ msgstr "Sumario de configuraciónes de instalación."
+
+#~ msgid "Format /home partition"
+#~ msgstr "Formato partición /home"
+
+#~ msgid "Install SliTaz on"
+#~ msgstr "Instalar SliTaz en"
+
+#~ msgid "Source:"
+#~ msgstr "Fuente:"
+
+#~ msgid "Set Home partition to"
+#~ msgstr "Establecer partición Home a"
+
+#~ msgid "Set Hostname as"
+#~ msgstr "Establecer Hostname como"
+
+#~ msgid "Set Default user as"
+#~ msgstr "Configurar usuario predeterminado a"
+
+#~ msgid "Check"
+#~ msgstr "Comprobar"
+
+#~ msgid "Backup /etc, /home and the packages list"
+#~ msgstr "Hacer copias de seguridad de /etc, /home y la lista de paquetes"
+
+#~ msgid "Upgrade SliTaz on"
+#~ msgstr "Actualizando SliTaz en"
+
+#~ msgid "Restore /etc, /home"
+#~ msgstr "Restaurando /etc, /home"
+
+#~ msgid "Upgrade additional packages."
+#~ msgstr "Actualizando paquetes adicionales."
+
+#~ msgid "Enable Windows dual-boot"
+#~ msgstr "Activar dual-boot Windows"
+
+#~ msgid "Install Grub"
+#~ msgstr "Instalar Grub"
+
+#~ msgid "Continue:(y/n)"
+#~ msgstr "Continuar:(y/n)"
+
+#~ msgid "Cancelled by user"
+#~ msgstr "Cancelado por usuario"
+
+#~ msgid "Formatting main partition:"
+#~ msgstr "Formatear partición principal:"
+
+#~ msgid "Can't mount"
+#~ msgstr "No se puede montar"
+
+#~ msgid "Falling back to running kernel name.."
+#~ msgstr "Volviendo a correr el nombre del kernel..."
diff -r aba8290691e2 -r 2b69f8b15b5a po/tazinst/fr.po
--- a/po/tazinst/fr.po	Sun Aug 14 10:51:11 2011 +0100
+++ b/po/tazinst/fr.po	Mon Aug 15 22:33:56 2011 +0200
@@ -8,95 +8,63 @@
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 10:00+0200\n"
-"PO-Revision-Date: 2011-07-31 10:39+0200\n"
+"POT-Creation-Date: 2011-08-14 16:42+0200\n"
+"PO-Revision-Date: 2011-08-14 17:02+0200\n"
 "Last-Translator: Dominique Corbex \n"
 "Language-Team: French\n"
+"Language: \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"
 
-#: installer/tazinst:48
+#: installer/tazinst:51
 msgid "Tazinst - SliTaz installer - Version"
 msgstr "Tazinst - Installateur Slitaz - Version"
 
-#: installer/tazinst:49
+#: installer/tazinst:53
 msgid "Usage"
 msgstr "Usage"
 
-#: installer/tazinst:50
-msgid "tazinst [command] [config-file|url|options]"
-msgstr "tazinst [commande] [fichier-config|url|options]"
+#: installer/tazinst:53
+msgid "tazinst [command] [setup-file|url-shortcut]"
+msgstr "tazinst [commande] [fichier-param|raccourci-url]"
 
-#: installer/tazinst:51
+#: installer/tazinst:55
 msgid "Commands"
 msgstr "Commandes"
 
-#: installer/tazinst:52
+#: installer/tazinst:56
 msgid "Print this short usage."
 msgstr "Affiche cette petite aide"
 
-#: installer/tazinst:53
-msgid "Install SliTaz on HDD using a configuration file."
-msgstr "Installe SliTaz sur HDD à l'aide d'un fichier de configuration."
+#: installer/tazinst:57
+msgid "Install SliTaz on HDD using setup file contents."
+msgstr "Installe SliTaz sur HDD à l'aide d'un fichier de paramètres."
 
-#: installer/tazinst:54
-msgid "Upgrade SliTaz on HDD using a configuration file."
-msgstr "Met à jour SliTaz sur HDD à l'aide d'un fichier de configuration."
+#: installer/tazinst:58
+msgid "Upgrade SliTaz on HDD using setup file contents."
+msgstr "Met à jour SliTaz sur HDD à l'aide d'un fichier de paramètres."
 
-#: installer/tazinst:55
-msgid "Generate a configuration file."
-msgstr "Génére un fichier de configuration."
+#: installer/tazinst:59
+msgid "Create a new setup file."
+msgstr "Crée un nouveau fichier de paramètres."
 
-#: installer/tazinst:56
-msgid "Check validity of the configuration file."
-msgstr "Vérifie la validité du fichier de configuration."
+#: installer/tazinst:60
+msgid "Check validity of settings in a setup file."
+msgstr "Vérifie la validité du fichier de paramètres."
 
-#: installer/tazinst:57
-msgid "Show the full URL of a predefined URL (stable|cooking|rolling)."
+#: installer/tazinst:61
+msgid "Show full URL of a predefined shortcut (stable|cooking|rolling)."
 msgstr "Affiche l'URL complète d'un raccourci (stable|cooking|rolling)."
 
-#
-#: installer/tazinst:58
-msgid "Install or upgrade using command line options:"
-msgstr "Installe ou met à jour en utilisant des options en ligne de commande:"
-
-#: installer/tazinst:59
-msgid "Full Install (not upgrading, all present data will be lost)."
-msgstr "Installation complète (pas de mise à jour, les données seront perdues)."
-
-#: installer/tazinst:60
-msgid "Upgrade (Needs an active internet connection)."
-msgstr "Mise à jour (Nécessite une connexion internet active)."
-
-#: installer/tazinst:61
-msgid "Install type (cdrom|usb|iso|web|weboot)."
-msgstr "Type d'installation (cdrom|usb|iso|web|weboot)."
-
 #: installer/tazinst:62
-msgid "Source media (ex: file.iso|usb partition|web url)."
-msgstr "Média source (ex: fichier.iso|partition usb|url web)."
+msgid "Display log file contents and exit."
+msgstr "Affiche le contenu du fichier journal."
 
 #: installer/tazinst:63
-msgid "Partition where SliTaz will be installed (ex:/dev/hda3)."
-msgstr "Partition où SliTaz sera installé (ex:/dev/hda3)."
-
-#: installer/tazinst:64
-msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)."
-msgstr "Formatage de la partition (fs=ext2|ext3|ext4|etc..)."
-
-#: installer/tazinst:65
-msgid "Install Grub."
-msgstr "Installer Grub."
-
-#: installer/tazinst:66
-msgid "Dual-boot a Windows partition (auto|hd, ex:hd0,0)."
-msgstr "Dual-boot avec une partition Windows (auto|hd, ex:hd0,0)."
-
-#: installer/tazinst:67
-msgid "Debug mode."
-msgstr "Mode Debug"
+msgid "Print version and exit."
+msgstr "Affiche la version."
 
 #: installer/tazinst:83
 msgid "Error"
@@ -106,66 +74,87 @@
 msgid "Warning:"
 msgstr "Attention :"
 
-#: installer/tazinst:117
-msgid "Can't write config file"
-msgstr "Impossible d'écrire un fichier de configuration."
+#: installer/tazinst:118
+msgid "Can't write setup file"
+msgstr "Impossible d'écrire un fichier de paramètres"
 
-#: installer/tazinst:176 installer/tazinst:215
-msgid "Config file not found"
-msgstr "Fichier de configuration non trouvé"
+#: installer/tazinst:177 installer/tazinst:225
+msgid "Setup file not found"
+msgstr "fichier de paramètres non trouvé"
 
-#: installer/tazinst:213
-msgid "Unable to read config file"
-msgstr "Impossible de lire le fichier de configuration."
+#: installer/tazinst:191
+msgid "Another instance of tazinst is running."
+msgstr "Une autre instance de tazinst est en cours."
 
-#: installer/tazinst:218
-msgid "No configuration file provided"
-msgstr "Fichier de configuration non trouvé"
+#: installer/tazinst:223
+msgid "Unable to read setup file"
+msgstr "Impossible de lire le fichier de paramètres"
 
-#: installer/tazinst:244
-msgid "Mismatched parameters"
-msgstr "Paramètres incompatibles"
+#: installer/tazinst:228
+msgid "No setup file provided"
+msgstr "Aucun fichier de paramètres fourni"
 
-#: installer/tazinst:248
-msgid "will not be formatted during upgrade"
-msgstr "ne sera pas formaté durant la mise à jour"
+#: installer/tazinst:259
+msgid "Unknown install mode"
+msgstr "Mode d'installation inconnu"
 
-#: installer/tazinst:278 installer/tazinst:289 installer/tazinst:363
-#, sh-format
-msgid "Invalid setting"
-msgstr "Paramètre invalide"
+#: installer/tazinst:268
+msgid "No source file provided"
+msgstr "Pas de fichier source fourni"
 
-#: installer/tazinst:287
-msgid "but SRC_FILE is not set"
-msgstr "mais SRC_FILE n'est pas défini"
+#: installer/tazinst:270
+msgid "Unknown source type"
+msgstr "Type de source inconnu"
 
-#: installer/tazinst:303
-msgid "file not found"
-msgstr "fichier non trouvé"
+#: installer/tazinst:284
+msgid "Source file not found"
+msgstr "fichier source non trouvé"
 
-#: installer/tazinst:307
-msgid "file not found on the web"
-msgstr "fichier non trouvé sur le web"
+#: installer/tazinst:288
+msgid "URL not found"
+msgstr "URL non trouvée"
 
-#: installer/tazinst:318 installer/tazinst:342
-msgid "Partition not found"
-msgstr "Partition non trouvée"
+#: installer/tazinst:299
+msgid "Partition for / not found"
+msgstr "Partition / non trouvée"
 
-#: installer/tazinst:330 installer/tazinst:355
-msgid "is not installed."
+#: installer/tazinst:302
+msgid "Target and source partitions should be different"
+msgstr "Les partitions cible et source doivent etre différentes"
+
+#: installer/tazinst:314 installer/tazinst:345
+msgid "is not installed"
 msgstr "n'est pas installé"
 
-#: installer/tazinst:332 installer/tazinst:357
-#, sh-format
-msgid "Unknown filesystem"
-msgstr "Système de fichiers inconnu"
+#: installer/tazinst:316
+msgid "Unknown filesystem (/)"
+msgstr "Système de fichiers inconnu (/)"
 
-#: installer/tazinst:371
-#, sh-format
-msgid "Invalid format"
-msgstr "Format invalide"
+#: installer/tazinst:326
+msgid "Partition for /home not found"
+msgstr "Partition /home non trouvée"
 
-#: installer/tazinst:382
+#: installer/tazinst:329
+msgid "/home and source partitions should be different"
+msgstr "Les partitions source et /home doivent être différentes"
+
+#: installer/tazinst:332
+msgid "/ and /home partitions should be different"
+msgstr "Les partitions / et /home doivent être différentes"
+
+#: installer/tazinst:347
+msgid "Unknown filesystem (/home)"
+msgstr "Système de fichiers inconnu (/home)"
+
+#: installer/tazinst:353
+msgid "Bootloader (grub): Invalid settings"
+msgstr "Chargeur d'amore Grub: Paramètre invalide"
+
+#: installer/tazinst:361
+msgid "Windows Dual-Boot: Invalid settings"
+msgstr "Windows Dual-Boot: Paramètre invalide"
+
+#: installer/tazinst:372
 msgid ""
 "You must be the root user (system administrator) to install SliTaz, please "
 "use 'su' to get a root SHell and restart installation."
@@ -174,196 +163,129 @@
 "SliTaz, utilisez « su » pour obtenir un shell root et redémarrer "
 "l'installation."
 
-#: installer/tazinst:399
-msgid "Failed to mount"
-msgstr "Impossible de monter"
+#: installer/tazinst:389
+msgid "Mount failed"
+msgstr "Échec du montage"
 
-#: installer/tazinst:418
+#: installer/tazinst:408
 msgid "Failed to mount USB device"
 msgstr "Impossible de monter le périphérique USB"
 
-#: installer/tazinst:431
-msgid "corrupted"
-msgstr "corrompu"
+#: installer/tazinst:421
+msgid "md5sum mismatch, file corrupted"
+msgstr "Erreur md5sum, fichier corrompu"
 
-#: installer/tazinst:433
+#: installer/tazinst:423
 msgid "md5 file not found, unable to check integrity."
 msgstr "fichier md5 non trouvé, impossible de vérifier l'intégrité."
 
-#: installer/tazinst:440
+#: installer/tazinst:430
 msgid "Failed to mount ISO."
 msgstr "Impossible de monter l'image ISO."
 
-#: installer/tazinst:452 installer/tazinst:456
-#, sh-format
-msgid "Failed to download."
-msgstr "Impossible de télécharger."
+#: installer/tazinst:442 installer/tazinst:446
+msgid "File download failed."
+msgstr "Échec au téléchargement du fichier."
 
-#: installer/tazinst:470
+#: installer/tazinst:460
 msgid "Web boot files not found"
 msgstr "Fichiers Web boot non trouvés"
 
-#: installer/tazinst:493 installer/tazinst:606 installer/tazinst:699
-#: installer/tazinst:734 installer/tazinst:802 installer/tazinst:1042
-#: installer/tazinst:1139 installer/tazinst:1180
+#: installer/tazinst:483 installer/tazinst:556 installer/tazinst:649
+#: installer/tazinst:684 installer/tazinst:752 installer/tazinst:994
+#: installer/tazinst:1091 installer/tazinst:1132
 msgid "Internal"
 msgstr "Interne"
 
-#: installer/tazinst:500
+#: installer/tazinst:490
 msgid "Invalid source"
 msgstr "Source invalide"
 
-#: installer/tazinst:509
-msgid "Installation settings summary:"
-msgstr "Récapitulatif des paramètres d'installation:"
-
-#: installer/tazinst:514
-msgid "Format root partition"
-msgstr "Formatage de la partition root"
-
-#: installer/tazinst:517
-msgid "Format /home partition"
-msgstr "Formatage de la partition /home"
-
-#: installer/tazinst:519
-msgid "Install SliTaz on"
-msgstr "Installe SliTaz sur"
-
-#: installer/tazinst:519 installer/tazinst:526
-msgid "Source:"
-msgstr "Source :"
-
-#: installer/tazinst:520
-msgid "Set Home partition to"
-msgstr "Installe la partition /home sur"
-
-#: installer/tazinst:521
-msgid "Set Hostname as"
-msgstr "Définition du Hostname"
-
-#: installer/tazinst:522
-msgid "Set Default user as"
-msgstr "Définition de l'utilsateur par défaut"
-
-#: installer/tazinst:524
-msgid "Check"
-msgstr "Vérifie"
-
-#: installer/tazinst:525
-msgid "Backup /etc, /home and the packages list"
-msgstr "Sauvegarde de /etc, /home et de la liste des paquets"
-
-#: installer/tazinst:526
-msgid "Upgrade SliTaz on"
-msgstr "Met à jour SliTaz sur"
-
-#: installer/tazinst:527
-msgid "Restore /etc, /home"
-msgstr "Restauration de /etc, /home"
-
-#: installer/tazinst:528
-msgid "Upgrade additional packages."
-msgstr "Mise à jour des paquets additionnels."
-
-#: installer/tazinst:531
-msgid "Enable Windows dual-boot"
-msgstr "Active le Dual-boot avec Windows"
-
-#: installer/tazinst:534
-msgid "Install Grub"
-msgstr "Installe Grub"
-
-#: installer/tazinst:537
-msgid "Continue:(y/n)"
-msgstr "Continuer : (o/n)"
-
-#: installer/tazinst:541
-msgid "Cancelled by user"
-msgstr "Annulé par l'utilisateur"
-
-#: installer/tazinst:556 installer/tazinst:1014
+#: installer/tazinst:506 installer/tazinst:966
 msgid "Partition in use"
 msgstr "Partition utilisée"
 
-#: installer/tazinst:570
-msgid "Formatting main partition:"
-msgstr "Formatage de la partition principale :"
+#: installer/tazinst:520
+msgid "Formatting / partition:"
+msgstr "Formatage de la partition / :"
 
-#: installer/tazinst:582
+#: installer/tazinst:532
 msgid "Formatting /home partition:"
 msgstr "Formatage de la partition /home :"
 
-#: installer/tazinst:595 installer/tazinst:1023
-msgid "Can't mount"
-msgstr "Montage impossible"
+#: installer/tazinst:545 installer/tazinst:975
+msgid "Unable to mount partition"
+msgstr "Impossible de monter la partition"
 
-#: installer/tazinst:634
-msgid "Falling back to running kernel name.."
-msgstr "Repli sur le nom du noyau actuellement utilisé.."
+#: installer/tazinst:585
+msgid "Kernel name not found, falling back to:"
+msgstr "Nom du noyau non trouvé, retour à:"
 
-#: installer/tazinst:749
+#: installer/tazinst:699
 msgid "Configuring host name:"
 msgstr "Configuration du Hostname :"
 
-#: installer/tazinst:838
+#: installer/tazinst:788
 msgid "No windows partition found. Dual-boot disabled"
 msgstr "Aucune partition Windows trouvée. Dual-boot désactivé"
 
-#: installer/tazinst:895
+#: installer/tazinst:845
 msgid "Enabling Windows dual-boot"
 msgstr "Activation du Dual-boot avec Windows"
 
-#: installer/tazinst:916
-msgid "Installing SliTaz on"
-msgstr "Installe SliTaz sur"
+#: installer/tazinst:866
+msgid "Installing SliTaz on:"
+msgstr "Installe SliTaz sur:"
 
-#: installer/tazinst:935
+#: installer/tazinst:885
 msgid "Configuring root and default user account:"
 msgstr "Configure les comptes de root et de l'utilisateur par défaut :"
 
-#: installer/tazinst:939
-msgid "Configuring partition to be used as /home..."
-msgstr "Configure la partition à utiliser comme /home..."
+#: installer/tazinst:889
+msgid "Configuring partition to be used as /home:"
+msgstr "Configure la partition à utiliser comme /home:"
 
-#: installer/tazinst:958
+#: installer/tazinst:908
 msgid "Running grub-install on:"
 msgstr "Installe Grub sur:"
 
-#: installer/tazinst:972
-msgid "Unmounting target"
-msgstr "Démontage de la partition hôte"
+#: installer/tazinst:922
+msgid "Unmounting target partition:"
+msgstr "Démontage de la partition:"
 
-#: installer/tazinst:978
-msgid "Unmounting"
-msgstr "Démontage"
+#: installer/tazinst:928
+msgid "Unmounting:"
+msgstr "Démontage:"
 
-#: installer/tazinst:984
+#: installer/tazinst:934
 msgid "Ejecting cdrom..."
 msgstr "Éjection du CD-Rom..."
 
-#: installer/tazinst:993
-msgid "Installation complete. You can now restart (reboot) "
+#: installer/tazinst:945
+msgid "Installation complete. You can now restart (reboot)"
 msgstr "Installation terminée. Vous pouvez maintenant redémarrer "
 
-#: installer/tazinst:994
+#: installer/tazinst:946 installer/tazinst:1167
 msgid "from your SliTaz GNU/Linux system."
 msgstr "votre système SliTaz GNU/Linux."
 
-#: installer/tazinst:997
+#: installer/tazinst:949
 msgid "Copying log files"
 msgstr "Copie du fichier journal"
 
-#: installer/tazinst:1032
+#: installer/tazinst:984
 msgid "Preparing upgrade of SliTaz release:"
 msgstr "Prépare la mise à jour de la version de SliTaz :"
 
-#: installer/tazinst:1034
+#: installer/tazinst:986
 msgid ""
 "This partition doesn't appear to contain a valid SliTaz system, the file: /"
 "etc/slitaz-release doesn't exist."
-msgstr "Cette partition ne semble pas contenir un système SliTaz valide, le fichier: /etc/slitaz-release n'existe pas."
+msgstr ""
+"Cette partition ne semble pas contenir un système SliTaz valide, le "
+"fichier: /etc/slitaz-release n'existe pas."
 
-#: installer/tazinst:1154
+#: installer/tazinst:1106
 msgid ""
 "The list of available packages on the mirror could not be downloaded. No "
 "missing packages will be reinstalled now, but you can do so later by looking "
@@ -374,42 +296,156 @@
 "possible de le faire ultérieurement à l'aide de la liste suivante : /var/lib/"
 "tazinst/packages-selection.diff"
 
-#: installer/tazinst:1167
+#: installer/tazinst:1119
 msgid "Grub update"
 msgstr "Mise à jour de Grub"
 
-#: installer/tazinst:1185
+#: installer/tazinst:1137
 msgid "Backup /etc, /home and the packages list..."
 msgstr "Sauvegarde de /etc, /home et de la liste des paquets..."
 
-#: installer/tazinst:1188
+#: installer/tazinst:1140
 msgid "Upgrading SliTaz on:"
 msgstr "Met à jour SliTaz sur :"
 
-#: installer/tazinst:1196
+#: installer/tazinst:1148
 msgid "Restoring configuration files..."
 msgstr "Restauration des fichiers de configuration..."
 
-#: installer/tazinst:1202
+#: installer/tazinst:1154
 msgid "Upgrading added packages..."
 msgstr "Mise à hour des paquets additionnels..."
 
-#: installer/tazinst:1214
-msgid ""
-"Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux "
-"system."
-msgstr ""
-"La mise à jour est terminée. Vous pouvez redémarrer votre système Slitaz GNU/"
-"Linux."
+#: installer/tazinst:1166
+msgid "Upgrade finished. You can now restart (reboot)"
+msgstr "La mise à jour est terminée. Vous pouvez redémarrer"
 
-#: installer/tazinst:1215
+#: installer/tazinst:1168
 msgid "Packages on the cdrom :"
 msgstr "Paquets sur le cdrom :"
 
-#: installer/tazinst:1216
+#: installer/tazinst:1169
 msgid "Packages installed from the mirror :"
 msgstr "Paquets installés depuis le miroir :"
 
+#~ msgid "Generate a configuration file."
+#~ msgstr "Génére un fichier de configuration."
+
+#
+#~ msgid "Install or upgrade using command line options:"
+#~ msgstr ""
+#~ "Installe ou met à jour en utilisant des options en ligne de commande:"
+
+#~ msgid "Full Install (not upgrading, all present data will be lost)."
+#~ msgstr ""
+#~ "Installation complète (pas de mise à jour, les données seront perdues)."
+
+#~ msgid "Upgrade (Needs an active internet connection)."
+#~ msgstr "Mise à jour (Nécessite une connexion internet active)."
+
+#~ msgid "Install type (cdrom|usb|iso|web|weboot)."
+#~ msgstr "Type d'installation (cdrom|usb|iso|web|weboot)."
+
+#~ msgid "Source media (ex: file.iso|usb partition|web url)."
+#~ msgstr "Média source (ex: fichier.iso|partition usb|url web)."
+
+#~ msgid "Partition where SliTaz will be installed (ex:/dev/hda3)."
+#~ msgstr "Partition où SliTaz sera installé (ex:/dev/hda3)."
+
+#~ msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)."
+#~ msgstr "Formatage de la partition (fs=ext2|ext3|ext4|etc..)."
+
+#~ msgid "Install Grub."
+#~ msgstr "Installer Grub."
+
+#~ msgid "Dual-boot a Windows partition (auto|hd, ex:hd0,0)."
+#~ msgstr ""
+#~ "Dual-boot avec une partition Windows (auto|hd, ex:hd0,0)."
+
+#~ msgid "Debug mode."
+#~ msgstr "Mode Debug"
+
+#~ msgid "Config file not found"
+#~ msgstr "Fichier de configuration non trouvé"
+
+#~ msgid "Mismatched parameters"
+#~ msgstr "Paramètres incompatibles"
+
+#~ msgid "will not be formatted during upgrade"
+#~ msgstr "ne sera pas formaté durant la mise à jour"
+
+#~ msgid "but SRC_FILE is not set"
+#~ msgstr "mais SRC_FILE n'est pas défini"
+
+#~ msgid "file not found on the web"
+#~ msgstr "fichier non trouvé sur le web"
+
+#~ msgid "Invalid format"
+#~ msgstr "Format invalide"
+
+#~ msgid "Failed to mount"
+#~ msgstr "Impossible de monter"
+
+#~ msgid "corrupted"
+#~ msgstr "corrompu"
+
+#~ msgid "Installation settings summary:"
+#~ msgstr "Récapitulatif des paramètres d'installation:"
+
+#~ msgid "Format /home partition"
+#~ msgstr "Formatage de la partition /home"
+
+#~ msgid "Install SliTaz on"
+#~ msgstr "Installe SliTaz sur"
+
+#~ msgid "Source:"
+#~ msgstr "Source :"
+
+#~ msgid "Set Home partition to"
+#~ msgstr "Installe la partition /home sur"
+
+#~ msgid "Set Hostname as"
+#~ msgstr "Définition du Hostname"
+
+#~ msgid "Set Default user as"
+#~ msgstr "Définition de l'utilsateur par défaut"
+
+#~ msgid "Check"
+#~ msgstr "Vérifie"
+
+#~ msgid "Backup /etc, /home and the packages list"
+#~ msgstr "Sauvegarde de /etc, /home et de la liste des paquets"
+
+#~ msgid "Upgrade SliTaz on"
+#~ msgstr "Met à jour SliTaz sur"
+
+#~ msgid "Restore /etc, /home"
+#~ msgstr "Restauration de /etc, /home"
+
+#~ msgid "Upgrade additional packages."
+#~ msgstr "Mise à jour des paquets additionnels."
+
+#~ msgid "Enable Windows dual-boot"
+#~ msgstr "Active le Dual-boot avec Windows"
+
+#~ msgid "Install Grub"
+#~ msgstr "Installe Grub"
+
+#~ msgid "Continue:(y/n)"
+#~ msgstr "Continuer : (o/n)"
+
+#~ msgid "Cancelled by user"
+#~ msgstr "Annulé par l'utilisateur"
+
+#~ msgid "Formatting main partition:"
+#~ msgstr "Formatage de la partition principale :"
+
+#~ msgid "Can't mount"
+#~ msgstr "Montage impossible"
+
+#~ msgid "Falling back to running kernel name.."
+#~ msgstr "Repli sur le nom du noyau actuellement utilisé.."
+
 #~ msgid "Check configuration file validity."
 #~ msgstr "Vérification de la validité du fichier de configuration."
 
diff -r aba8290691e2 -r 2b69f8b15b5a po/tazinst/tazinst.pot
--- a/po/tazinst/tazinst.pot	Sun Aug 14 10:51:11 2011 +0100
+++ b/po/tazinst/tazinst.pot	Mon Aug 15 22:33:56 2011 +0200
@@ -8,92 +8,61 @@
 msgstr ""
 "Project-Id-Version: Tazinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 10:00+0200\n"
+"POT-Creation-Date: 2011-08-14 16:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: installer/tazinst:48
+#: installer/tazinst:51
 msgid "Tazinst - SliTaz installer - Version"
 msgstr ""
 
-#: installer/tazinst:49
+#: installer/tazinst:53
 msgid "Usage"
 msgstr ""
 
-#: installer/tazinst:50
-msgid "tazinst [command] [config-file|url|options]"
+#: installer/tazinst:53
+msgid "tazinst [command] [setup-file|url-shortcut]"
 msgstr ""
 
-#: installer/tazinst:51
+#: installer/tazinst:55
 msgid "Commands"
 msgstr ""
 
-#: installer/tazinst:52
+#: installer/tazinst:56
 msgid "Print this short usage."
 msgstr ""
 
-#: installer/tazinst:53
-msgid "Install SliTaz on HDD using a configuration file."
-msgstr ""
-
-#: installer/tazinst:54
-msgid "Upgrade SliTaz on HDD using a configuration file."
-msgstr ""
-
-#: installer/tazinst:55
-msgid "Generate a configuration file."
-msgstr ""
-
-#: installer/tazinst:56
-msgid "Check validity of the configuration file."
-msgstr ""
-
 #: installer/tazinst:57
-msgid "Show the full URL of a predefined URL (stable|cooking|rolling)."
+msgid "Install SliTaz on HDD using setup file contents."
 msgstr ""
 
 #: installer/tazinst:58
-msgid "Install or upgrade using command line options:"
+msgid "Upgrade SliTaz on HDD using setup file contents."
 msgstr ""
 
 #: installer/tazinst:59
-msgid "Full Install (not upgrading, all present data will be lost)."
+msgid "Create a new setup file."
 msgstr ""
 
 #: installer/tazinst:60
-msgid "Upgrade (Needs an active internet connection)."
+msgid "Check validity of settings in a setup file."
 msgstr ""
 
 #: installer/tazinst:61
-msgid "Install type (cdrom|usb|iso|web|weboot)."
+msgid "Show full URL of a predefined shortcut (stable|cooking|rolling)."
 msgstr ""
 
 #: installer/tazinst:62
-msgid "Source media (ex: file.iso|usb partition|web url)."
+msgid "Display log file contents and exit."
 msgstr ""
 
 #: installer/tazinst:63
-msgid "Partition where SliTaz will be installed (ex:/dev/hda3)."
-msgstr ""
-
-#: installer/tazinst:64
-msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)."
-msgstr ""
-
-#: installer/tazinst:65
-msgid "Install Grub."
-msgstr ""
-
-#: installer/tazinst:66
-msgid "Dual-boot a Windows partition (auto|hd, ex:hd0,0)."
-msgstr ""
-
-#: installer/tazinst:67
-msgid "Debug mode."
+msgid "Print version and exit."
 msgstr ""
 
 #: installer/tazinst:83
@@ -104,297 +73,247 @@
 msgid "Warning:"
 msgstr ""
 
-#: installer/tazinst:117
-msgid "Can't write config file"
+#: installer/tazinst:118
+msgid "Can't write setup file"
 msgstr ""
 
-#: installer/tazinst:176 installer/tazinst:215
-msgid "Config file not found"
+#: installer/tazinst:177 installer/tazinst:225
+msgid "Setup file not found"
 msgstr ""
 
-#: installer/tazinst:213
-msgid "Unable to read config file"
+#: installer/tazinst:191
+msgid "Another instance of tazinst is running."
 msgstr ""
 
-#: installer/tazinst:218
-msgid "No configuration file provided"
+#: installer/tazinst:223
+msgid "Unable to read setup file"
 msgstr ""
 
-#: installer/tazinst:244
-msgid "Mismatched parameters"
+#: installer/tazinst:228
+msgid "No setup file provided"
 msgstr ""
 
-#: installer/tazinst:248
-msgid "will not be formatted during upgrade"
+#: installer/tazinst:259
+msgid "Unknown install mode"
 msgstr ""
 
-#: installer/tazinst:278 installer/tazinst:289 installer/tazinst:363
-#, sh-format
-msgid "Invalid setting"
+#: installer/tazinst:268
+msgid "No source file provided"
 msgstr ""
 
-#: installer/tazinst:287
-msgid "but SRC_FILE is not set"
+#: installer/tazinst:270
+msgid "Unknown source type"
 msgstr ""
 
-#: installer/tazinst:303
-msgid "file not found"
+#: installer/tazinst:284
+msgid "Source file not found"
 msgstr ""
 
-#: installer/tazinst:307
-msgid "file not found on the web"
+#: installer/tazinst:288
+msgid "URL not found"
 msgstr ""
 
-#: installer/tazinst:318 installer/tazinst:342
-msgid "Partition not found"
+#: installer/tazinst:299
+msgid "Partition for / not found"
 msgstr ""
 
-#: installer/tazinst:330 installer/tazinst:355
-msgid "is not installed."
+#: installer/tazinst:302
+msgid "Target and source partitions should be different"
 msgstr ""
 
-#: installer/tazinst:332 installer/tazinst:357
-#, sh-format
-msgid "Unknown filesystem"
+#: installer/tazinst:314 installer/tazinst:345
+msgid "is not installed"
 msgstr ""
 
-#: installer/tazinst:371
-#, sh-format
-msgid "Invalid format"
+#: installer/tazinst:316
+msgid "Unknown filesystem (/)"
 msgstr ""
 
-#: installer/tazinst:382
+#: installer/tazinst:326
+msgid "Partition for /home not found"
+msgstr ""
+
+#: installer/tazinst:329
+msgid "/home and source partitions should be different"
+msgstr ""
+
+#: installer/tazinst:332
+msgid "/ and /home partitions should be different"
+msgstr ""
+
+#: installer/tazinst:347
+msgid "Unknown filesystem (/home)"
+msgstr ""
+
+#: installer/tazinst:353
+msgid "Bootloader (grub): Invalid settings"
+msgstr ""
+
+#: installer/tazinst:361
+msgid "Windows Dual-Boot: Invalid settings"
+msgstr ""
+
+#: installer/tazinst:372
 msgid ""
 "You must be the root user (system administrator) to install SliTaz, please "
 "use 'su' to get a root SHell and restart installation."
 msgstr ""
 
-#: installer/tazinst:399
-msgid "Failed to mount"
+#: installer/tazinst:389
+msgid "Mount failed"
 msgstr ""
 
-#: installer/tazinst:418
+#: installer/tazinst:408
 msgid "Failed to mount USB device"
 msgstr ""
 
-#: installer/tazinst:431
-msgid "corrupted"
+#: installer/tazinst:421
+msgid "md5sum mismatch, file corrupted"
 msgstr ""
 
-#: installer/tazinst:433
+#: installer/tazinst:423
 msgid "md5 file not found, unable to check integrity."
 msgstr ""
 
-#: installer/tazinst:440
+#: installer/tazinst:430
 msgid "Failed to mount ISO."
 msgstr ""
 
-#: installer/tazinst:452 installer/tazinst:456
-#, sh-format
-msgid "Failed to download."
+#: installer/tazinst:442 installer/tazinst:446
+msgid "File download failed."
 msgstr ""
 
-#: installer/tazinst:470
+#: installer/tazinst:460
 msgid "Web boot files not found"
 msgstr ""
 
-#: installer/tazinst:493 installer/tazinst:606 installer/tazinst:699
-#: installer/tazinst:734 installer/tazinst:802 installer/tazinst:1042
-#: installer/tazinst:1139 installer/tazinst:1180
+#: installer/tazinst:483 installer/tazinst:556 installer/tazinst:649
+#: installer/tazinst:684 installer/tazinst:752 installer/tazinst:994
+#: installer/tazinst:1091 installer/tazinst:1132
 msgid "Internal"
 msgstr ""
 
-#: installer/tazinst:500
+#: installer/tazinst:490
 msgid "Invalid source"
 msgstr ""
 
-#: installer/tazinst:509
-msgid "Installation settings summary:"
-msgstr ""
-
-#: installer/tazinst:514
-msgid "Format root partition"
-msgstr ""
-
-#: installer/tazinst:517
-msgid "Format /home partition"
-msgstr ""
-
-#: installer/tazinst:519
-msgid "Install SliTaz on"
-msgstr ""
-
-#: installer/tazinst:519 installer/tazinst:526
-msgid "Source:"
+#: installer/tazinst:506 installer/tazinst:966
+msgid "Partition in use"
 msgstr ""
 
 #: installer/tazinst:520
-msgid "Set Home partition to"
+msgid "Formatting / partition:"
 msgstr ""
 
-#: installer/tazinst:521
-msgid "Set Hostname as"
-msgstr ""
-
-#: installer/tazinst:522
-msgid "Set Default user as"
-msgstr ""
-
-#: installer/tazinst:524
-msgid "Check"
-msgstr ""
-
-#: installer/tazinst:525
-msgid "Backup /etc, /home and the packages list"
-msgstr ""
-
-#: installer/tazinst:526
-msgid "Upgrade SliTaz on"
-msgstr ""
-
-#: installer/tazinst:527
-msgid "Restore /etc, /home"
-msgstr ""
-
-#: installer/tazinst:528
-msgid "Upgrade additional packages."
-msgstr ""
-
-#: installer/tazinst:531
-msgid "Enable Windows dual-boot"
-msgstr ""
-
-#: installer/tazinst:534
-msgid "Install Grub"
-msgstr ""
-
-#: installer/tazinst:537
-msgid "Continue:(y/n)"
-msgstr ""
-
-#: installer/tazinst:541
-msgid "Cancelled by user"
-msgstr ""
-
-#: installer/tazinst:556 installer/tazinst:1014
-msgid "Partition in use"
-msgstr ""
-
-#: installer/tazinst:570
-msgid "Formatting main partition:"
-msgstr ""
-
-#: installer/tazinst:582
+#: installer/tazinst:532
 msgid "Formatting /home partition:"
 msgstr ""
 
-#: installer/tazinst:595 installer/tazinst:1023
-msgid "Can't mount"
+#: installer/tazinst:545 installer/tazinst:975
+msgid "Unable to mount partition"
 msgstr ""
 
-#: installer/tazinst:634
-msgid "Falling back to running kernel name.."
+#: installer/tazinst:585
+msgid "Kernel name not found, falling back to:"
 msgstr ""
 
-#: installer/tazinst:749
+#: installer/tazinst:699
 msgid "Configuring host name:"
 msgstr ""
 
-#: installer/tazinst:838
+#: installer/tazinst:788
 msgid "No windows partition found. Dual-boot disabled"
 msgstr ""
 
-#: installer/tazinst:895
+#: installer/tazinst:845
 msgid "Enabling Windows dual-boot"
 msgstr ""
 
-#: installer/tazinst:916
-msgid "Installing SliTaz on"
+#: installer/tazinst:866
+msgid "Installing SliTaz on:"
 msgstr ""
 
-#: installer/tazinst:935
+#: installer/tazinst:885
 msgid "Configuring root and default user account:"
 msgstr ""
 
-#: installer/tazinst:939
-msgid "Configuring partition to be used as /home..."
+#: installer/tazinst:889
+msgid "Configuring partition to be used as /home:"
 msgstr ""
 
-#: installer/tazinst:958
+#: installer/tazinst:908
 msgid "Running grub-install on:"
 msgstr ""
 
-#: installer/tazinst:972
-msgid "Unmounting target"
+#: installer/tazinst:922
+msgid "Unmounting target partition:"
 msgstr ""
 
-#: installer/tazinst:978
-msgid "Unmounting"
+#: installer/tazinst:928
+msgid "Unmounting:"
+msgstr ""
+
+#: installer/tazinst:934
+msgid "Ejecting cdrom..."
+msgstr ""
+
+#: installer/tazinst:945
+msgid "Installation complete. You can now restart (reboot)"
+msgstr ""
+
+#: installer/tazinst:946 installer/tazinst:1167
+msgid "from your SliTaz GNU/Linux system."
+msgstr ""
+
+#: installer/tazinst:949
+msgid "Copying log files"
 msgstr ""
 
 #: installer/tazinst:984
-msgid "Ejecting cdrom..."
-msgstr ""
-
-#: installer/tazinst:993
-msgid "Installation complete. You can now restart (reboot) "
-msgstr ""
-
-#: installer/tazinst:994
-msgid "from your SliTaz GNU/Linux system."
-msgstr ""
-
-#: installer/tazinst:997
-msgid "Copying log files"
-msgstr ""
-
-#: installer/tazinst:1032
 msgid "Preparing upgrade of SliTaz release:"
 msgstr ""
 
-#: installer/tazinst:1034
+#: installer/tazinst:986
 msgid ""
 "This partition doesn't appear to contain a valid SliTaz system, the file: /"
 "etc/slitaz-release doesn't exist."
 msgstr ""
 
-#: installer/tazinst:1154
+#: installer/tazinst:1106
 msgid ""
 "The list of available packages on the mirror could not be downloaded. No "
 "missing packages will be reinstalled now, but you can do so later by looking "
 "at the following list: /var/lib/tazinst/packages-selection.diff"
 msgstr ""
 
-#: installer/tazinst:1167
+#: installer/tazinst:1119
 msgid "Grub update"
 msgstr ""
 
-#: installer/tazinst:1185
+#: installer/tazinst:1137
 msgid "Backup /etc, /home and the packages list..."
 msgstr ""
 
-#: installer/tazinst:1188
+#: installer/tazinst:1140
 msgid "Upgrading SliTaz on:"
 msgstr ""
 
-#: installer/tazinst:1196
+#: installer/tazinst:1148
 msgid "Restoring configuration files..."
 msgstr ""
 
-#: installer/tazinst:1202
+#: installer/tazinst:1154
 msgid "Upgrading added packages..."
 msgstr ""
 
-#: installer/tazinst:1214
-msgid ""
-"Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux "
-"system."
+#: installer/tazinst:1166
+msgid "Upgrade finished. You can now restart (reboot)"
 msgstr ""
 
-#: installer/tazinst:1215
+#: installer/tazinst:1168
 msgid "Packages on the cdrom :"
 msgstr ""
 
-#: installer/tazinst:1216
+#: installer/tazinst:1169
 msgid "Packages installed from the mirror :"
 msgstr ""