# HG changeset patch # User Dominique Corbex # Date 1311168562 -7200 # Node ID b28d4a6bf467ab0811d0d2195be07077a7d1f79a # Parent 15546925dd96ffe2bb54fcd02b5ca1518c1baa09 tazinst: French locale added diff -r 15546925dd96 -r b28d4a6bf467 Makefile --- a/Makefile Tue Jul 19 22:52:27 2011 +0200 +++ b/Makefile Wed Jul 20 15:29:22 2011 +0200 @@ -5,7 +5,7 @@ DOCDIR?=/usr/share/doc DESTDIR?= -PROJECTS=slitaz-tools slitaz-boxes tazbox tazdrop +PROJECTS=slitaz-tools slitaz-boxes tazbox tazdrop tazinst LINGUAS=fr pt_BR all: msgfmt @@ -31,7 +31,7 @@ --package-name="SliTaz Boxes" \ ./tinyutils/scpbox @echo "done" - + tazbox-pot: @echo -n "Generating tazbox pot file... " @xgettext -o po/tazbox/tazbox.pot -L Shell \ @@ -44,7 +44,13 @@ --package-name="TazDrop" ./tazdrop/tazdrop @echo "done" -pot: tools-pot boxes-pot tazbox-pot tazdrop-pot +tazinst-pot: + @echo -n "Generating tazinst pot file... " + @xgettext -o po/tazinst/tazinst.pot -L Shell \ + --package-name="Tazinst" ./tazinst/tazinst + @echo "done" + +pot: tools-pot boxes-pot tazbox-pot tazdrop-pot tazinst-pot msgmerge: @for p in $(PROJECTS); do \ @@ -97,9 +103,16 @@ # Installer's install -m 0777 -d $(DESTDIR)$(PREFIX)/share/slitaz/messages/en install -m 0755 installer/slitaz-installer $(DESTDIR)$(PREFIX)/bin - install -m 0755 installer/tazinst $(DESTDIR)$(PREFIX)/bin 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 $(LINGUAS); \ + 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; # slitaz-tools i18n for l in $(LINGUAS); \ do \ @@ -139,7 +152,7 @@ $(DESTDIR)$(PREFIX)/share/slitaz/messages/en # Gksu fake for pcmanfm. cd $(DESTDIR)$(PREFIX)/bin && ln -s subox gksu - + clean: rm -rf po/mo rm -f po/*/*.po~ diff -r 15546925dd96 -r b28d4a6bf467 installer/README --- a/installer/README Tue Jul 19 22:52:27 2011 +0200 +++ b/installer/README Wed Jul 20 15:29:22 2011 +0200 @@ -2,19 +2,36 @@ ================================================================================ -The first SliTaz installer uses ncurses Dialog within a SHell script. As of -April 2011 it is the last SliTaz home made tool that doesn't have a -desktop integrated interface. So we must think differently and make changes, -we must also keep in mind that the first installer had some crappy code -since it was written at the start of the project. +The first SliTaz installer was using ncurses Dialog within a SHell script. It +was the last SliTaz home made tool that doesn't have a desktop integrated +interface, and had some crappy code since it was written at the start of the +project. -The NEW way to think: one installer, entirely in SHell script and usable from +Tazinst is the new installer written entirely in SHell script and usable from the cmdline without dialog or any other gui-like interface! This new installer -must be able to perform an installation automatically based an a simple config -file with clear variables such as: TYPE="iso|web", TARGET="/dev/hda1", USER="". +is able to perform an installation automatically based on a simple config file +with clear variables such as: INST_TYPE="iso", TGT_PARTITION="/dev/hda1". -With this way, we will be able 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 bar or/and -messages). +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 +bar or/and messages). + +i18n +---- +Tazinst has been coded from the beginning with gettext support. Please +forget 'echo' and use gettext, but remember that gettext "" is equivalent +to echo -n. All scripts use the same TEXTDOMAIN and the same pot files, all +translations go in the po/ folder. + +To start a new translation please use msginit from the pot file directory. +Example for French/France locale (fr_FR): + +$ msginit -l fr_FR -o fr.po -i tazpanel.pot + +To update all translations from a newly updated pot file: + +$ make msgmerge + +================================================================================ \ No newline at end of file diff -r 15546925dd96 -r b28d4a6bf467 installer/tazinst --- a/installer/tazinst Tue Jul 19 22:52:27 2011 +0200 +++ b/installer/tazinst Wed Jul 20 15:29:22 2011 +0200 @@ -19,7 +19,12 @@ # 6: No SliTaz system to upgrade found # 8: Internal error -VERSION=3.0 +VERSION=3.01 + +# Internationalization +. /usr/bin/gettext.sh +TEXTDOMAIN='tazinst' +export TEXTDOMAIN SOURCE_ROOT=/media/source TARGET_ROOT=/mnt/target @@ -39,13 +44,13 @@ { 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]\n\"`" + echo -e "\033[0m `gettext \"tazinst [command] [config-file]\"`\n" echo -e "\033[1m`gettext \"Commands\"`: \033[0m" - echo -e "`gettext \"usage Print this short usage.\"`" - echo -e "`gettext \"install Install SliTaz on HDD using a configuration file.\"`" - echo -e "`gettext \"upgrade Upgrade SliTaz on HDD using a configuration file.\"`" - echo -e "`gettext \"config Generate a configuration file.\"`" - echo -e "`gettext \"cli Install or upgrade using command line options:\"`" + 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 "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).\"`" @@ -528,7 +533,7 @@ echo -ne "`gettext \"Continue:(y/n)\"`" read answer case $answer in - [yY]) echo -e "`gettext \"Running $BACKLIST..\"`" ;; + [oOyY]) echo -e "`gettext \"Running $BACKLIST..\"`" ;; *) abort 4 `gettext "Cancelled by user"` ;; esac STEP=0 diff -r 15546925dd96 -r b28d4a6bf467 po/tazinst/fr.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/tazinst/fr.po Wed Jul 20 15:29:22 2011 +0200 @@ -0,0 +1,223 @@ +# French translation for Tazinst (SliTaz installer). +# Traduction françaises du paquet Tazinst +# Copyright (C) 2011 - SliTaz Team +# This file is distributed under the same license as Tazinst. +# Dominique Corbex , 2011 +# +msgid "" +msgstr "" +"Project-Id-Version: 3.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-07-20 13:01+0200\n" +"PO-Revision-Date: 2011-07-20 14:19+0200\n" +"Last-Translator: Dominique Corbex \n" +"Language-Team: French\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" + +#: tazinst:40 +msgid "Tazinst - SliTaz installer - Version" +msgstr "Tazinst - Installateur Slitaz - Version" + +#: tazinst:41 +msgid "Usage" +msgstr "Usage" + +#: tazinst:42 +msgid "tazinst [command] [config-file]" +msgstr "tazinst [commande] [fichier de configuration]" + +#: tazinst:43 +msgid "Commands" +msgstr "Commandes" + +#: tazinst:44 +msgid "Print this short usage." +msgstr "Affiche cette petite aide" + +#: tazinst:45 +msgid "Install SliTaz on HDD using a configuration file." +msgstr "Installer SliTaz sur un disque dur à l'aide d'un fichier de configuration." + +#: tazinst:46 +msgid "Upgrade SliTaz on HDD using a configuration file." +msgstr "Mettre à jour SliTaz sur un disque dur à l'aide d'un fichier de configuration." + +#: tazinst:47 +msgid "Generate a configuration file." +msgstr "Générer un fichier de configuration." + +# +#: tazinst:48 +msgid "Install or upgrade using command line options:" +msgstr "Installer ou mettre à jour en utilisant des options en ligne de commande:" + +#: tazinst:49 +msgid "Full Install (not upgrading, all present data will be lost)." +msgstr "Installation complète (pas de mise à jour, les données seront perdues)." + +#: tazinst:50 +msgid "Upgrade (Needs an active internet connection)." +msgstr "Mise à jour (Nécessite une connexion internet active)." + +#: tazinst:51 +msgid "Install type (cdrom|usb|iso|web|weboot)." +msgstr "Type d'installation (cdrom|usb|iso|web|weboot)." + +#: tazinst:52 +msgid "Source media (ex: file.iso|usb partition|web url)." +msgstr "Média source (ex: file.iso|usb partition|web url)." + +#: tazinst:53 +msgid "Partition where SliTaz will be installed (ex:/dev/hda3)." +msgstr "Partition où SliTaz sera installé (ex:/dev/hda3)." + +#: tazinst:54 +msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)." +msgstr "Formatage de la partition (fs=ext2|ext3|ext4|etc..)." + +#: tazinst:55 +msgid "Install Grub." +msgstr "Installer Grub." + +#: tazinst:56 +msgid "Dual-boot a Windows partition (auto|hd, ex:hd0,0)." +msgstr "Dual-boot avec une partition Windows (auto|hd, ex:hd0,0)." + +#: tazinst:57 +msgid "Debug mode." +msgstr "Mode Debug" + +#: tazinst:73 +msgid "Error" +msgstr "Erreur" + +#: tazinst:74 +msgid "Installation cancelled" +msgstr "Installation annulée" + +#: tazinst:82 +msgid "Warning:" +msgstr "Attention :" + +#: tazinst:206 +msgid "Configuration file not found" +msgstr "Fichier de configuration non trouvé" + +#: tazinst:209 +msgid "No configuration file provided" +msgstr "Fichier de configuration non trouvé" + +#: tazinst:235 +msgid "Mismatched parameters" +msgstr "Paramètres incompatibles" + +#: tazinst:373 +msgid "" +"You must be the root user (system administrator) to install SliTaz, please " +"use 'su' to get a root SHell and restart installation." +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." + +#: tazinst:461 +msgid "Web boot files not found" +msgstr "Fichiers Web boot non trouvés" + +#: tazinst:484 tazinst:597 tazinst:690 tazinst:725 tazinst:793 tazinst:1033 +#: tazinst:1130 tazinst:1171 +msgid "Internal" +msgstr "Interne" + +#: tazinst:491 +msgid "Invalid source" +msgstr "Source invalide" + +#: tazinst:500 +msgid "Installation settings summary:" +msgstr "Récapitulatif des paramètres d'installation:" + +#: tazinst:516 +msgid "Backup /etc, /home and the packages list" +msgstr "Sauvegarde de /etc, /home et de la liste des paquets" + +#: tazinst:518 +msgid "Restore /etc, /home" +msgstr "Restauration de /etc, /home" + +#: tazinst:519 +msgid "Upgrade additional packages." +msgstr "Mise à jour des paquets additionnels." + +#: tazinst:525 +msgid "Install Grub" +msgstr "Installer Grub" + +#: tazinst:528 +msgid "Continue:(y/n)" +msgstr "Continuer : (o/n)" + +#: tazinst:532 +msgid "Cancelled by user" +msgstr "Annulé par l'utilisateur" + +#: tazinst:625 +msgid "Falling back to running kernel name.." +msgstr "Repli sur le nom du noyau actuellement utilisé.." + +#: tazinst:829 +msgid "No windows partition found. Dual-boot disabled" +msgstr "Aucune partition Windows trouvée. Dual-boot désactivé" + +#: tazinst:886 +msgid "Enabling Windows dual-boot" +msgstr "Activation du Dual-boot avec Windows" + +#: tazinst:975 +msgid "Ejecting cdrom..." +msgstr "Éjection du CD-Rom..." + +#: tazinst:984 +msgid "Installation complete. You can now restart (reboot) " +msgstr "Installation terminée. Vous pouvez maintenant redémarrer " + +#: tazinst:985 +msgid "from your SliTaz GNU/Linux system." +msgstr "votre système SliTaz GNU/Linux." + +#: tazinst:1145 +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 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" + +#: tazinst:1158 +msgid "Grub update" +msgstr "Mise à jour de Grub" + +#: tazinst:1176 +msgid "Backup /etc, /home and the packages list..." +msgstr "Sauvegarde de /etc, /home et de la liste des paquets..." + +#: tazinst:1187 +msgid "Restoring configuration files..." +msgstr "Restauration des fichiers de configuration..." + +#: tazinst:1193 +msgid "Upgrading added packages..." +msgstr "Mise à hour des paquets additionnels..." + +#: tazinst:1205 +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." + +#: tazinst:1206 +msgid "Packages on the cdrom :" +msgstr "Paquets sur le cdrom :" + +#: tazinst:1207 +msgid "Packages installed from the mirror :" +msgstr "Paquets installés depuis le miroir :" diff -r 15546925dd96 -r b28d4a6bf467 po/tazinst/tazinst.pot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/tazinst/tazinst.pot Wed Jul 20 15:29:22 2011 +0200 @@ -0,0 +1,221 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-07-20 13:01+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: tazinst:40 +msgid "Tazinst - SliTaz installer - Version" +msgstr "" + +#: tazinst:41 +msgid "Usage" +msgstr "" + +#: tazinst:42 +msgid "tazinst [command] [config-file]" +msgstr "" + +#: tazinst:43 +msgid "Commands" +msgstr "" + +#: tazinst:44 +msgid "Print this short usage." +msgstr "" + +#: tazinst:45 +msgid "Install SliTaz on HDD using a configuration file." +msgstr "" + +#: tazinst:46 +msgid "Upgrade SliTaz on HDD using a configuration file." +msgstr "" + +#: tazinst:47 +msgid "Generate a configuration file." +msgstr "" + +#: tazinst:48 +msgid "Install or upgrade using command line options:" +msgstr "" + +#: tazinst:49 +msgid "Full Install (not upgrading, all present data will be lost)." +msgstr "" + +#: tazinst:50 +msgid "Upgrade (Needs an active internet connection)." +msgstr "" + +#: tazinst:51 +msgid "Install type (cdrom|usb|iso|web|weboot)." +msgstr "" + +#: tazinst:52 +msgid "Source media (ex: file.iso|usb partition|web url)." +msgstr "" + +#: tazinst:53 +msgid "Partition where SliTaz will be installed (ex:/dev/hda3)." +msgstr "" + +#: tazinst:54 +msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)." +msgstr "" + +#: tazinst:55 +msgid "Install Grub." +msgstr "" + +#: tazinst:56 +msgid "Dual-boot a Windows partition (auto|hd, ex:hd0,0)." +msgstr "" + +#: tazinst:57 +msgid "Debug mode." +msgstr "" + +#: tazinst:73 +msgid "Error" +msgstr "" + +#: tazinst:74 +msgid "Installation cancelled" +msgstr "" + +#: tazinst:82 +msgid "Warning:" +msgstr "" + +#: tazinst:206 +msgid "Configuration file not found" +msgstr "" + +#: tazinst:209 +msgid "No configuration file provided" +msgstr "" + +#: tazinst:235 +msgid "Mismatched parameters" +msgstr "" + +#: tazinst:373 +msgid "" +"You must be the root user (system administrator) to install SliTaz, please " +"use 'su' to get a root SHell and restart installation." +msgstr "" + +#: tazinst:461 +msgid "Web boot files not found" +msgstr "" + +#: tazinst:484 tazinst:597 tazinst:690 tazinst:725 tazinst:793 tazinst:1033 +#: tazinst:1130 tazinst:1171 +msgid "Internal" +msgstr "" + +#: tazinst:491 +msgid "Invalid source" +msgstr "" + +#: tazinst:500 +msgid "Installation settings summary:" +msgstr "" + +#: tazinst:516 +msgid "Backup /etc, /home and the packages list" +msgstr "" + +#: tazinst:518 +msgid "Restore /etc, /home" +msgstr "" + +#: tazinst:519 +msgid "Upgrade additional packages." +msgstr "" + +#: tazinst:525 +msgid "Install Grub" +msgstr "" + +#: tazinst:528 +msgid "Continue:(y/n)" +msgstr "" + +#: tazinst:532 +msgid "Cancelled by user" +msgstr "" + +#: tazinst:625 +msgid "Falling back to running kernel name.." +msgstr "" + +#: tazinst:829 +msgid "No windows partition found. Dual-boot disabled" +msgstr "" + +#: tazinst:886 +msgid "Enabling Windows dual-boot" +msgstr "" + +#: tazinst:975 +msgid "Ejecting cdrom..." +msgstr "" + +#: tazinst:984 +msgid "Installation complete. You can now restart (reboot) " +msgstr "" + +#: tazinst:985 +msgid "from your SliTaz GNU/Linux system." +msgstr "" + +#: tazinst:1145 +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 "" + +#: tazinst:1158 +msgid "Grub update" +msgstr "" + +#: tazinst:1176 +msgid "Backup /etc, /home and the packages list..." +msgstr "" + +#: tazinst:1187 +msgid "Restoring configuration files..." +msgstr "" + +#: tazinst:1193 +msgid "Upgrading added packages..." +msgstr "" + +#: tazinst:1205 +msgid "" +"Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux " +"system." +msgstr "" + +#: tazinst:1206 +msgid "Packages on the cdrom :" +msgstr "" + +#: tazinst:1207 +msgid "Packages installed from the mirror :" +msgstr ""