slitaz-tools rev 665
tazinst: lock file added, doc updated
| author | Dominique Corbex <domcox@slitaz.org> |
|---|---|
| date | Mon Aug 15 22:33:56 2011 +0200 (2011-08-15) |
| parents | aba8290691e2 |
| children | 8202e0f842a6 |
| files | Makefile doc/tazinst.en.html doc/tazinst.fr.html installer/README installer/tazinst po/tazinst/es_AR.po po/tazinst/fr.po po/tazinst/tazinst.pot |
line diff
1.1 --- a/Makefile Sun Aug 14 10:51:11 2011 +0100 1.2 +++ b/Makefile Mon Aug 15 22:33:56 2011 +0200 1.3 @@ -6,7 +6,7 @@ 1.4 DESTDIR?= 1.5 1.6 PROJECTS=slitaz-tools slitaz-boxes tazbox tazinst tazdrop 1.7 -LINGUAS=fr pt_BR 1.8 +LINGUAS=es_AR fr pt_BR 1.9 1.10 all: msgfmt 1.11 1.12 @@ -106,13 +106,14 @@ 1.13 install -m 0644 messages/en/installer.msg \ 1.14 $(DESTDIR)$(PREFIX)/share/slitaz/messages/en 1.15 # tazinst 1.16 - install -m 0755 installer/tazinst $(DESTDIR)$(PREFIX)/bin 1.17 - for l in fr; \ 1.18 - do \ 1.19 - install -m 0777 -d $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ 1.20 - install -m 0644 po/mo/$$l/tazinst.mo \ 1.21 - $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ 1.22 - done; 1.23 + install -m 0755 installer/tazinst $(DESTDIR)$(PREFIX)/sbin 1.24 + for l in $(LINGUAS); do \ 1.25 + for i in `ls po/mo/$$l/tazinst.mo` ; do \ 1.26 + install -m 0777 -d $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ 1.27 + install -m 0644 po/mo/$$l/tazinst.mo \ 1.28 + $(DESTDIR)$(PREFIX)/share/locale/$$l/LC_MESSAGES; \ 1.29 + done \ 1.30 + done 1.31 # slitaz-tools i18n 1.32 for l in $(LINGUAS); \ 1.33 do \
2.1 --- a/doc/tazinst.en.html Sun Aug 14 10:51:11 2011 +0100 2.2 +++ b/doc/tazinst.en.html Mon Aug 15 22:33:56 2011 +0200 2.3 @@ -23,167 +23,201 @@ 2.4 2.5 <h2>SYNTAX</h2> 2.6 <pre> 2.7 -tazinst [command] [configuration file] 2.8 +tazinst [command] [option] 2.9 </pre> 2.10 2.11 <h2>DESCRIPTION</h2> 2.12 <p> 2.13 - Tazinst is a lightweight SliTaz HDD installer (~ 29 KB). It installs SliTaz to a hard drive from a 2.14 - Live-CD, LiveUSB key, a SliTaz ISO image, or from the web by downloading a stable 2.15 - version, a cooking version or by giving the http link of another iso (eg: Development ISO). 2.16 + Tazinst is a lightweight SliTaz HDD installer (~ 31 KB). It installs SliTaz 2.17 + to a hard drive from a Live-CD, LiveUSB key, a SliTaz ISO image, or from 2.18 + the web by downloading a stable, cooking or rolling version or by giving 2.19 + the http link of another iso (eg: Development ISO). 2.20 </p> 2.21 <p> 2.22 - Tazinst can format the target partition to ext2, ext3, ext4 or other formats if the 2.23 - matching packages are installed. The home partition can be installed on another 2.24 - partition and if need be formatted before installation into any one of the available 2.25 - formats. Tazinst may upon request install the Grub bootloader in the MBR of the target 2.26 - disk. A dual-boot with an existing Windows© partition is possible, finding the Windows© 2.27 - partition can either be done automatically or manually specified. 2.28 + Tazinst can format the target partition to ext2, ext3, ext4 or other formats 2.29 + if the matching packages are installed. The home partition can be installed 2.30 + on another partition and if need be formatted before installation into any 2.31 + one of the available formats. Tazinst may upon request install the Grub 2.32 + bootloader in the MBR of the target disk. A dual-boot with an existing 2.33 + Windows© partition is possible, finding the Windows© partition can either be 2.34 + done automatically or manually specified. 2.35 </p> 2.36 <p> 2.37 - Tazinst can also update SliTaz installed on a hard disk partition which is handy 2.38 - in case of version changes. In this case, Slitaz is updated, data in /home is 2.39 - preserved and additional packages are reinstalled on to the new version. 2.40 + Tazinst can also update SliTaz installed on a hard disk partition which is 2.41 + handy in case of version changes. In this case, Slitaz is updated, data in 2.42 + /home is preserved and additional packages are reinstalled on to the new 2.43 + version. 2.44 </p> 2.45 <p> 2.46 - Tazinst was created independently for the needs of the SliTaz GNU/Linux mini distribution. 2.47 + Tazinst was created independently for the needs of the SliTaz GNU/Linux mini 2.48 + distribution. 2.49 </p> 2.50 <p> 2.51 - Tazinst is written from scratch in shell script and is compatible with Busybox Ash and Bash. 2.52 - Tazinst is licensed under the GNU Free gpl v3. 2.53 + Tazinst is written from scratch in shell script and is compatible with 2.54 + Busybox Ash and Bash. Tazinst is licensed under the GNU Free gpl v3. 2.55 </p> 2.56 2.57 -<h2>COMMANDS</h2> 2.58 -<a name="config"></a> 2.59 -<h3>config</h3> 2.60 +<h2>SETUP FILE</h2> 2.61 <p> 2.62 - Generates a self-documenting configuration file which when edited as required by the user 2.63 - will install or update SliTaz to a hard drive using tazinst install [filename]. 2.64 + Tazinst installer is able to perform an installation automatically based on 2.65 + a simple setup file with clear variables such as: 2.66 + <code>INST_TYPE="iso"</code>, <code>TGT_PARTITION="/dev/hda1"</code>. 2.67 + 2.68 + With this way, it allows developpers to create a different kind of frontend: 2.69 + Dialog, GTK and CGI/web in TazPanel. The frontend just has to create a 2.70 + setup file and start the cmdline installer and report steps in a nice way 2.71 + (progress bar or/and messages). 2.72 </p> 2.73 -<pre> 2.74 -tazinst config /var/lib/tazinst.conf 2.75 -</pre> 2.76 - 2.77 <p> 2.78 - The configuration file contains the following variables: 2.79 + The setup file contains the following variables: 2.80 </p> 2.81 <ul> 2.82 - <li>The variables describing the installation source:</li> 2.83 -</ul> 2.84 + <li class="level1"><div class="li"> 2.85 + The variables describing the installation source: 2.86 2.87 <ol> 2.88 - <li class="level1"><div class="li"> * INST_TYPE: the type of media containing 2.89 - the SliTaz source files, either: cdrom (SliTaz LiveCD), usb 2.90 - (SliTaz LiveUSB), iso (ISO image of SliTaz), web (ISO image on the Web), 2.91 - weboot, ex: <code>INST_TYPE=web</code></div> 2.92 - </li> 2.93 - <li class="level1"><div class="li"> * SRC_FILE: the name of the source file containing 2.94 - SliTaz. It depends on the type of support: 2.95 + <li class="level1"><div class="li"> 2.96 + <strong>*INST_TYPE</strong>: the type of media containing the SliTaz source 2.97 + files, either: <strong>cdrom</strong> (SliTaz LiveCD), <strong>usb</strong> 2.98 + (SliTaz LiveUSB), <strong>iso</strong> (ISO image of SliTaz), 2.99 + <strong>web</strong> (ISO image on the Web), <strong>weboot</strong>, 2.100 + ex: <code>INST_TYPE=web</code> 2.101 + </div></li> 2.102 + <li class="level1"><div class="li"> 2.103 + <strong>SRC_FILE</strong>: the name of the source file containing SliTaz. 2.104 + It depends on the type of support: 2.105 <ul> 2.106 <li class="level2"><div class="li">cdrom (SliTaz LiveCD): 2.107 - <i>unused</i></div> 2.108 - </li> 2.109 + <i>unused</i> 2.110 + </div></li> 2.111 <li class="level2"><div class="li">usb (SliTaz LiveUSB): name of the 2.112 partition on the host USB device, ex: <code>SRC_FILE=/dev/sdb1</code> 2.113 - </div> 2.114 - </li> 2.115 + </div></li> 2.116 <li class="level2"><div class="li">iso (ISO image of SliTaz): name of the 2.117 - ISO file, ex: <code>SRC_FILE=~/slitaz.3.0.iso</code></div> 2.118 - </li> 2.119 + ISO file, ex: <code>SRC_FILE=~/slitaz.3.0.iso</code> 2.120 + </div></li> 2.121 <li class="level2"><div class="li">web (ISO image on the Web): name of the 2.122 URL, ex: <code> 2.123 SRC_FILE=http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso</code>. 2.124 Note that 3 URLs are predefined: 'stable', 'cooking, 'rolling', ex: 2.125 <code>SRC_FILE=cooking</code> downloads the latest cooking available 2.126 - from the web</div> 2.127 - </li> 2.128 - <li class="level2"><div class="li">weboot: <i>unused</i></div></li> 2.129 - </ul></div> 2.130 - </li> 2.131 + from the web 2.132 + </div></li> 2.133 + <li class="level2"><div class="li">weboot: <i>unused</i> 2.134 + </div></li> 2.135 </ol> 2.136 +</div></li> 2.137 +</ul> 2.138 2.139 <ul> 2.140 - <li class="level1"><div class="li"> The variables describing the target 2.141 - partition: </div> 2.142 - </li> 2.143 + <li class="level1"><div class="li">The variables describing the target 2.144 + partition: 2.145 + 2.146 +<ol> 2.147 + <li class="level1"><div class="li"> 2.148 + <strong>*TGT_PARTITION</strong>: the name of the target partition SliTaz 2.149 + will install to or update, 2.150 + ex: <code>TGT_PARTITION=/dev/hda3</code> 2.151 + </div></li> 2.152 + <li class="level1"><div class="li"> 2.153 + <strong>TGT_FS</strong>: if this variable is entered, the target partition 2.154 + will be formatted in the file system specified, otherwise the partition will 2.155 + be cleaned and /home will be preserved, ex: <code>TGT_FS=ext3</code> 2.156 + </div></li> 2.157 + <li class="level1"><div class="li"> 2.158 + <strong>TGT_HOME</strong>: this variable indicates if need be, the name of 2.159 + the partition to receive the /home directory, 2.160 + ex: <code>TGT_HOME=/dev/hda5</code> 2.161 + </div></li> 2.162 + <li class="level1"><div class="li"> 2.163 + <strong>TGT_HOME_FS</strong>: if this variable is entered, the home 2.164 + partition will be formatted in the file system specified, 2.165 + ex: <code>TGT_HOME_FS=ext2</code> 2.166 + </div></li> 2.167 +</ol> 2.168 +</div></li> 2.169 </ul> 2.170 2.171 +<ul> 2.172 + <li class="level1"><div class="li">The system settings: 2.173 + 2.174 <ol> 2.175 - <li class="level1"><div class="li"> * TGT_PARTITION: the name of the target 2.176 - partition SliTaz will install to or update, ex: <code>TGT_PARTITION= 2.177 - /dev/hda3</code></div> 2.178 - </li> 2.179 - <li class="level1"><div class="li">TGT_FS: if this variable is entered, the 2.180 - target partition will be formatted in the file system specified, otherwise 2.181 - the partition will be cleaned and /home will be preserved, ex: <code> 2.182 - TGT_FS=ext3</code></div> 2.183 - </li> 2.184 - <li class="level1"><div class="li">TGT_HOME: this variable indicates if need 2.185 - be, the name of the partition to receive the /home directory, ex: <code> 2.186 - TGT_HOME=/dev/hda5</code></div> 2.187 - </li> 2.188 - <li class="level1"><div class="li">TGT_HOME_FS: if this variable is entered, 2.189 - the home partition will be formatted in the file system specified, 2.190 - ex: <code>TGT_HOME_FS=ext2</code></div> 2.191 - </li> 2.192 + <li class="level1"><div class="li"> 2.193 + <strong>TGT_HOSTNAME</strong>: name of the system, 2.194 + ex: <code>TGT_HOSTNAME=hd-slitaz</code>, by default 2.195 + <code>TGT_HOSTNAME=slitaz</code> 2.196 + </div></li> 2.197 + <li class="level1"><div class="li"> 2.198 + <strong>TGT_ROOT_PWD</strong>: superuser password, 2.199 + ex: <code>TGT_ROOT_PWD=toor</code>, by default 2.200 + <code>TGT_ROOT_PWD=root</code> 2.201 + </div></li> 2.202 + <li class="level1"><div class="li"> 2.203 + <strong>TGT_USER</strong>: user name, 2.204 + ex: <code>TGT_USER=toto</code>, by default <code>TGT_USER=tux</code> 2.205 + </div></li> 2.206 + <li class="level1"><div class="li"> 2.207 + <strong>TGT_USER_PWD</strong>: user password, 2.208 + ex: <code>TGT_USER_PWD=titi</code>, by default 2.209 + <code>TGT_USER_PWD=tux</code> 2.210 + </div></li> 2.211 </ol> 2.212 +</div></li> 2.213 +</ul> 2.214 2.215 <ul> 2.216 - <li class="level1"><div class="li"> The configuration variables: 2.217 - </div> 2.218 - </li> 2.219 + <li class="level1"><div class="li"> The boot loader (bootloader) 2.220 + configuration variables: 2.221 + 2.222 +<ol> 2.223 + <li class="level1"><div class="li"> 2.224 + <strong>TGT_GRUB</strong>: install the GRUB bootloader (yes or no), 2.225 + ex: <code>TGT_GRUB=yes</code>, by default <code>TGT_GRUB=no</code> 2.226 + </div></li> 2.227 + <li class="level1"><div class="li"> 2.228 + <strong>TGT_WINBOOT</strong>: if this variable is entered, it indicates the 2.229 + partition containing Windows© to implement a dual-boot. It can also be set 2.230 + to 'auto', in this case the dual-boot will be on the first partition 2.231 + Windows© detected, 2.232 + ex: <code>TGT_WINBOOT=auto</code> 2.233 + </div></li> 2.234 +</ol> 2.235 +</div/></li> 2.236 </ul> 2.237 2.238 -<ol> 2.239 - <li class="level1"><div class="li">TGT_HOSTNAME: name of the system, ex: <code> 2.240 - TGT_HOSTNAME=hd-slitaz</code>, by default <code>TGT_HOSTNAME=slitaz</code> 2.241 - </div> 2.242 - </li> 2.243 - <li class="level1"><div class="li">TGT_ROOT_PWD: superuser password, ex: 2.244 - <code>TGT_ROOT_PWD=toor</code>, by default <code> 2.245 - TGT_ROOT_PWD=root</code></div> 2.246 - </li> 2.247 - <li class="level1"><div class="li">TGT_USER: user name, 2.248 - ex: <code>TGT_USER=toto</code>, by default <code>TGT_USER=tux</code></div> 2.249 - </li> 2.250 - <li class="level1"><div class="li">TGT_USER_PWD: user password, 2.251 - ex: <code>TGT_USER_PWD=titi</code>, by default 2.252 - <code>TGT_USER_PWD=tux</code></div> 2.253 - </li> 2.254 -</ol> 2.255 - 2.256 -<ul> 2.257 - <li class="level1"><div class="li"> The boot loader (bootloader) configuration variables: </div> 2.258 - </li> 2.259 -</ul> 2.260 - 2.261 -<ol> 2.262 - <li>TGT_GRUB: install the GRUB bootloader (yes or no), ex: 2.263 - <code>TGT_GRUB=yes</code>, by default <code>TGT_GRUB=no</code> 2.264 - </li> 2.265 - <li class="level1"><div class="li">TGT_WINBOOT: if this variable is entered, 2.266 - it indicates the partition containing Windows© to implement a dual-boot. It can 2.267 - also be set to 'auto', in this case the dual-boot will be on the first partition 2.268 - Windows© detected, 2.269 - ex: <code>TGT_WINBOOT=auto</code></div> 2.270 - </li> 2.271 -</ol> 2.272 - 2.273 <p> 2.274 - Note that only variables preceded by a asterisk are mandatory, others are optional. Thus a minimal configuration file can be: 2.275 + Note that only variables preceded by a asterisk are mandatory, others are 2.276 + optional. Thus a minimal setup file can be: 2.277 </p> 2.278 <pre> 2.279 INST_TYPE=cdrom 2.280 TGT_PARTITION=/dev/hda3 2.281 </pre> 2.282 <p> 2.283 - This file will install SliTaz on /dev/hda3 formatting the partition from a LiveCD. 2.284 + This file will install SliTaz on /dev/hda3 formatting the partition from a 2.285 + LiveCD. 2.286 </p> 2.287 2.288 +<h2>COMMANDS</h2> 2.289 + 2.290 +<a name="new"></a> 2.291 +<h3>new</h3> 2.292 +<p> 2.293 + Generates a new self-documenting setup file which when edited as required 2.294 + by the user will install or update SliTaz to a hard drive. 2.295 +</p> 2.296 +<pre> 2.297 +tazinst new /var/lib/tazinst.conf 2.298 +</pre> 2.299 + 2.300 + 2.301 <a name="install"></a> 2.302 <h3>install</h3> 2.303 <p> 2.304 - Launch the SliTaz installer based on data in the configuration file. 2.305 + Performs a SliTaz install on a HDD based on data in the setup file. 2.306 + If you decide to format your HDD, all data will be lost. If you do not 2.307 + format, all data but an existing /home directory will be removed, the 2.308 + home directory will be kept as is. 2.309 </p> 2.310 <pre> 2.311 tazinst install /var/lib/tazinst.conf 2.312 @@ -192,7 +226,10 @@ 2.313 <a name="upgrade"></a> 2.314 <h3>upgrade</h3> 2.315 <p> 2.316 - Launch and upgrade SliTaz based on data in the configuration file. 2.317 + Upgrade an existing SliTaz system on a HDD based on data in the setup file. 2.318 + Your /home /etc /var/www directories will be kept, all other directories 2.319 + will be removed. Any additional package added to your old Slitaz system 2.320 + will be updated as long you have an active internet connection. 2.321 </p> 2.322 <pre> 2.323 tazinst upgrade /var/lib/tazinst.conf 2.324 @@ -200,24 +237,106 @@ 2.325 2.326 <a name="showurl"></a> 2.327 <h3>showurl</h3> 2.328 -<p>Display the full URL of the predefined shortcuts: 'stable', 'cooking, 'rolling'.</p> 2.329 -<p>You may overwrite these shortcuts in the /etc/slitaz/tazinst.conf file:</p> 2.330 -<ul> 2.331 -<li>URL_STABLE="http://mirror.slitaz.org/iso/stable/slitaz...." for 'stable'</li> 2.332 -<li>URL_COOKING="http://mirror.slitaz.org/iso/cooking/slitaz..." for 'cooking'</li> 2.333 -<li>URL_ROLLING="http://mirror.slitaz.org/iso/rolling/slitaz..." for 'rolling'</li> 2.334 -</ul> 2.335 +<p> 2.336 + Display the full URL of the predefined shortcuts: 'stable', 'cooking, 2.337 + 'rolling'. 2.338 +</p> 2.339 +<p> 2.340 + Note: You may overwrite these shortcuts in the system file: 2.341 + /etc/slitaz/tazinst.conf. 2.342 +</p> 2.343 <pre> 2.344 tazinst showurl stable 2.345 </pre> 2.346 2.347 <a name="check"></a> 2.348 <h3>check</h3> 2.349 -<p>Check a configuration file for errors.</p> 2.350 +<p> 2.351 + Check a setup file for errors. 2.352 +</p> 2.353 <pre> 2.354 tazinst check /var/lib/tazinst.conf 2.355 </pre> 2.356 2.357 +<a name="log"></a> 2.358 +<h3>log</h3> 2.359 +<p> 2.360 + Display the last log file contents and exit. 2.361 +</p> 2.362 +<pre> 2.363 +tazinst log 2.364 +</pre> 2.365 + 2.366 +<a name="version"></a> 2.367 +<h3>version</h3> 2.368 +<p> 2.369 + Print the version information and exit. 2.370 +</p> 2.371 +<pre> 2.372 +tazinst version 2.373 +</pre> 2.374 + 2.375 +<h2>SYSTEM FILE</h2> 2.376 +<p> 2.377 + The /etc/slitaz/tazinst.conf configuration file allows you to change default 2.378 + settings of tazinst, if you want to use custom values for URL, directories 2.379 + and files, you'll have to create it and modify the following variables: 2.380 +</p> 2.381 + 2.382 +<ul> 2.383 +<li class="level1"><div class="li">Predefined urls: 2.384 + 2.385 +<ol> 2.386 + <li class="level1"><div class="li">URL of the current stable version:<br /> 2.387 + <code>URL_STABLE="http://mirror.slitaz.org/iso/stable/slitaz-4.0.iso" 2.388 + </code> 2.389 + </div></li> 2.390 + <li class="level1"><div class="li">URL of the current cooking version:<br /> 2.391 + <code>URL_COOKING="http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso" 2.392 + </code> 2.393 + </div></li> 2.394 + <li class="level1"><div class="li">URL of the current rolling version:<br /> 2.395 + <code>URL_ROLLING="http://mirror.slitaz.org/iso/rolling/slitaz-core.iso" 2.396 + </code> 2.397 + </div></li> 2.398 +</ol> 2.399 +</div></ul> 2.400 +</ul> 2.401 + 2.402 +<ul> 2.403 +<li class="level1"><div class="li">Mount points: 2.404 + 2.405 +<ol> 2.406 + <li class="level1"><div class="li"> 2.407 + Source partition mount point:<br /> 2.408 + <code>SOURCE_ROOT="/media/source"</code> 2.409 + </div></li> 2.410 + <li class="level1"><div class="li"> 2.411 + Target partition mount point:<br /> 2.412 + <code>TARGET_ROOT="/mnt/target"</code> 2.413 + </div></li> 2.414 +</ol> 2.415 +</div></li> 2.416 +</ul> 2.417 + 2.418 +<ul> 2.419 +<li class="level1"><div class="li">Log and Debug: 2.420 + 2.421 +<ol> 2.422 + <li class="level1"><div class="li">Log File Location:<br /> 2.423 + <code>LOG="/var/log/tazinst.log"</code> 2.424 + </div></li> 2.425 + <li class="level1"><div class="li">Debugging: (quiet => 0, debug => 1)<br /> 2.426 + <code>DEBUG=0</code> 2.427 + </div></li> 2.428 + <p> 2.429 + It is highly recommended to set <code>DEBUG=1</code> and join the 2.430 + content of the resulting Log file when sending a bug report to 2.431 + developpers. 2.432 + </p> 2.433 +</ol> 2.434 +</div></li> 2.435 +</ul> 2.436 2.437 <h2>MAINTAINERS</h2> 2.438 <p>
3.1 --- a/doc/tazinst.fr.html Sun Aug 14 10:51:11 2011 +0100 3.2 +++ b/doc/tazinst.fr.html Mon Aug 15 22:33:56 2011 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 <!DOCTYPE html> 3.5 <html xmlns="http://www.w3.org/1999/xhtml"> 3.6 <head> 3.7 - <title>Tazinst Manual - Manuel de l'installeur 'tazinst'</title> 3.8 + <title>Tazinst Manual - Manuel de l'installateur 'tazinst'</title> 3.9 <meta charset="utf-8" /> 3.10 <link rel="shortcut icon" href="favicon.ico" /> 3.11 <link rel="stylesheet" type="text/css" href="style.css" /> 3.12 @@ -10,7 +10,7 @@ 3.13 3.14 <!-- Header --> 3.15 <div id="header"> 3.16 - <h1>Tazinst Manual</h1> 3.17 + <h1>Manuel de Tazinst</h1> 3.18 </div> 3.19 3.20 <!-- Start content --> 3.21 @@ -23,12 +23,12 @@ 3.22 3.23 <h2>SYNTAXE</h2> 3.24 <pre> 3.25 -tazinst [commande] [fichier de configuration] 3.26 +tazinst [commande] [option] 3.27 </pre> 3.28 3.29 <h2>DESCRIPTION</h2> 3.30 <p> 3.31 - Tazinst est l'installateur ultra léger (~29 Ko) de SliTaz sur disque dur. 3.32 + Tazinst est l'installateur ultra léger (~31 Ko) de SliTaz sur disque dur. 3.33 Il permet d'installer SliTaz au choix à partir du Live-CD, d'une clé 3.34 LiveUSB, d'une image ISO de SliTaz, ou depuis le web en téléchargeant la 3.35 version stable, la version cooking ou en donnant le lien http d'une autre 3.36 @@ -61,135 +61,143 @@ 3.37 libre GNU gpl v3. 3.38 </p> 3.39 3.40 -<h2>COMMANDES</h2> 3.41 -<a name="config"></a> 3.42 -<h3>config</h3> 3.43 +<h2>FICHIER DE PARAMÈTRES</h2> 3.44 <p> 3.45 - Génère un fichier de configuration autodocumenté, qui une fois édité 3.46 - suivant les besoins de l'utilisateur, permettra d'installer ou mettre 3.47 - à jour SliTaz sur disque dur, en utilisant <code>tazinst install 3.48 - [nom du fichier]</code>. 3.49 + L'installateur Tazinst permet de réaliser une installation automatiquement 3.50 + à l'aide d'un simple fichier de paramètres contenant des variables 3.51 + significatives telles que : 3.52 + <code>INST_TYPE="iso"</code>, <code>TGT_PARTITION="/dev/hda1"</code>. 3.53 + 3.54 + De cette manière, cela permet aux développeurs de créer différents types de 3.55 + frontend : Dialog, GTK et CGI/web dans TazPanel. Le frontend doit juste 3.56 + créer un fichier de paramètres, puis lancer tazinst en ligne de commande et 3.57 + afficher un rapport d'avancement des différentes étapes (Jauges et/ou 3.58 + messages). 3.59 </p> 3.60 -<pre> 3.61 -tazinst config /var/lib/tazinst.conf 3.62 -</pre> 3.63 - 3.64 <p> 3.65 - Le fichier de configuration contient les variables suivantes : 3.66 + Le fichier de paramètres contient les variables suivantes : 3.67 </p> 3.68 <ul> 3.69 - <li>Les variables décrivant la source d'installation :</li> 3.70 -</ul> 3.71 + <li class="level1"><div class="li"> 3.72 + Les variables décrivant la source d'installation : 3.73 3.74 <ol> 3.75 -<li class="level1"><div class="li"> * INST_TYPE : le type du support contenant 3.76 -les fichiers sources de SliTaz, au choix : cdrom (LiveCD de SliTaz), usb 3.77 -(LiveUSB de SliTaz), iso (Image ISO de SliTaz), web (Image ISO sur le Web), 3.78 -weboot, ex : <code>INST_TYPE=web</code></div> 3.79 -</li> 3.80 -<li class="level1"><div class="li"> * SRC_FILE : le nom de la source contenant 3.81 -SliTaz. Il dépend du type de support : 3.82 + <li class="level1"><div class="li"> 3.83 + <strong>*INST_TYPE</strong> : le type du support contenant les fichiers 3.84 + sources de SliTaz, au choix : <strong>cdrom</strong> (LiveCD de SliTaz), 3.85 + <strong>usb</strong> (LiveUSB de SliTaz), <strong>iso</strong> (Image ISO 3.86 + de SliTaz), <strong>web</strong> (Image ISO sur le Web), 3.87 + <strong>weboot</strong>, 3.88 + ex : <code>INST_TYPE=web</code> 3.89 + </div></li> 3.90 + <li class="level1"><div class="li"> 3.91 + <strong>*SRC_FILE</strong> : le nom de la source contenant SliTaz. Il dépend 3.92 + du type de support : 3.93 <ul> 3.94 <li class="level2"><div class="li">cdrom (LiveCD de SliTaz) : 3.95 - <i>inutilisé</i></div> 3.96 - </li> 3.97 + <i>inutilisé</i> 3.98 + </div></li> 3.99 <li class="level2"><div class="li">usb (LiveUSB de SliTaz) : Nom de la 3.100 partition hôte de périphérique USB, ex : <code>SRC_FILE=/dev/sdb1</code> 3.101 - </div> 3.102 - </li> 3.103 + </div></li> 3.104 <li class="level2"><div class="li">iso (Image ISO de SliTaz) : Nom du 3.105 - fichier ISO, ex : <code>SRC_FILE=~/slitaz.3.0.iso</code></div> 3.106 - </li> 3.107 + fichier ISO, ex : <code>SRC_FILE=~/slitaz.3.0.iso</code> 3.108 + </div></li> 3.109 <li class="level2"><div class="li">web (Image ISO sur le Web) : Nom de 3.110 l'URL, ex : <code> 3.111 SRC_FILE=http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso</code>. 3.112 À noter que 3 URL sont prédéfinies : 'stable', 'cooking, 'rolling', ex : 3.113 <code>SRC_FILE=cooking</code> téléchargera la dernière cooking disponible 3.114 - sur le web</div> 3.115 - </li> 3.116 - <li class="level2"><div class="li">weboot : <i>inutilisé</i></div></li> 3.117 - </ul></div> 3.118 -</li> 3.119 + sur le web 3.120 + </div></li> 3.121 + <li class="level2"><div class="li">weboot : <i>inutilisé</i> 3.122 + </div></li> 3.123 </ol> 3.124 +</div></li> 3.125 +</ul> 3.126 3.127 <ul> 3.128 -<li class="level1"><div class="li"> Les variables décrivant la partition 3.129 -cible : </div> 3.130 -</li> 3.131 + <li class="level1"><div class="li"> Les variables décrivant la partition 3.132 + cible : 3.133 + 3.134 + <ol> 3.135 + <li class="level1"><div class="li"> 3.136 + <strong>*TGT_PARTITION</strong> : Le nom de la partition cible sur laquelle 3.137 + SliTaz sera installé ou mis à jour, 3.138 + ex : <code>TGT_PARTITION=/dev/hda3</code> 3.139 + </div></li> 3.140 + <li class="level1"><div class="li"> 3.141 + <strong>TGT_FS</strong> : Si cette variable est renseignée, la partition 3.142 + cible sera formatée dans le système de fichiers indiqué, sinon, la partition 3.143 + sera nettoyée et le répertoire /home sera conservé, 3.144 + ex : <code>TGT_FS=ext3</code> 3.145 + </div></li> 3.146 + <li class="level1"><div class="li"> 3.147 + <strong>TGT_HOME</strong> : Cette variable indique, si besoin est, le nom de 3.148 + la partition recevant le répertoire /home, 3.149 + ex : <code>TGT_HOME=/dev/hda5</code> 3.150 + </div></li> 3.151 + <li class="level1"><div class="li"> 3.152 + <strong>TGT_HOME_FS</strong> : Si cette variable est renseignée, la 3.153 + partition /home sera formatée dans le système de fichiers indiqué, 3.154 + ex : <code>TGT_HOME_FS=ext2</code> 3.155 + </div></li> 3.156 +</ol> 3.157 +</div></li> 3.158 </ul> 3.159 3.160 +<ul> 3.161 + <li class="level1"><div class="li"> Les paramètres du système : 3.162 + 3.163 <ol> 3.164 -<li class="level1"><div class="li"> * TGT_PARTITION : Le nom de la partition 3.165 -cible sur laquelle SliTaz sera insallé ou mis à jour, ex : <code>TGT_PARTITION= 3.166 -/dev/hda3</code></div> 3.167 -</li> 3.168 -<li class="level1"><div class="li">TGT_FS : Si cette variable est renseignée, 3.169 -la partition cible sera formatée dans le système de fichiers indiqué, sinon, 3.170 -la partition sera nettoyée et le répertoire /home sera conservé, ex : <code> 3.171 -TGT_FS=ext3</code></div> 3.172 -</li> 3.173 -<li class="level1"><div class="li">TGT_HOME : Cette variable indique, si 3.174 -besoin est, le nom de la partition recevant le répertoire /home, ex : <code> 3.175 -TGT_HOME=/dev/hda5</code></div> 3.176 -</li> 3.177 -<li class="level1"><div class="li">TGT_HOME_FS : Si cette variable est 3.178 -renseignée, la partition/home sera formatée dans le système de fichiers 3.179 -indiqué, ex : <code>TGT_HOME_FS=ext2</code></div> 3.180 -</li> 3.181 + <li class="level1"><div class="li"> 3.182 + <strong>TGT_HOSTNAME</strong> : Nom du système, 3.183 + ex : <code>TGT_HOSTNAME=hd-slitaz</code>, par défaut 3.184 + <code>TGT_HOSTNAME=slitaz</code> 3.185 + </div></li> 3.186 + <li class="level1"><div class="li"> 3.187 + <strong>TGT_ROOT_PWD</strong> : Mot de passe du super-utilisateur, 3.188 + ex : <code>TGT_ROOT_PWD=toor</code>, par défaut 3.189 + <code>TGT_ROOT_PWD=root</code> 3.190 + </div></li> 3.191 + <li class="level1"><div class="li"> 3.192 + <strong>TGT_USER</strong> : Nom de l'utitisateur par défaut, 3.193 + ex : <code>TGT_USER=toto</code>, par défaut 3.194 + <code>TGT_USER=tux</code> 3.195 + </div></li> 3.196 + <li class="level1"><div class="li"> 3.197 + <strong>TGT_USER_PWD</strong> : Mot de passe de l'utilisateur par défaut, 3.198 + ex : <code>TGT_USER_PWD=titi</code>, par défaut 3.199 + <code>TGT_USER_PWD=tux</code> 3.200 + </div></li> 3.201 </ol> 3.202 +</div></li> 3.203 +</ul> 3.204 3.205 <ul> 3.206 -<li class="level1"><div class="li"> Les variables de configuration de Slitaz : 3.207 -</div> 3.208 -</li> 3.209 -</ul> 3.210 + <li class="level1"><div class="li"> Les variables de configuration du chargeur 3.211 + de démarrage (bootloader) : 3.212 3.213 <ol> 3.214 -<li class="level1"><div class="li">TGT_HOSTNAME : Nom du système, ex : <code> 3.215 -TGT_HOSTNAME=hd-slitaz</code>, par défaut <code>TGT_HOSTNAME=slitaz</code> 3.216 -</div> 3.217 -</li> 3.218 -<li class="level1"><div class="li">TGT_ROOT_PWD : Mot de passe du super- 3.219 -utilisateur, ex : <code>TGT_ROOT_PWD=toor</code>, par défaut <code> 3.220 -TGT_ROOT_PWD=root</code></div> 3.221 -</li> 3.222 -<li class="level1"><div class="li">TGT_USER : Nom de l'utitisateur par défaut, 3.223 -ex : <code>TGT_USER=toto</code>, par défaut <code>TGT_USER=tux</code></div> 3.224 -</li> 3.225 -<li class="level1"><div class="li">TGT_USER_PWD : Mot de passe de 3.226 -l'utilisateur par défaut, ex : <code>TGT_USER_PWD=titi</code>, par défaut 3.227 -<code>TGT_USER_PWD=tux</code></div> 3.228 -</li> 3.229 + <li class="level1"><div class="li"> 3.230 + <strong>TGT_GRUB</strong> : Installation de GRUB (yes ou no), 3.231 + ex : <code>TGT_GRUB=yes</code>, par défaut <code>TGT_GRUB=no</code> 3.232 + </div></li> 3.233 + <li class="level1"><div class="li"> 3.234 + <strong>TGT_WINBOOT</strong> : Si cette variable est renseignée, elle 3.235 + indique la partition contenant Windows© pour mettre en place un Dual-boot. 3.236 + Elle peut être aussi positionnée à 'auto', dans ce cas le dual-boot se 3.237 + fera sur la première partition Windows© détectée, 3.238 + ex : <code>TGT_WINBOOT=auto</code> 3.239 + </div></li> 3.240 </ol> 3.241 - 3.242 -<ul> 3.243 -<li class="level1"><div class="li"> Les variables de configuration du chargeur 3.244 -de démarrage (bootloader) : </div> 3.245 -</li> 3.246 +</div></li> 3.247 </ul> 3.248 3.249 -<ol> 3.250 - <li>TGT_GRUB : Installation de GRUB (yes ou no), ex : 3.251 - <code>TGT_GRUB=yes</code>, par défaut <code>TGT_GRUB=no</code> 3.252 - </li> 3.253 - <li class="level1"><div class="li">TGT_MENU_PARTITION: Nom de la partition 3.254 - où le fichier de configuration de GRUB est installé. Normalement, cette 3.255 - variable n'est pas renseignée, elle peut servir dans le cas où GRUB est 3.256 - installé dans une partition dédiée, ou dans une configuration multi-os, 3.257 - ex : <code>TGT_MENU_PARTITION=/dev/hda4</code></div> 3.258 - </li> 3.259 - <li class="level1"><div class="li">TGT_WINBOOT : Si cette variable est 3.260 - renseignée, elle indique la partition contenant Windows© pour mettre en 3.261 - place un Dual-boot. Elle peut être aussi positionnée à 'auto', dans ce 3.262 - cas le dual-boot se fera sur la première partition Windows© détectée, 3.263 - ex : <code>TGT_WINBOOT=auto</code></div> 3.264 - </li> 3.265 -</ol> 3.266 - 3.267 <p> 3.268 À noter que seules les variables précédées d'une atérisque sont 3.269 obligatoires, les autres sont optionnelles. Ainsi un fichier de 3.270 - configuration minimaliste peut être le suivant: 3.271 + paramètres minimaliste peut être le suivant: 3.272 </p> 3.273 <pre> 3.274 INST_TYPE=cdrom 3.275 @@ -200,11 +208,27 @@ 3.276 formatter la partition, à partir d'un LiveCD. 3.277 </p> 3.278 3.279 +<h2>COMMANDES</h2> 3.280 + 3.281 +<a name="new"></a> 3.282 +<h3>new</h3> 3.283 +<p> 3.284 + Génère un fichier de paramètres autodocumenté, qui une fois édité 3.285 + suivant les besoins de l'utilisateur, permettra d'installer ou mettre 3.286 + à jour SliTaz sur disque dur. 3.287 +</p> 3.288 +<pre> 3.289 +tazinst new /var/lib/tazinst.conf 3.290 +</pre> 3.291 + 3.292 <a name="install"></a> 3.293 <h3>install</h3> 3.294 <p> 3.295 Lance l'installation de SliTaz en fonction des données présentes dans le 3.296 - fichier de configuration. 3.297 + fichier de paramètres. Si le formattage de la partition est demandé, 3.298 + toutes les données seront perdues. Si le disque n'est pas formatté, toutes 3.299 + les données sauf un répertoire /home existant seront effacées, ce répertoire 3.300 + /home sera gardé tel quel. 3.301 </p> 3.302 <pre> 3.303 tazinst install /var/lib/tazinst.conf 3.304 @@ -214,15 +238,122 @@ 3.305 <h3>upgrade</h3> 3.306 <p> 3.307 Lance la mise à jour de SliTaz en fonction des données présentes dans le 3.308 - fichier de configuration. 3.309 + fichier de paramètres. Les répertoires /home /etc /var/www seront 3.310 + conservés, tous les autres répertoires seront supprimés. Tout paquet ajouté 3.311 + à la configuration de votre ancien système SliTaz sera mis à jour à la 3.312 + condition qu'une connexion internet soit active. 3.313 </p> 3.314 <pre> 3.315 tazinst upgrade /var/lib/tazinst.conf 3.316 </pre> 3.317 3.318 -<h2>MAINTENEUR</h2> 3.319 +<a name="showurl"></a> 3.320 +<h3>showurl</h3> 3.321 <p> 3.322 - Christophe Lincoln <pankso at slitaz.org> 3.323 + Affiche l'URL complète des raccourcis prédéfinis : 'stable', 'cooking, 3.324 + 'rolling'. 3.325 +</p> 3.326 +<p> 3.327 + Note: Vous pouvez redéfinir ces raccourcis dans le fichier système : 3.328 + /etc/slitaz/tazinst.conf. 3.329 +</p> 3.330 +<pre> 3.331 +tazinst showurl stable 3.332 +</pre> 3.333 + 3.334 +<a name="check"></a> 3.335 +<h3>check</h3> 3.336 +<p> 3.337 + Vérifie que le fichier de paramètres ne contient pas d'erreurs. 3.338 +</p> 3.339 +<pre> 3.340 +tazinst check /var/lib/tazinst.conf 3.341 +</pre> 3.342 + 3.343 +<a name="log"></a> 3.344 +<h3>log</h3> 3.345 +<p> 3.346 + Affiche le contenu du fichier journal. 3.347 +</p> 3.348 +<pre> 3.349 +tazinst log 3.350 +</pre> 3.351 + 3.352 +<a name="version"></a> 3.353 +<h3>version</h3> 3.354 +<p> 3.355 + Affiche les informations de version. 3.356 +</p> 3.357 +<pre> 3.358 +tazinst version 3.359 +</pre> 3.360 + 3.361 +<h2>FICHIER SYSTÈME DE CONFIGURATION</h2> 3.362 +<p> 3.363 + Le fichier système de configuration /etc/slitaz/tazinst.conf permet de 3.364 + changer les paramètres par défaut de tazinst. Pour utiliser des valeurs 3.365 + personnalisées pour les URL, répertoires et fichiers, ce fichier doit être 3.366 + créé et les variables suivantes modifiées : 3.367 +</p> 3.368 + 3.369 +<ul> 3.370 + <li class="level1"><div class="li">URLs prédéfinies : 3.371 + 3.372 +<ol> 3.373 + <li class="level1"><div class="li">URL de la version stable actuelle :<br /> 3.374 + <code>URL_STABLE="http://mirror.slitaz.org/iso/stable/slitaz-4.0.iso" 3.375 + </code> 3.376 + </div></li> 3.377 + <li class="level1"><div class="li">URL de la version cooking :<br /> 3.378 + <code>URL_COOKING="http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso" 3.379 + </code> 3.380 + </div></li> 3.381 + <li class="level1"><div class="li">URL de la version rolling :<br /> 3.382 + <code>URL_ROLLING="http://mirror.slitaz.org/iso/rolling/slitaz-core.iso" 3.383 + </code> 3.384 + </div></li> 3.385 +</ol> 3.386 +</div></ul> 3.387 +</ul> 3.388 + 3.389 +<ul> 3.390 +<li class="level1"><div class="li">Points de montage : 3.391 + 3.392 +<ol> 3.393 + <li class="level1"><div class="li"> 3.394 + Point de montage de la partition Source :<br /> 3.395 + <code>SOURCE_ROOT="/media/source"</code> 3.396 + </div></li> 3.397 + <li class="level1"><div class="li"> 3.398 + Point de montage de la partition Cible :<br /> 3.399 + <code>TARGET_ROOT="/mnt/target"</code> 3.400 + </div></li> 3.401 +</ol> 3.402 +</div></li> 3.403 +</ul> 3.404 + 3.405 +<ul> 3.406 +<li class="level1"><div class="li">Debug et journal : 3.407 + 3.408 +<ol> 3.409 + <li class="level1"><div class="li">Emplacement du fichier journal :<br /> 3.410 + <code>LOG="/var/log/tazinst.log"</code> 3.411 + </div></li> 3.412 + <li class="level1"><div class="li">Debugging: (non => 0, debug => 1)<br /> 3.413 + <code>DEBUG=0</code> 3.414 + </div></li> 3.415 + <p> 3.416 + Il est chaudement recommandé de définir <code>DEBUG=1</code> et de 3.417 + joindre le fichier journal resultant lors de l'envoi d'un rapport de 3.418 + bogue aux développeurs. 3.419 + </p> 3.420 +</ol> 3.421 +</div></li> 3.422 +</ul> 3.423 + 3.424 +<h2>MAINTENEURS</h2> 3.425 +<p> 3.426 + Christophe Lincoln <pankso at slitaz.org> <br /> 3.427 Dominique Corbex <domcox at slitaz.org> 3.428 </p> 3.429
4.1 --- a/installer/README Sun Aug 14 10:51:11 2011 +0100 4.2 +++ b/installer/README Mon Aug 15 22:33:56 2011 +0200 4.3 @@ -14,7 +14,7 @@ 4.4 4.5 With this way, it allows developpers to create a different kind of frontend: 4.6 Dialog, GTK and CGI/web in TazPanel. The frontend just has to create a config 4.7 -file and start the cmdline installer and report steps in a nice way (progess 4.8 +file and start the cmdline installer and report steps in a nice way (progress 4.9 bar or/and messages). 4.10 4.11
5.1 --- a/installer/tazinst Sun Aug 14 10:51:11 2011 +0100 5.2 +++ b/installer/tazinst Mon Aug 15 22:33:56 2011 +0200 5.3 @@ -12,14 +12,15 @@ 5.4 # 5.5 # Exit codes: 5.6 # 1: Parameters error 5.7 -# 2: Configuration file error 5.8 +# 2: Setup file error 5.9 # 3: Source error 5.10 # 4: Cancelled by user 5.11 # 5: Target partition error 5.12 # 6: SliTaz system to upgrade not found 5.13 +# 7: Another instance is running 5.14 # 8: Internal error 5.15 5.16 -VERSION=3.22 5.17 +VERSION=3.30 5.18 5.19 # Internationalization 5.20 . /usr/bin/gettext.sh 5.21 @@ -29,6 +30,7 @@ 5.22 SOURCE_ROOT=/media/source 5.23 TARGET_ROOT=/mnt/target 5.24 LOG=/var/log/tazinst.log 5.25 +LOCK=/run/tazinst.pid 5.26 BACKLIST="SliTaz GNU/Linux installer" 5.27 5.28 # DEBUG=1: Enable debug msgs 5.29 @@ -39,34 +41,28 @@ 5.30 URL_COOKING="http://mirror.slitaz.org/iso/cooking/slitaz-cooking.iso" 5.31 URL_ROLLING="http://mirror.slitaz.org/iso/rolling/slitaz-core.iso" 5.32 5.33 -# Config 5.34 +# Tazinst conf 5.35 [ -r /etc/slitaz/tazinst.conf ] && . /etc/slitaz/tazinst.conf 5.36 5.37 # Print a short help 5.38 usage() 5.39 { 5.40 - echo -e "\n`gettext \"Tazinst - SliTaz installer - Version\"`: $VERSION\n" 5.41 - echo -e "\033[1m`gettext \"Usage\"`:" 5.42 - echo -e "\033[0m `gettext \"tazinst [command] [config-file|url|options]\"`\n" 5.43 - echo -e "\033[1m`gettext \"Commands\"`: \033[0m" 5.44 - echo -e "usage `gettext \"Print this short usage.\"`" 5.45 - echo -e "install `gettext \"Install SliTaz on HDD using a configuration file.\"`" 5.46 - echo -e "upgrade `gettext \"Upgrade SliTaz on HDD using a configuration file.\"`" 5.47 - echo -e "config `gettext \"Generate a configuration file.\"`" 5.48 - echo -e "check `gettext \"Check validity of the configuration file.\"`" 5.49 - echo -e "showurl `gettext \"Show the full URL of a predefined URL (stable|cooking|rolling).\"`" 5.50 - echo -e "log `gettext \"Display log file contents.\"`" 5.51 - echo -e "cli `gettext \"Install or upgrade using command line options:\"`" 5.52 - echo -e " -i `gettext \"Full Install (not upgrading, all present data will be lost).\"`" 5.53 - echo -e " -u `gettext \"Upgrade (Needs an active internet connection).\"`" 5.54 - echo -e " -t <type> `gettext \"Install type (cdrom|usb|iso|web|weboot).\"`" 5.55 - echo -e " -s <source> `gettext \"Source media (ex: file.iso|usb partition|web url).\"`" 5.56 - echo -e " -p <partition> `gettext \"Partition where SliTaz will be installed (ex:/dev/hda3).\"`" 5.57 - echo -e " -f <fs> `gettext \"Partition to be formatted (fs=ext2|ext3|ext4|etc..).\"`" 5.58 - echo -e " -g `gettext \"Install Grub.\"`" 5.59 - echo -e " -w `gettext \"Dual-boot a Windows partition (auto|hd<disk>,<part> ex:hd0,0).\"`" 5.60 - echo -e " -d `gettext \"Debug mode.\"`" 5.61 - exit 0 5.62 + cat <<EOT 5.63 +$(echo -e "\n$(gettext "Tazinst - SliTaz installer - Version"): $VERSION") 5.64 + 5.65 +$(echo -e "\033[1m$(gettext "Usage"):\033[0m $(gettext "tazinst [command] [setup-file|url-shortcut]")") 5.66 + 5.67 +$(echo -e "\033[1m$(gettext "Commands"): \033[0m") 5.68 + usage|help $(gettext "Print this short usage.") 5.69 + install <file> $(gettext "Install SliTaz on HDD using setup file contents.") 5.70 + upgrade <file> $(gettext "Upgrade SliTaz on HDD using setup file contents.") 5.71 + new <file> $(gettext "Create a new setup file.") 5.72 + check <file> $(gettext "Check validity of settings in a setup file.") 5.73 + showurl <shortcut> $(gettext "Show full URL of a predefined shortcut (stable|cooking|rolling).") 5.74 + log $(gettext "Display log file contents and exit.") 5.75 + version $(gettext "Print version and exit.") 5.76 +EOT 5.77 + exit 1 5.78 } 5.79 5.80 # Print an error msg & exit 5.81 @@ -81,7 +77,10 @@ 5.82 if mount | grep -q $TARGET_ROOT; then 5.83 umount $TARGET_ROOT 2>>$LOG 5.84 fi 5.85 - echo -e "`gettext \"Error\"` $@" 5.86 + # rm lock 5.87 + rm -f $LOCK 5.88 + 5.89 + echo -e "$(gettext "Error") $@" 5.90 test $(id -u) = 0 && echo "Installation cancelled on error $@" >> $LOG 5.91 exit $1 5.92 } 5.93 @@ -89,36 +88,37 @@ 5.94 # Print a warning msg 5.95 warning() 5.96 { 5.97 - echo -e "`gettext \"Warning:\"` $@" | tee -a $LOG 5.98 + echo -e "$(gettext "Warning:") $@" | tee -a $LOG 5.99 } 5.100 5.101 # Print a debug msg 5.102 debug() 5.103 { 5.104 - [ $DEBUG -gt 0 ] && echo -e "\033[1mDEBUG: \033[0m$1" 5.105 - echo "DEBUG: $1" >>$LOG 5.106 + [ $DEBUG -gt 0 ] && echo -e "\033[1mDEBUG:\033[0m $1" 5.107 + [ $DEBUG -gt 0 ] && echo "DEBUG: $1" >>$LOG 5.108 } 5.109 5.110 -# print a msg 5.111 +# Print a simple msg 5.112 msg() 5.113 { 5.114 STEP=$(($STEP+1)) 5.115 echo "$STEP. $@" | tee -a $LOG 5.116 + sleep 1 5.117 } 5.118 5.119 -######################## 5.120 -# Gen-config functions # 5.121 -######################## 5.122 +####################### 5.123 +# New setup functions # 5.124 +####################### 5.125 5.126 -# Generate a config file 5.127 -# $1: Configuration file 5.128 -gen_config() 5.129 +# Generate a setup file 5.130 +# $1: Setup file 5.131 +gen_setup() 5.132 { 5.133 - CONFILE=$1 5.134 - touch $CONFILE || abort 2 `gettext "Can't write config file"` 5.135 - if [ -r "$CONFILE" ]; then 5.136 - cat > $CONFILE << _EOF_ 5.137 -# tazinst.conf: SliTaz Installer configuration file. 5.138 + SETUP=$1 5.139 + touch $SETUP || abort 2 $(gettext "Can't write setup file") 5.140 + if [ -r "$SETUP" ]; then 5.141 + cat > $SETUP << _EOF_ 5.142 +# SliTaz Installer setup file. 5.143 # 5.144 5.145 # Install type : [cdrom|usb|iso|web|weboot] 5.146 @@ -174,7 +174,7 @@ 5.147 _EOF_ 5.148 5.149 else 5.150 - abort 2 `gettext "Config file not found"` 5.151 + abort 2 $(gettext "Setup file not found") 5.152 fi 5.153 } 5.154 5.155 @@ -186,6 +186,14 @@ 5.156 # $@ : 5.157 init() 5.158 { 5.159 + # Check if another instance of tazinst is running 5.160 + if [ -e "$LOCK" ]; then 5.161 + echo $(gettext "Another instance of tazinst is running.") 5.162 + exit 7 5.163 + else 5.164 + echo $$ > $LOCK 5.165 + fi 5.166 + 5.167 echo "=== Tazinst: start at `date` ===" >$LOG 5.168 echo "Command: $0 $@" >>$LOG 5.169 debug $(fdisk -l | grep \/dev) 5.170 @@ -202,54 +210,25 @@ 5.171 TGT_GRUB=no 5.172 } 5.173 5.174 -# Read Conf 5.175 -# $1: conf file 5.176 -read_configuration_file() 5.177 +# Read setup 5.178 +# $1: setup file 5.179 +read_setup_file() 5.180 { 5.181 - CONFILE=$1 5.182 - if [ -n "$CONFILE" ]; then 5.183 - if [ -r "$CONFILE" ]; then 5.184 - debug "Using config-file=$CONFILE" 5.185 + SETUP=$1 5.186 + if [ -n "$SETUP" ]; then 5.187 + if [ -r "$SETUP" ]; then 5.188 + debug "Using setup-file=$SETUP" 5.189 # source doesn't like file without a path 5.190 - [ $(echo "$CONFILE" | grep -c "/") == "0" ] && CONFILE="./$CONFILE" 5.191 - source $CONFILE || abort 2 `gettext "Unable to read config file"` 5.192 + [ $(echo "$SETUP" | grep -c "/") == "0" ] && SETUP="./$SETUP" 5.193 + source $SETUP || abort 2 $(gettext "Unable to read setup file") 5.194 else 5.195 - abort 2 `gettext "Config file not found"` 5.196 + abort 2 $(gettext "Setup file not found") 5.197 fi 5.198 else 5.199 - abort 2 `gettext "No configuration file provided"` 5.200 + abort 2 $(gettext "No setup file provided") 5.201 fi 5.202 } 5.203 5.204 -# Cli options 5.205 -# $@: tazinst parms 5.206 -check_cli_options() 5.207 -{ 5.208 - shift 5.209 - while getopts "c:df:ghip:s:t:uw:" opt ; do 5.210 - case $opt in 5.211 - d) DEBUG=1 ;; 5.212 - f) TGT_FS=$OPTARG ;; 5.213 - g) TGT_GRUB="yes" ;; 5.214 - h) usage ;; 5.215 - i) INSTALL="install" ;; 5.216 - p) TGT_PARTITION=$OPTARG ;; 5.217 - s) SRC_FILE=$OPTARG ;; 5.218 - t) INST_TYPE=$OPTARG ;; 5.219 - u) UPGRADE="upgrade" ;; 5.220 - w) TGT_WINBOOT=$OPTARG ;; 5.221 - [?]) abort 1 ;; 5.222 - esac 5.223 - done 5.224 - 5.225 - # Duplicate install modes are forbidden 5.226 - [ -n "$INSTALL" ] && [ -n "$UPGRADE" ] && abort 1 `gettext "Mismatched parameters"` 5.227 - INST_ACTION="$INSTALL$UPGRADE" 5.228 - # Don't allow formatting on upgrades 5.229 - [ "$INST_ACTION" == "upgrade" ] && [ -n "$TGT_FS" ] && \ 5.230 - warning "$TGT_PARTITION: `gettext "will not be formatted during upgrade"`" 5.231 -} 5.232 - 5.233 # check main vars 5.234 check_vars() 5.235 { 5.236 @@ -277,7 +256,7 @@ 5.237 # Check Action 5.238 case $INST_ACTION in 5.239 install|upgrade|check) ;; 5.240 - *) msg "INST_ACTION=$INST_ACTION: `gettext "Invalid setting"`"; error=yes ;; 5.241 + *) msg "$INST_ACTION: $(gettext "Unknown install mode")"; error=yes ;; 5.242 esac 5.243 5.244 # Check Type 5.245 @@ -286,9 +265,9 @@ 5.246 usb|iso|web) 5.247 # We need a valid source 5.248 if [ -z "$SRC_FILE" ]; then 5.249 - msg "INST_TYPE=$INST_TYPE, `gettext "but no source file is provided"`"; error=yes 5.250 + msg "$INST_TYPE: $(gettext "No source file provided")"; error=yes 5.251 fi ;; 5.252 - *) msg "INST_TYPE=$INST_TYPE: `gettext "Invalid setting"`"; error=yes ;; 5.253 + *) msg "$INST_TYPE: $(gettext "Unknown source type")"; error=yes ;; 5.254 esac 5.255 5.256 # Check Source file 5.257 @@ -302,11 +281,11 @@ 5.258 case $INST_TYPE in 5.259 iso) 5.260 if [ ! -r "$SRC_FILE" ]; then 5.261 - msg "SRC_FILE=$SRC_FILE: `gettext "file not found"`"; error=yes 5.262 + msg "$SRC_FILE: $(gettext "Source file not found")"; error=yes 5.263 fi ;; 5.264 web) 5.265 if ! wget -sq "$SRC_FILE" 2> /dev/null ; then 5.266 - msg "SRC_FILE=$SRC_FILE: `gettext "file not found on the web"`"; error=yes 5.267 + msg "$SRC_FILE: $(gettext "URL not found")"; error=yes 5.268 fi ;; 5.269 esac 5.270 5.271 @@ -317,10 +296,10 @@ 5.272 [ "$partition" == "$TGT_PARTITION" ] && found="yes" 5.273 done 5.274 if [ "$found" != "yes" ]; then 5.275 - msg "TGT_PARTITION=$TGT_PARTITION: `gettext "Partition not found"`"; error=yes 5.276 + msg "$TGT_PARTITION: $(gettext "Partition for / not found")"; error=yes 5.277 fi 5.278 if [ "$TGT_PARTITION" == "$SRC_FILE" ]; then 5.279 - msg $(gettext "Target and source partitions should be different."); error=yes 5.280 + msg $(gettext "Target and source partitions should be different"); error=yes 5.281 fi 5.282 5.283 # Check Filesystem 5.284 @@ -332,9 +311,9 @@ 5.285 [ -x "$xdir/mkfs.$TGT_FS" ] && found=yes 5.286 done 5.287 if [ "$found" == "no" ]; then 5.288 - msg "$TGT_FS: mkfs.$TGT_FS `gettext "is not installed."`"; error=yes 5.289 + msg "$TGT_FS: mkfs.$TGT_FS $(gettext "is not installed")"; error=yes 5.290 fi ;; 5.291 - *) msg "TGT_FS=$TGT_FS: `gettext "Unknown filesystem"`"; error=yes ;; 5.292 + *) msg "$TGT_FS: $(gettext "Unknown filesystem (/)")"; error=yes ;; 5.293 esac 5.294 5.295 # Check Home partition 5.296 @@ -344,13 +323,13 @@ 5.297 [ "$partition" == "$TGT_HOME" ] && found=yes 5.298 done 5.299 if [ "$found" != "yes" ]; then 5.300 - msg "TGT_HOME=$TGT_HOME: `gettext "Partition not found"`"; error=yes 5.301 + msg "$TGT_HOME: $(gettext "Partition for /home not found")"; error=yes 5.302 fi 5.303 if [ "$TGT_HOME" == "$SRC_FILE" ]; then 5.304 - msg $(gettext "/home and source partitions should be different."); error=yes 5.305 + msg $(gettext "/home and source partitions should be different"); error=yes 5.306 fi 5.307 if [ "$TGT_HOME" == "$TGT_PARTITION" ]; then 5.308 - msg $(gettext "main and /home partitions should be different."); error=yes 5.309 + msg $(gettext "/ and /home partitions should be different"); error=yes 5.310 fi 5.311 fi 5.312 5.313 @@ -363,15 +342,15 @@ 5.314 [ -x "$xdir/mkfs.$TGT_FS" ] && found=yes 5.315 done 5.316 if [ "$found" == "no" ]; then 5.317 - msg "$TGT_FS: mkfs.$TGT_FS `gettext "is not installed."`"; error=yes 5.318 + msg "$TGT_FS: mkfs.$TGT_FS $(gettext "is not installed")"; error=yes 5.319 fi ;; 5.320 - *) msg "TGT_HOME_FS=$TGT_HOME_FS: `gettext "Unknown filesystem"`"; error=yes ;; 5.321 + *) msg "$TGT_HOME_FS: $(gettext "Unknown filesystem (/home)")"; error=yes ;; 5.322 esac 5.323 5.324 # Check Grub 5.325 case $TGT_GRUB in 5.326 yes|no) ;; 5.327 - *) msg "TGT_GRUB=$TGT_GRUB: `gettext "Invalid setting"`"; error=yes ;; 5.328 + *) msg $(gettext "Bootloader (grub): Invalid settings"); error=yes ;; 5.329 esac 5.330 5.331 # Check Winboot 5.332 @@ -379,7 +358,7 @@ 5.333 "") ;; 5.334 auto) ;; 5.335 hd[[:digit:]],[[:digit:]]) ;; 5.336 - *) msg "TGT_WINBOOT=$TGT_WINBOOT: `gettext "Invalid format"`"; error=yes ;; 5.337 + *) msg $(gettext "Windows Dual-Boot: Invalid settings"); error=yes ;; 5.338 esac 5.339 5.340 # Stop on error 5.341 @@ -390,8 +369,8 @@ 5.342 check_root() 5.343 { 5.344 if test $(id -u) != 0 ; then 5.345 - echo -e "`gettext \"You must be the root user (system administrator) to install SliTaz, \ 5.346 -please use 'su' to get a root SHell and restart installation.\"`" 5.347 + gettext "You must be the root user (system administrator) to install SliTaz, \ 5.348 +please use 'su' to get a root SHell and restart installation." 5.349 exit 0 5.350 fi 5.351 } 5.352 @@ -407,7 +386,7 @@ 5.353 debug "Using files from cdrom ($CDROM)..." 5.354 sleep 2 5.355 else 5.356 - warning "$CDROM: `gettext "Failed to mount"`" 5.357 + warning "$CDROM: $(gettext "Mount failed")" 5.358 fi 5.359 } 5.360 5.361 @@ -426,7 +405,7 @@ 5.362 debug "Using files from USB device ($SRC_FILE)..." 5.363 SOURCE_STATUS="mount" 5.364 else 5.365 - warning "$SRC_FILE: `gettext "Failed to mount USB device"`" 5.366 + warning "$SRC_FILE: $(gettext "Failed to mount USB device")" 5.367 fi 5.368 fi 5.369 } 5.370 @@ -439,16 +418,16 @@ 5.371 src_md5=$(echo $SRC_FILE | sed 's/.iso$/.md5/') 5.372 if [ -r "$src_md5" ]; then 5.373 [ $(md5sum $SRC_FILE | cut -d' ' -f1) == $(cat "$src_md5" | cut -d' ' -f1) ] || \ 5.374 - abort 3 "$SRC-FILE `gettext "corrupted"`" 5.375 + abort 3 "$SRC-FILE: $(gettext "md5sum mismatch, file corrupted")" 5.376 else 5.377 - warning "$SRC_FILE: `gettext "md5 file not found, unable to check integrity."`" 5.378 + warning "$SRC_FILE: $(gettext "md5 file not found, unable to check integrity.")" 5.379 fi 5.380 # Try to mount ISO 5.381 if mount -o loop -t iso9660 $SRC_FILE $SOURCE_ROOT 2>>$LOG; then 5.382 debug "Using files from ISO ($SRC_FILE)..." 5.383 sleep 2 5.384 else 5.385 - warning "$SRC_FILE: `gettext "Failed to mount ISO."`" 5.386 + warning "$SRC_FILE: $(gettext "Failed to mount ISO.")" 5.387 fi 5.388 } 5.389 5.390 @@ -460,11 +439,11 @@ 5.391 if wget $SRC_FILE -P /tmp; then 5.392 debug "Download completed." 5.393 else 5.394 - warning "$SRC_FILE: `gettext "Failed to download."`" 5.395 + warning "$SRC_FILE: $(gettext "File download failed.")" 5.396 fi 5.397 src_md5=$(echo $SRC_FILE | sed 's/.iso$/.md5/') 5.398 debug "Downloading $src_md5" 5.399 - wget $src_md5 -P /tmp || warning "$src_md5: `gettext "Failed to download."`" 5.400 + wget $src_md5 -P /tmp || warning "$src_md5: $(gettext "File download failed.")" 5.401 tmpfile=$(echo $SRC_FILE | awk 'BEGIN{RS="/"}{out=$1}END{printf"%s",out}') 5.402 SRC_FILE="/tmp/$tmpfile" 5.403 check_iso 5.404 @@ -478,7 +457,7 @@ 5.405 ln -s $SRC_FILE/boot $SOURCE_ROOT/boot 5.406 sleep 2 5.407 else 5.408 - abort 3 `gettext "Web boot files not found"` 5.409 + abort 3 $(gettext "Web boot files not found") 5.410 fi 5.411 } 5.412 5.413 @@ -501,59 +480,19 @@ 5.414 check_cdrom 5.415 check_web ;; 5.416 *) 5.417 - abort 8 `gettext "Internal"` ;; 5.418 + abort 8 $(gettext "Internal") ;; 5.419 esac 5.420 5.421 # Exit with error msg if no rootfs.gz found. 5.422 debug "Checking installation media..." 5.423 if [ ! -f $SOURCE_ROOT/boot/rootfs.gz -a \ 5.424 ! -f $SOURCE_ROOT/boot/rootfs1.gz ]; then 5.425 - abort 3 `gettext "Invalid source"` 5.426 + abort 3 $(gettext "Invalid source") 5.427 else 5.428 debug "Installation media checked ok" 5.429 fi 5.430 } 5.431 5.432 -# Tiny summary 5.433 -summary() 5.434 -{ 5.435 - echo -e "`gettext \"Installation settings summary:\"`" 5.436 - STEP=0 5.437 - 5.438 - if [ "$INST_ACTION" == "install" ]; then 5.439 - if [ -n "$TGT_FS" ]; then 5.440 - msg "`gettext "Format root partition"` '$TGT_PARTITION' ($TGT_FS)" 5.441 - fi 5.442 - if [ -n "$TGT_HOME_FS" ]; then 5.443 - msg "`gettext "Format /home partition"` '$TGT_HOME' ($TGT_HOME_FS)" 5.444 - fi 5.445 - msg "`gettext "Install SliTaz on"` '$TGT_PARTITION'. `gettext "Source:"` $INST_TYPE" 5.446 - [ -n "$TGT_HOME" ] && msg "`gettext "Set Home partition to" `'$TGT_HOME'" 5.447 - msg "`gettext "Set Hostname as"` '$TGT_HOSTNAME'" 5.448 - msg "`gettext "Set Default user as"` '$TGT_USER'" 5.449 - else 5.450 - msg "`gettext "Check"` '$TGT_PARTITION'" 5.451 - msg `gettext "Backup /etc, /home and the packages list"` 5.452 - msg "`gettext "Upgrade SliTaz on"` '$TGT_PARTITION'. `gettext "Source:"` $INST_TYPE" 5.453 - msg `gettext "Restore /etc, /home"` 5.454 - msg `gettext "Upgrade additional packages."` 5.455 - fi 5.456 - if [ -n "$TGT_WINBOOT" ]; then 5.457 - msg "`gettext "Enable Windows dual-boot"` ($TGT_WINBOOT)" 5.458 - fi 5.459 - if [ "$TGT_GRUB" == "yes" ]; then 5.460 - msg `gettext "Install Grub"` 5.461 - fi 5.462 - 5.463 - echo -ne "`gettext \"Continue:(y/n)\"`" 5.464 - read answer 5.465 - case $answer in 5.466 - [oOyY]) echo -e "`gettext \"Running $BACKLIST..\"`" ;; 5.467 - *) abort 4 `gettext "Cancelled by user"` ;; 5.468 - esac 5.469 - STEP=0 5.470 -} 5.471 - 5.472 ####################### 5.473 # Installer functions # 5.474 ####################### 5.475 @@ -564,7 +503,7 @@ 5.476 debug "Preparing target partition..." 5.477 # Target may be used 5.478 mount | grep -q $TGT_PARTITION && \ 5.479 - abort 5 "$TGT_PARTITION: `gettext "Partition in use"`" 5.480 + abort 5 "$TGT_PARTITION: $(gettext "Partition in use")" 5.481 # Mount point can be already used. 5.482 if mount | grep -q $TARGET_ROOT; then 5.483 umount $TARGET_ROOT 2>>$LOG 5.484 @@ -578,7 +517,7 @@ 5.485 # ROOT_FS=$(parted /dev/hda5 print -m | grep "^1:" | cut -d':' -f5) ;; 5.486 ROOT_FS=auto ;; 5.487 *) 5.488 - msg "`gettext "Formatting main partition:"` $TGT_PARTITION ($TGT_FS)" 5.489 + msg "$(gettext "Formatting / partition:") $TGT_PARTITION ($TGT_FS)" 5.490 mkfs.$TGT_FS $TGT_PARTITION >>$LOG 2>>$LOG 5.491 ROOT_FS=$TGT_FS ;; 5.492 esac 5.493 @@ -590,7 +529,7 @@ 5.494 "") 5.495 debug "The partition ($TGT_HOME) will be kept..." ;; 5.496 *) 5.497 - msg "`gettext "Formatting /home partition:"` $TGT_HOME ($TGT_HOME_FS)" 5.498 + msg "$(gettext "Formatting /home partition:") $TGT_HOME ($TGT_HOME_FS)" 5.499 mkfs.$TGT_HOME_FS -L "Home" $TGT_HOME >>$LOG 2>>$LOG ;; 5.500 esac 5.501 sleep 2 5.502 @@ -603,7 +542,7 @@ 5.503 5.504 mount -t $ROOT_FS $TGT_PARTITION $TARGET_ROOT >>$LOG 2>>$LOG 5.505 if [ $(mount | grep -c "mnt/target") == "0" ]; then 5.506 - abort 5 "$TGT_PARTITION: `gettext "Can't mount"`" 5.507 + abort 5 "$TGT_PARTITION: $(gettext "Unable to mount partition")" 5.508 fi 5.509 } 5.510 5.511 @@ -614,7 +553,7 @@ 5.512 # partition was not formatted 5.513 debug "Cleaning the root partition ($TGT_PARTITION)..." 5.514 # Keep /home in case of reinstall. 5.515 - cd $TARGET_ROOT || abort 8 `gettext "Internal"` 5.516 + cd $TARGET_ROOT || abort 8 $(gettext "Internal") 5.517 for dir in * 5.518 do 5.519 case "$dir" in 5.520 @@ -642,8 +581,8 @@ 5.521 KERNEL=$(ls /$TARGET_ROOT/lib/modules | tail -1) 5.522 KERNEL="vmlinuz-$KERNEL" 5.523 else 5.524 - warning `gettext "Falling back to running kernel name.."` 5.525 KERNEL=vmlinuz-`uname -r` 5.526 + warning "$(gettext "Kernel name not found, falling back to:") $(uname -r)" 5.527 fi 5.528 mkdir -p $TARGET_ROOT/boot 5.529 cp $SOURCE_ROOT/boot/bzImage $TARGET_ROOT/boot/$KERNEL 5.530 @@ -707,7 +646,7 @@ 5.531 { 5.532 local isloramfs 5.533 isloramfs= 5.534 - cd $TARGET_ROOT || abort 8 `gettext "Internal"` 5.535 + cd $TARGET_ROOT || abort 8 $(gettext "Internal") 5.536 if [ -d $1/../fs/etc ]; then 5.537 # This is a tazlitobox loram (cdrom) 5.538 cp -a $1/../fs/. . 5.539 @@ -742,7 +681,7 @@ 5.540 # Pre configure freshly installed system (60 - 80%). 5.541 pre_config_system() 5.542 { 5.543 - cd $TARGET_ROOT || abort 8 `gettext "Internal"` 5.544 + cd $TARGET_ROOT || abort 8 $(gettext "Internal") 5.545 # Restore backup of existing /home if exists. 5.546 # (created by prepare_target_dev) 5.547 if [ -d home.bak ]; then 5.548 @@ -757,7 +696,7 @@ 5.549 sed -i s#'CHECK_FS=\"\"'#"CHECK_FS=\"$TGT_PARTITION\""# etc/rcS.conf 5.550 sleep 2 5.551 # Set hostname. 5.552 - msg "`gettext "Configuring host name:"` $TGT_HOSTNAME" 5.553 + msg "$(gettext "Configuring host name:") $TGT_HOSTNAME" 5.554 echo $TGT_HOSTNAME > etc/hostname 5.555 } 5.556 5.557 @@ -766,7 +705,7 @@ 5.558 { 5.559 cat > $TARGET_ROOT/users.sh << _EOF_ 5.560 #!/bin/sh 5.561 -echo "root:$TGT_ROOT_PWD" | chpasswd > /etc/null 5.562 +echo "root:$TGT_ROOT_PWD" | chpasswd 5.563 adduser -D -H $TGT_USER 5.564 5.565 for grp in audio cdrom floppy dialout disk kmem tape tty video; do 5.566 @@ -775,7 +714,7 @@ 5.567 fi 5.568 done 5.569 5.570 -echo "$TGT_USER:$TGT_USER_PWD" | chpasswd > /etc/null 5.571 +echo "$TGT_USER:$TGT_USER_PWD" | chpasswd 5.572 if [ ! -d /home/$TGT_USER ]; then 5.573 cp -a /etc/skel /home/$TGT_USER 5.574 [ -e /root/.xinitrc ] && cp /root/.xinitrc /home/$TGT_USER 5.575 @@ -810,7 +749,7 @@ 5.576 home_config() 5.577 { 5.578 debug "home_config: $TGT_HOME" 5.579 - cd $TARGET_ROOT || abort 8 `gettext "Internal"` 5.580 + cd $TARGET_ROOT || abort 8 $(gettext "Internal") 5.581 mv home/$TGT_USER tmp 5.582 mount $TGT_HOME home 5.583 if [ -d $TARGET_ROOT/home/$TGTUSER ]; then 5.584 @@ -826,7 +765,7 @@ 5.585 # Search for a Windows partition 5.586 win_partition() 5.587 { 5.588 -# msg `gettext "Searching for Windows"` 5.589 + debug "Searching for Windows" 5.590 if [ "$TGT_WINBOOT" == "auto" ];then 5.591 WINBOOT=$(fdisk -l | awk ' 5.592 BEGIN{disk=-1, found=-1, winboot=""} 5.593 @@ -846,7 +785,7 @@ 5.594 } 5.595 END{printf "%s", winboot}') 5.596 if [ -z "$WINBOOT" ]; then 5.597 - warning `gettext "No windows partition found. Dual-boot disabled"` 5.598 + warning $(gettext "No windows partition found. Dual-boot disabled") 5.599 TGT_WINBOOT="" 5.600 fi 5.601 fi 5.602 @@ -903,7 +842,7 @@ 5.603 5.604 _EOF_ 5.605 if [ -n "$TGT_WINBOOT" ]; then 5.606 - msg `gettext "Enabling Windows dual-boot"` 5.607 + msg $(gettext "Enabling Windows dual-boot") 5.608 cat >> $TARGET_ROOT/boot/grub/menu.lst << _EOF_ 5.609 # For booting Windows : 5.610 # 5.611 @@ -924,7 +863,7 @@ 5.612 # Files install, calling for functions or with cmds. 5.613 install_files() 5.614 { 5.615 - msg "`gettext "Installing SliTaz on"` $TGT_PARTITION" 5.616 + msg "$(gettext "Installing SliTaz on:") $TGT_PARTITION" 5.617 # saving pwd 5.618 local save_pwd=$(pwd) 5.619 5.620 @@ -943,11 +882,11 @@ 5.621 debug "Preconfiguring the system..." 5.622 pre_config_system 5.623 5.624 - msg "`gettext "Configuring root and default user account:"` $TGT_USER" 5.625 + msg "$(gettext "Configuring root and default user account:") $TGT_USER" 5.626 users_settings 5.627 5.628 if [ "$TGT_HOME" != "" ]; then 5.629 - msg "$TGT_HOME: `gettext "Configuring partition to be used as /home..."`" 5.630 + msg "$(gettext "Configuring partition to be used as /home:") $TGT_HOME" 5.631 home_config 5.632 sleep 2 5.633 fi 5.634 @@ -966,7 +905,7 @@ 5.635 { 5.636 if [ "$TGT_GRUB" == "yes" ]; then 5.637 TARGET_DISK=`echo $TGT_PARTITION | sed s/"[0-9]"/''/` 5.638 - msg "`gettext "Running grub-install on:"` $TARGET_DISK" 5.639 + msg "$(gettext "Running grub-install on:") $TARGET_DISK" 5.640 grub-install --no-floppy \ 5.641 --root-directory=$TARGET_ROOT $TARGET_DISK 2>>$LOG 5.642 debug "Grub installation done..." 5.643 @@ -980,32 +919,34 @@ 5.644 { 5.645 # Umount target 5.646 if mount | grep -q $TARGET_ROOT; then 5.647 - echo -e "`gettext \"Unmounting target\"` ($TGT_PARTITION)..." 5.648 + echo "$(gettext "Unmounting target partition:") $TGT_PARTITION" 5.649 umount $TARGET_ROOT 2>>$LOG 5.650 fi 5.651 5.652 # Umount source 5.653 if mount | grep -q $SOURCE_ROOT; then 5.654 - echo -e "`gettext \"Unmounting\"` $SOURCE_ROOT" 5.655 + echo "$(gettext "Unmounting:") $SOURCE_ROOT" 5.656 umount $SOURCE_ROOT 5.657 fi 5.658 5.659 # Eject cd 5.660 if [ "$INST_TYPE" == "cdrom" ]; then 5.661 - echo -e "`gettext \"Ejecting cdrom...\"`" 5.662 + gettext "Ejecting cdrom..." 5.663 eject 5.664 fi 5.665 + # Remove lock file 5.666 + rm -f $LOCK 5.667 sleep 2 5.668 } 5.669 5.670 # End of installation. 5.671 end_of_install() 5.672 { 5.673 - echo -e "`gettext \"Installation complete. You can now restart (reboot) \"`" 5.674 - echo -e "`gettext \"from your SliTaz GNU/Linux system.\"`" 5.675 + msg $(gettext "Installation complete. You can now restart (reboot)") 5.676 + echo " $(gettext "from your SliTaz GNU/Linux system.")" 5.677 echo "=== Tazinst end at `date` ===" >>$LOG 5.678 # Log files 5.679 - echo -e "`gettext \"Copying log files\"` ($LOG)..." 5.680 + echo "$(gettext "Copying log files") ($LOG)..." 5.681 cp -a $LOG $TARGET_ROOT/var/log 5.682 sleep 2 5.683 # umount 5.684 @@ -1022,7 +963,7 @@ 5.685 debug "Preparing the target partition..." 5.686 # Target may be used 5.687 mount | grep -q $TGT_PARTITION && \ 5.688 - abort 5 "$TGT_PARTITION: `gettext "Partition in use"`" 5.689 + abort 5 "$TGT_PARTITION: $(gettext "Partition in use")" 5.690 # Mount point can be already used. 5.691 if mount | grep -q $TARGET_ROOT; then 5.692 umount $TARGET_ROOT 2>>$LOG 5.693 @@ -1031,7 +972,7 @@ 5.694 # Mount target. 5.695 mount $TGT_PARTITION $TARGET_ROOT >>$LOG 2>>$LOG 5.696 if [ $(mount | grep -c "mnt/target") == "0" ]; then 5.697 - abort 5 "$TGT_PARTITION `gettext "Can't mount"`" 5.698 + abort 5 "$TGT_PARTITION $(gettext "Unable to mount partition")" 5.699 fi 5.700 } 5.701 5.702 @@ -1040,17 +981,17 @@ 5.703 { 5.704 if [ -f $TARGET_ROOT/etc/slitaz-release ]; then 5.705 release=`cat $TARGET_ROOT/etc/slitaz-release` 5.706 - msg "`gettext "Preparing upgrade of SliTaz release:"` $release" 5.707 + msg "$(gettext "Preparing upgrade of SliTaz release:") $release" 5.708 else 5.709 - abort 6 "'$TGT_PARTITION': `gettext "This partition doesn't appear to contain \ 5.710 -a valid SliTaz system, the file: /etc/slitaz-release doesn't exist."`" 5.711 + abort 6 "$TGT_PARTITION: $(gettext "This partition doesn't appear to contain \ 5.712 +a valid SliTaz system, the file: /etc/slitaz-release doesn't exist.")" 5.713 fi && sleep 2 5.714 } 5.715 5.716 # Backup target packages list. 5.717 backup_files() 5.718 { 5.719 - cd $TARGET_ROOT || abort 8 `gettext "Internal"` 5.720 + cd $TARGET_ROOT || abort 8 $(gettext "Internal") 5.721 ls -1 var/lib/tazpkg/installed > home/packages-selection.list 5.722 for dir in * 5.723 do 5.724 @@ -1147,7 +1088,7 @@ 5.725 # Search for added pkgs 5.726 update_pkgs() 5.727 { 5.728 - cd $TARGET_ROOT/var/lib/tazinst || abort 8 `gettext "Internal"` 5.729 + cd $TARGET_ROOT/var/lib/tazinst || abort 8 $(gettext "Internal") 5.730 # LiveCD packages list. 5.731 debug "Creating package lists..." 5.732 ls -1 $TARGET_ROOT/var/lib/tazpkg/installed > packages-source.list || exit 1 5.733 @@ -1162,10 +1103,10 @@ 5.734 install_pkgs 5.735 else 5.736 touch packages-to-install.list 5.737 - warning `gettext "The list of available packages on the mirror could not be \ 5.738 + warning $(gettext "The list of available packages on the mirror could not be \ 5.739 downloaded. No missing packages will be reinstalled now, but \ 5.740 you can do so later by looking at the following list: \ 5.741 -/var/lib/tazinst/packages-selection.diff"` 5.742 +/var/lib/tazinst/packages-selection.diff") 5.743 fi 5.744 sleep 2 5.745 } 5.746 @@ -1175,7 +1116,7 @@ 5.747 { 5.748 # Backup and create a new grub menu.lst. 5.749 if [ "$TGT_GRUB" == "yes" ]; then 5.750 - msg `gettext "Grub update"` 5.751 + msg $(gettext "Grub update") 5.752 mv $TARGET_ROOT/boot/grub/menu.lst \ 5.753 $TARGET_ROOT/boot/grub/menu.lst.bak 2>/dev/null 5.754 grub_config 5.755 @@ -1188,15 +1129,15 @@ 5.756 { 5.757 # saving pwd 5.758 local save_pwd=$(pwd) 5.759 - cd $TARGET_ROOT || abort 8 `gettext "Internal"` 5.760 + cd $TARGET_ROOT || abort 8 $(gettext "Internal") 5.761 5.762 debug "Searching for /etc/slitaz-release" 5.763 check_release 5.764 5.765 - msg `gettext "Backup /etc, /home and the packages list..."` 5.766 + msg $(gettext "Backup /etc, /home and the packages list...") 5.767 backup_files 5.768 5.769 - msg "`gettext "Upgrading SliTaz on:"` $TGT_PARTITION" 5.770 + msg "$(gettext "Upgrading SliTaz on:") $TGT_PARTITION" 5.771 5.772 debug "Copying the bootloader syslinux/isolinux..." 5.773 copy_bootloaders 5.774 @@ -1204,13 +1145,13 @@ 5.775 debug "Extracting the root system..." 5.776 extract_rootfs $SOURCE_ROOT/boot 5.777 5.778 - msg `gettext "Restoring configuration files..."` 5.779 + msg $(gettext "Restoring configuration files...") 5.780 restore_files 5.781 5.782 debug "Installing the kernel..." 5.783 install_kernel 5.784 5.785 - msg `gettext "Upgrading added packages..."` 5.786 + msg $(gettext "Upgrading added packages...") 5.787 update_pkgs 5.788 5.789 # restoring pwd 5.790 @@ -1222,9 +1163,10 @@ 5.791 { 5.792 pkgscd=`cat $TARGET_ROOT/var/lib/tazinst/packages-source.list | wc -l` 5.793 pkginst=`cat $TARGET_ROOT/var/lib/tazinst/packages-to-install.list | wc -l` 5.794 - echo -e "`gettext \"Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux system.\"`" 5.795 - echo -e "`gettext \"Packages on the cdrom :\"`" $pkgscd 5.796 - echo -e "`gettext \"Packages installed from the mirror :\"`" $pkginst 5.797 + msg $(gettext "Upgrade finished. You can now restart (reboot)") 5.798 + echo $(gettext "from your SliTaz GNU/Linux system.") 5.799 + echo "$(gettext "Packages on the cdrom :") $pkgscd" 5.800 + echo "$(gettext "Packages installed from the mirror :") $pkginst" 5.801 echo "=== Tazinst end at `date` ===" >>$LOG 5.802 umount_devices 5.803 } 5.804 @@ -1238,7 +1180,7 @@ 5.805 INST_ACTION=install 5.806 check_root 5.807 init $@ 5.808 - read_configuration_file $2 5.809 + read_setup_file $2 5.810 check_vars 5.811 check_source 5.812 prepare_install 5.813 @@ -1249,34 +1191,15 @@ 5.814 INST_ACTION=upgrade 5.815 check_root 5.816 init $@ 5.817 - read_configuration_file $2 5.818 + read_setup_file $2 5.819 check_vars 5.820 check_source 5.821 prepare_upgrade 5.822 upgrade_files 5.823 grub_update 5.824 end_of_upgrade ;; 5.825 - config) 5.826 - gen_config $2 ;; 5.827 - cli) 5.828 - check_root 5.829 - init $@ 5.830 - check_cli_options $@ 5.831 - check_vars 5.832 - check_source 5.833 - summary 5.834 - case $INST_ACTION in 5.835 - upgrade) 5.836 - prepare_upgrade 5.837 - upgrade_files 5.838 - grub_update 5.839 - end_of_upgrade ;; 5.840 - install) 5.841 - prepare_install 5.842 - install_files 5.843 - grub_install 5.844 - end_of_install ;; 5.845 - esac ;; 5.846 + new) 5.847 + gen_setup $2 ;; 5.848 showurl) 5.849 case $2 in 5.850 stable) 5.851 @@ -1291,10 +1214,11 @@ 5.852 INST_ACTION=check 5.853 check_root 5.854 init $@ 5.855 - read_configuration_file $2 5.856 - check_vars ;; 5.857 + read_setup_file $2 5.858 + check_vars 5.859 + rm -f $LOCK ;; 5.860 log) 5.861 - cat $LOG ;; 5.862 + [ -r "$LOG" ] && cat $LOG ;; 5.863 version) 5.864 echo $VERSION ;; 5.865 usage|*)
6.1 --- a/po/tazinst/es_AR.po Sun Aug 14 10:51:11 2011 +0100 6.2 +++ b/po/tazinst/es_AR.po Mon Aug 15 22:33:56 2011 +0200 6.3 @@ -7,93 +7,68 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: Tazinst\n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2011-07-31 10:00+0200\n" 6.8 +"POT-Creation-Date: 2011-08-14 16:42+0200\n" 6.9 "PO-Revision-Date: 2011-08-11 20:52-0300\n" 6.10 "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n" 6.11 "Language-Team: LANGUAGE <LL@li.org>\n" 6.12 +"Language: \n" 6.13 "MIME-Version: 1.0\n" 6.14 "Content-Type: text/plain; charset=UTF-8\n" 6.15 "Content-Transfer-Encoding: 8bit\n" 6.16 6.17 -#: installer/tazinst:48 6.18 +#: installer/tazinst:51 6.19 msgid "Tazinst - SliTaz installer - Version" 6.20 msgstr "Tazinst - Instalador SliTaz - Versión" 6.21 6.22 -#: installer/tazinst:49 6.23 +#: installer/tazinst:53 6.24 msgid "Usage" 6.25 msgstr "Uso" 6.26 6.27 -#: installer/tazinst:50 6.28 -msgid "tazinst [command] [config-file|url|options]" 6.29 +#: installer/tazinst:53 6.30 +#, fuzzy 6.31 +msgid "tazinst [command] [setup-file|url-shortcut]" 6.32 msgstr "tazinst [commando] [config-file|url|optiones]" 6.33 6.34 -#: installer/tazinst:51 6.35 +#: installer/tazinst:55 6.36 msgid "Commands" 6.37 msgstr "Comandos" 6.38 6.39 -#: installer/tazinst:52 6.40 +#: installer/tazinst:56 6.41 msgid "Print this short usage." 6.42 msgstr "Imprime este corto uso." 6.43 6.44 -#: installer/tazinst:53 6.45 -msgid "Install SliTaz on HDD using a configuration file." 6.46 +#: installer/tazinst:57 6.47 +#, fuzzy 6.48 +msgid "Install SliTaz on HDD using setup file contents." 6.49 msgstr "Instala SliTaz en un disco duro usando un archivo de configuración." 6.50 6.51 -#: installer/tazinst:54 6.52 -msgid "Upgrade SliTaz on HDD using a configuration file." 6.53 +#: installer/tazinst:58 6.54 +#, fuzzy 6.55 +msgid "Upgrade SliTaz on HDD using setup file contents." 6.56 msgstr "Actualiza SliTaz en un disco duro usando un archivo de configuración." 6.57 6.58 -#: installer/tazinst:55 6.59 -msgid "Generate a configuration file." 6.60 -msgstr "Generar un archivo de configuración" 6.61 +#: installer/tazinst:59 6.62 +msgid "Create a new setup file." 6.63 +msgstr "" 6.64 6.65 -#: installer/tazinst:56 6.66 -msgid "Check validity of the configuration file." 6.67 +#: installer/tazinst:60 6.68 +#, fuzzy 6.69 +msgid "Check validity of settings in a setup file." 6.70 msgstr "Comprobar validez del archivo de configuración." 6.71 6.72 -#: installer/tazinst:57 6.73 -msgid "Show the full URL of a predefined URL (stable|cooking|rolling)." 6.74 -msgstr "Mostrar el URL completo de un URL predefinido (stable|cooking|rolling)." 6.75 - 6.76 -#: installer/tazinst:58 6.77 -msgid "Install or upgrade using command line options:" 6.78 -msgstr "Instalar o actualizar usando las opciónes en la línea de comandos:" 6.79 - 6.80 -#: installer/tazinst:59 6.81 -msgid "Full Install (not upgrading, all present data will be lost)." 6.82 -msgstr "Instalación completa (no actualiza, todo dato presente será perdido)." 6.83 - 6.84 -#: installer/tazinst:60 6.85 -msgid "Upgrade (Needs an active internet connection)." 6.86 -msgstr "Actualizar (necesita una conexión de internet activa)." 6.87 - 6.88 #: installer/tazinst:61 6.89 -msgid "Install type (cdrom|usb|iso|web|weboot)." 6.90 -msgstr "Tipo de instalación (cdrom|usb|web|webroot)." 6.91 +#, fuzzy 6.92 +msgid "Show full URL of a predefined shortcut (stable|cooking|rolling)." 6.93 +msgstr "" 6.94 +"Mostrar el URL completo de un URL predefinido (stable|cooking|rolling)." 6.95 6.96 #: installer/tazinst:62 6.97 -msgid "Source media (ex: file.iso|usb partition|web url)." 6.98 -msgstr "Fuente de datos (ej: archivo.iso| partición usb| web url)." 6.99 +msgid "Display log file contents and exit." 6.100 +msgstr "" 6.101 6.102 #: installer/tazinst:63 6.103 -msgid "Partition where SliTaz will be installed (ex:/dev/hda3)." 6.104 -msgstr "Partición donde SliTaz será instalada (ej: /dev/hda3)." 6.105 - 6.106 -#: installer/tazinst:64 6.107 -msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)." 6.108 -msgstr "Partición a ser fomateada (fs=ext2|ext3|ext4|etc...)." 6.109 - 6.110 -#: installer/tazinst:65 6.111 -msgid "Install Grub." 6.112 -msgstr "Instalar Grub." 6.113 - 6.114 -#: installer/tazinst:66 6.115 -msgid "Dual-boot a Windows partition (auto|hd<disk>,<part> ex:hd0,0)." 6.116 -msgstr "Inicio dual en partición Windows (auto|hd<disk>,<part> ej: hd0,0)." 6.117 - 6.118 -#: installer/tazinst:67 6.119 -msgid "Debug mode." 6.120 -msgstr "Modo debug." 6.121 +msgid "Print version and exit." 6.122 +msgstr "" 6.123 6.124 #: installer/tazinst:83 6.125 msgid "Error" 6.126 @@ -103,304 +78,396 @@ 6.127 msgid "Warning:" 6.128 msgstr "Precaución" 6.129 6.130 -#: installer/tazinst:117 6.131 -msgid "Can't write config file" 6.132 +#: installer/tazinst:118 6.133 +#, fuzzy 6.134 +msgid "Can't write setup file" 6.135 msgstr "No se puede escribir el archivo de configuración" 6.136 6.137 -#: installer/tazinst:176 6.138 -#: installer/tazinst:215 6.139 -msgid "Config file not found" 6.140 -msgstr "Archivo de configuración no encontrado" 6.141 +#: installer/tazinst:177 installer/tazinst:225 6.142 +#, fuzzy 6.143 +msgid "Setup file not found" 6.144 +msgstr "Archivo no encontrado" 6.145 6.146 -#: installer/tazinst:213 6.147 -msgid "Unable to read config file" 6.148 +#: installer/tazinst:191 6.149 +msgid "Another instance of tazinst is running." 6.150 +msgstr "" 6.151 + 6.152 +#: installer/tazinst:223 6.153 +#, fuzzy 6.154 +msgid "Unable to read setup file" 6.155 msgstr "Incapaz de leer el archivo de configuración" 6.156 6.157 -#: installer/tazinst:218 6.158 -msgid "No configuration file provided" 6.159 +#: installer/tazinst:228 6.160 +#, fuzzy 6.161 +msgid "No setup file provided" 6.162 msgstr "No provista de un archivo de configuración" 6.163 6.164 -#: installer/tazinst:244 6.165 -msgid "Mismatched parameters" 6.166 -msgstr "Los parámetros no coinciden" 6.167 +#: installer/tazinst:259 6.168 +#, fuzzy 6.169 +msgid "Unknown install mode" 6.170 +msgstr "Sistema de archivos desconocido" 6.171 6.172 -#: installer/tazinst:248 6.173 -msgid "will not be formatted during upgrade" 6.174 -msgstr "no se formateará durante la actualización" 6.175 +#: installer/tazinst:268 6.176 +#, fuzzy 6.177 +msgid "No source file provided" 6.178 +msgstr "No provista de un archivo de configuración" 6.179 6.180 -#: installer/tazinst:278 6.181 -#: installer/tazinst:289 6.182 -#: installer/tazinst:363 6.183 -#, sh-format 6.184 -msgid "Invalid setting" 6.185 +#: installer/tazinst:270 6.186 +msgid "Unknown source type" 6.187 +msgstr "" 6.188 + 6.189 +#: installer/tazinst:284 6.190 +#, fuzzy 6.191 +msgid "Source file not found" 6.192 +msgstr "Archivo no encontrado" 6.193 + 6.194 +#: installer/tazinst:288 6.195 +#, fuzzy 6.196 +msgid "URL not found" 6.197 +msgstr "Archivo no encontrado" 6.198 + 6.199 +#: installer/tazinst:299 6.200 +#, fuzzy 6.201 +msgid "Partition for / not found" 6.202 +msgstr "Partición no encontrada" 6.203 + 6.204 +#: installer/tazinst:302 6.205 +msgid "Target and source partitions should be different" 6.206 +msgstr "" 6.207 + 6.208 +#: installer/tazinst:314 installer/tazinst:345 6.209 +#, fuzzy 6.210 +msgid "is not installed" 6.211 +msgstr "No está instalado." 6.212 + 6.213 +#: installer/tazinst:316 6.214 +#, fuzzy 6.215 +msgid "Unknown filesystem (/)" 6.216 +msgstr "Sistema de archivos desconocido" 6.217 + 6.218 +#: installer/tazinst:326 6.219 +#, fuzzy 6.220 +msgid "Partition for /home not found" 6.221 +msgstr "Partición no encontrada" 6.222 + 6.223 +#: installer/tazinst:329 6.224 +msgid "/home and source partitions should be different" 6.225 +msgstr "" 6.226 + 6.227 +#: installer/tazinst:332 6.228 +msgid "/ and /home partitions should be different" 6.229 +msgstr "" 6.230 + 6.231 +#: installer/tazinst:347 6.232 +#, fuzzy 6.233 +msgid "Unknown filesystem (/home)" 6.234 +msgstr "Sistema de archivos desconocido" 6.235 + 6.236 +#: installer/tazinst:353 6.237 +#, fuzzy 6.238 +msgid "Bootloader (grub): Invalid settings" 6.239 msgstr "Configuraciónes inválidas" 6.240 6.241 -#: installer/tazinst:287 6.242 -msgid "but SRC_FILE is not set" 6.243 -msgstr "pero SRC_FILE no está establecido" 6.244 +#: installer/tazinst:361 6.245 +#, fuzzy 6.246 +msgid "Windows Dual-Boot: Invalid settings" 6.247 +msgstr "Configuraciónes inválidas" 6.248 6.249 -#: installer/tazinst:303 6.250 -msgid "file not found" 6.251 -msgstr "Archivo no encontrado" 6.252 +#: installer/tazinst:372 6.253 +msgid "" 6.254 +"You must be the root user (system administrator) to install SliTaz, please " 6.255 +"use 'su' to get a root SHell and restart installation." 6.256 +msgstr "" 6.257 +"Debes ser usuario root (administrador del sistema) para instalar SliTaz. Por " 6.258 +"favor usa el comando 'su' para tener un SHell root y reiniciar la " 6.259 +"instalación." 6.260 6.261 -#: installer/tazinst:307 6.262 -msgid "file not found on the web" 6.263 -msgstr "Archivo no encontrado en el web" 6.264 +#: installer/tazinst:389 6.265 +msgid "Mount failed" 6.266 +msgstr "" 6.267 6.268 -#: installer/tazinst:318 6.269 -#: installer/tazinst:342 6.270 -msgid "Partition not found" 6.271 -msgstr "Partición no encontrada" 6.272 - 6.273 -#: installer/tazinst:330 6.274 -#: installer/tazinst:355 6.275 -msgid "is not installed." 6.276 -msgstr "No está instalado." 6.277 - 6.278 -#: installer/tazinst:332 6.279 -#: installer/tazinst:357 6.280 -#, sh-format 6.281 -msgid "Unknown filesystem" 6.282 -msgstr "Sistema de archivos desconocido" 6.283 - 6.284 -#: installer/tazinst:371 6.285 -#, sh-format 6.286 -msgid "Invalid format" 6.287 -msgstr "Formato inválido" 6.288 - 6.289 -#: installer/tazinst:382 6.290 -msgid "You must be the root user (system administrator) to install SliTaz, please use 'su' to get a root SHell and restart installation." 6.291 -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." 6.292 - 6.293 -#: installer/tazinst:399 6.294 -msgid "Failed to mount" 6.295 -msgstr "Falló el montaje" 6.296 - 6.297 -#: installer/tazinst:418 6.298 +#: installer/tazinst:408 6.299 msgid "Failed to mount USB device" 6.300 msgstr "Falló el montaje del dispositivo USB" 6.301 6.302 -#: installer/tazinst:431 6.303 -msgid "corrupted" 6.304 -msgstr "corrupto" 6.305 +#: installer/tazinst:421 6.306 +msgid "md5sum mismatch, file corrupted" 6.307 +msgstr "" 6.308 6.309 -#: installer/tazinst:433 6.310 +#: installer/tazinst:423 6.311 msgid "md5 file not found, unable to check integrity." 6.312 msgstr "archivo md5 no encontrado. Incapaz de comprobar integridad." 6.313 6.314 -#: installer/tazinst:440 6.315 +#: installer/tazinst:430 6.316 msgid "Failed to mount ISO." 6.317 msgstr "Falló al montar ISO." 6.318 6.319 -#: installer/tazinst:452 6.320 -#: installer/tazinst:456 6.321 -#, sh-format 6.322 -msgid "Failed to download." 6.323 +#: installer/tazinst:442 installer/tazinst:446 6.324 +#, fuzzy 6.325 +msgid "File download failed." 6.326 msgstr "Falló al descargar." 6.327 6.328 -#: installer/tazinst:470 6.329 +#: installer/tazinst:460 6.330 msgid "Web boot files not found" 6.331 msgstr "Archivos boot web no encontrados" 6.332 6.333 -#: installer/tazinst:493 6.334 -#: installer/tazinst:606 6.335 -#: installer/tazinst:699 6.336 -#: installer/tazinst:734 6.337 -#: installer/tazinst:802 6.338 -#: installer/tazinst:1042 6.339 -#: installer/tazinst:1139 6.340 -#: installer/tazinst:1180 6.341 +#: installer/tazinst:483 installer/tazinst:556 installer/tazinst:649 6.342 +#: installer/tazinst:684 installer/tazinst:752 installer/tazinst:994 6.343 +#: installer/tazinst:1091 installer/tazinst:1132 6.344 msgid "Internal" 6.345 msgstr "Interno" 6.346 6.347 -#: installer/tazinst:500 6.348 +#: installer/tazinst:490 6.349 msgid "Invalid source" 6.350 msgstr "Fuente inválida" 6.351 6.352 -#: installer/tazinst:509 6.353 -msgid "Installation settings summary:" 6.354 -msgstr "Sumario de configuraciónes de instalación." 6.355 - 6.356 -#: installer/tazinst:514 6.357 -msgid "Format root partition" 6.358 -msgstr "Formato partición root" 6.359 - 6.360 -#: installer/tazinst:517 6.361 -msgid "Format /home partition" 6.362 -msgstr "Formato partición /home" 6.363 - 6.364 -#: installer/tazinst:519 6.365 -msgid "Install SliTaz on" 6.366 -msgstr "Instalar SliTaz en" 6.367 - 6.368 -#: installer/tazinst:519 6.369 -#: installer/tazinst:526 6.370 -msgid "Source:" 6.371 -msgstr "Fuente:" 6.372 - 6.373 -#: installer/tazinst:520 6.374 -msgid "Set Home partition to" 6.375 -msgstr "Establecer partición Home a" 6.376 - 6.377 -#: installer/tazinst:521 6.378 -msgid "Set Hostname as" 6.379 -msgstr "Establecer Hostname como" 6.380 - 6.381 -#: installer/tazinst:522 6.382 -msgid "Set Default user as" 6.383 -msgstr "Configurar usuario predeterminado a" 6.384 - 6.385 -#: installer/tazinst:524 6.386 -msgid "Check" 6.387 -msgstr "Comprobar" 6.388 - 6.389 -#: installer/tazinst:525 6.390 -msgid "Backup /etc, /home and the packages list" 6.391 -msgstr "Hacer copias de seguridad de /etc, /home y la lista de paquetes" 6.392 - 6.393 -#: installer/tazinst:526 6.394 -msgid "Upgrade SliTaz on" 6.395 -msgstr "Actualizando SliTaz en" 6.396 - 6.397 -#: installer/tazinst:527 6.398 -msgid "Restore /etc, /home" 6.399 -msgstr "Restaurando /etc, /home" 6.400 - 6.401 -#: installer/tazinst:528 6.402 -msgid "Upgrade additional packages." 6.403 -msgstr "Actualizando paquetes adicionales." 6.404 - 6.405 -#: installer/tazinst:531 6.406 -msgid "Enable Windows dual-boot" 6.407 -msgstr "Activar dual-boot Windows" 6.408 - 6.409 -#: installer/tazinst:534 6.410 -msgid "Install Grub" 6.411 -msgstr "Instalar Grub" 6.412 - 6.413 -#: installer/tazinst:537 6.414 -msgid "Continue:(y/n)" 6.415 -msgstr "Continuar:(y/n)" 6.416 - 6.417 -#: installer/tazinst:541 6.418 -msgid "Cancelled by user" 6.419 -msgstr "Cancelado por usuario" 6.420 - 6.421 -#: installer/tazinst:556 6.422 -#: installer/tazinst:1014 6.423 +#: installer/tazinst:506 installer/tazinst:966 6.424 msgid "Partition in use" 6.425 msgstr "Partición en uso" 6.426 6.427 -#: installer/tazinst:570 6.428 -msgid "Formatting main partition:" 6.429 -msgstr "Formatear partición principal:" 6.430 +#: installer/tazinst:520 6.431 +#, fuzzy 6.432 +msgid "Formatting / partition:" 6.433 +msgstr "Formateando partición /home:" 6.434 6.435 -#: installer/tazinst:582 6.436 +#: installer/tazinst:532 6.437 msgid "Formatting /home partition:" 6.438 msgstr "Formateando partición /home:" 6.439 6.440 -#: installer/tazinst:595 6.441 -#: installer/tazinst:1023 6.442 -msgid "Can't mount" 6.443 -msgstr "No se puede montar" 6.444 +#: installer/tazinst:545 installer/tazinst:975 6.445 +#, fuzzy 6.446 +msgid "Unable to mount partition" 6.447 +msgstr "Formato partición root" 6.448 6.449 -#: installer/tazinst:634 6.450 -msgid "Falling back to running kernel name.." 6.451 -msgstr "Volviendo a correr el nombre del kernel..." 6.452 +#: installer/tazinst:585 6.453 +msgid "Kernel name not found, falling back to:" 6.454 +msgstr "" 6.455 6.456 -#: installer/tazinst:749 6.457 +#: installer/tazinst:699 6.458 msgid "Configuring host name:" 6.459 msgstr "Configurando el nombre de host:" 6.460 6.461 -#: installer/tazinst:838 6.462 +#: installer/tazinst:788 6.463 msgid "No windows partition found. Dual-boot disabled" 6.464 msgstr "No se encontraron particiónes windows. boot-dual desactivado" 6.465 6.466 -#: installer/tazinst:895 6.467 +#: installer/tazinst:845 6.468 msgid "Enabling Windows dual-boot" 6.469 msgstr "Activando inicio dual Windows" 6.470 6.471 -#: installer/tazinst:916 6.472 -msgid "Installing SliTaz on" 6.473 +#: installer/tazinst:866 6.474 +#, fuzzy 6.475 +msgid "Installing SliTaz on:" 6.476 msgstr "Instalando SliTaz en" 6.477 6.478 -#: installer/tazinst:935 6.479 +#: installer/tazinst:885 6.480 msgid "Configuring root and default user account:" 6.481 msgstr "Configurando root y cuenta de usuario predeterminada..." 6.482 6.483 -#: installer/tazinst:939 6.484 -msgid "Configuring partition to be used as /home..." 6.485 +#: installer/tazinst:889 6.486 +#, fuzzy 6.487 +msgid "Configuring partition to be used as /home:" 6.488 msgstr "Configurando partición para ser usada como /home..." 6.489 6.490 -#: installer/tazinst:958 6.491 +#: installer/tazinst:908 6.492 msgid "Running grub-install on:" 6.493 msgstr "Corriendo grub-install en:" 6.494 6.495 -#: installer/tazinst:972 6.496 -msgid "Unmounting target" 6.497 +#: installer/tazinst:922 6.498 +#, fuzzy 6.499 +msgid "Unmounting target partition:" 6.500 msgstr "Desmontando objetivo" 6.501 6.502 -#: installer/tazinst:978 6.503 -msgid "Unmounting" 6.504 +#: installer/tazinst:928 6.505 +#, fuzzy 6.506 +msgid "Unmounting:" 6.507 msgstr "Desmontando" 6.508 6.509 -#: installer/tazinst:984 6.510 +#: installer/tazinst:934 6.511 msgid "Ejecting cdrom..." 6.512 msgstr "eyectando cdrom..." 6.513 6.514 -#: installer/tazinst:993 6.515 -msgid "Installation complete. You can now restart (reboot) " 6.516 +#: installer/tazinst:945 6.517 +#, fuzzy 6.518 +msgid "Installation complete. You can now restart (reboot)" 6.519 msgstr "Instalación completa. Puede reiniciar" 6.520 6.521 -#: installer/tazinst:994 6.522 +#: installer/tazinst:946 installer/tazinst:1167 6.523 msgid "from your SliTaz GNU/Linux system." 6.524 msgstr "de su sistema SliTaz GNU/Linux" 6.525 6.526 -#: installer/tazinst:997 6.527 +#: installer/tazinst:949 6.528 msgid "Copying log files" 6.529 msgstr "Copiando archivos log" 6.530 6.531 -#: installer/tazinst:1032 6.532 +#: installer/tazinst:984 6.533 msgid "Preparing upgrade of SliTaz release:" 6.534 msgstr "Preparando actualización de SliTaz, versión:" 6.535 6.536 -#: installer/tazinst:1034 6.537 -msgid "This partition doesn't appear to contain a valid SliTaz system, the file: /etc/slitaz-release doesn't exist." 6.538 -msgstr "Esta partición no parece contener un sistema válido SliTaz. La fila: /etc/slitaz-release no existe." 6.539 +#: installer/tazinst:986 6.540 +msgid "" 6.541 +"This partition doesn't appear to contain a valid SliTaz system, the file: /" 6.542 +"etc/slitaz-release doesn't exist." 6.543 +msgstr "" 6.544 +"Esta partición no parece contener un sistema válido SliTaz. La fila: /etc/" 6.545 +"slitaz-release no existe." 6.546 6.547 -#: installer/tazinst:1154 6.548 -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" 6.549 -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" 6.550 +#: installer/tazinst:1106 6.551 +msgid "" 6.552 +"The list of available packages on the mirror could not be downloaded. No " 6.553 +"missing packages will be reinstalled now, but you can do so later by looking " 6.554 +"at the following list: /var/lib/tazinst/packages-selection.diff" 6.555 +msgstr "" 6.556 +"La lista de los paquetes disponibles en el espejo, no pueden ser " 6.557 +"descargados. No missing packages will be reinstalled now, pero puedes luego " 6.558 +"mirar en la siguiente lista: /var/lib/tazinst/packages-selection.diff" 6.559 6.560 -#: installer/tazinst:1167 6.561 +#: installer/tazinst:1119 6.562 msgid "Grub update" 6.563 msgstr "Actualizar Grub" 6.564 6.565 -#: installer/tazinst:1185 6.566 +#: installer/tazinst:1137 6.567 msgid "Backup /etc, /home and the packages list..." 6.568 msgstr "Creando copia de seguridad /etc, /home y la lista de paquetes..." 6.569 6.570 -#: installer/tazinst:1188 6.571 +#: installer/tazinst:1140 6.572 msgid "Upgrading SliTaz on:" 6.573 msgstr "Actualizando SliTaz en :" 6.574 6.575 -#: installer/tazinst:1196 6.576 +#: installer/tazinst:1148 6.577 msgid "Restoring configuration files..." 6.578 msgstr "Restaurando archivos de configuración..." 6.579 6.580 -#: installer/tazinst:1202 6.581 +#: installer/tazinst:1154 6.582 msgid "Upgrading added packages..." 6.583 msgstr "Actualizando paquetes agregados..." 6.584 6.585 -#: installer/tazinst:1214 6.586 -msgid "Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux system." 6.587 -msgstr "Actualización completa. Puede ahora reiniciar su sistema operativo SliTaz GNU/Linux." 6.588 +#: installer/tazinst:1166 6.589 +#, fuzzy 6.590 +msgid "Upgrade finished. You can now restart (reboot)" 6.591 +msgstr "" 6.592 +"Actualización completa. Puede ahora reiniciar su sistema operativo SliTaz " 6.593 +"GNU/Linux." 6.594 6.595 -#: installer/tazinst:1215 6.596 +#: installer/tazinst:1168 6.597 msgid "Packages on the cdrom :" 6.598 msgstr "Paquetes en cdrom :" 6.599 6.600 -#: installer/tazinst:1216 6.601 +#: installer/tazinst:1169 6.602 msgid "Packages installed from the mirror :" 6.603 msgstr "Paquetes instalados desde el espejo :" 6.604 6.605 +#~ msgid "Generate a configuration file." 6.606 +#~ msgstr "Generar un archivo de configuración" 6.607 + 6.608 +#~ msgid "Install or upgrade using command line options:" 6.609 +#~ msgstr "Instalar o actualizar usando las opciónes en la línea de comandos:" 6.610 + 6.611 +#~ msgid "Full Install (not upgrading, all present data will be lost)." 6.612 +#~ msgstr "" 6.613 +#~ "Instalación completa (no actualiza, todo dato presente será perdido)." 6.614 + 6.615 +#~ msgid "Upgrade (Needs an active internet connection)." 6.616 +#~ msgstr "Actualizar (necesita una conexión de internet activa)." 6.617 + 6.618 +#~ msgid "Install type (cdrom|usb|iso|web|weboot)." 6.619 +#~ msgstr "Tipo de instalación (cdrom|usb|web|webroot)." 6.620 + 6.621 +#~ msgid "Source media (ex: file.iso|usb partition|web url)." 6.622 +#~ msgstr "Fuente de datos (ej: archivo.iso| partición usb| web url)." 6.623 + 6.624 +#~ msgid "Partition where SliTaz will be installed (ex:/dev/hda3)." 6.625 +#~ msgstr "Partición donde SliTaz será instalada (ej: /dev/hda3)." 6.626 + 6.627 +#~ msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)." 6.628 +#~ msgstr "Partición a ser fomateada (fs=ext2|ext3|ext4|etc...)." 6.629 + 6.630 +#~ msgid "Install Grub." 6.631 +#~ msgstr "Instalar Grub." 6.632 + 6.633 +#~ msgid "Dual-boot a Windows partition (auto|hd<disk>,<part> ex:hd0,0)." 6.634 +#~ msgstr "Inicio dual en partición Windows (auto|hd<disk>,<part> ej: hd0,0)." 6.635 + 6.636 +#~ msgid "Debug mode." 6.637 +#~ msgstr "Modo debug." 6.638 + 6.639 +#~ msgid "Config file not found" 6.640 +#~ msgstr "Archivo de configuración no encontrado" 6.641 + 6.642 +#~ msgid "Mismatched parameters" 6.643 +#~ msgstr "Los parámetros no coinciden" 6.644 + 6.645 +#~ msgid "will not be formatted during upgrade" 6.646 +#~ msgstr "no se formateará durante la actualización" 6.647 + 6.648 +#~ msgid "but SRC_FILE is not set" 6.649 +#~ msgstr "pero SRC_FILE no está establecido" 6.650 + 6.651 +#~ msgid "file not found on the web" 6.652 +#~ msgstr "Archivo no encontrado en el web" 6.653 + 6.654 +#~ msgid "Invalid format" 6.655 +#~ msgstr "Formato inválido" 6.656 + 6.657 +#~ msgid "Failed to mount" 6.658 +#~ msgstr "Falló el montaje" 6.659 + 6.660 +#~ msgid "corrupted" 6.661 +#~ msgstr "corrupto" 6.662 + 6.663 +#~ msgid "Installation settings summary:" 6.664 +#~ msgstr "Sumario de configuraciónes de instalación." 6.665 + 6.666 +#~ msgid "Format /home partition" 6.667 +#~ msgstr "Formato partición /home" 6.668 + 6.669 +#~ msgid "Install SliTaz on" 6.670 +#~ msgstr "Instalar SliTaz en" 6.671 + 6.672 +#~ msgid "Source:" 6.673 +#~ msgstr "Fuente:" 6.674 + 6.675 +#~ msgid "Set Home partition to" 6.676 +#~ msgstr "Establecer partición Home a" 6.677 + 6.678 +#~ msgid "Set Hostname as" 6.679 +#~ msgstr "Establecer Hostname como" 6.680 + 6.681 +#~ msgid "Set Default user as" 6.682 +#~ msgstr "Configurar usuario predeterminado a" 6.683 + 6.684 +#~ msgid "Check" 6.685 +#~ msgstr "Comprobar" 6.686 + 6.687 +#~ msgid "Backup /etc, /home and the packages list" 6.688 +#~ msgstr "Hacer copias de seguridad de /etc, /home y la lista de paquetes" 6.689 + 6.690 +#~ msgid "Upgrade SliTaz on" 6.691 +#~ msgstr "Actualizando SliTaz en" 6.692 + 6.693 +#~ msgid "Restore /etc, /home" 6.694 +#~ msgstr "Restaurando /etc, /home" 6.695 + 6.696 +#~ msgid "Upgrade additional packages." 6.697 +#~ msgstr "Actualizando paquetes adicionales." 6.698 + 6.699 +#~ msgid "Enable Windows dual-boot" 6.700 +#~ msgstr "Activar dual-boot Windows" 6.701 + 6.702 +#~ msgid "Install Grub" 6.703 +#~ msgstr "Instalar Grub" 6.704 + 6.705 +#~ msgid "Continue:(y/n)" 6.706 +#~ msgstr "Continuar:(y/n)" 6.707 + 6.708 +#~ msgid "Cancelled by user" 6.709 +#~ msgstr "Cancelado por usuario" 6.710 + 6.711 +#~ msgid "Formatting main partition:" 6.712 +#~ msgstr "Formatear partición principal:" 6.713 + 6.714 +#~ msgid "Can't mount" 6.715 +#~ msgstr "No se puede montar" 6.716 + 6.717 +#~ msgid "Falling back to running kernel name.." 6.718 +#~ msgstr "Volviendo a correr el nombre del kernel..."
7.1 --- a/po/tazinst/fr.po Sun Aug 14 10:51:11 2011 +0100 7.2 +++ b/po/tazinst/fr.po Mon Aug 15 22:33:56 2011 +0200 7.3 @@ -8,95 +8,63 @@ 7.4 msgstr "" 7.5 "Project-Id-Version: 3.0\n" 7.6 "Report-Msgid-Bugs-To: \n" 7.7 -"POT-Creation-Date: 2011-07-31 10:00+0200\n" 7.8 -"PO-Revision-Date: 2011-07-31 10:39+0200\n" 7.9 +"POT-Creation-Date: 2011-08-14 16:42+0200\n" 7.10 +"PO-Revision-Date: 2011-08-14 17:02+0200\n" 7.11 "Last-Translator: Dominique Corbex <domcox@slitaz.org>\n" 7.12 "Language-Team: French\n" 7.13 +"Language: \n" 7.14 "MIME-Version: 1.0\n" 7.15 "Content-Type: text/plain; charset=UTF-8\n" 7.16 "Content-Transfer-Encoding: 8bit\n" 7.17 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 7.18 7.19 -#: installer/tazinst:48 7.20 +#: installer/tazinst:51 7.21 msgid "Tazinst - SliTaz installer - Version" 7.22 msgstr "Tazinst - Installateur Slitaz - Version" 7.23 7.24 -#: installer/tazinst:49 7.25 +#: installer/tazinst:53 7.26 msgid "Usage" 7.27 msgstr "Usage" 7.28 7.29 -#: installer/tazinst:50 7.30 -msgid "tazinst [command] [config-file|url|options]" 7.31 -msgstr "tazinst [commande] [fichier-config|url|options]" 7.32 +#: installer/tazinst:53 7.33 +msgid "tazinst [command] [setup-file|url-shortcut]" 7.34 +msgstr "tazinst [commande] [fichier-param|raccourci-url]" 7.35 7.36 -#: installer/tazinst:51 7.37 +#: installer/tazinst:55 7.38 msgid "Commands" 7.39 msgstr "Commandes" 7.40 7.41 -#: installer/tazinst:52 7.42 +#: installer/tazinst:56 7.43 msgid "Print this short usage." 7.44 msgstr "Affiche cette petite aide" 7.45 7.46 -#: installer/tazinst:53 7.47 -msgid "Install SliTaz on HDD using a configuration file." 7.48 -msgstr "Installe SliTaz sur HDD à l'aide d'un fichier de configuration." 7.49 +#: installer/tazinst:57 7.50 +msgid "Install SliTaz on HDD using setup file contents." 7.51 +msgstr "Installe SliTaz sur HDD à l'aide d'un fichier de paramètres." 7.52 7.53 -#: installer/tazinst:54 7.54 -msgid "Upgrade SliTaz on HDD using a configuration file." 7.55 -msgstr "Met à jour SliTaz sur HDD à l'aide d'un fichier de configuration." 7.56 +#: installer/tazinst:58 7.57 +msgid "Upgrade SliTaz on HDD using setup file contents." 7.58 +msgstr "Met à jour SliTaz sur HDD à l'aide d'un fichier de paramètres." 7.59 7.60 -#: installer/tazinst:55 7.61 -msgid "Generate a configuration file." 7.62 -msgstr "Génére un fichier de configuration." 7.63 +#: installer/tazinst:59 7.64 +msgid "Create a new setup file." 7.65 +msgstr "Crée un nouveau fichier de paramètres." 7.66 7.67 -#: installer/tazinst:56 7.68 -msgid "Check validity of the configuration file." 7.69 -msgstr "Vérifie la validité du fichier de configuration." 7.70 +#: installer/tazinst:60 7.71 +msgid "Check validity of settings in a setup file." 7.72 +msgstr "Vérifie la validité du fichier de paramètres." 7.73 7.74 -#: installer/tazinst:57 7.75 -msgid "Show the full URL of a predefined URL (stable|cooking|rolling)." 7.76 +#: installer/tazinst:61 7.77 +msgid "Show full URL of a predefined shortcut (stable|cooking|rolling)." 7.78 msgstr "Affiche l'URL complète d'un raccourci (stable|cooking|rolling)." 7.79 7.80 -# 7.81 -#: installer/tazinst:58 7.82 -msgid "Install or upgrade using command line options:" 7.83 -msgstr "Installe ou met à jour en utilisant des options en ligne de commande:" 7.84 - 7.85 -#: installer/tazinst:59 7.86 -msgid "Full Install (not upgrading, all present data will be lost)." 7.87 -msgstr "Installation complète (pas de mise à jour, les données seront perdues)." 7.88 - 7.89 -#: installer/tazinst:60 7.90 -msgid "Upgrade (Needs an active internet connection)." 7.91 -msgstr "Mise à jour (Nécessite une connexion internet active)." 7.92 - 7.93 -#: installer/tazinst:61 7.94 -msgid "Install type (cdrom|usb|iso|web|weboot)." 7.95 -msgstr "Type d'installation (cdrom|usb|iso|web|weboot)." 7.96 - 7.97 #: installer/tazinst:62 7.98 -msgid "Source media (ex: file.iso|usb partition|web url)." 7.99 -msgstr "Média source (ex: fichier.iso|partition usb|url web)." 7.100 +msgid "Display log file contents and exit." 7.101 +msgstr "Affiche le contenu du fichier journal." 7.102 7.103 #: installer/tazinst:63 7.104 -msgid "Partition where SliTaz will be installed (ex:/dev/hda3)." 7.105 -msgstr "Partition où SliTaz sera installé (ex:/dev/hda3)." 7.106 - 7.107 -#: installer/tazinst:64 7.108 -msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)." 7.109 -msgstr "Formatage de la partition (fs=ext2|ext3|ext4|etc..)." 7.110 - 7.111 -#: installer/tazinst:65 7.112 -msgid "Install Grub." 7.113 -msgstr "Installer Grub." 7.114 - 7.115 -#: installer/tazinst:66 7.116 -msgid "Dual-boot a Windows partition (auto|hd<disk>,<part> ex:hd0,0)." 7.117 -msgstr "Dual-boot avec une partition Windows (auto|hd<disk>,<part> ex:hd0,0)." 7.118 - 7.119 -#: installer/tazinst:67 7.120 -msgid "Debug mode." 7.121 -msgstr "Mode Debug" 7.122 +msgid "Print version and exit." 7.123 +msgstr "Affiche la version." 7.124 7.125 #: installer/tazinst:83 7.126 msgid "Error" 7.127 @@ -106,66 +74,87 @@ 7.128 msgid "Warning:" 7.129 msgstr "Attention :" 7.130 7.131 -#: installer/tazinst:117 7.132 -msgid "Can't write config file" 7.133 -msgstr "Impossible d'écrire un fichier de configuration." 7.134 +#: installer/tazinst:118 7.135 +msgid "Can't write setup file" 7.136 +msgstr "Impossible d'écrire un fichier de paramètres" 7.137 7.138 -#: installer/tazinst:176 installer/tazinst:215 7.139 -msgid "Config file not found" 7.140 -msgstr "Fichier de configuration non trouvé" 7.141 +#: installer/tazinst:177 installer/tazinst:225 7.142 +msgid "Setup file not found" 7.143 +msgstr "fichier de paramètres non trouvé" 7.144 7.145 -#: installer/tazinst:213 7.146 -msgid "Unable to read config file" 7.147 -msgstr "Impossible de lire le fichier de configuration." 7.148 +#: installer/tazinst:191 7.149 +msgid "Another instance of tazinst is running." 7.150 +msgstr "Une autre instance de tazinst est en cours." 7.151 7.152 -#: installer/tazinst:218 7.153 -msgid "No configuration file provided" 7.154 -msgstr "Fichier de configuration non trouvé" 7.155 +#: installer/tazinst:223 7.156 +msgid "Unable to read setup file" 7.157 +msgstr "Impossible de lire le fichier de paramètres" 7.158 7.159 -#: installer/tazinst:244 7.160 -msgid "Mismatched parameters" 7.161 -msgstr "Paramètres incompatibles" 7.162 +#: installer/tazinst:228 7.163 +msgid "No setup file provided" 7.164 +msgstr "Aucun fichier de paramètres fourni" 7.165 7.166 -#: installer/tazinst:248 7.167 -msgid "will not be formatted during upgrade" 7.168 -msgstr "ne sera pas formaté durant la mise à jour" 7.169 +#: installer/tazinst:259 7.170 +msgid "Unknown install mode" 7.171 +msgstr "Mode d'installation inconnu" 7.172 7.173 -#: installer/tazinst:278 installer/tazinst:289 installer/tazinst:363 7.174 -#, sh-format 7.175 -msgid "Invalid setting" 7.176 -msgstr "Paramètre invalide" 7.177 +#: installer/tazinst:268 7.178 +msgid "No source file provided" 7.179 +msgstr "Pas de fichier source fourni" 7.180 7.181 -#: installer/tazinst:287 7.182 -msgid "but SRC_FILE is not set" 7.183 -msgstr "mais SRC_FILE n'est pas défini" 7.184 +#: installer/tazinst:270 7.185 +msgid "Unknown source type" 7.186 +msgstr "Type de source inconnu" 7.187 7.188 -#: installer/tazinst:303 7.189 -msgid "file not found" 7.190 -msgstr "fichier non trouvé" 7.191 +#: installer/tazinst:284 7.192 +msgid "Source file not found" 7.193 +msgstr "fichier source non trouvé" 7.194 7.195 -#: installer/tazinst:307 7.196 -msgid "file not found on the web" 7.197 -msgstr "fichier non trouvé sur le web" 7.198 +#: installer/tazinst:288 7.199 +msgid "URL not found" 7.200 +msgstr "URL non trouvée" 7.201 7.202 -#: installer/tazinst:318 installer/tazinst:342 7.203 -msgid "Partition not found" 7.204 -msgstr "Partition non trouvée" 7.205 +#: installer/tazinst:299 7.206 +msgid "Partition for / not found" 7.207 +msgstr "Partition / non trouvée" 7.208 7.209 -#: installer/tazinst:330 installer/tazinst:355 7.210 -msgid "is not installed." 7.211 +#: installer/tazinst:302 7.212 +msgid "Target and source partitions should be different" 7.213 +msgstr "Les partitions cible et source doivent etre différentes" 7.214 + 7.215 +#: installer/tazinst:314 installer/tazinst:345 7.216 +msgid "is not installed" 7.217 msgstr "n'est pas installé" 7.218 7.219 -#: installer/tazinst:332 installer/tazinst:357 7.220 -#, sh-format 7.221 -msgid "Unknown filesystem" 7.222 -msgstr "Système de fichiers inconnu" 7.223 +#: installer/tazinst:316 7.224 +msgid "Unknown filesystem (/)" 7.225 +msgstr "Système de fichiers inconnu (/)" 7.226 7.227 -#: installer/tazinst:371 7.228 -#, sh-format 7.229 -msgid "Invalid format" 7.230 -msgstr "Format invalide" 7.231 +#: installer/tazinst:326 7.232 +msgid "Partition for /home not found" 7.233 +msgstr "Partition /home non trouvée" 7.234 7.235 -#: installer/tazinst:382 7.236 +#: installer/tazinst:329 7.237 +msgid "/home and source partitions should be different" 7.238 +msgstr "Les partitions source et /home doivent être différentes" 7.239 + 7.240 +#: installer/tazinst:332 7.241 +msgid "/ and /home partitions should be different" 7.242 +msgstr "Les partitions / et /home doivent être différentes" 7.243 + 7.244 +#: installer/tazinst:347 7.245 +msgid "Unknown filesystem (/home)" 7.246 +msgstr "Système de fichiers inconnu (/home)" 7.247 + 7.248 +#: installer/tazinst:353 7.249 +msgid "Bootloader (grub): Invalid settings" 7.250 +msgstr "Chargeur d'amore Grub: Paramètre invalide" 7.251 + 7.252 +#: installer/tazinst:361 7.253 +msgid "Windows Dual-Boot: Invalid settings" 7.254 +msgstr "Windows Dual-Boot: Paramètre invalide" 7.255 + 7.256 +#: installer/tazinst:372 7.257 msgid "" 7.258 "You must be the root user (system administrator) to install SliTaz, please " 7.259 "use 'su' to get a root SHell and restart installation." 7.260 @@ -174,196 +163,129 @@ 7.261 "SliTaz, utilisez « su » pour obtenir un shell root et redémarrer " 7.262 "l'installation." 7.263 7.264 -#: installer/tazinst:399 7.265 -msgid "Failed to mount" 7.266 -msgstr "Impossible de monter" 7.267 +#: installer/tazinst:389 7.268 +msgid "Mount failed" 7.269 +msgstr "Échec du montage" 7.270 7.271 -#: installer/tazinst:418 7.272 +#: installer/tazinst:408 7.273 msgid "Failed to mount USB device" 7.274 msgstr "Impossible de monter le périphérique USB" 7.275 7.276 -#: installer/tazinst:431 7.277 -msgid "corrupted" 7.278 -msgstr "corrompu" 7.279 +#: installer/tazinst:421 7.280 +msgid "md5sum mismatch, file corrupted" 7.281 +msgstr "Erreur md5sum, fichier corrompu" 7.282 7.283 -#: installer/tazinst:433 7.284 +#: installer/tazinst:423 7.285 msgid "md5 file not found, unable to check integrity." 7.286 msgstr "fichier md5 non trouvé, impossible de vérifier l'intégrité." 7.287 7.288 -#: installer/tazinst:440 7.289 +#: installer/tazinst:430 7.290 msgid "Failed to mount ISO." 7.291 msgstr "Impossible de monter l'image ISO." 7.292 7.293 -#: installer/tazinst:452 installer/tazinst:456 7.294 -#, sh-format 7.295 -msgid "Failed to download." 7.296 -msgstr "Impossible de télécharger." 7.297 +#: installer/tazinst:442 installer/tazinst:446 7.298 +msgid "File download failed." 7.299 +msgstr "Échec au téléchargement du fichier." 7.300 7.301 -#: installer/tazinst:470 7.302 +#: installer/tazinst:460 7.303 msgid "Web boot files not found" 7.304 msgstr "Fichiers Web boot non trouvés" 7.305 7.306 -#: installer/tazinst:493 installer/tazinst:606 installer/tazinst:699 7.307 -#: installer/tazinst:734 installer/tazinst:802 installer/tazinst:1042 7.308 -#: installer/tazinst:1139 installer/tazinst:1180 7.309 +#: installer/tazinst:483 installer/tazinst:556 installer/tazinst:649 7.310 +#: installer/tazinst:684 installer/tazinst:752 installer/tazinst:994 7.311 +#: installer/tazinst:1091 installer/tazinst:1132 7.312 msgid "Internal" 7.313 msgstr "Interne" 7.314 7.315 -#: installer/tazinst:500 7.316 +#: installer/tazinst:490 7.317 msgid "Invalid source" 7.318 msgstr "Source invalide" 7.319 7.320 -#: installer/tazinst:509 7.321 -msgid "Installation settings summary:" 7.322 -msgstr "Récapitulatif des paramètres d'installation:" 7.323 - 7.324 -#: installer/tazinst:514 7.325 -msgid "Format root partition" 7.326 -msgstr "Formatage de la partition root" 7.327 - 7.328 -#: installer/tazinst:517 7.329 -msgid "Format /home partition" 7.330 -msgstr "Formatage de la partition /home" 7.331 - 7.332 -#: installer/tazinst:519 7.333 -msgid "Install SliTaz on" 7.334 -msgstr "Installe SliTaz sur" 7.335 - 7.336 -#: installer/tazinst:519 installer/tazinst:526 7.337 -msgid "Source:" 7.338 -msgstr "Source :" 7.339 - 7.340 -#: installer/tazinst:520 7.341 -msgid "Set Home partition to" 7.342 -msgstr "Installe la partition /home sur" 7.343 - 7.344 -#: installer/tazinst:521 7.345 -msgid "Set Hostname as" 7.346 -msgstr "Définition du Hostname" 7.347 - 7.348 -#: installer/tazinst:522 7.349 -msgid "Set Default user as" 7.350 -msgstr "Définition de l'utilsateur par défaut" 7.351 - 7.352 -#: installer/tazinst:524 7.353 -msgid "Check" 7.354 -msgstr "Vérifie" 7.355 - 7.356 -#: installer/tazinst:525 7.357 -msgid "Backup /etc, /home and the packages list" 7.358 -msgstr "Sauvegarde de /etc, /home et de la liste des paquets" 7.359 - 7.360 -#: installer/tazinst:526 7.361 -msgid "Upgrade SliTaz on" 7.362 -msgstr "Met à jour SliTaz sur" 7.363 - 7.364 -#: installer/tazinst:527 7.365 -msgid "Restore /etc, /home" 7.366 -msgstr "Restauration de /etc, /home" 7.367 - 7.368 -#: installer/tazinst:528 7.369 -msgid "Upgrade additional packages." 7.370 -msgstr "Mise à jour des paquets additionnels." 7.371 - 7.372 -#: installer/tazinst:531 7.373 -msgid "Enable Windows dual-boot" 7.374 -msgstr "Active le Dual-boot avec Windows" 7.375 - 7.376 -#: installer/tazinst:534 7.377 -msgid "Install Grub" 7.378 -msgstr "Installe Grub" 7.379 - 7.380 -#: installer/tazinst:537 7.381 -msgid "Continue:(y/n)" 7.382 -msgstr "Continuer : (o/n)" 7.383 - 7.384 -#: installer/tazinst:541 7.385 -msgid "Cancelled by user" 7.386 -msgstr "Annulé par l'utilisateur" 7.387 - 7.388 -#: installer/tazinst:556 installer/tazinst:1014 7.389 +#: installer/tazinst:506 installer/tazinst:966 7.390 msgid "Partition in use" 7.391 msgstr "Partition utilisée" 7.392 7.393 -#: installer/tazinst:570 7.394 -msgid "Formatting main partition:" 7.395 -msgstr "Formatage de la partition principale :" 7.396 +#: installer/tazinst:520 7.397 +msgid "Formatting / partition:" 7.398 +msgstr "Formatage de la partition / :" 7.399 7.400 -#: installer/tazinst:582 7.401 +#: installer/tazinst:532 7.402 msgid "Formatting /home partition:" 7.403 msgstr "Formatage de la partition /home :" 7.404 7.405 -#: installer/tazinst:595 installer/tazinst:1023 7.406 -msgid "Can't mount" 7.407 -msgstr "Montage impossible" 7.408 +#: installer/tazinst:545 installer/tazinst:975 7.409 +msgid "Unable to mount partition" 7.410 +msgstr "Impossible de monter la partition" 7.411 7.412 -#: installer/tazinst:634 7.413 -msgid "Falling back to running kernel name.." 7.414 -msgstr "Repli sur le nom du noyau actuellement utilisé.." 7.415 +#: installer/tazinst:585 7.416 +msgid "Kernel name not found, falling back to:" 7.417 +msgstr "Nom du noyau non trouvé, retour à:" 7.418 7.419 -#: installer/tazinst:749 7.420 +#: installer/tazinst:699 7.421 msgid "Configuring host name:" 7.422 msgstr "Configuration du Hostname :" 7.423 7.424 -#: installer/tazinst:838 7.425 +#: installer/tazinst:788 7.426 msgid "No windows partition found. Dual-boot disabled" 7.427 msgstr "Aucune partition Windows trouvée. Dual-boot désactivé" 7.428 7.429 -#: installer/tazinst:895 7.430 +#: installer/tazinst:845 7.431 msgid "Enabling Windows dual-boot" 7.432 msgstr "Activation du Dual-boot avec Windows" 7.433 7.434 -#: installer/tazinst:916 7.435 -msgid "Installing SliTaz on" 7.436 -msgstr "Installe SliTaz sur" 7.437 +#: installer/tazinst:866 7.438 +msgid "Installing SliTaz on:" 7.439 +msgstr "Installe SliTaz sur:" 7.440 7.441 -#: installer/tazinst:935 7.442 +#: installer/tazinst:885 7.443 msgid "Configuring root and default user account:" 7.444 msgstr "Configure les comptes de root et de l'utilisateur par défaut :" 7.445 7.446 -#: installer/tazinst:939 7.447 -msgid "Configuring partition to be used as /home..." 7.448 -msgstr "Configure la partition à utiliser comme /home..." 7.449 +#: installer/tazinst:889 7.450 +msgid "Configuring partition to be used as /home:" 7.451 +msgstr "Configure la partition à utiliser comme /home:" 7.452 7.453 -#: installer/tazinst:958 7.454 +#: installer/tazinst:908 7.455 msgid "Running grub-install on:" 7.456 msgstr "Installe Grub sur:" 7.457 7.458 -#: installer/tazinst:972 7.459 -msgid "Unmounting target" 7.460 -msgstr "Démontage de la partition hôte" 7.461 +#: installer/tazinst:922 7.462 +msgid "Unmounting target partition:" 7.463 +msgstr "Démontage de la partition:" 7.464 7.465 -#: installer/tazinst:978 7.466 -msgid "Unmounting" 7.467 -msgstr "Démontage" 7.468 +#: installer/tazinst:928 7.469 +msgid "Unmounting:" 7.470 +msgstr "Démontage:" 7.471 7.472 -#: installer/tazinst:984 7.473 +#: installer/tazinst:934 7.474 msgid "Ejecting cdrom..." 7.475 msgstr "Éjection du CD-Rom..." 7.476 7.477 -#: installer/tazinst:993 7.478 -msgid "Installation complete. You can now restart (reboot) " 7.479 +#: installer/tazinst:945 7.480 +msgid "Installation complete. You can now restart (reboot)" 7.481 msgstr "Installation terminée. Vous pouvez maintenant redémarrer " 7.482 7.483 -#: installer/tazinst:994 7.484 +#: installer/tazinst:946 installer/tazinst:1167 7.485 msgid "from your SliTaz GNU/Linux system." 7.486 msgstr "votre système SliTaz GNU/Linux." 7.487 7.488 -#: installer/tazinst:997 7.489 +#: installer/tazinst:949 7.490 msgid "Copying log files" 7.491 msgstr "Copie du fichier journal" 7.492 7.493 -#: installer/tazinst:1032 7.494 +#: installer/tazinst:984 7.495 msgid "Preparing upgrade of SliTaz release:" 7.496 msgstr "Prépare la mise à jour de la version de SliTaz :" 7.497 7.498 -#: installer/tazinst:1034 7.499 +#: installer/tazinst:986 7.500 msgid "" 7.501 "This partition doesn't appear to contain a valid SliTaz system, the file: /" 7.502 "etc/slitaz-release doesn't exist." 7.503 -msgstr "Cette partition ne semble pas contenir un système SliTaz valide, le fichier: /etc/slitaz-release n'existe pas." 7.504 +msgstr "" 7.505 +"Cette partition ne semble pas contenir un système SliTaz valide, le " 7.506 +"fichier: /etc/slitaz-release n'existe pas." 7.507 7.508 -#: installer/tazinst:1154 7.509 +#: installer/tazinst:1106 7.510 msgid "" 7.511 "The list of available packages on the mirror could not be downloaded. No " 7.512 "missing packages will be reinstalled now, but you can do so later by looking " 7.513 @@ -374,42 +296,156 @@ 7.514 "possible de le faire ultérieurement à l'aide de la liste suivante : /var/lib/" 7.515 "tazinst/packages-selection.diff" 7.516 7.517 -#: installer/tazinst:1167 7.518 +#: installer/tazinst:1119 7.519 msgid "Grub update" 7.520 msgstr "Mise à jour de Grub" 7.521 7.522 -#: installer/tazinst:1185 7.523 +#: installer/tazinst:1137 7.524 msgid "Backup /etc, /home and the packages list..." 7.525 msgstr "Sauvegarde de /etc, /home et de la liste des paquets..." 7.526 7.527 -#: installer/tazinst:1188 7.528 +#: installer/tazinst:1140 7.529 msgid "Upgrading SliTaz on:" 7.530 msgstr "Met à jour SliTaz sur :" 7.531 7.532 -#: installer/tazinst:1196 7.533 +#: installer/tazinst:1148 7.534 msgid "Restoring configuration files..." 7.535 msgstr "Restauration des fichiers de configuration..." 7.536 7.537 -#: installer/tazinst:1202 7.538 +#: installer/tazinst:1154 7.539 msgid "Upgrading added packages..." 7.540 msgstr "Mise à hour des paquets additionnels..." 7.541 7.542 -#: installer/tazinst:1214 7.543 -msgid "" 7.544 -"Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux " 7.545 -"system." 7.546 -msgstr "" 7.547 -"La mise à jour est terminée. Vous pouvez redémarrer votre système Slitaz GNU/" 7.548 -"Linux." 7.549 +#: installer/tazinst:1166 7.550 +msgid "Upgrade finished. You can now restart (reboot)" 7.551 +msgstr "La mise à jour est terminée. Vous pouvez redémarrer" 7.552 7.553 -#: installer/tazinst:1215 7.554 +#: installer/tazinst:1168 7.555 msgid "Packages on the cdrom :" 7.556 msgstr "Paquets sur le cdrom :" 7.557 7.558 -#: installer/tazinst:1216 7.559 +#: installer/tazinst:1169 7.560 msgid "Packages installed from the mirror :" 7.561 msgstr "Paquets installés depuis le miroir :" 7.562 7.563 +#~ msgid "Generate a configuration file." 7.564 +#~ msgstr "Génére un fichier de configuration." 7.565 + 7.566 +# 7.567 +#~ msgid "Install or upgrade using command line options:" 7.568 +#~ msgstr "" 7.569 +#~ "Installe ou met à jour en utilisant des options en ligne de commande:" 7.570 + 7.571 +#~ msgid "Full Install (not upgrading, all present data will be lost)." 7.572 +#~ msgstr "" 7.573 +#~ "Installation complète (pas de mise à jour, les données seront perdues)." 7.574 + 7.575 +#~ msgid "Upgrade (Needs an active internet connection)." 7.576 +#~ msgstr "Mise à jour (Nécessite une connexion internet active)." 7.577 + 7.578 +#~ msgid "Install type (cdrom|usb|iso|web|weboot)." 7.579 +#~ msgstr "Type d'installation (cdrom|usb|iso|web|weboot)." 7.580 + 7.581 +#~ msgid "Source media (ex: file.iso|usb partition|web url)." 7.582 +#~ msgstr "Média source (ex: fichier.iso|partition usb|url web)." 7.583 + 7.584 +#~ msgid "Partition where SliTaz will be installed (ex:/dev/hda3)." 7.585 +#~ msgstr "Partition où SliTaz sera installé (ex:/dev/hda3)." 7.586 + 7.587 +#~ msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)." 7.588 +#~ msgstr "Formatage de la partition (fs=ext2|ext3|ext4|etc..)." 7.589 + 7.590 +#~ msgid "Install Grub." 7.591 +#~ msgstr "Installer Grub." 7.592 + 7.593 +#~ msgid "Dual-boot a Windows partition (auto|hd<disk>,<part> ex:hd0,0)." 7.594 +#~ msgstr "" 7.595 +#~ "Dual-boot avec une partition Windows (auto|hd<disk>,<part> ex:hd0,0)." 7.596 + 7.597 +#~ msgid "Debug mode." 7.598 +#~ msgstr "Mode Debug" 7.599 + 7.600 +#~ msgid "Config file not found" 7.601 +#~ msgstr "Fichier de configuration non trouvé" 7.602 + 7.603 +#~ msgid "Mismatched parameters" 7.604 +#~ msgstr "Paramètres incompatibles" 7.605 + 7.606 +#~ msgid "will not be formatted during upgrade" 7.607 +#~ msgstr "ne sera pas formaté durant la mise à jour" 7.608 + 7.609 +#~ msgid "but SRC_FILE is not set" 7.610 +#~ msgstr "mais SRC_FILE n'est pas défini" 7.611 + 7.612 +#~ msgid "file not found on the web" 7.613 +#~ msgstr "fichier non trouvé sur le web" 7.614 + 7.615 +#~ msgid "Invalid format" 7.616 +#~ msgstr "Format invalide" 7.617 + 7.618 +#~ msgid "Failed to mount" 7.619 +#~ msgstr "Impossible de monter" 7.620 + 7.621 +#~ msgid "corrupted" 7.622 +#~ msgstr "corrompu" 7.623 + 7.624 +#~ msgid "Installation settings summary:" 7.625 +#~ msgstr "Récapitulatif des paramètres d'installation:" 7.626 + 7.627 +#~ msgid "Format /home partition" 7.628 +#~ msgstr "Formatage de la partition /home" 7.629 + 7.630 +#~ msgid "Install SliTaz on" 7.631 +#~ msgstr "Installe SliTaz sur" 7.632 + 7.633 +#~ msgid "Source:" 7.634 +#~ msgstr "Source :" 7.635 + 7.636 +#~ msgid "Set Home partition to" 7.637 +#~ msgstr "Installe la partition /home sur" 7.638 + 7.639 +#~ msgid "Set Hostname as" 7.640 +#~ msgstr "Définition du Hostname" 7.641 + 7.642 +#~ msgid "Set Default user as" 7.643 +#~ msgstr "Définition de l'utilsateur par défaut" 7.644 + 7.645 +#~ msgid "Check" 7.646 +#~ msgstr "Vérifie" 7.647 + 7.648 +#~ msgid "Backup /etc, /home and the packages list" 7.649 +#~ msgstr "Sauvegarde de /etc, /home et de la liste des paquets" 7.650 + 7.651 +#~ msgid "Upgrade SliTaz on" 7.652 +#~ msgstr "Met à jour SliTaz sur" 7.653 + 7.654 +#~ msgid "Restore /etc, /home" 7.655 +#~ msgstr "Restauration de /etc, /home" 7.656 + 7.657 +#~ msgid "Upgrade additional packages." 7.658 +#~ msgstr "Mise à jour des paquets additionnels." 7.659 + 7.660 +#~ msgid "Enable Windows dual-boot" 7.661 +#~ msgstr "Active le Dual-boot avec Windows" 7.662 + 7.663 +#~ msgid "Install Grub" 7.664 +#~ msgstr "Installe Grub" 7.665 + 7.666 +#~ msgid "Continue:(y/n)" 7.667 +#~ msgstr "Continuer : (o/n)" 7.668 + 7.669 +#~ msgid "Cancelled by user" 7.670 +#~ msgstr "Annulé par l'utilisateur" 7.671 + 7.672 +#~ msgid "Formatting main partition:" 7.673 +#~ msgstr "Formatage de la partition principale :" 7.674 + 7.675 +#~ msgid "Can't mount" 7.676 +#~ msgstr "Montage impossible" 7.677 + 7.678 +#~ msgid "Falling back to running kernel name.." 7.679 +#~ msgstr "Repli sur le nom du noyau actuellement utilisé.." 7.680 + 7.681 #~ msgid "Check configuration file validity." 7.682 #~ msgstr "Vérification de la validité du fichier de configuration." 7.683
8.1 --- a/po/tazinst/tazinst.pot Sun Aug 14 10:51:11 2011 +0100 8.2 +++ b/po/tazinst/tazinst.pot Mon Aug 15 22:33:56 2011 +0200 8.3 @@ -8,92 +8,61 @@ 8.4 msgstr "" 8.5 "Project-Id-Version: Tazinst\n" 8.6 "Report-Msgid-Bugs-To: \n" 8.7 -"POT-Creation-Date: 2011-07-31 10:00+0200\n" 8.8 +"POT-Creation-Date: 2011-08-14 16:42+0200\n" 8.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 8.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 8.11 "Language-Team: LANGUAGE <LL@li.org>\n" 8.12 +"Language: \n" 8.13 "MIME-Version: 1.0\n" 8.14 "Content-Type: text/plain; charset=CHARSET\n" 8.15 "Content-Transfer-Encoding: 8bit\n" 8.16 8.17 -#: installer/tazinst:48 8.18 +#: installer/tazinst:51 8.19 msgid "Tazinst - SliTaz installer - Version" 8.20 msgstr "" 8.21 8.22 -#: installer/tazinst:49 8.23 +#: installer/tazinst:53 8.24 msgid "Usage" 8.25 msgstr "" 8.26 8.27 -#: installer/tazinst:50 8.28 -msgid "tazinst [command] [config-file|url|options]" 8.29 +#: installer/tazinst:53 8.30 +msgid "tazinst [command] [setup-file|url-shortcut]" 8.31 msgstr "" 8.32 8.33 -#: installer/tazinst:51 8.34 +#: installer/tazinst:55 8.35 msgid "Commands" 8.36 msgstr "" 8.37 8.38 -#: installer/tazinst:52 8.39 +#: installer/tazinst:56 8.40 msgid "Print this short usage." 8.41 msgstr "" 8.42 8.43 -#: installer/tazinst:53 8.44 -msgid "Install SliTaz on HDD using a configuration file." 8.45 -msgstr "" 8.46 - 8.47 -#: installer/tazinst:54 8.48 -msgid "Upgrade SliTaz on HDD using a configuration file." 8.49 -msgstr "" 8.50 - 8.51 -#: installer/tazinst:55 8.52 -msgid "Generate a configuration file." 8.53 -msgstr "" 8.54 - 8.55 -#: installer/tazinst:56 8.56 -msgid "Check validity of the configuration file." 8.57 -msgstr "" 8.58 - 8.59 #: installer/tazinst:57 8.60 -msgid "Show the full URL of a predefined URL (stable|cooking|rolling)." 8.61 +msgid "Install SliTaz on HDD using setup file contents." 8.62 msgstr "" 8.63 8.64 #: installer/tazinst:58 8.65 -msgid "Install or upgrade using command line options:" 8.66 +msgid "Upgrade SliTaz on HDD using setup file contents." 8.67 msgstr "" 8.68 8.69 #: installer/tazinst:59 8.70 -msgid "Full Install (not upgrading, all present data will be lost)." 8.71 +msgid "Create a new setup file." 8.72 msgstr "" 8.73 8.74 #: installer/tazinst:60 8.75 -msgid "Upgrade (Needs an active internet connection)." 8.76 +msgid "Check validity of settings in a setup file." 8.77 msgstr "" 8.78 8.79 #: installer/tazinst:61 8.80 -msgid "Install type (cdrom|usb|iso|web|weboot)." 8.81 +msgid "Show full URL of a predefined shortcut (stable|cooking|rolling)." 8.82 msgstr "" 8.83 8.84 #: installer/tazinst:62 8.85 -msgid "Source media (ex: file.iso|usb partition|web url)." 8.86 +msgid "Display log file contents and exit." 8.87 msgstr "" 8.88 8.89 #: installer/tazinst:63 8.90 -msgid "Partition where SliTaz will be installed (ex:/dev/hda3)." 8.91 -msgstr "" 8.92 - 8.93 -#: installer/tazinst:64 8.94 -msgid "Partition to be formatted (fs=ext2|ext3|ext4|etc..)." 8.95 -msgstr "" 8.96 - 8.97 -#: installer/tazinst:65 8.98 -msgid "Install Grub." 8.99 -msgstr "" 8.100 - 8.101 -#: installer/tazinst:66 8.102 -msgid "Dual-boot a Windows partition (auto|hd<disk>,<part> ex:hd0,0)." 8.103 -msgstr "" 8.104 - 8.105 -#: installer/tazinst:67 8.106 -msgid "Debug mode." 8.107 +msgid "Print version and exit." 8.108 msgstr "" 8.109 8.110 #: installer/tazinst:83 8.111 @@ -104,297 +73,247 @@ 8.112 msgid "Warning:" 8.113 msgstr "" 8.114 8.115 -#: installer/tazinst:117 8.116 -msgid "Can't write config file" 8.117 +#: installer/tazinst:118 8.118 +msgid "Can't write setup file" 8.119 msgstr "" 8.120 8.121 -#: installer/tazinst:176 installer/tazinst:215 8.122 -msgid "Config file not found" 8.123 +#: installer/tazinst:177 installer/tazinst:225 8.124 +msgid "Setup file not found" 8.125 msgstr "" 8.126 8.127 -#: installer/tazinst:213 8.128 -msgid "Unable to read config file" 8.129 +#: installer/tazinst:191 8.130 +msgid "Another instance of tazinst is running." 8.131 msgstr "" 8.132 8.133 -#: installer/tazinst:218 8.134 -msgid "No configuration file provided" 8.135 +#: installer/tazinst:223 8.136 +msgid "Unable to read setup file" 8.137 msgstr "" 8.138 8.139 -#: installer/tazinst:244 8.140 -msgid "Mismatched parameters" 8.141 +#: installer/tazinst:228 8.142 +msgid "No setup file provided" 8.143 msgstr "" 8.144 8.145 -#: installer/tazinst:248 8.146 -msgid "will not be formatted during upgrade" 8.147 +#: installer/tazinst:259 8.148 +msgid "Unknown install mode" 8.149 msgstr "" 8.150 8.151 -#: installer/tazinst:278 installer/tazinst:289 installer/tazinst:363 8.152 -#, sh-format 8.153 -msgid "Invalid setting" 8.154 +#: installer/tazinst:268 8.155 +msgid "No source file provided" 8.156 msgstr "" 8.157 8.158 -#: installer/tazinst:287 8.159 -msgid "but SRC_FILE is not set" 8.160 +#: installer/tazinst:270 8.161 +msgid "Unknown source type" 8.162 msgstr "" 8.163 8.164 -#: installer/tazinst:303 8.165 -msgid "file not found" 8.166 +#: installer/tazinst:284 8.167 +msgid "Source file not found" 8.168 msgstr "" 8.169 8.170 -#: installer/tazinst:307 8.171 -msgid "file not found on the web" 8.172 +#: installer/tazinst:288 8.173 +msgid "URL not found" 8.174 msgstr "" 8.175 8.176 -#: installer/tazinst:318 installer/tazinst:342 8.177 -msgid "Partition not found" 8.178 +#: installer/tazinst:299 8.179 +msgid "Partition for / not found" 8.180 msgstr "" 8.181 8.182 -#: installer/tazinst:330 installer/tazinst:355 8.183 -msgid "is not installed." 8.184 +#: installer/tazinst:302 8.185 +msgid "Target and source partitions should be different" 8.186 msgstr "" 8.187 8.188 -#: installer/tazinst:332 installer/tazinst:357 8.189 -#, sh-format 8.190 -msgid "Unknown filesystem" 8.191 +#: installer/tazinst:314 installer/tazinst:345 8.192 +msgid "is not installed" 8.193 msgstr "" 8.194 8.195 -#: installer/tazinst:371 8.196 -#, sh-format 8.197 -msgid "Invalid format" 8.198 +#: installer/tazinst:316 8.199 +msgid "Unknown filesystem (/)" 8.200 msgstr "" 8.201 8.202 -#: installer/tazinst:382 8.203 +#: installer/tazinst:326 8.204 +msgid "Partition for /home not found" 8.205 +msgstr "" 8.206 + 8.207 +#: installer/tazinst:329 8.208 +msgid "/home and source partitions should be different" 8.209 +msgstr "" 8.210 + 8.211 +#: installer/tazinst:332 8.212 +msgid "/ and /home partitions should be different" 8.213 +msgstr "" 8.214 + 8.215 +#: installer/tazinst:347 8.216 +msgid "Unknown filesystem (/home)" 8.217 +msgstr "" 8.218 + 8.219 +#: installer/tazinst:353 8.220 +msgid "Bootloader (grub): Invalid settings" 8.221 +msgstr "" 8.222 + 8.223 +#: installer/tazinst:361 8.224 +msgid "Windows Dual-Boot: Invalid settings" 8.225 +msgstr "" 8.226 + 8.227 +#: installer/tazinst:372 8.228 msgid "" 8.229 "You must be the root user (system administrator) to install SliTaz, please " 8.230 "use 'su' to get a root SHell and restart installation." 8.231 msgstr "" 8.232 8.233 -#: installer/tazinst:399 8.234 -msgid "Failed to mount" 8.235 +#: installer/tazinst:389 8.236 +msgid "Mount failed" 8.237 msgstr "" 8.238 8.239 -#: installer/tazinst:418 8.240 +#: installer/tazinst:408 8.241 msgid "Failed to mount USB device" 8.242 msgstr "" 8.243 8.244 -#: installer/tazinst:431 8.245 -msgid "corrupted" 8.246 +#: installer/tazinst:421 8.247 +msgid "md5sum mismatch, file corrupted" 8.248 msgstr "" 8.249 8.250 -#: installer/tazinst:433 8.251 +#: installer/tazinst:423 8.252 msgid "md5 file not found, unable to check integrity." 8.253 msgstr "" 8.254 8.255 -#: installer/tazinst:440 8.256 +#: installer/tazinst:430 8.257 msgid "Failed to mount ISO." 8.258 msgstr "" 8.259 8.260 -#: installer/tazinst:452 installer/tazinst:456 8.261 -#, sh-format 8.262 -msgid "Failed to download." 8.263 +#: installer/tazinst:442 installer/tazinst:446 8.264 +msgid "File download failed." 8.265 msgstr "" 8.266 8.267 -#: installer/tazinst:470 8.268 +#: installer/tazinst:460 8.269 msgid "Web boot files not found" 8.270 msgstr "" 8.271 8.272 -#: installer/tazinst:493 installer/tazinst:606 installer/tazinst:699 8.273 -#: installer/tazinst:734 installer/tazinst:802 installer/tazinst:1042 8.274 -#: installer/tazinst:1139 installer/tazinst:1180 8.275 +#: installer/tazinst:483 installer/tazinst:556 installer/tazinst:649 8.276 +#: installer/tazinst:684 installer/tazinst:752 installer/tazinst:994 8.277 +#: installer/tazinst:1091 installer/tazinst:1132 8.278 msgid "Internal" 8.279 msgstr "" 8.280 8.281 -#: installer/tazinst:500 8.282 +#: installer/tazinst:490 8.283 msgid "Invalid source" 8.284 msgstr "" 8.285 8.286 -#: installer/tazinst:509 8.287 -msgid "Installation settings summary:" 8.288 -msgstr "" 8.289 - 8.290 -#: installer/tazinst:514 8.291 -msgid "Format root partition" 8.292 -msgstr "" 8.293 - 8.294 -#: installer/tazinst:517 8.295 -msgid "Format /home partition" 8.296 -msgstr "" 8.297 - 8.298 -#: installer/tazinst:519 8.299 -msgid "Install SliTaz on" 8.300 -msgstr "" 8.301 - 8.302 -#: installer/tazinst:519 installer/tazinst:526 8.303 -msgid "Source:" 8.304 +#: installer/tazinst:506 installer/tazinst:966 8.305 +msgid "Partition in use" 8.306 msgstr "" 8.307 8.308 #: installer/tazinst:520 8.309 -msgid "Set Home partition to" 8.310 +msgid "Formatting / partition:" 8.311 msgstr "" 8.312 8.313 -#: installer/tazinst:521 8.314 -msgid "Set Hostname as" 8.315 -msgstr "" 8.316 - 8.317 -#: installer/tazinst:522 8.318 -msgid "Set Default user as" 8.319 -msgstr "" 8.320 - 8.321 -#: installer/tazinst:524 8.322 -msgid "Check" 8.323 -msgstr "" 8.324 - 8.325 -#: installer/tazinst:525 8.326 -msgid "Backup /etc, /home and the packages list" 8.327 -msgstr "" 8.328 - 8.329 -#: installer/tazinst:526 8.330 -msgid "Upgrade SliTaz on" 8.331 -msgstr "" 8.332 - 8.333 -#: installer/tazinst:527 8.334 -msgid "Restore /etc, /home" 8.335 -msgstr "" 8.336 - 8.337 -#: installer/tazinst:528 8.338 -msgid "Upgrade additional packages." 8.339 -msgstr "" 8.340 - 8.341 -#: installer/tazinst:531 8.342 -msgid "Enable Windows dual-boot" 8.343 -msgstr "" 8.344 - 8.345 -#: installer/tazinst:534 8.346 -msgid "Install Grub" 8.347 -msgstr "" 8.348 - 8.349 -#: installer/tazinst:537 8.350 -msgid "Continue:(y/n)" 8.351 -msgstr "" 8.352 - 8.353 -#: installer/tazinst:541 8.354 -msgid "Cancelled by user" 8.355 -msgstr "" 8.356 - 8.357 -#: installer/tazinst:556 installer/tazinst:1014 8.358 -msgid "Partition in use" 8.359 -msgstr "" 8.360 - 8.361 -#: installer/tazinst:570 8.362 -msgid "Formatting main partition:" 8.363 -msgstr "" 8.364 - 8.365 -#: installer/tazinst:582 8.366 +#: installer/tazinst:532 8.367 msgid "Formatting /home partition:" 8.368 msgstr "" 8.369 8.370 -#: installer/tazinst:595 installer/tazinst:1023 8.371 -msgid "Can't mount" 8.372 +#: installer/tazinst:545 installer/tazinst:975 8.373 +msgid "Unable to mount partition" 8.374 msgstr "" 8.375 8.376 -#: installer/tazinst:634 8.377 -msgid "Falling back to running kernel name.." 8.378 +#: installer/tazinst:585 8.379 +msgid "Kernel name not found, falling back to:" 8.380 msgstr "" 8.381 8.382 -#: installer/tazinst:749 8.383 +#: installer/tazinst:699 8.384 msgid "Configuring host name:" 8.385 msgstr "" 8.386 8.387 -#: installer/tazinst:838 8.388 +#: installer/tazinst:788 8.389 msgid "No windows partition found. Dual-boot disabled" 8.390 msgstr "" 8.391 8.392 -#: installer/tazinst:895 8.393 +#: installer/tazinst:845 8.394 msgid "Enabling Windows dual-boot" 8.395 msgstr "" 8.396 8.397 -#: installer/tazinst:916 8.398 -msgid "Installing SliTaz on" 8.399 +#: installer/tazinst:866 8.400 +msgid "Installing SliTaz on:" 8.401 msgstr "" 8.402 8.403 -#: installer/tazinst:935 8.404 +#: installer/tazinst:885 8.405 msgid "Configuring root and default user account:" 8.406 msgstr "" 8.407 8.408 -#: installer/tazinst:939 8.409 -msgid "Configuring partition to be used as /home..." 8.410 +#: installer/tazinst:889 8.411 +msgid "Configuring partition to be used as /home:" 8.412 msgstr "" 8.413 8.414 -#: installer/tazinst:958 8.415 +#: installer/tazinst:908 8.416 msgid "Running grub-install on:" 8.417 msgstr "" 8.418 8.419 -#: installer/tazinst:972 8.420 -msgid "Unmounting target" 8.421 +#: installer/tazinst:922 8.422 +msgid "Unmounting target partition:" 8.423 msgstr "" 8.424 8.425 -#: installer/tazinst:978 8.426 -msgid "Unmounting" 8.427 +#: installer/tazinst:928 8.428 +msgid "Unmounting:" 8.429 +msgstr "" 8.430 + 8.431 +#: installer/tazinst:934 8.432 +msgid "Ejecting cdrom..." 8.433 +msgstr "" 8.434 + 8.435 +#: installer/tazinst:945 8.436 +msgid "Installation complete. You can now restart (reboot)" 8.437 +msgstr "" 8.438 + 8.439 +#: installer/tazinst:946 installer/tazinst:1167 8.440 +msgid "from your SliTaz GNU/Linux system." 8.441 +msgstr "" 8.442 + 8.443 +#: installer/tazinst:949 8.444 +msgid "Copying log files" 8.445 msgstr "" 8.446 8.447 #: installer/tazinst:984 8.448 -msgid "Ejecting cdrom..." 8.449 -msgstr "" 8.450 - 8.451 -#: installer/tazinst:993 8.452 -msgid "Installation complete. You can now restart (reboot) " 8.453 -msgstr "" 8.454 - 8.455 -#: installer/tazinst:994 8.456 -msgid "from your SliTaz GNU/Linux system." 8.457 -msgstr "" 8.458 - 8.459 -#: installer/tazinst:997 8.460 -msgid "Copying log files" 8.461 -msgstr "" 8.462 - 8.463 -#: installer/tazinst:1032 8.464 msgid "Preparing upgrade of SliTaz release:" 8.465 msgstr "" 8.466 8.467 -#: installer/tazinst:1034 8.468 +#: installer/tazinst:986 8.469 msgid "" 8.470 "This partition doesn't appear to contain a valid SliTaz system, the file: /" 8.471 "etc/slitaz-release doesn't exist." 8.472 msgstr "" 8.473 8.474 -#: installer/tazinst:1154 8.475 +#: installer/tazinst:1106 8.476 msgid "" 8.477 "The list of available packages on the mirror could not be downloaded. No " 8.478 "missing packages will be reinstalled now, but you can do so later by looking " 8.479 "at the following list: /var/lib/tazinst/packages-selection.diff" 8.480 msgstr "" 8.481 8.482 -#: installer/tazinst:1167 8.483 +#: installer/tazinst:1119 8.484 msgid "Grub update" 8.485 msgstr "" 8.486 8.487 -#: installer/tazinst:1185 8.488 +#: installer/tazinst:1137 8.489 msgid "Backup /etc, /home and the packages list..." 8.490 msgstr "" 8.491 8.492 -#: installer/tazinst:1188 8.493 +#: installer/tazinst:1140 8.494 msgid "Upgrading SliTaz on:" 8.495 msgstr "" 8.496 8.497 -#: installer/tazinst:1196 8.498 +#: installer/tazinst:1148 8.499 msgid "Restoring configuration files..." 8.500 msgstr "" 8.501 8.502 -#: installer/tazinst:1202 8.503 +#: installer/tazinst:1154 8.504 msgid "Upgrading added packages..." 8.505 msgstr "" 8.506 8.507 -#: installer/tazinst:1214 8.508 -msgid "" 8.509 -"Upgrade finished. You can now restart (reboot) from your SliTaz GNU/Linux " 8.510 -"system." 8.511 +#: installer/tazinst:1166 8.512 +msgid "Upgrade finished. You can now restart (reboot)" 8.513 msgstr "" 8.514 8.515 -#: installer/tazinst:1215 8.516 +#: installer/tazinst:1168 8.517 msgid "Packages on the cdrom :" 8.518 msgstr "" 8.519 8.520 -#: installer/tazinst:1216 8.521 +#: installer/tazinst:1169 8.522 msgid "Packages installed from the mirror :" 8.523 msgstr ""