slitaz-tools rev 319
Translate installer
| author | Paul Issott <paul@slitaz.org> |
|---|---|
| date | Sun Mar 22 11:08:47 2009 +0000 (2009-03-22) |
| parents | d310a3288496 |
| children | d69f74e9a92b |
| files | installer/en.msg installer/slitaz-installer |
line diff
1.1 --- a/installer/en.msg Mon Mar 16 16:52:44 2009 +0100 1.2 +++ b/installer/en.msg Sun Mar 22 11:08:47 2009 +0000 1.3 @@ -32,8 +32,8 @@ 1.4 1.5 # grub_install 1.6 GRUB_INSTALL_MSG="\n 1.7 -You now have the option to install the GRUB bootloader which is capable of \ 1.8 -booting any kind of operating system. If you want to use an existing \ 1.9 +You have now the option to install the GRUB bootloader which is capable of \ 1.10 +booting almost any kind of operating system. If you want to use an existing \ 1.11 GRUB installation, skip this step and add the correct lines to your GRUB \ 1.12 configuration file (menu.lst). Note that the SliTaz Installer creates a \ 1.13 configuration file on the target which can be used as an example \ 1.14 @@ -42,5 +42,5 @@ 1.15 1.16 # end_of_install 1.17 END_OF_INSTALL_MSG="\n 1.18 -Installation is finished, you can now exit the installer or reboot on your new \ 1.19 +Installation is now finished, you can exit the installer or reboot on your new \ 1.20 SliTaz GNU/Linux operating system."
2.1 --- a/installer/slitaz-installer Mon Mar 16 16:52:44 2009 +0100 2.2 +++ b/installer/slitaz-installer Sun Mar 22 11:08:47 2009 +0000 2.3 @@ -5,7 +5,7 @@ 2.4 # English but displayed messages are in French. The script starts with a 2.5 # few main variables, then all the functions and then a sequence of functions. 2.6 # 2.7 -# (C) 2007-2009 SliTaz - GNU General Public License v3. 2.8 +# (C) 2007-2008 SliTaz - GNU General Public License v3. 2.9 # 2.10 # Author : Christophe Lincoln <pankso@slitaz.org> 2.11 # 2.12 @@ -36,7 +36,7 @@ 2.13 # Installer functions # 2.14 ####################### 2.15 2.16 -# Messages language setting 2.17 +# Messages language setting. 2.18 set_messages() 2.19 { 2.20 case $LANG in 2.21 @@ -110,7 +110,7 @@ 2.22 echo "start_installer: `date`" > $LOG 2.23 } 2.24 2.25 -# Mount cdrom and verify if it's realy SliTaz CD. 2.26 +# Mount cdrom and verify if it's really SliTaz CD. 2.27 mount_cdrom() 2.28 { 2.29 ERROR_MSG="" 2.30 @@ -132,7 +132,7 @@ 2.31 $DIALOG --title " Mounting cdrom " \ 2.32 --backtitle "$BACKLIST" \ 2.33 --gauge "Preparing the installation media..." 18 70 0 2.34 - # Exit with error msg if no rootfs.gz found 2.35 + # Exit with error msg if no rootfs.gz found. 2.36 if [ ! -f /media/cdrom/boot/rootfs.gz ]; then 2.37 ERROR_MSG="$MOUNT_CDROM_ERROR_MSG" 2.38 error_message 2.39 @@ -156,7 +156,7 @@ 2.40 ask_for_target_dev() 2.41 { 2.42 exec 3>&1 2.43 - TARGET_DEV=`$DIALOG --title " Partition racine " \ 2.44 + TARGET_DEV=`$DIALOG --title " Root Partition " \ 2.45 --backtitle "$BACKLIST" --clear \ 2.46 --extra-label "List" --extra-button \ 2.47 --colors --inputbox "$ASK_FOR_TARGET_DEV_MSG" 18 70 2>&1 1>&3` 2.48 @@ -239,10 +239,10 @@ 2.49 sleep 2 2.50 2.51 ) | 2.52 - $DIALOG --title " Préparation de la cible " \ 2.53 + $DIALOG --title " Prepare the target " \ 2.54 --backtitle "$BACKLIST" \ 2.55 --gauge "Target in preparation..." 18 70 0 2.56 - # Mount target 2.57 + # Mount target. 2.58 mount $TARGET_DEV $TARGET_ROOT >>$LOG 2>>$LOG 2.59 } 2.60 2.61 @@ -267,7 +267,7 @@ 2.62 { 2.63 if [ "$CLEAN" == "clean" ]; then 2.64 echo "XXX" && echo 15 2.65 - echo -e "\nNettoyage de la partition racine ($TARGET_DEV)..." 2.66 + echo -e "\nCleaning the root partition ($TARGET_DEV)..." 2.67 echo "XXX" 2.68 # Keep /home in case of reinstall. 2.69 cd $TARGET_ROOT 2.70 @@ -333,15 +333,15 @@ 2.71 # /etc/skel (60%) 2.72 gen_etc_skel() 2.73 { 2.74 - # Maybe we don't have /home/hacker directory 2.75 + # Maybe we don't have /home/hacker directory. 2.76 if [ -d $TARGET_ROOT/home/hacker ]; then 2.77 echo "XXX" && echo 60 2.78 - echo -e "\nCopie des fichiers utilisateurs par défaut (/etc/skel)..." 2.79 + echo -e "\nCopying default user files (/etc/skel)..." 2.80 echo "XXX" 2.81 cp -a $TARGET_ROOT/home/hacker $TARGET_ROOT/etc/skel 2.82 else 2.83 echo "XXX" && echo 60 2.84 - echo -e "\nCréation du répertoire (/etc/skel)..." 2.85 + echo -e "\nCreating directory (/etc/skel)..." 2.86 echo "XXX" 2.87 mkdir -p $TARGET_ROOT/etc/skel \ 2.88 $TARGET_ROOT/etc/Documents \ 2.89 @@ -360,7 +360,7 @@ 2.90 # (created by prepare_target_dev) 2.91 if [ -d home.bak ]; then 2.92 echo "XXX" && echo 75 2.93 - echo -e "\nRestauration du répertoire /home..." 2.94 + echo -e "\nThe restore directory: /home..." 2.95 echo "XXX" 2.96 rm -rf home 2.97 mv home.bak home 2.98 @@ -369,13 +369,13 @@ 2.99 # Add root device to CHECK_FS in rcS.conf to check filesystem 2.100 # on each boot. 2.101 echo "XXX" && echo 80 2.102 - echo -e "\nAjout de $TARGET_DEV à CHECK_FS du fichier /etc/rcS.conf..." 2.103 + echo -e "\nAdding $TARGET_DEV and CHECK_FS to file /etc/rcS.conf..." 2.104 echo "XXX" 2.105 sed -i s#'CHECK_FS=\"\"'#"CHECK_FS=\"$TARGET_DEV\""# etc/rcS.conf 2.106 sleep 2 2.107 # Set hostname. 2.108 echo "XXX" && echo 85 2.109 - echo -e "\nConfiguration du nom de machine: $HOSTNAME" 2.110 + echo -e "\nConfiguring host name: $HOSTNAME" 2.111 echo "XXX" 2.112 echo $HOSTNAME > etc/hostname 2.113 sleep 2 2.114 @@ -429,60 +429,60 @@ 2.115 ( 2.116 2.117 echo "XXX" && echo 10 2.118 - echo -e "\nNettoyage de la partition racine si nécessaire..." 2.119 + echo -e "\nCleaning the root partition if necessary..." 2.120 echo "XXX" 2.121 clean_target 2.122 2.123 echo "XXX" && echo 20 2.124 - echo -e "\nInstallation du noyau ($KERNEL)..." 2.125 + echo -e "\nInstalling the kernel ($KERNEL)..." 2.126 echo "XXX" 2.127 install_kernel 2.128 2.129 echo "XXX" && echo 30 2.130 - echo -e "\nCopie des bootloaders syslinux/isolinux..." 2.131 + echo -e "\nCopying the bootloader syslinux/isolinux..." 2.132 echo "XXX" 2.133 copy_bootloaders 2.134 2.135 echo "XXX" && echo 40 2.136 - echo -e "\nCopie du système compressé (rootfs.gz)..." 2.137 + echo -e "\nCopying the compressed system (rootfs.gz)..." 2.138 echo "XXX" 2.139 cp /media/cdrom/boot/rootfs.gz $TARGET_ROOT 2.140 sleep 2 2.141 2.142 echo "XXX" && echo 50 2.143 - echo -e "\nExtraction du système racine..." 2.144 + echo -e "\nExtracting the root system..." 2.145 echo "XXX" 2.146 extract_rootfs 2.147 2.148 echo "XXX" && echo 60 2.149 - echo -e "\nCopie des fichiers utilisateurs par défaut (/etc/skel)..." 2.150 + echo -e "\nCopying the default user files (/etc/skel)..." 2.151 echo "XXX" 2.152 gen_etc_skel 2.153 sleep 2 2.154 2.155 echo "XXX" && echo 70 2.156 - echo -e "\nPreconfiguration du système..." 2.157 + echo -e "\nPreconfiguring the system..." 2.158 echo "XXX" 2.159 pre_config_system 2.160 2.161 echo "XXX" && echo 90 2.162 - echo -e "\nCréation du fichier de configuration de GRUB (menu.lst)..." 2.163 + echo -e "\nCreating the configuration file for GRUB (menu.lst)..." 2.164 echo "XXX" 2.165 grub_config 2.166 2.167 echo "XXX" && echo 100 2.168 - echo -e "\nFin de l'installation des fichiers..." 2.169 + echo -e "\nFinishing the files installation..." 2.170 echo "XXX" 2.171 echo "install_files: OK" >>$LOG 2.172 sleep 4 2.173 2.174 ) | 2.175 - $DIALOG --title " Installation des fichiers " \ 2.176 + $DIALOG --title " Install files " \ 2.177 --backtitle "$BACKLIST" \ 2.178 --gauge "Starting to install files..." 18 70 0 2.179 } 2.180 2.181 -# GRUB info with disk name used for grub-install 2.182 +# GRUB info with disk name used for grub-install. 2.183 grub_install() 2.184 { 2.185 TARGET_DISK=`echo $TARGET_DEV | sed s/"[0-9]"/''/` 2.186 @@ -495,18 +495,18 @@ 2.187 0) 2.188 ( 2.189 echo "XXX" && echo 50 2.190 - echo -e "\nExécution de grub-install sur : $TARGET_DISK..." 2.191 + echo -e "\nRunning grub-install on : $TARGET_DISK..." 2.192 echo "XXX" 2.193 grub-install --no-floppy \ 2.194 --root-directory=$TARGET_ROOT $TARGET_DISK 2>>$LOG 2.195 echo "XXX" && echo 100 2.196 - echo -e "\nFin de l'installation..." 2.197 + echo -e "\nFinished installation..." 2.198 echo "XXX" 2.199 sleep 2 2.200 ) | 2.201 $DIALOG --title " GRUB install " \ 2.202 --backtitle "$BACKLIST" \ 2.203 - --gauge "Installation de GRUB..." 18 70 0 ;; 2.204 + --gauge "Installating GRUB..." 18 70 0 ;; 2.205 1) 2.206 echo "grub_install: NO" >>$LOG ;; 2.207 255) 2.208 @@ -514,23 +514,23 @@ 2.209 esac 2.210 } 2.211 2.212 -# Copy log file, umount target and eject cdrom 2.213 +# Copy log file, umount target and eject cdrom. 2.214 umount_devices() 2.215 { 2.216 ( 2.217 echo "XXX" && echo 25 2.218 - echo -e "\nCopie du fichier de log ($LOG)..." 2.219 + echo -e "\nCopying the log files ($LOG)..." 2.220 echo "XXX" 2.221 cp -a $LOG $TARGET_ROOT/var/log 2.222 sleep 2 2.223 echo "XXX" && echo 50 2.224 - echo -e "\nDémontage de la cible ($TARGET_DEV)..." 2.225 + echo -e "\nUnmounting the target ($TARGET_DEV)..." 2.226 echo "XXX" 2.227 if mount | grep -q $TARGET_ROOT; then 2.228 umount $TARGET_ROOT 2>/dev/null 2.229 fi 2.230 echo "XXX" && echo 75 2.231 - echo -e "\nDémontage et éjection du cdrom..." 2.232 + echo -e "\nUnmounting and ejecting the cdrom..." 2.233 echo "XXX" 2.234 if mount | grep -q /media/cdrom; then 2.235 umount /media/cdrom 2.236 @@ -547,11 +547,11 @@ 2.237 --gauge "$TITLE starting..." 18 70 0 2.238 } 2.239 2.240 -# End of installation 2.241 +# End of installation. 2.242 end_of_install() 2.243 { 2.244 echo "end_of_install: `date`" >>$LOG 2.245 - $DIALOG --title " Installation terminée " \ 2.246 + $DIALOG --title " Installation complete " \ 2.247 --backtitle "$BACKLIST" \ 2.248 --yes-label "Exit" \ 2.249 --no-label "Reboot" \ 2.250 @@ -578,17 +578,16 @@ 2.251 ask_for_upgrade_dev() 2.252 { 2.253 exec 3>&1 2.254 - UPGRADE_DEV=`$DIALOG --title " Cible à mettre jour " \ 2.255 + UPGRADE_DEV=`$DIALOG --title " Target to upgrade " \ 2.256 --backtitle "$BACKLIST" --clear \ 2.257 --extra-label "List" --extra-button \ 2.258 --colors --inputbox "\n 2.259 -L'installateur va mettre à jour le système cible en commançant par sauver tous \ 2.260 -les fichiers de configuration et la liste des paquets installés. Ensuite, il va \ 2.261 -nettoyer la partition et installer la version de SliTaz contenue sur le cdrom, \ 2.262 -restaurer les fichiers de configuration et réinstaller l'ensemble des paquets \ 2.263 -qui ne sont pas présents sur le LiveCD. Il vous font donc une connection internet \ 2.264 -active avant de mettre à jour.\n\n 2.265 -\Z2Partition contenant le système à mettre à jour:\Zn" 18 70 2>&1 1>&3` 2.266 +The installer will upgrade the target by saving all configuration files and \ 2.267 +the list of installed packages. Then, it will clean the partition and install the \ 2.268 +version of SliTaz contained on the cdrom, restore the configuration files and \ 2.269 +reinstall all packages which are not present on the cdrom. You will need an active \ 2.270 +internet connection before upgrading.\n\n 2.271 +\Z2Partition containing the system upgrade:\Zn" 18 70 2>&1 1>&3` 2.272 retval=$? 2.273 exec 3>&- 2.274 check_retval 2.275 @@ -606,34 +605,34 @@ 2.276 if cat /proc/partitions | grep -q $DEV_NAME; then 2.277 echo "ask_for_target_dev: $TARGET_DEV" >>$LOG 2.278 else 2.279 - ERROR_MSG="La partition \Z2$UPGRADE_DEV\Zn ne semble pas exister." 2.280 + ERROR_MSG="The partition \Z2$UPGRADE_DEV\Zn doesn't seem to exist." 2.281 error_message 2.282 ask_for_upgrade_dev 2.283 fi 2.284 echo "partition to upgrade: $UPGRADE_DEV" >>$LOG 2.285 } 2.286 2.287 -# Prepare the part to upgrade, backup, install, restore configs 2.288 +# Prepare the partition to upgrade, backup, install, restore configs 2.289 # and reinstall pkgs. 2.290 upgrade_process() 2.291 { 2.292 ( 2.293 echo "XXX" && echo 5 2.294 - echo -e "\nPréparation de la partition cible..." 2.295 + echo -e "\nPreparing the target partition..." 2.296 echo "XXX" 2.297 # Mount point can be already used. 2.298 if mount | grep -q $TARGET_ROOT; then 2.299 umount $TARGET_ROOT 2>$LOG 2.300 fi 2.301 mkdir -p $TARGET_ROOT && sleep 2 2.302 - # Mount target 2.303 + # Mount target. 2.304 mount $UPGRADE_DEV $TARGET_ROOT >>$LOG 2>>$LOG 2.305 cd $TARGET_ROOT 2.306 TARGET_DEV=$UPGRADE_DEV 2.307 set_messages 2.308 2.309 echo "XXX" && echo 10 2.310 - echo -e "\nRecherch de /etc/slitaz-release" 2.311 + echo -e "\nSearch for /etc/slitaz-release" 2.312 echo "XXX" 2.313 if [ -f etc/slitaz-release ]; then 2.314 release=`cat etc/slitaz-release` 2.315 @@ -641,16 +640,16 @@ 2.316 echo -e "\nSliTaz release: $release" 2.317 echo "XXX" 2.318 else 2.319 - ERROR_MSG="La partition \Z2$UPGRADE_DEV\Zn ne semble pas contenir de \ 2.320 -système SliTaz, le fichier: /etc/slitaz-release n'existe pas." 2.321 + ERROR_MSG="The partition \Z2$UPGRADE_DEV\Zn doesn't appear to contain \ 2.322 +a SliTaz system, the file: /etc/slitaz-release doesn't exist." 2.323 error_message 2.324 exit 0 2.325 fi && sleep 2 2.326 2.327 echo "XXX" && echo 20 2.328 - echo -e "\nSauvegarde de /etc, /home et de la liste des paquets..." 2.329 + echo -e "\nBackup /etc, /home and the packages list..." 2.330 echo "XXX" 2.331 - # Backup target packages list 2.332 + # Backup target packages list. 2.333 ls -1 var/lib/tazpkg/installed > home/packages-selection.list 2.334 for dir in * 2.335 do 2.336 @@ -687,29 +686,29 @@ 2.337 sleep 2 2.338 2.339 echo "XXX" && echo 25 2.340 - echo -e "\nInstallation du noyau ($KERNEL)..." 2.341 + echo -e "\nInstalling the kernel ($KERNEL)..." 2.342 echo "XXX" 2.343 install_kernel 2.344 2.345 echo "XXX" && echo 30 2.346 - echo -e "\nCopie des bootloaders syslinux/isolinux..." 2.347 + echo -e "\nCopying the bootloader syslinux/isolinux..." 2.348 echo "XXX" 2.349 copy_bootloaders 2.350 2.351 echo "XXX" && echo 35 2.352 - echo -e "\nCopie du système compressé (rootfs.gz)..." 2.353 + echo -e "\nCopying the compressed system (rootfs.gz)..." 2.354 echo "XXX" 2.355 cp /media/cdrom/boot/rootfs.gz $TARGET_ROOT 2.356 sleep 2 2.357 2.358 echo "XXX" && echo 40 2.359 - echo -e "\nExtraction du système racine..." 2.360 + echo -e "\nExtracting the root system..." 2.361 echo "XXX" 2.362 extract_rootfs 2.363 2.364 # Restore backups. 2.365 echo "XXX" && echo 42 2.366 - echo -e "\nRestauration des fichiers de configuration..." 2.367 + echo -e "\nRestoring configuration files..." 2.368 echo "XXX" 2.369 rm -rf $TARGET_ROOT/home 2.370 mv $TARGET_ROOT/home.bak $TARGET_ROOT/home 2.371 @@ -729,7 +728,7 @@ 2.372 2.373 # LiveCD packages list. 2.374 echo "XXX" && echo 46 2.375 - echo -e "\nCréation des listes de paquets..." 2.376 + echo -e "\nCreating package lists..." 2.377 echo "XXX" 2.378 ls -1 $TARGET_ROOT/var/lib/tazpkg/installed > packages-cdrom.list || exit 1 2.379 echo "packages-cdrom.list: done" >> $LOG 2.380 @@ -740,18 +739,18 @@ 2.381 # Get mirror list. 2.382 tazpkg recharge >>$LOG 2>>$LOG 2.383 if [ ! -f /var/lib/tazpkg/packages.list ]; then 2.384 - ERROR_MSG="La liste des paquets disponibles sur le miroir n'a pas pu \ 2.385 -être téléchargée. Aucun paquets manquants ne sera réintallés maintenant, mais 2.386 -vous pourrez le faire plus tard en vous aidant de la liste: \n\n 2.387 + ERROR_MSG="The list of available packages on the mirror could not be \ 2.388 +downloaded. No missing packages will be reinstalled now, but \ 2.389 +you can do so later by looking at the following list: \n\n 2.390 2.391 /var/lib/slitaz-installer/packages-selection.diff" 2.392 error_message 2.393 fi 2.394 sleep 2 2.395 2.396 - # Check if the pkg is on the mirror 2.397 + # Check if the pkg is on the mirror. 2.398 echo "XXX" && echo 48 2.399 - echo -e "\nVérification de la disponibilité des paquets..." 2.400 + echo -e "\nChecking the availability of packages..." 2.401 echo "XXX" 2.402 touch packages-to-install.list 2.403 packages=0 2.404 @@ -766,7 +765,7 @@ 2.405 2.406 # Calculate the percent for one package and install. 2.407 echo "XXX" && echo 50 2.408 - echo -e "\nInstallation des éventuels paquets..." 2.409 + echo -e "\nInstalling any packages..." 2.410 echo "XXX" 2.411 sleep 2 2.412 if [ "$packages" == "0" ]; then 2.413 @@ -779,7 +778,7 @@ 2.414 do 2.415 pct=$(($pct+$onepkg)) 2.416 echo "XXX" && echo $pct 2.417 - echo -e "\nInstallation de: $pkg..." 2.418 + echo -e "\nInstallation of: $pkg..." 2.419 echo "XXX" 2.420 # Log please. 2.421 echo "get-install: $pkg" >>$LOG 2.422 @@ -791,16 +790,16 @@ 2.423 done 2.424 fi 2.425 echo "XXX" && echo 100 2.426 - echo -e "\nInstallation des paquets terminée..." 2.427 + echo -e "\nInstallation of packages complete..." 2.428 echo "XXX" 2.429 sleep 2 2.430 ) | 2.431 - $DIALOG --title " Processus de mise à jour " \ 2.432 + $DIALOG --title " Processing system upgrade " \ 2.433 --backtitle "$BACKLIST" \ 2.434 --gauge "Target in preparation..." 18 70 0 2.435 } 2.436 2.437 -# End of system upgrade 2.438 +# End of system upgrade. 2.439 end_of_upgrade() 2.440 { 2.441 TARGET_DEV=$UPGRADE_DEV 2.442 @@ -808,15 +807,15 @@ 2.443 pkgscd=`cat $TARGET_ROOT/var/lib/slitaz-installer/packages-cdrom.list | wc -l` 2.444 pkginst=`cat $TARGET_ROOT/var/lib/slitaz-installer/packages-to-install.list | wc -l` 2.445 echo "end_of_upgrade: `date`" >>$LOG 2.446 - $DIALOG --title " Mise à jour terminée " \ 2.447 + $DIALOG --title " Upgrade completed " \ 2.448 --backtitle "$BACKLIST" \ 2.449 --yes-label "Exit" \ 2.450 --no-label "Reboot" \ 2.451 --clear --colors --yesno "\n 2.452 -Mise à jour terminée. Vous pouvez dès maintenant redémarrer (reboot) \ 2.453 -sur votre système SliTaz GNU/Linux à jour.\n\n 2.454 -Paquets présents sur le cdrom : $pkgscd\n 2.455 -Paquets installés depuis le miroir : $pkginst\n" 18 70 2.456 +Upgrade finished. You can know restart (reboot) \ 2.457 +from your SliTaz GNU/Linux system.\n\n 2.458 +Packages on the cdrom : $pkgscd\n 2.459 +Packages installed from the mirror : $pkginst\n" 18 70 2.460 retval=$? 2.461 case $retval in 2.462 0) 2.463 @@ -841,7 +840,7 @@ 2.464 2.465 case $ACTION in 2.466 upgrade) 2.467 - BACKLIST="$BACKLIST (Mise à jour)" 2.468 + BACKLIST="$BACKLIST (Upgrade)" 2.469 mount_cdrom 2.470 ask_for_upgrade_dev 2.471 upgrade_process