slitaz-tools rev 658

tazinst: some i18n and misc fixes
author Dominique Corbex <domcox@slitaz.org>
date Sun Jul 31 10:32:56 2011 +0200 (2011-07-31)
parents 9ec8aeb6a41f
children 94b6f4af84be
files Makefile installer/README installer/tazinst po/tazinst/fr.po po/tazinst/tazinst.pot
line diff
     1.1 --- a/Makefile	Wed Jul 27 10:30:45 2011 +0200
     1.2 +++ b/Makefile	Sun Jul 31 10:32:56 2011 +0200
     1.3 @@ -46,7 +46,7 @@
     1.4  
     1.5  tazinst-pot:
     1.6  	@echo -n "Generating tazinst pot file... "
     1.7 -	@xgettext -o po/tazinst/tazinst.pot -L Shell \
     1.8 +	@xgettext -o po/installer/tazinst.pot -L Shell \
     1.9  		--package-name="Tazinst" ./tazinst/tazinst
    1.10  	@echo "done"
    1.11  
     2.1 --- a/installer/README	Wed Jul 27 10:30:45 2011 +0200
     2.2 +++ b/installer/README	Sun Jul 31 10:32:56 2011 +0200
     2.3 @@ -28,10 +28,12 @@
     2.4  To start a new translation please use msginit from the pot file directory. 
     2.5  Example for French/France locale (fr_FR):
     2.6  
     2.7 -$ msginit -l fr_FR -o fr.po -i tazpanel.pot
     2.8 +$ msginit -l fr_FR -o fr.po -i tazinst.pot
     2.9  
    2.10  To update all translations from a newly updated pot file:
    2.11  
    2.12  $ make msgmerge
    2.13 +Or:
    2.14 +$ msgmerge -U fr.po tazinst.pot
    2.15  
    2.16  ================================================================================
     3.1 --- a/installer/tazinst	Wed Jul 27 10:30:45 2011 +0200
     3.2 +++ b/installer/tazinst	Sun Jul 31 10:32:56 2011 +0200
     3.3 @@ -19,7 +19,7 @@
     3.4  # 6: SliTaz system to upgrade not found
     3.5  # 8: Internal error
     3.6  
     3.7 -VERSION=3.11
     3.8 +VERSION=3.20
     3.9  
    3.10  # Internationalization
    3.11  . /usr/bin/gettext.sh
    3.12 @@ -53,7 +53,7 @@
    3.13  	echo -e "install       `gettext \"Install SliTaz on HDD using a configuration file.\"`"
    3.14  	echo -e "upgrade       `gettext \"Upgrade SliTaz on HDD using a configuration file.\"`"
    3.15  	echo -e "config        `gettext \"Generate a configuration file.\"`"
    3.16 -	echo -e "check         `gettext \"Check configuration file validity.\"`"
    3.17 +	echo -e "check         `gettext \"Check validity of the configuration file.\"`"
    3.18  	echo -e "showurl       `gettext \"Show the full URL of a predefined URL (stable|cooking|rolling).\"`"
    3.19  	echo -e "cli           `gettext \"Install or upgrade using command line options:\"`"
    3.20  	echo -e "  -i             `gettext \"Full Install (not upgrading, all present data will be lost).\"`"
    3.21 @@ -81,7 +81,6 @@
    3.22  		umount $TARGET_ROOT 2>>$LOG
    3.23  	fi
    3.24  	echo -e "`gettext \"Error\"` $@"
    3.25 -#	echo -e "`gettext \"Installation cancelled\"`"
    3.26  	test $(id -u) = 0 && echo "Installation cancelled on error $@" >> $LOG
    3.27  	exit $1
    3.28  }
    3.29 @@ -115,7 +114,7 @@
    3.30  gen_config()
    3.31  {
    3.32  	CONFILE=$1
    3.33 -	touch $CONFILE || abort 2 `gettext "Unable to write to $CONFILE"`
    3.34 +	touch $CONFILE || abort 2 `gettext "Can't write config file"`
    3.35  	if [ -r "$CONFILE" ]; then
    3.36  		cat > $CONFILE << _EOF_
    3.37  # tazinst.conf: SliTaz Installer configuration file.
    3.38 @@ -174,7 +173,7 @@
    3.39  _EOF_
    3.40  
    3.41  	else
    3.42 -		abort 2 `gettext "Configuration file $CONFILE not found"`
    3.43 +		abort 2 `gettext "Config file not found"`
    3.44  	fi
    3.45  }
    3.46  
    3.47 @@ -211,9 +210,9 @@
    3.48  			debug "Using config-file=$CONFILE"
    3.49  			# source doesn't like file without a path
    3.50  			[ $(echo "$CONFILE" | grep -c "/") == "0" ] && CONFILE="./$CONFILE"
    3.51 -			source $CONFILE || abort 2 `gettext "Unable to read $CONFILE"`
    3.52 +			source $CONFILE || abort 2 `gettext "Unable to read config file"`
    3.53  		else
    3.54 -			abort 2 `gettext "Configuration file not found"`
    3.55 +			abort 2 `gettext "Config file not found"`
    3.56  		fi
    3.57  	else
    3.58  		abort 2 `gettext "No configuration file provided"`
    3.59 @@ -246,7 +245,7 @@
    3.60  	INST_ACTION="$INSTALL$UPGRADE"
    3.61  	# Don't allow formatting on upgrades
    3.62  	[ "$INST_ACTION" == "upgrade" ] && [ -n "$TGT_FS" ] && \
    3.63 -		warning `gettext "Partition $TGT_PARTITION will not be formatted during upgrade"`
    3.64 +		warning "$TGT_PARTITION: `gettext "will not be formatted during upgrade"`"
    3.65  }
    3.66  
    3.67  # check main vars
    3.68 @@ -276,7 +275,7 @@
    3.69  	# Check Action
    3.70  	case $INST_ACTION in
    3.71  		install|upgrade|check) ;;
    3.72 -		*) msg `gettext "INST_ACTION=$INST_ACTION: Invalid setting"`; error=yes ;;
    3.73 +		*) msg "INST_ACTION=$INST_ACTION: `gettext "Invalid setting"`"; error=yes ;;
    3.74  	esac
    3.75  
    3.76  	# Check Type
    3.77 @@ -285,9 +284,9 @@
    3.78  		usb|iso|web)
    3.79  			# We need a valid source 
    3.80  			if [ -z "$SRC_FILE" ]; then
    3.81 -				msg `gettext "Type is $INST_TYPE, but INST_SOURCE is not set"`; error=yes
    3.82 +				msg "INST_TYPE=$INST_TYPE,`gettext "but SRC_FILE is not set"`"; error=yes
    3.83  			fi ;;
    3.84 -		*) msg `gettext "INST_TYPE=$INST_TYPE: Invalid setting"`; error=yes ;;
    3.85 +		*) msg "INST_TYPE=$INST_TYPE: `gettext "Invalid setting"`"; error=yes ;;
    3.86  	esac
    3.87  
    3.88  	# Check Source file
    3.89 @@ -301,11 +300,11 @@
    3.90  	case $INST_TYPE in
    3.91  		iso)
    3.92  			if [ ! -r "$SRC_FILE" ]; then
    3.93 -				msg `gettext "SRC_FILE=$SRC_FILE: file not found"`; error=yes
    3.94 +				msg "SRC_FILE=$SRC_FILE: `gettext "file not found"`"; error=yes
    3.95  			fi ;;
    3.96  		web)
    3.97  			if ! wget -sq "$SRC_FILE" 2> /dev/null ; then
    3.98 -				msg `gettext "SRC_FILE=$SRC_FILE: file not found on the web"`; error=yes
    3.99 +				msg "SRC_FILE=$SRC_FILE: `gettext "file not found on the web"`"; error=yes
   3.100  			fi ;;
   3.101  	esac
   3.102  
   3.103 @@ -316,7 +315,7 @@
   3.104  		[ "$partition" == "$TGT_PARTITION" ] && found="yes"
   3.105  	done
   3.106  	if [ "$found" != "yes" ]; then
   3.107 -		msg `gettext "TGT_PARTITION=$TGT_PARTITION Partition not found"`; error=yes
   3.108 +		msg "TGT_PARTITION=$TGT_PARTITION: `gettext "Partition not found"`"; error=yes
   3.109  	fi
   3.110  
   3.111  	# Check Filesystem
   3.112 @@ -328,9 +327,9 @@
   3.113  				[ -x "$xdir/mkfs.$TGT_FS" ] && found=yes
   3.114  			done
   3.115  			if [ "$found" == "no" ]; then
   3.116 -				msg `gettext "$TGT_FS: mkfs.$TGT_FS is not installed."`; error=yes
   3.117 +				msg "$TGT_FS: mkfs.$TGT_FS `gettext "is not installed."`"; error=yes
   3.118  			fi ;;
   3.119 -		*) msg `gettext "TGT_FS=$TGT_FS: Unknown filesystem"`; error=yes ;;
   3.120 +		*) msg "TGT_FS=$TGT_FS: `gettext "Unknown filesystem"`"; error=yes ;;
   3.121  	esac
   3.122  
   3.123  	# Check Home partition
   3.124 @@ -340,7 +339,7 @@
   3.125  			[ "$partition" == "$TGT_HOME" ] && found=yes
   3.126  		 done
   3.127  		if [ "$found" != "yes" ]; then
   3.128 -			msg `gettext "TGT_HOME=$TGT_HOME: Partition not found"`; error=yes
   3.129 +			msg "TGT_HOME=$TGT_HOME: `gettext "Partition not found"`"; error=yes
   3.130  		fi
   3.131  	fi
   3.132  
   3.133 @@ -353,15 +352,15 @@
   3.134  				[ -x "$xdir/mkfs.$TGT_FS" ] && found=yes
   3.135  			done
   3.136  			if [ "$found" == "no" ]; then
   3.137 -				msg `gettext "$TGT_FS: mkfs.$TGT_FS is not installed."`; error=yes
   3.138 +				msg "$TGT_FS: mkfs.$TGT_FS `gettext "is not installed."`"; error=yes
   3.139  			fi ;;
   3.140 -		*) msg `gettext "TGT_HOME_FS=$TGT_HOME_FS: unknown filesystem"`; error=yes ;;
   3.141 +		*) msg "TGT_HOME_FS=$TGT_HOME_FS: `eval_gettext "Unknown filesystem"`"; error=yes ;;
   3.142  	esac
   3.143  
   3.144  	# Check Grub
   3.145  	case $TGT_GRUB in
   3.146  		yes|no) ;;
   3.147 -		*) msg `gettext "TGT_GRUB=$TGT_GRUB: Invalid setting"`; error=yes ;;
   3.148 +		*) msg "TGT_GRUB=$TGT_GRUB: `eval_gettext "Invalid setting"`"; error=yes ;;
   3.149  	esac
   3.150  
   3.151  	# Check Winboot
   3.152 @@ -369,7 +368,7 @@
   3.153  		"") ;;
   3.154  		auto) ;;
   3.155  		hd[[:digit:]],[[:digit:]]) ;;
   3.156 -		*) msg `gettext "TGT_WINBOOT=$TGT_WINBOOT: Invalid format"`; error=yes ;;
   3.157 +		*) msg "TGT_WINBOOT=$TGT_WINBOOT: `eval_gettext "Invalid format"`"; error=yes ;;
   3.158  	esac
   3.159  
   3.160  	# Stop on error
   3.161 @@ -397,7 +396,7 @@
   3.162  		debug "Using files from cdrom ($CDROM)..."
   3.163  		sleep 2
   3.164  	else
   3.165 -		warning `gettext "Failed to mount $CDROM"`
   3.166 +		warning "$CDROM: `gettext "Failed to mount"`"
   3.167  	fi
   3.168  }
   3.169  
   3.170 @@ -416,7 +415,7 @@
   3.171  			debug "Using files from USB device ($SRC_FILE)..."
   3.172  			SOURCE_STATUS="mount"
   3.173  		else
   3.174 -			warning `gettext "Failed to mount USB device $SRC_FILE"`
   3.175 +			warning "$SRC_FILE: `gettext "Failed to mount USB device"`"
   3.176  		fi
   3.177  	fi
   3.178  }
   3.179 @@ -429,16 +428,16 @@
   3.180  	src_md5=$(echo $SRC_FILE | sed 's/.iso$/.md5/')
   3.181  	if [ -r "$src_md5" ]; then
   3.182  		[ $(md5sum $SRC_FILE | cut -d' ' -f1) == $(cat "$src_md5" | cut -d' ' -f1) ] || \
   3.183 -			abort 3 `gettext "$SRC-FILE corrupted"`
   3.184 +			abort 3 "$SRC-FILE `gettext "corrupted"`"
   3.185  	else
   3.186 -		warning `gettext "$src_md5 not found, unable to check integrity of $SRC_FILE"`
   3.187 +		warning "$SRC_FILE: `gettext "md5 file not found, unable to check integrity."`"
   3.188  	fi
   3.189  	# Try to mount ISO
   3.190  	if mount -o loop -t iso9660 $SRC_FILE $SOURCE_ROOT 2>>$LOG; then
   3.191  		debug "Using files from ISO ($SRC_FILE)..."
   3.192  		sleep 2
   3.193  	else
   3.194 -		warning `gettext "Failed to mount ISO '$SRC_FILE'"`
   3.195 +		warning "$SRC_FILE: `gettext "Failed to mount ISO."`"
   3.196  	fi
   3.197  }
   3.198  
   3.199 @@ -450,11 +449,11 @@
   3.200  	if wget $SRC_FILE -P /tmp; then
   3.201  		debug "Download completed."
   3.202  	else
   3.203 -		warning `gettext "Failed to download '$SRC_FILE'"`
   3.204 +		warning "$SRC_FILE: `gettext "Failed to download."`"
   3.205  	fi
   3.206  	src_md5=$(echo $SRC_FILE | sed 's/.iso$/.md5/')
   3.207  	debug "Downloading $src_md5"
   3.208 -	wget $src_md5 -P /tmp || warning `gettext "Failed to download '$src_md5'"`
   3.209 +	wget $src_md5 -P /tmp || warning "$src_md5: `eval_gettext "Failed to download."`"
   3.210  	tmpfile=$(echo $SRC_FILE | awk 'BEGIN{RS="/"}{out=$1}END{printf"%s",out}')
   3.211  	SRC_FILE="/tmp/$tmpfile"
   3.212  	check_iso
   3.213 @@ -512,24 +511,24 @@
   3.214  
   3.215  	if [ "$INST_ACTION" == "install" ]; then
   3.216  		if [ -n "$TGT_FS" ]; then
   3.217 -			msg `gettext "Format root partition '$TGT_PARTITION' ($TGT_FS)"`
   3.218 +			msg "`gettext "Format root partition"` '$TGT_PARTITION' ($TGT_FS)"
   3.219  		fi
   3.220  		if [ -n "$TGT_HOME_FS" ]; then
   3.221 -			msg `gettext "Format /home partition '$TGT_HOME' ($TGT_HOME_FS)"`
   3.222 +			msg "`gettext "Format /home partition"` '$TGT_HOME' ($TGT_HOME_FS)"
   3.223  		fi	
   3.224 -		msg `gettext "Install SliTaz on '$TGT_PARTITION' from $INST_TYPE"`
   3.225 -		[ -n "$TGT_HOME" ] && msg `gettext "Set Home partition to '$TGT_HOME'"`
   3.226 -		msg `gettext "Set Hostname as '$TGT_HOSTNAME'"`
   3.227 -		msg `gettext "Set Default user as '$TGT_USER'"`
   3.228 +		msg "`gettext "Install SliTaz on"` '$TGT_PARTITION'. `gettext "Source:"` $INST_TYPE"
   3.229 +		[ -n "$TGT_HOME" ] && msg "`gettext "Set Home partition to" `'$TGT_HOME'"
   3.230 +		msg "`gettext "Set Hostname as"` '$TGT_HOSTNAME'"
   3.231 +		msg "`gettext "Set Default user as"` '$TGT_USER'"
   3.232  	else
   3.233 -		msg `gettext "Check '$TGT_PARTITION'"`
   3.234 +		msg "`gettext "Check"` '$TGT_PARTITION'"
   3.235  		msg `gettext "Backup /etc, /home and the packages list"`
   3.236 -		msg `gettext "Upgrade SliTaz on '$TGT_PARTITION' from $INST_TYPE"`
   3.237 +		msg "`gettext "Upgrade SliTaz on"` '$TGT_PARTITION'. `gettext "Source:"` $INST_TYPE"
   3.238  		msg `gettext "Restore /etc, /home"`
   3.239  		msg `gettext "Upgrade additional packages."`
   3.240  	fi
   3.241  	if [ -n "$TGT_WINBOOT" ]; then
   3.242 -		msg `gettext "Enable Windows dual-boot ($TGT_WINBOOT)"`
   3.243 +		msg "`gettext "Enable Windows dual-boot"` ($TGT_WINBOOT)"
   3.244  	fi
   3.245  	if [ "$TGT_GRUB" == "yes" ]; then
   3.246  		msg `gettext "Install Grub"`
   3.247 @@ -554,7 +553,7 @@
   3.248  	debug "Preparing target partition..."
   3.249  	# Target may be used
   3.250  	mount | grep -q $TGT_PARTITION && \
   3.251 -		abort 5 `gettext $TGT_PARTITION": Partition in use"`
   3.252 +		abort 5 "$TGT_PARTITION: `gettext "Partition in use"`"
   3.253  	# Mount point can be already used.
   3.254  	if mount | grep -q $TARGET_ROOT; then
   3.255  		umount $TARGET_ROOT 2>>$LOG
   3.256 @@ -568,7 +567,7 @@
   3.257  #			ROOT_FS=$(parted /dev/hda5 print -m | grep "^1:" | cut -d':' -f5) ;;
   3.258  			ROOT_FS=auto ;;
   3.259  		*)
   3.260 -			msg `gettext "Formatting $TGT_PARTITION ($TGT_FS)"`
   3.261 +			msg "`gettext "Formatting main partition:"` $TGT_PARTITION ($TGT_FS)"
   3.262  			mkfs.$TGT_FS $TGT_PARTITION >>$LOG 2>>$LOG
   3.263  			ROOT_FS=$TGT_FS ;;
   3.264  	esac
   3.265 @@ -580,7 +579,7 @@
   3.266  			"")
   3.267  				debug "The partition ($TGT_HOME) will be kept..." ;;
   3.268  			*)
   3.269 -				msg `gettext "Formatting /home on $TGT_HOME ($TGT_HOME_FS)"`
   3.270 +				msg "`gettext "Formatting /home partition:"` $TGT_HOME ($TGT_HOME_FS)"
   3.271  				mkfs.$TGT_HOME_FS -L "Home" $TGT_HOME >>$LOG 2>>$LOG ;;
   3.272  		esac
   3.273  		sleep 2
   3.274 @@ -593,7 +592,7 @@
   3.275  
   3.276  	mount -t $ROOT_FS $TGT_PARTITION $TARGET_ROOT >>$LOG 2>>$LOG
   3.277  	if [ $(mount | grep -c "mnt/target") == "0" ]; then
   3.278 -		abort 5 `gettext "Can't mount $TGT_PARTITION"`
   3.279 +		abort 5 "$TGT_PARTITION: `gettext "Can't mount"`"
   3.280  	fi
   3.281  }
   3.282  
   3.283 @@ -747,7 +746,7 @@
   3.284  	sed -i s#'CHECK_FS=\"\"'#"CHECK_FS=\"$TGT_PARTITION\""# etc/rcS.conf
   3.285  	sleep 2
   3.286  	# Set hostname.
   3.287 -	msg `gettext "Configuring host name: $TGT_HOSTNAME"`
   3.288 +	msg "`gettext "Configuring host name:"` $TGT_HOSTNAME"
   3.289  	echo $TGT_HOSTNAME > etc/hostname
   3.290  }
   3.291  
   3.292 @@ -914,7 +913,7 @@
   3.293  # Files install, calling for functions or with cmds.
   3.294  install_files()
   3.295  {
   3.296 -	msg `gettext "Installing SliTaz on $TGT_PARTITION"`
   3.297 +	msg "`gettext "Installing SliTaz on"` $TGT_PARTITION"
   3.298  	# saving pwd
   3.299  	local save_pwd=$(pwd)
   3.300  
   3.301 @@ -933,11 +932,11 @@
   3.302  	debug "Preconfiguring the system..."
   3.303  	pre_config_system
   3.304  
   3.305 -	msg `gettext "Configuring root and default $TGT_USER account..."`
   3.306 +	msg "`gettext "Configuring root and default user account:"` $TGT_USER"
   3.307  	users_settings
   3.308  
   3.309  	if [ "$TGT_HOME" != "" ]; then
   3.310 -		msg `gettext "Configuring $TGT_HOME to be used as /home..."`
   3.311 +		msg "$TGT_HOME: `gettext "Configuring partition to be used as /home..."`"
   3.312  		home_config
   3.313  		sleep 2
   3.314  	fi
   3.315 @@ -956,7 +955,7 @@
   3.316  {
   3.317  	if [ "$TGT_GRUB" == "yes" ]; then
   3.318  		TARGET_DISK=`echo $TGT_PARTITION | sed s/"[0-9]"/''/`
   3.319 -		msg `gettext "Running grub-install on : $TARGET_DISK"`
   3.320 +		msg "`gettext "Running grub-install on:"` $TARGET_DISK"
   3.321  		grub-install --no-floppy \
   3.322  				--root-directory=$TARGET_ROOT $TARGET_DISK 2>>$LOG
   3.323  		debug "Grub installation done..."
   3.324 @@ -970,13 +969,13 @@
   3.325  {
   3.326  	# Umount target
   3.327  	if mount | grep -q $TARGET_ROOT; then
   3.328 -		echo -e "`gettext \"Unmounting target ($TGT_PARTITION)...\"`"
   3.329 +		echo -e "`gettext \"Unmounting target\"` ($TGT_PARTITION)..."
   3.330  	umount $TARGET_ROOT 2>>$LOG
   3.331  	fi
   3.332  
   3.333  	# Umount source
   3.334  	if mount | grep -q $SOURCE_ROOT; then
   3.335 -		echo -e "`gettext \"Unmounting $SOURCE_ROOT\"`"
   3.336 +		echo -e "`gettext \"Unmounting\"` $SOURCE_ROOT"
   3.337  		umount $SOURCE_ROOT
   3.338  	fi
   3.339  
   3.340 @@ -995,7 +994,7 @@
   3.341  	echo -e "`gettext \"from your SliTaz GNU/Linux system.\"`"
   3.342  	echo "=== Tazinst end at `date` ===" >>$LOG
   3.343  	# Log files
   3.344 -	echo -e "`gettext \"Copying log files ($LOG)...\"`"
   3.345 +	echo -e "`gettext \"Copying log files\"` ($LOG)..."
   3.346  	cp -a $LOG $TARGET_ROOT/var/log
   3.347  	sleep 2
   3.348  	# umount
   3.349 @@ -1012,7 +1011,7 @@
   3.350  	debug "Preparing the target partition..."
   3.351  	# Target may be used
   3.352  	mount | grep -q $TGT_PARTITION && \
   3.353 -		abort 5 `gettext "$TGT_PARTITION": Partition in use"`
   3.354 +		abort 5 "$TGT_PARTITION: `gettext "Partition in use"`"
   3.355  	# Mount point can be already used.
   3.356  	if mount | grep -q $TARGET_ROOT; then
   3.357  		umount $TARGET_ROOT 2>>$LOG
   3.358 @@ -1021,7 +1020,7 @@
   3.359  	# Mount target.
   3.360  	mount $TGT_PARTITION $TARGET_ROOT >>$LOG 2>>$LOG
   3.361  	if [ $(mount | grep -c "mnt/target") == "0" ]; then
   3.362 -		abort 5 `gettext "Can't mount $TGT_PARTITION"`
   3.363 +		abort 5 "$TGT_PARTITION `gettext "Can't mount"`"
   3.364  	fi
   3.365  }
   3.366  
   3.367 @@ -1030,10 +1029,10 @@
   3.368  {
   3.369  	if [ -f $TARGET_ROOT/etc/slitaz-release ]; then
   3.370  		release=`cat $TARGET_ROOT/etc/slitaz-release`
   3.371 -		msg `gettext "Preparing upgrade of SliTaz release: $release"`
   3.372 +		msg "`gettext "Preparing upgrade of SliTaz release:"` $release"
   3.373  	else
   3.374 -		abort 6 `gettext "The partition '$TGT_PARTITION' doesn't appear to contain \
   3.375 -a SliTaz system, the file: /etc/slitaz-release doesn't exist."`
   3.376 +		abort 6 "'$TGT_PARTITION': `gettext "This partition doesn't appear to contain \
   3.377 +a valid SliTaz system, the file: /etc/slitaz-release doesn't exist."`"
   3.378  	fi && sleep 2
   3.379  }
   3.380  
   3.381 @@ -1186,7 +1185,7 @@
   3.382  	msg `gettext "Backup /etc, /home and the packages list..."`
   3.383  	backup_files
   3.384  
   3.385 -	msg `gettext "Upgrading SliTaz on $TGT_PARTITION"`
   3.386 +	msg "`gettext "Upgrading SliTaz on:"` $TGT_PARTITION"
   3.387  
   3.388  	debug "Copying the bootloader syslinux/isolinux..."
   3.389  	copy_bootloaders
     4.1 --- a/po/tazinst/fr.po	Wed Jul 27 10:30:45 2011 +0200
     4.2 +++ b/po/tazinst/fr.po	Sun Jul 31 10:32:56 2011 +0200
     4.3 @@ -1,5 +1,5 @@
     4.4  # French translation for Tazinst (SliTaz installer).
     4.5 -# Traduction françaises du paquet Tazinst
     4.6 +# Traduction française du paquet Tazinst
     4.7  # Copyright (C) 2011 - SliTaz Team
     4.8  # This file is distributed under the same license as Tazinst.
     4.9  # Dominique Corbex <domcox@slitaz.org>, 2011
    4.10 @@ -8,8 +8,8 @@
    4.11  msgstr ""
    4.12  "Project-Id-Version: 3.0\n"
    4.13  "Report-Msgid-Bugs-To: \n"
    4.14 -"POT-Creation-Date: 2011-07-20 13:01+0200\n"
    4.15 -"PO-Revision-Date: 2011-07-20 14:19+0200\n"
    4.16 +"POT-Creation-Date: 2011-07-31 10:00+0200\n"
    4.17 +"PO-Revision-Date: 2011-07-31 10:28+0200\n"
    4.18  "Last-Translator: Dominique Corbex <domcox@slitaz.org>\n"
    4.19  "Language-Team: French\n"
    4.20  "MIME-Version: 1.0\n"
    4.21 @@ -17,207 +17,401 @@
    4.22  "Content-Transfer-Encoding: 8bit\n"
    4.23  "Plural-Forms: nplurals=2; plural=(n > 1);\n"
    4.24  
    4.25 -#: tazinst:40
    4.26 +#: installer/tazinst:48
    4.27  msgid "Tazinst - SliTaz installer - Version"
    4.28  msgstr "Tazinst - Installateur Slitaz - Version"
    4.29  
    4.30 -#: tazinst:41
    4.31 +#: installer/tazinst:49
    4.32  msgid "Usage"
    4.33  msgstr "Usage"
    4.34  
    4.35 -#: tazinst:42
    4.36 -msgid "tazinst [command] [config-file]"
    4.37 -msgstr "tazinst [commande] [fichier de configuration]"
    4.38 +#: installer/tazinst:50
    4.39 +msgid "tazinst [command] [config-file|url|options]"
    4.40 +msgstr "tazinst [commande] [fichier-config|url|options]"
    4.41  
    4.42 -#: tazinst:43
    4.43 +#: installer/tazinst:51
    4.44  msgid "Commands"
    4.45  msgstr "Commandes"
    4.46  
    4.47 -#: tazinst:44
    4.48 +#: installer/tazinst:52
    4.49  msgid "Print this short usage."
    4.50  msgstr "Affiche cette petite aide"
    4.51  
    4.52 -#: tazinst:45
    4.53 +#: installer/tazinst:53
    4.54  msgid "Install SliTaz on HDD using a configuration file."
    4.55 -msgstr "Installer SliTaz sur un disque dur à l'aide d'un fichier de configuration."
    4.56 +msgstr "Installe SliTaz sur HDD à l'aide d'un fichier de configuration."
    4.57  
    4.58 -#: tazinst:46
    4.59 +#: installer/tazinst:54
    4.60  msgid "Upgrade SliTaz on HDD using a configuration file."
    4.61 -msgstr "Mettre à jour SliTaz sur un disque dur à l'aide d'un fichier de configuration."
    4.62 +msgstr "Met à jour SliTaz sur HDD à l'aide d'un fichier de configuration."
    4.63  
    4.64 -#: tazinst:47
    4.65 +#: installer/tazinst:55
    4.66  msgid "Generate a configuration file."
    4.67 -msgstr "Générer un fichier de configuration."
    4.68 +msgstr "Génére un fichier de configuration."
    4.69 +
    4.70 +#: installer/tazinst:56
    4.71 +msgid "Check validity of the configuration file."
    4.72 +msgstr "Vérifie la validité du fichier de configuration."
    4.73 +
    4.74 +#: installer/tazinst:57
    4.75 +msgid "Show the full URL of a predefined URL (stable|cooking|rolling)."
    4.76 +msgstr "Affiche l'URL complète d'un raccourci (stable|cooking|rolling)."
    4.77  
    4.78  #
    4.79 -#: tazinst:48
    4.80 +#: installer/tazinst:58
    4.81  msgid "Install or upgrade using command line options:"
    4.82 -msgstr "Installer ou mettre à jour en utilisant des options en ligne de commande:"
    4.83 +msgstr "Installe ou met à jour en utilisant des options en ligne de commande:"
    4.84  
    4.85 -#: tazinst:49
    4.86 +#: installer/tazinst:59
    4.87  msgid "Full Install (not upgrading, all present data will be lost)."
    4.88  msgstr "Installation complète (pas de mise à jour, les données seront perdues)."
    4.89  
    4.90 -#: tazinst:50
    4.91 +#: installer/tazinst:60
    4.92  msgid "Upgrade (Needs an active internet connection)."
    4.93  msgstr "Mise à jour (Nécessite une connexion internet active)."
    4.94  
    4.95 -#: tazinst:51
    4.96 +#: installer/tazinst:61
    4.97  msgid "Install type (cdrom|usb|iso|web|weboot)."
    4.98  msgstr "Type d'installation (cdrom|usb|iso|web|weboot)."
    4.99  
   4.100 -#: tazinst:52
   4.101 +#: installer/tazinst:62
   4.102  msgid "Source media (ex: file.iso|usb partition|web url)."
   4.103 -msgstr "Média source (ex: file.iso|usb partition|web url)."
   4.104 +msgstr "Média source (ex: fichier.iso|partition usb|url web)."
   4.105  
   4.106 -#: tazinst:53
   4.107 +#: installer/tazinst:63
   4.108  msgid "Partition where SliTaz will be installed (ex:/dev/hda3)."
   4.109  msgstr "Partition où SliTaz sera installé (ex:/dev/hda3)."
   4.110  
   4.111 -#: tazinst:54
   4.112 +#: installer/tazinst:64
   4.113  msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)."
   4.114  msgstr "Formatage de la partition (fs=ext2|ext3|ext4|etc..)."
   4.115  
   4.116 -#: tazinst:55
   4.117 +#: installer/tazinst:65
   4.118  msgid "Install Grub."
   4.119  msgstr "Installer Grub."
   4.120  
   4.121 -#: tazinst:56
   4.122 +#: installer/tazinst:66
   4.123  msgid "Dual-boot a Windows partition (auto|hd<disk>,<part> ex:hd0,0)."
   4.124  msgstr "Dual-boot avec une partition Windows (auto|hd<disk>,<part> ex:hd0,0)."
   4.125  
   4.126 -#: tazinst:57
   4.127 +#: installer/tazinst:67
   4.128  msgid "Debug mode."
   4.129  msgstr "Mode Debug"
   4.130  
   4.131 -#: tazinst:73
   4.132 +#: installer/tazinst:83
   4.133  msgid "Error"
   4.134  msgstr "Erreur"
   4.135  
   4.136 -#: tazinst:74
   4.137 -msgid "Installation cancelled"
   4.138 -msgstr "Installation annulée"
   4.139 -
   4.140 -#: tazinst:82
   4.141 +#: installer/tazinst:91
   4.142  msgid "Warning:"
   4.143  msgstr "Attention :"
   4.144  
   4.145 -#: tazinst:206
   4.146 -msgid "Configuration file not found"
   4.147 +#: installer/tazinst:117
   4.148 +msgid "Can't write config file"
   4.149 +msgstr "Impossible d'écrire un fichier de configuration."
   4.150 +
   4.151 +#: installer/tazinst:176 installer/tazinst:215
   4.152 +msgid "Config file not found"
   4.153  msgstr "Fichier de configuration non trouvé"
   4.154  
   4.155 -#: tazinst:209
   4.156 +#: installer/tazinst:213
   4.157 +msgid "Unable to read config file"
   4.158 +msgstr "Impossible de lire le fichier de configuration."
   4.159 +
   4.160 +#: installer/tazinst:218
   4.161  msgid "No configuration file provided"
   4.162  msgstr "Fichier de configuration non trouvé"
   4.163  
   4.164 -#: tazinst:235
   4.165 +#: installer/tazinst:244
   4.166  msgid "Mismatched parameters"
   4.167  msgstr "Paramètres incompatibles"
   4.168  
   4.169 -#: tazinst:373
   4.170 +#: installer/tazinst:248
   4.171 +msgid "will not be formatted during upgrade"
   4.172 +msgstr "ne sera pas formaté durant la mise à jour"
   4.173 +
   4.174 +#: installer/tazinst:278 installer/tazinst:289 installer/tazinst:363
   4.175 +#, sh-format
   4.176 +msgid "Invalid setting"
   4.177 +msgstr "Paramètre invalide"
   4.178 +
   4.179 +#: installer/tazinst:287
   4.180 +msgid "but SRC_FILE is not set"
   4.181 +msgstr "mais SRC_FILE n'est pas défini"
   4.182 +
   4.183 +#: installer/tazinst:303
   4.184 +msgid "file not found"
   4.185 +msgstr "fichier non trouvé"
   4.186 +
   4.187 +#: installer/tazinst:307
   4.188 +msgid "file not found on the web"
   4.189 +msgstr "fichier non trouvé sur le web"
   4.190 +
   4.191 +#: installer/tazinst:318 installer/tazinst:342
   4.192 +msgid "Partition not found"
   4.193 +msgstr "Partition non trouvée"
   4.194 +
   4.195 +#: installer/tazinst:330 installer/tazinst:355
   4.196 +msgid "is not installed."
   4.197 +msgstr "n'est pas installé"
   4.198 +
   4.199 +#: installer/tazinst:332 installer/tazinst:357
   4.200 +#, sh-format
   4.201 +msgid "Unknown filesystem"
   4.202 +msgstr "Système de fichiers inconnu"
   4.203 +
   4.204 +#: installer/tazinst:371
   4.205 +#, sh-format
   4.206 +msgid "Invalid format"
   4.207 +msgstr "Format invalide"
   4.208 +
   4.209 +#: installer/tazinst:382
   4.210  msgid ""
   4.211  "You must be the root user (system administrator) to install SliTaz, please "
   4.212  "use 'su' to get a root SHell and restart installation."
   4.213 -msgstr "Vous devez être l'utilisateur root (administrateur système) pour installer SliTaz, utilisez « su » pour obtenir un shell root et redémarrer l'installation."
   4.214 +msgstr ""
   4.215 +"Vous devez être l'utilisateur root (administrateur système) pour installer "
   4.216 +"SliTaz, utilisez « su » pour obtenir un shell root et redémarrer "
   4.217 +"l'installation."
   4.218  
   4.219 -#: tazinst:461
   4.220 +#: installer/tazinst:399
   4.221 +msgid "Failed to mount"
   4.222 +msgstr "Impossible de monter"
   4.223 +
   4.224 +#: installer/tazinst:418
   4.225 +msgid "Failed to mount USB device"
   4.226 +msgstr "Impossible de monter le périphérique USB"
   4.227 +
   4.228 +#: installer/tazinst:431
   4.229 +msgid "corrupted"
   4.230 +msgstr "corrompu"
   4.231 +
   4.232 +#: installer/tazinst:433
   4.233 +msgid "md5 file not found, unable to check integrity."
   4.234 +msgstr "fichier md5 non trouvé, impossible de vérifier l'intégrité."
   4.235 +
   4.236 +#: installer/tazinst:440
   4.237 +msgid "Failed to mount ISO."
   4.238 +msgstr "Impossible de monter l'image ISO."
   4.239 +
   4.240 +#: installer/tazinst:452 installer/tazinst:456
   4.241 +#, sh-format
   4.242 +msgid "Failed to download."
   4.243 +msgstr "Impossible de télécharger."
   4.244 +
   4.245 +#: installer/tazinst:470
   4.246  msgid "Web boot files not found"
   4.247  msgstr "Fichiers Web boot non trouvés"
   4.248  
   4.249 -#: tazinst:484 tazinst:597 tazinst:690 tazinst:725 tazinst:793 tazinst:1033
   4.250 -#: tazinst:1130 tazinst:1171
   4.251 +#: installer/tazinst:493 installer/tazinst:606 installer/tazinst:699
   4.252 +#: installer/tazinst:734 installer/tazinst:802 installer/tazinst:1042
   4.253 +#: installer/tazinst:1139 installer/tazinst:1180
   4.254  msgid "Internal"
   4.255  msgstr "Interne"
   4.256  
   4.257 -#: tazinst:491
   4.258 +#: installer/tazinst:500
   4.259  msgid "Invalid source"
   4.260  msgstr "Source invalide"
   4.261  
   4.262 -#: tazinst:500
   4.263 +#: installer/tazinst:509
   4.264  msgid "Installation settings summary:"
   4.265  msgstr "Récapitulatif des paramètres d'installation:"
   4.266  
   4.267 -#: tazinst:516
   4.268 +#: installer/tazinst:514
   4.269 +msgid "Format root partition"
   4.270 +msgstr "Formatage de la partition root"
   4.271 +
   4.272 +#: installer/tazinst:517
   4.273 +msgid "Format /home partition"
   4.274 +msgstr "Formatage de la partition /home"
   4.275 +
   4.276 +#: installer/tazinst:519
   4.277 +msgid "Install SliTaz on"
   4.278 +msgstr "Installe SliTaz sur"
   4.279 +
   4.280 +#: installer/tazinst:519 installer/tazinst:526
   4.281 +msgid "Source:"
   4.282 +msgstr "Source :"
   4.283 +
   4.284 +#: installer/tazinst:520
   4.285 +msgid "Set Home partition to"
   4.286 +msgstr "Installe la partition /home sur"
   4.287 +
   4.288 +#: installer/tazinst:521
   4.289 +msgid "Set Hostname as"
   4.290 +msgstr "Définition du Hostname"
   4.291 +
   4.292 +#: installer/tazinst:522
   4.293 +msgid "Set Default user as"
   4.294 +msgstr "Définition de l'utilsateur par défaut"
   4.295 +
   4.296 +#: installer/tazinst:524
   4.297 +msgid "Check"
   4.298 +msgstr "Vérifie"
   4.299 +
   4.300 +#: installer/tazinst:525
   4.301  msgid "Backup /etc, /home and the packages list"
   4.302  msgstr "Sauvegarde de /etc, /home et de la liste des paquets"
   4.303  
   4.304 -#: tazinst:518
   4.305 +#: installer/tazinst:526
   4.306 +msgid "Upgrade SliTaz on"
   4.307 +msgstr "Met à jour SliTaz sur"
   4.308 +
   4.309 +#: installer/tazinst:527
   4.310  msgid "Restore /etc, /home"
   4.311  msgstr "Restauration de /etc, /home"
   4.312  
   4.313 -#: tazinst:519
   4.314 +#: installer/tazinst:528
   4.315  msgid "Upgrade additional packages."
   4.316  msgstr "Mise à jour des paquets additionnels."
   4.317  
   4.318 -#: tazinst:525
   4.319 +#: installer/tazinst:531
   4.320 +msgid "Enable Windows dual-boot"
   4.321 +msgstr "Active le Dual-boot avec Windows"
   4.322 +
   4.323 +#: installer/tazinst:534
   4.324  msgid "Install Grub"
   4.325 -msgstr "Installer Grub"
   4.326 +msgstr "Installe Grub"
   4.327  
   4.328 -#: tazinst:528
   4.329 +#: installer/tazinst:537
   4.330  msgid "Continue:(y/n)"
   4.331  msgstr "Continuer : (o/n)"
   4.332  
   4.333 -#: tazinst:532
   4.334 +#: installer/tazinst:541
   4.335  msgid "Cancelled by user"
   4.336  msgstr "Annulé par l'utilisateur"
   4.337  
   4.338 -#: tazinst:625
   4.339 +#: installer/tazinst:556 installer/tazinst:1014
   4.340 +msgid "Partition in use"
   4.341 +msgstr "Partition utilisée"
   4.342 +
   4.343 +#: installer/tazinst:570
   4.344 +msgid "Formatting main partition:"
   4.345 +msgstr "Formatage de la partition principale :"
   4.346 +
   4.347 +#: installer/tazinst:582
   4.348 +msgid "Formatting /home partition:"
   4.349 +msgstr "Formatage de la partition /home :"
   4.350 +
   4.351 +#: installer/tazinst:595 installer/tazinst:1023
   4.352 +msgid "Can't mount"
   4.353 +msgstr "Montage impossible"
   4.354 +
   4.355 +#: installer/tazinst:634
   4.356  msgid "Falling back to running kernel name.."
   4.357  msgstr "Repli sur le nom du noyau actuellement utilisé.."
   4.358  
   4.359 -#: tazinst:829
   4.360 +#: installer/tazinst:749
   4.361 +msgid "Configuring host name:"
   4.362 +msgstr "Configuration du Hostname :"
   4.363 +
   4.364 +#: installer/tazinst:838
   4.365  msgid "No windows partition found. Dual-boot disabled"
   4.366  msgstr "Aucune partition Windows trouvée. Dual-boot désactivé"
   4.367  
   4.368 -#: tazinst:886
   4.369 +#: installer/tazinst:895
   4.370  msgid "Enabling Windows dual-boot"
   4.371  msgstr "Activation du Dual-boot avec Windows"
   4.372  
   4.373 -#: tazinst:975
   4.374 +#: installer/tazinst:916
   4.375 +msgid "Installing SliTaz on"
   4.376 +msgstr "Installe SliTaz sur"
   4.377 +
   4.378 +#: installer/tazinst:935
   4.379 +msgid "Configuring root and default user account:"
   4.380 +msgstr "Configure les comptes de root et de l'utilisateur par défaut :"
   4.381 +
   4.382 +#: installer/tazinst:939
   4.383 +msgid "Configuring partition to be used as /home..."
   4.384 +msgstr "Configure la partition à utiliser comme /home..."
   4.385 +
   4.386 +#: installer/tazinst:958
   4.387 +msgid "Running grub-install on:"
   4.388 +msgstr "Installe Grub sur:"
   4.389 +
   4.390 +#: installer/tazinst:972
   4.391 +msgid "Unmounting target"
   4.392 +msgstr "Démontage de la partition hôte"
   4.393 +
   4.394 +#: installer/tazinst:978
   4.395 +msgid "Unmounting"
   4.396 +msgstr "Démontage"
   4.397 +
   4.398 +#: installer/tazinst:984
   4.399  msgid "Ejecting cdrom..."
   4.400  msgstr "Éjection du CD-Rom..."
   4.401  
   4.402 -#: tazinst:984
   4.403 +#: installer/tazinst:993
   4.404  msgid "Installation complete. You can now restart (reboot) "
   4.405  msgstr "Installation terminée. Vous pouvez maintenant redémarrer "
   4.406  
   4.407 -#: tazinst:985
   4.408 +#: installer/tazinst:994
   4.409  msgid "from your SliTaz GNU/Linux system."
   4.410  msgstr "votre système SliTaz GNU/Linux."
   4.411  
   4.412 -#: tazinst:1145
   4.413 +#: installer/tazinst:997
   4.414 +msgid "Copying log files"
   4.415 +msgstr "Copie du fichier journal"
   4.416 +
   4.417 +#: installer/tazinst:1032
   4.418 +msgid "Preparing upgrade of SliTaz release:"
   4.419 +msgstr "Prépare la mise à jour de la version de SliTaz :"
   4.420 +
   4.421 +#: installer/tazinst:1034
   4.422 +msgid ""
   4.423 +"This partition doesn't appear to contain a valid SliTaz system, the file: /"
   4.424 +"etc/slitaz-release doesn't exist."
   4.425 +msgstr "Cette partition ne semble pas contenir un système SliTaz valide, le fichier: /etc/slitaz-release n'existe pas."
   4.426 +
   4.427 +#: installer/tazinst:1154
   4.428  msgid ""
   4.429  "The list of available packages on the mirror could not be downloaded. No "
   4.430  "missing packages will be reinstalled now, but you can do so later by looking "
   4.431  "at the following list: /var/lib/tazinst/packages-selection.diff"
   4.432 -msgstr "La liste des paquets disponibles sur le miroir ne peut être téléchargée. Aucun paquet manquant ne peut être réinstallé maintenant, mais il est possible de le faire ultérieurement à l'aide de la liste suivante : /var/lib/tazinst/packages-selection.diff"
   4.433 +msgstr ""
   4.434 +"La liste des paquets disponibles sur le miroir ne peut être téléchargée. "
   4.435 +"Aucun paquet manquant ne peut être réinstallé maintenant, mais il est "
   4.436 +"possible de le faire ultérieurement à l'aide de la liste suivante : /var/lib/"
   4.437 +"tazinst/packages-selection.diff"
   4.438  
   4.439 -#: tazinst:1158
   4.440 +#: installer/tazinst:1167
   4.441  msgid "Grub update"
   4.442  msgstr "Mise à jour de Grub"
   4.443  
   4.444 -#: tazinst:1176
   4.445 +#: installer/tazinst:1185
   4.446  msgid "Backup /etc, /home and the packages list..."
   4.447  msgstr "Sauvegarde de /etc, /home et de la liste des paquets..."
   4.448  
   4.449 -#: tazinst:1187
   4.450 +#: installer/tazinst:1188
   4.451 +msgid "Upgrading SliTaz on:"
   4.452 +msgstr "Met à jour SliTaz sur :"
   4.453 +
   4.454 +#: installer/tazinst:1196
   4.455  msgid "Restoring configuration files..."
   4.456  msgstr "Restauration des fichiers de configuration..."
   4.457  
   4.458 -#: tazinst:1193
   4.459 +#: installer/tazinst:1202
   4.460  msgid "Upgrading added packages..."
   4.461  msgstr "Mise à hour des paquets additionnels..."
   4.462  
   4.463 -#: tazinst:1205
   4.464 +#: installer/tazinst:1214
   4.465  msgid ""
   4.466  "Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux "
   4.467  "system."
   4.468 -msgstr "La mise à jour est terminée. Vous pouvez redémarrer votre système Slitaz GNU/Linux."
   4.469 +msgstr ""
   4.470 +"La mise à jour est terminée. Vous pouvez redémarrer votre système Slitaz GNU/"
   4.471 +"Linux."
   4.472  
   4.473 -#: tazinst:1206
   4.474 +#: installer/tazinst:1215
   4.475  msgid "Packages on the cdrom :"
   4.476  msgstr "Paquets sur le cdrom :"
   4.477  
   4.478 -#: tazinst:1207
   4.479 +#: installer/tazinst:1216
   4.480  msgid "Packages installed from the mirror :"
   4.481  msgstr "Paquets installés depuis le miroir :"
   4.482 +
   4.483 +#~ msgid "Check configuration file validity."
   4.484 +#~ msgstr "Vérification de la validité du fichier de configuration."
   4.485 +
   4.486 +#~ msgid "Installation cancelled"
   4.487 +#~ msgstr "Installation annulée"
     5.1 --- a/po/tazinst/tazinst.pot	Wed Jul 27 10:30:45 2011 +0200
     5.2 +++ b/po/tazinst/tazinst.pot	Sun Jul 31 10:32:56 2011 +0200
     5.3 @@ -6,9 +6,9 @@
     5.4  #, fuzzy
     5.5  msgid ""
     5.6  msgstr ""
     5.7 -"Project-Id-Version: PACKAGE VERSION\n"
     5.8 +"Project-Id-Version: Tazinst\n"
     5.9  "Report-Msgid-Bugs-To: \n"
    5.10 -"POT-Creation-Date: 2011-07-20 13:01+0200\n"
    5.11 +"POT-Creation-Date: 2011-07-31 10:00+0200\n"
    5.12  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    5.13  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    5.14  "Language-Team: LANGUAGE <LL@li.org>\n"
    5.15 @@ -16,206 +16,385 @@
    5.16  "Content-Type: text/plain; charset=CHARSET\n"
    5.17  "Content-Transfer-Encoding: 8bit\n"
    5.18  
    5.19 -#: tazinst:40
    5.20 +#: installer/tazinst:48
    5.21  msgid "Tazinst - SliTaz installer - Version"
    5.22  msgstr ""
    5.23  
    5.24 -#: tazinst:41
    5.25 +#: installer/tazinst:49
    5.26  msgid "Usage"
    5.27  msgstr ""
    5.28  
    5.29 -#: tazinst:42
    5.30 -msgid "tazinst [command] [config-file]"
    5.31 +#: installer/tazinst:50
    5.32 +msgid "tazinst [command] [config-file|url|options]"
    5.33  msgstr ""
    5.34  
    5.35 -#: tazinst:43
    5.36 +#: installer/tazinst:51
    5.37  msgid "Commands"
    5.38  msgstr ""
    5.39  
    5.40 -#: tazinst:44
    5.41 +#: installer/tazinst:52
    5.42  msgid "Print this short usage."
    5.43  msgstr ""
    5.44  
    5.45 -#: tazinst:45
    5.46 +#: installer/tazinst:53
    5.47  msgid "Install SliTaz on HDD using a configuration file."
    5.48  msgstr ""
    5.49  
    5.50 -#: tazinst:46
    5.51 +#: installer/tazinst:54
    5.52  msgid "Upgrade SliTaz on HDD using a configuration file."
    5.53  msgstr ""
    5.54  
    5.55 -#: tazinst:47
    5.56 +#: installer/tazinst:55
    5.57  msgid "Generate a configuration file."
    5.58  msgstr ""
    5.59  
    5.60 -#: tazinst:48
    5.61 +#: installer/tazinst:56
    5.62 +msgid "Check validity of the configuration file."
    5.63 +msgstr ""
    5.64 +
    5.65 +#: installer/tazinst:57
    5.66 +msgid "Show the full URL of a predefined URL (stable|cooking|rolling)."
    5.67 +msgstr ""
    5.68 +
    5.69 +#: installer/tazinst:58
    5.70  msgid "Install or upgrade using command line options:"
    5.71  msgstr ""
    5.72  
    5.73 -#: tazinst:49
    5.74 +#: installer/tazinst:59
    5.75  msgid "Full Install (not upgrading, all present data will be lost)."
    5.76  msgstr ""
    5.77  
    5.78 -#: tazinst:50
    5.79 +#: installer/tazinst:60
    5.80  msgid "Upgrade (Needs an active internet connection)."
    5.81  msgstr ""
    5.82  
    5.83 -#: tazinst:51
    5.84 +#: installer/tazinst:61
    5.85  msgid "Install type (cdrom|usb|iso|web|weboot)."
    5.86  msgstr ""
    5.87  
    5.88 -#: tazinst:52
    5.89 +#: installer/tazinst:62
    5.90  msgid "Source media (ex: file.iso|usb partition|web url)."
    5.91  msgstr ""
    5.92  
    5.93 -#: tazinst:53
    5.94 +#: installer/tazinst:63
    5.95  msgid "Partition where SliTaz will be installed (ex:/dev/hda3)."
    5.96  msgstr ""
    5.97  
    5.98 -#: tazinst:54
    5.99 +#: installer/tazinst:64
   5.100  msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)."
   5.101  msgstr ""
   5.102  
   5.103 -#: tazinst:55
   5.104 +#: installer/tazinst:65
   5.105  msgid "Install Grub."
   5.106  msgstr ""
   5.107  
   5.108 -#: tazinst:56
   5.109 +#: installer/tazinst:66
   5.110  msgid "Dual-boot a Windows partition (auto|hd<disk>,<part> ex:hd0,0)."
   5.111  msgstr ""
   5.112  
   5.113 -#: tazinst:57
   5.114 +#: installer/tazinst:67
   5.115  msgid "Debug mode."
   5.116  msgstr ""
   5.117  
   5.118 -#: tazinst:73
   5.119 +#: installer/tazinst:83
   5.120  msgid "Error"
   5.121  msgstr ""
   5.122  
   5.123 -#: tazinst:74
   5.124 -msgid "Installation cancelled"
   5.125 -msgstr ""
   5.126 -
   5.127 -#: tazinst:82
   5.128 +#: installer/tazinst:91
   5.129  msgid "Warning:"
   5.130  msgstr ""
   5.131  
   5.132 -#: tazinst:206
   5.133 -msgid "Configuration file not found"
   5.134 +#: installer/tazinst:117
   5.135 +msgid "Can't write config file"
   5.136  msgstr ""
   5.137  
   5.138 -#: tazinst:209
   5.139 +#: installer/tazinst:176 installer/tazinst:215
   5.140 +msgid "Config file not found"
   5.141 +msgstr ""
   5.142 +
   5.143 +#: installer/tazinst:213
   5.144 +msgid "Unable to read config file"
   5.145 +msgstr ""
   5.146 +
   5.147 +#: installer/tazinst:218
   5.148  msgid "No configuration file provided"
   5.149  msgstr ""
   5.150  
   5.151 -#: tazinst:235
   5.152 +#: installer/tazinst:244
   5.153  msgid "Mismatched parameters"
   5.154  msgstr ""
   5.155  
   5.156 -#: tazinst:373
   5.157 +#: installer/tazinst:248
   5.158 +msgid "will not be formatted during upgrade"
   5.159 +msgstr ""
   5.160 +
   5.161 +#: installer/tazinst:278 installer/tazinst:289 installer/tazinst:363
   5.162 +#, sh-format
   5.163 +msgid "Invalid setting"
   5.164 +msgstr ""
   5.165 +
   5.166 +#: installer/tazinst:287
   5.167 +msgid "but SRC_FILE is not set"
   5.168 +msgstr ""
   5.169 +
   5.170 +#: installer/tazinst:303
   5.171 +msgid "file not found"
   5.172 +msgstr ""
   5.173 +
   5.174 +#: installer/tazinst:307
   5.175 +msgid "file not found on the web"
   5.176 +msgstr ""
   5.177 +
   5.178 +#: installer/tazinst:318 installer/tazinst:342
   5.179 +msgid "Partition not found"
   5.180 +msgstr ""
   5.181 +
   5.182 +#: installer/tazinst:330 installer/tazinst:355
   5.183 +msgid "is not installed."
   5.184 +msgstr ""
   5.185 +
   5.186 +#: installer/tazinst:332 installer/tazinst:357
   5.187 +#, sh-format
   5.188 +msgid "Unknown filesystem"
   5.189 +msgstr ""
   5.190 +
   5.191 +#: installer/tazinst:371
   5.192 +#, sh-format
   5.193 +msgid "Invalid format"
   5.194 +msgstr ""
   5.195 +
   5.196 +#: installer/tazinst:382
   5.197  msgid ""
   5.198  "You must be the root user (system administrator) to install SliTaz, please "
   5.199  "use 'su' to get a root SHell and restart installation."
   5.200  msgstr ""
   5.201  
   5.202 -#: tazinst:461
   5.203 +#: installer/tazinst:399
   5.204 +msgid "Failed to mount"
   5.205 +msgstr ""
   5.206 +
   5.207 +#: installer/tazinst:418
   5.208 +msgid "Failed to mount USB device"
   5.209 +msgstr ""
   5.210 +
   5.211 +#: installer/tazinst:431
   5.212 +msgid "corrupted"
   5.213 +msgstr ""
   5.214 +
   5.215 +#: installer/tazinst:433
   5.216 +msgid "md5 file not found, unable to check integrity."
   5.217 +msgstr ""
   5.218 +
   5.219 +#: installer/tazinst:440
   5.220 +msgid "Failed to mount ISO."
   5.221 +msgstr ""
   5.222 +
   5.223 +#: installer/tazinst:452 installer/tazinst:456
   5.224 +#, sh-format
   5.225 +msgid "Failed to download."
   5.226 +msgstr ""
   5.227 +
   5.228 +#: installer/tazinst:470
   5.229  msgid "Web boot files not found"
   5.230  msgstr ""
   5.231  
   5.232 -#: tazinst:484 tazinst:597 tazinst:690 tazinst:725 tazinst:793 tazinst:1033
   5.233 -#: tazinst:1130 tazinst:1171
   5.234 +#: installer/tazinst:493 installer/tazinst:606 installer/tazinst:699
   5.235 +#: installer/tazinst:734 installer/tazinst:802 installer/tazinst:1042
   5.236 +#: installer/tazinst:1139 installer/tazinst:1180
   5.237  msgid "Internal"
   5.238  msgstr ""
   5.239  
   5.240 -#: tazinst:491
   5.241 +#: installer/tazinst:500
   5.242  msgid "Invalid source"
   5.243  msgstr ""
   5.244  
   5.245 -#: tazinst:500
   5.246 +#: installer/tazinst:509
   5.247  msgid "Installation settings summary:"
   5.248  msgstr ""
   5.249  
   5.250 -#: tazinst:516
   5.251 +#: installer/tazinst:514
   5.252 +msgid "Format root partition"
   5.253 +msgstr ""
   5.254 +
   5.255 +#: installer/tazinst:517
   5.256 +msgid "Format /home partition"
   5.257 +msgstr ""
   5.258 +
   5.259 +#: installer/tazinst:519
   5.260 +msgid "Install SliTaz on"
   5.261 +msgstr ""
   5.262 +
   5.263 +#: installer/tazinst:519 installer/tazinst:526
   5.264 +msgid "Source:"
   5.265 +msgstr ""
   5.266 +
   5.267 +#: installer/tazinst:520
   5.268 +msgid "Set Home partition to"
   5.269 +msgstr ""
   5.270 +
   5.271 +#: installer/tazinst:521
   5.272 +msgid "Set Hostname as"
   5.273 +msgstr ""
   5.274 +
   5.275 +#: installer/tazinst:522
   5.276 +msgid "Set Default user as"
   5.277 +msgstr ""
   5.278 +
   5.279 +#: installer/tazinst:524
   5.280 +msgid "Check"
   5.281 +msgstr ""
   5.282 +
   5.283 +#: installer/tazinst:525
   5.284  msgid "Backup /etc, /home and the packages list"
   5.285  msgstr ""
   5.286  
   5.287 -#: tazinst:518
   5.288 +#: installer/tazinst:526
   5.289 +msgid "Upgrade SliTaz on"
   5.290 +msgstr ""
   5.291 +
   5.292 +#: installer/tazinst:527
   5.293  msgid "Restore /etc, /home"
   5.294  msgstr ""
   5.295  
   5.296 -#: tazinst:519
   5.297 +#: installer/tazinst:528
   5.298  msgid "Upgrade additional packages."
   5.299  msgstr ""
   5.300  
   5.301 -#: tazinst:525
   5.302 +#: installer/tazinst:531
   5.303 +msgid "Enable Windows dual-boot"
   5.304 +msgstr ""
   5.305 +
   5.306 +#: installer/tazinst:534
   5.307  msgid "Install Grub"
   5.308  msgstr ""
   5.309  
   5.310 -#: tazinst:528
   5.311 +#: installer/tazinst:537
   5.312  msgid "Continue:(y/n)"
   5.313  msgstr ""
   5.314  
   5.315 -#: tazinst:532
   5.316 +#: installer/tazinst:541
   5.317  msgid "Cancelled by user"
   5.318  msgstr ""
   5.319  
   5.320 -#: tazinst:625
   5.321 +#: installer/tazinst:556 installer/tazinst:1014
   5.322 +msgid "Partition in use"
   5.323 +msgstr ""
   5.324 +
   5.325 +#: installer/tazinst:570
   5.326 +msgid "Formatting main partition:"
   5.327 +msgstr ""
   5.328 +
   5.329 +#: installer/tazinst:582
   5.330 +msgid "Formatting /home partition:"
   5.331 +msgstr ""
   5.332 +
   5.333 +#: installer/tazinst:595 installer/tazinst:1023
   5.334 +msgid "Can't mount"
   5.335 +msgstr ""
   5.336 +
   5.337 +#: installer/tazinst:634
   5.338  msgid "Falling back to running kernel name.."
   5.339  msgstr ""
   5.340  
   5.341 -#: tazinst:829
   5.342 +#: installer/tazinst:749
   5.343 +msgid "Configuring host name:"
   5.344 +msgstr ""
   5.345 +
   5.346 +#: installer/tazinst:838
   5.347  msgid "No windows partition found. Dual-boot disabled"
   5.348  msgstr ""
   5.349  
   5.350 -#: tazinst:886
   5.351 +#: installer/tazinst:895
   5.352  msgid "Enabling Windows dual-boot"
   5.353  msgstr ""
   5.354  
   5.355 -#: tazinst:975
   5.356 +#: installer/tazinst:916
   5.357 +msgid "Installing SliTaz on"
   5.358 +msgstr ""
   5.359 +
   5.360 +#: installer/tazinst:935
   5.361 +msgid "Configuring root and default user account:"
   5.362 +msgstr ""
   5.363 +
   5.364 +#: installer/tazinst:939
   5.365 +msgid "Configuring partition to be used as /home..."
   5.366 +msgstr ""
   5.367 +
   5.368 +#: installer/tazinst:958
   5.369 +msgid "Running grub-install on:"
   5.370 +msgstr ""
   5.371 +
   5.372 +#: installer/tazinst:972
   5.373 +msgid "Unmounting target"
   5.374 +msgstr ""
   5.375 +
   5.376 +#: installer/tazinst:978
   5.377 +msgid "Unmounting"
   5.378 +msgstr ""
   5.379 +
   5.380 +#: installer/tazinst:984
   5.381  msgid "Ejecting cdrom..."
   5.382  msgstr ""
   5.383  
   5.384 -#: tazinst:984
   5.385 +#: installer/tazinst:993
   5.386  msgid "Installation complete. You can now restart (reboot) "
   5.387  msgstr ""
   5.388  
   5.389 -#: tazinst:985
   5.390 +#: installer/tazinst:994
   5.391  msgid "from your SliTaz GNU/Linux system."
   5.392  msgstr ""
   5.393  
   5.394 -#: tazinst:1145
   5.395 +#: installer/tazinst:997
   5.396 +msgid "Copying log files"
   5.397 +msgstr ""
   5.398 +
   5.399 +#: installer/tazinst:1032
   5.400 +msgid "Preparing upgrade of SliTaz release:"
   5.401 +msgstr ""
   5.402 +
   5.403 +#: installer/tazinst:1034
   5.404 +msgid ""
   5.405 +"This partition doesn't appear to contain a valid SliTaz system, the file: /"
   5.406 +"etc/slitaz-release doesn't exist."
   5.407 +msgstr ""
   5.408 +
   5.409 +#: installer/tazinst:1154
   5.410  msgid ""
   5.411  "The list of available packages on the mirror could not be downloaded. No "
   5.412  "missing packages will be reinstalled now, but you can do so later by looking "
   5.413  "at the following list: /var/lib/tazinst/packages-selection.diff"
   5.414  msgstr ""
   5.415  
   5.416 -#: tazinst:1158
   5.417 +#: installer/tazinst:1167
   5.418  msgid "Grub update"
   5.419  msgstr ""
   5.420  
   5.421 -#: tazinst:1176
   5.422 +#: installer/tazinst:1185
   5.423  msgid "Backup /etc, /home and the packages list..."
   5.424  msgstr ""
   5.425  
   5.426 -#: tazinst:1187
   5.427 +#: installer/tazinst:1188
   5.428 +msgid "Upgrading SliTaz on:"
   5.429 +msgstr ""
   5.430 +
   5.431 +#: installer/tazinst:1196
   5.432  msgid "Restoring configuration files..."
   5.433  msgstr ""
   5.434  
   5.435 -#: tazinst:1193
   5.436 +#: installer/tazinst:1202
   5.437  msgid "Upgrading added packages..."
   5.438  msgstr ""
   5.439  
   5.440 -#: tazinst:1205
   5.441 +#: installer/tazinst:1214
   5.442  msgid ""
   5.443  "Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux "
   5.444  "system."
   5.445  msgstr ""
   5.446  
   5.447 -#: tazinst:1206
   5.448 +#: installer/tazinst:1215
   5.449  msgid "Packages on the cdrom :"
   5.450  msgstr ""
   5.451  
   5.452 -#: tazinst:1207
   5.453 +#: installer/tazinst:1216
   5.454  msgid "Packages installed from the mirror :"
   5.455  msgstr ""