tazinst rev 73
Fix i18n & L10n
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Apr 09 17:22:22 2016 +0300 (2016-04-09) |
| parents | fee6f859a768 |
| children | 73513b6171df |
| files | Makefile installer.cgi po/installer/el.po po/installer/es.po po/installer/fr.po po/installer/installer.pot po/installer/pt_BR.po po/installer/ru.po po/installer/sv.po po/installer/zh_CN.po po/slitaz-installer/fr.po po/slitaz-installer/pt_BR.po po/slitaz-installer/ru.po po/slitaz-installer/slitaz-installer.pot po/slitaz-installer/zh_CN.po po/tazinst/es.po po/tazinst/fr.po po/tazinst/pt_BR.po po/tazinst/ru.po po/tazinst/tazinst.pot po/tazinst/zh_CN.po slitaz-installer tazinst |
line diff
1.1 --- a/Makefile Wed Apr 06 09:52:43 2016 +0300 1.2 +++ b/Makefile Sat Apr 09 17:22:22 2016 +0300 1.3 @@ -19,14 +19,17 @@ 1.4 xgettext -o po/tazinst/tazinst.pot -L Shell \ 1.5 --package-name="TazInst" \ 1.6 --package-version="$(VERSION)" \ 1.7 + -k_ -k_n \ 1.8 ./tazinst 1.9 xgettext -o po/slitaz-installer/slitaz-installer.pot -L Shell \ 1.10 --package-name="slitaz-installer" \ 1.11 --package-version="$(VERSION)" \ 1.12 + -k_ -k_n \ 1.13 ./slitaz-installer 1.14 xgettext -o po/installer/installer.pot -L Shell \ 1.15 --package-name="installer.cgi" \ 1.16 --package-version="$(VERSION)" \ 1.17 + -k_ -k_n \ 1.18 ./installer.cgi 1.19 1.20 msgmerge:
2.1 --- a/installer.cgi Wed Apr 06 09:52:43 2016 +0300 2.2 +++ b/installer.cgi Sat Apr 09 17:22:22 2016 +0300 2.3 @@ -17,7 +17,7 @@ 2.4 . lib/libtazpanel 2.5 get_config 2.6 2.7 -TITLE=$(gettext 'TazPanel - Installer') 2.8 +TITLE=$(_ 'TazPanel - Installer') 2.9 2.10 # export package name for gettext. 2.11 TEXTDOMAIN='installer' 2.12 @@ -39,16 +39,16 @@ 2.13 menu) 2.14 cat <<EOT 2.15 <li tabindex="0"> 2.16 - <span>$(gettext 'Installation')</span> 2.17 + <span>$(_ 'Installation')</span> 2.18 <menu> 2.19 <li><a data-icon="install" 2.20 - href="installer.cgi" data-root>$(gettext 'Installation')</a></li> 2.21 + href="installer.cgi" data-root>$(_ 'Installation')</a></li> 2.22 <li><a data-icon="slitaz" 2.23 - href="installer.cgi?page=install" data-root>$(gettext 'Install SliTaz')</a></li> 2.24 + href="installer.cgi?page=install" data-root>$(_ 'Install SliTaz')</a></li> 2.25 <li><a data-icon="upgrade" 2.26 - href="installer.cgi?page=upgrade" data-root>$(gettext 'Upgrade system')</a></li> 2.27 + href="installer.cgi?page=upgrade" data-root>$(_ 'Upgrade system')</a></li> 2.28 <li><a data-icon="slitaz" 2.29 - href="installer.cgi?page=evaluate" data-root>$(gettext 'Evaluate SliTaz')</a></li> 2.30 + href="installer.cgi?page=evaluate" data-root>$(_ 'Evaluate SliTaz')</a></li> 2.31 </menu> 2.32 </li> 2.33 EOT 2.34 @@ -64,16 +64,16 @@ 2.35 cat <<EOT 2.36 <!-- Welcome message --> 2.37 2.38 -<h2>$(gettext "Welcome to the SliTaz Installer!")</h2> 2.39 +<h2>$(_ 'Welcome to the SliTaz Installer!')</h2> 2.40 2.41 -<p>$(gettext "The SliTaz Installer installs or upgrades SliTaz to a \ 2.42 +<p>$(_ "The SliTaz Installer installs or upgrades SliTaz to a \ 2.43 hard disk drive from a device like a Live-CD or LiveUSB key, from a SliTaz \ 2.44 ISO file, or from the web by downloading an ISO file.")</p> 2.45 2.46 -<p>$(gettext "Windows™ users can evaluate SliTaz in the directory \ 2.47 +<p>$(_ "Windows™ users can evaluate SliTaz in the directory \ 2.48 \\slitaz on their hard disk.")</p> 2.49 2.50 -<p>$(gettext "Which type of installation do you want to start?")</p> 2.51 +<p>$(_ "Which type of installation do you want to start?")</p> 2.52 EOT 2.53 } 2.54 2.55 @@ -83,14 +83,14 @@ 2.56 <!-- Install message --> 2.57 2.58 <section> 2.59 - <header>$(gettext 'Install')</header> 2.60 + <header>$(_ 'Install')</header> 2.61 2.62 <div> 2.63 - <p>$(gettext "Install SliTaz on a partition of your hard disk drive. If \ 2.64 + <p>$(_ "Install SliTaz on a partition of your hard disk drive. If \ 2.65 you decide to format your partition, all data will be lost. If you do not \ 2.66 format, all data except for any existing /home directory will be removed \ 2.67 (the home directory will be kept as is).")</p> 2.68 - <p>$(gettext "Before installation, you may need to create or resize \ 2.69 + <p>$(_ "Before installation, you may need to create or resize \ 2.70 partitions on your hard disk drive in order to make space for SliTaz \ 2.71 GNU/Linux. You can graphically manage your partitions with Gparted")</p> 2.72 </div> 2.73 @@ -98,8 +98,8 @@ 2.74 <footer> 2.75 <form> 2.76 <button name="page" value="install" data-icon="slitaz" 2.77 - title="$(gettext 'Proceed to a new SliTaz installation')" 2.78 - >$(gettext 'Install SliTaz')</button> 2.79 + title="$(_ 'Proceed to a new SliTaz installation')" 2.80 + >$(_ 'Install SliTaz')</button> 2.81 </form> 2.82 </footer> 2.83 </section> 2.84 @@ -112,10 +112,10 @@ 2.85 <!-- Upgrade message --> 2.86 2.87 <section> 2.88 - <header>$(gettext 'Upgrade')</header> 2.89 + <header>$(_ 'Upgrade')</header> 2.90 2.91 <div> 2.92 - <p>$(gettext "Upgrade an already installed SliTaz system on your hard disk \ 2.93 + <p>$(_ "Upgrade an already installed SliTaz system on your hard disk \ 2.94 drive. Your /home /etc /var/www directories will be kept, all other \ 2.95 directories will be removed. Any additional packages added to your old \ 2.96 SliTaz system will be updated as long you have an active internet connection.")</p> 2.97 @@ -124,8 +124,8 @@ 2.98 <footer> 2.99 <form> 2.100 <button name="page" value="upgrade" data-icon="upgrade" 2.101 - title="$(gettext 'Upgrade an existing SliTaz system')" 2.102 - >$(gettext 'Upgrade SliTaz')</button> 2.103 + title="$(_ 'Upgrade an existing SliTaz system')" 2.104 + >$(_ 'Upgrade SliTaz')</button> 2.105 </form> 2.106 </footer> 2.107 </section> 2.108 @@ -138,12 +138,12 @@ 2.109 <!-- Evaluate message --> 2.110 2.111 <section> 2.112 - <header>$(gettext "Evaluate:") $(gettext "Without Partitioning / Formating")</header> 2.113 + <header>$(_ 'Evaluate: Without Partitioning / Formating')</header> 2.114 2.115 <div> 2.116 - <p>$(gettext "SliTaz and Windows™ can coexist in the same partition.")</p> 2.117 - <p>$(gettext "SliTaz will be in the \slitaz directory like UMSDOS did \ 2.118 -in the previous century...")</p> 2.119 + <p>$(_ 'SliTaz and Windows™ can coexist in the same partition.')</p> 2.120 + <p>$(_ "SliTaz will be in the %s directory like UMSDOS did \ 2.121 +in the previous century..." '\slitaz')</p> 2.122 </div> 2.123 2.124 <footer> 2.125 @@ -151,13 +151,13 @@ 2.126 <input type="hidden" name="iso"/> 2.127 <input type="hidden" name="action" value="install"/> 2.128 <table> 2.129 - <tr><td>$(gettext 'ISO image file full path') 2.130 - <span data-img="info" title="$(gettext 'set /dev/cdrom for a physical CD-ROM')"></span> 2.131 + <tr><td>$(_ 'ISO image file full path') 2.132 + <span data-img="info" title="$(_ 'set %s for a physical CD-ROM' '/dev/cdrom')"></span> 2.133 </td> 2.134 <td>$(file_chooser "iso" "")</td></tr> 2.135 - <tr><td>$(gettext 'Target partition')</td> 2.136 + <tr><td>$(_ 'Target partition')</td> 2.137 <td><select name="instdev"> 2.138 - <option value="/dev/null">$(gettext 'Choose a partition')</option> 2.139 + <option value="/dev/null">$(_ 'Choose a partition')</option> 2.140 EOT 2.141 blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \ 2.142 sed -e 's|[A-Z]*ID="[^"]*"||g;s| SEC[^ ]*||;s|LABEL=||;s|:||' \ 2.143 @@ -169,7 +169,7 @@ 2.144 cat <<EOT 2.145 </select></td></tr> 2.146 </table> 2.147 - <button data-icon="install">$(gettext 'Install')</button> 2.148 + <button data-icon="install">$(_ 'Install')</button> 2.149 </form> 2.150 </footer> 2.151 </section> 2.152 @@ -192,27 +192,27 @@ 2.153 <!-- GParted message --> 2.154 2.155 <section> 2.156 - <header>$(gettext "Partitioning")</header> 2.157 + <header>$(_ 'Partitioning')</header> 2.158 2.159 <div> 2.160 - <p>$(gettext "On most used systems, the hard drive is already dedicated to \ 2.161 + <p>$(_ "On most used systems, the hard drive is already dedicated to \ 2.162 partitions for Windows™, or Linux, or another operating \ 2.163 system. You'll need to resize these partitions in order to make space for \ 2.164 SliTaz GNU/Linux. SliTaz will co-exist with other operating systems already \ 2.165 installed on your hard drive.")</p> 2.166 - <p>$(gettext "The amount of space needed depends on how much software you \ 2.167 + <p>$(_ "The amount of space needed depends on how much software you \ 2.168 plan to install and how much space you require for users. It's conceivable \ 2.169 that you could run a minimal SliTaz system in 300 megs or less, but 2 gigs \ 2.170 is indeed more comfy.")</p> 2.171 - <p>$(gettext "A separate home partition and a partition that will be used \ 2.172 + <p>$(_ "A separate home partition and a partition that will be used \ 2.173 as Linux swap space may be created if needed. SliTaz detects and uses swap \ 2.174 partitions automatically.")</p> 2.175 <hr/> 2.176 - <p>$(gettext "You can graphically manage your partitions with GParted. \ 2.177 + <p>$(_ "You can graphically manage your partitions with GParted. \ 2.178 GParted is a partition editor for graphically managing your disk partitions. \ 2.179 GParted allows you to create, destroy, resize and copy partitions without \ 2.180 data loss.")</p> 2.181 - <p>$(gettext "GParted supports ext2, ext3, ext4, linux swap, ntfs and \ 2.182 + <p>$(_ "GParted supports ext2, ext3, ext4, linux swap, ntfs and \ 2.183 fat32 filesystems right out of the box. Support for xjs, jfs, hfs and other \ 2.184 filesystems is available as well but you first need to add drivers for these \ 2.185 filesystems by installing the related packages xfsprogs, jfsutils, linux-hfs \ 2.186 @@ -223,15 +223,15 @@ 2.187 <!-- Launch GParted --> 2.188 <form> 2.189 <button name="page" value="gparted" data-icon="hdd" 2.190 - title="$(gettext 'Launch GParted, the partition editor tool')" 2.191 - >$(gettext 'Execute GParted')</button> 2.192 + title="$(_ 'Launch GParted, the partition editor tool')" 2.193 + >$(_ 'Execute GParted')</button> 2.194 </form> 2.195 </footer> 2.196 </section> 2.197 2.198 -<h5>$(gettext "Continue installation")</h5> 2.199 +<h5>$(_ 'Continue installation')</h5> 2.200 2.201 -<p>$(gettext "Once you've made room for SliTaz on your drive, you should \ 2.202 +<p>$(_ "Once you've made room for SliTaz on your drive, you should \ 2.203 be able to continue installation.")</p> 2.204 EOT 2.205 } 2.206 @@ -256,9 +256,9 @@ 2.207 input_media "cdrom" \ 2.208 "$media" 2.209 label_media "cdrom" \ 2.210 - "$(gettext 'LiveCD')" \ 2.211 + "$(_ 'LiveCD')" \ 2.212 "$media" \ 2.213 - "$(gettext 'Use the SliTaz LiveCD')" 2.214 + "$(_ 'Use the SliTaz LiveCD')" 2.215 br 2.216 fi 2.217 # usb 2.218 @@ -266,10 +266,10 @@ 2.219 input_media "usb" \ 2.220 "$media" 2.221 label_media "usb" \ 2.222 - "$(gettext 'LiveUSB:')" \ 2.223 + "$(_ 'LiveUSB:')" \ 2.224 "$media" \ 2.225 - "$(gettext 'Enter the partition where SliTaz Live is located on 2.226 - your USB Key')" 2.227 + "$(_ 'Enter the partition where SliTaz Live is located on your USB Key')" 2.228 + 2.229 error="$?" 2.230 select "$(/usr/sbin/tazinst list usb "$INSTFILE" | cut -d' ' -f2)" \ 2.231 "$source" \ 2.232 @@ -283,22 +283,22 @@ 2.233 input_media "iso" \ 2.234 "$media" 2.235 label_media "iso" \ 2.236 - "$(gettext 'ISO file:')" \ 2.237 + "$(_ 'ISO file:')" \ 2.238 "$media" \ 2.239 - "$(gettext 'Select a SliTaz ISO file located on a local disk')" 2.240 + "$(_ 'Select a SliTaz ISO file located on a local disk')" 2.241 error="$?" 2.242 if [ "$media" == "iso" ]; then 2.243 input "text" \ 2.244 "src_iso" \ 2.245 "$source" "" \ 2.246 - "$(gettext 'Select an ISO or enter the full path to the ISO file')"\ 2.247 + "$(_ 'Select an ISO or enter the full path to the ISO file')"\ 2.248 "iso" 2.249 else 2.250 input "text" \ 2.251 "src_iso" \ 2.252 "" \ 2.253 "none" \ 2.254 - "$(gettext 'Select an ISO or enter the full path to the ISO file')"\ 2.255 + "$(_ 'Select an ISO or enter the full path to the ISO file')"\ 2.256 "iso" 2.257 fi 2.258 datalist "$(/usr/sbin/tazinst list iso "$INSTFILE")" \ 2.259 @@ -310,23 +310,23 @@ 2.260 input_media "web" \ 2.261 "$media" 2.262 label_media "web" \ 2.263 - "$(gettext 'Web:')" \ 2.264 + "$(_ 'Web:')" \ 2.265 "$media" \ 2.266 - "$(gettext 'Select a SliTaz version on the Web')" 2.267 + "$(_ 'Select a SliTaz version on the Web')" 2.268 error="$?" 2.269 2.270 if [ "$media" == "web" ]; then 2.271 input "text" \ 2.272 "src_web" \ 2.273 "$source" "" \ 2.274 - "$(gettext 'Select a version or enter the full url to an ISO file')"\ 2.275 + "$(_ 'Select a version or enter the full URL to an ISO file')"\ 2.276 "web" 2.277 else 2.278 input "text" \ 2.279 "src_web" \ 2.280 "" \ 2.281 "none" \ 2.282 - "$(gettext 'Select a version or enter the full url to an ISO file')"\ 2.283 + "$(_ 'Select a version or enter the full URL to an ISO file')"\ 2.284 "web" 2.285 fi 2.286 datalist "$(/usr/sbin/tazinst help web "$INSTFILE")" \ 2.287 @@ -342,13 +342,13 @@ 2.288 comment "root_uuid selection" 2.289 if [ "$mode" == "upgrade" ]; then 2.290 label "root_uuid" \ 2.291 - "$(gettext 'Existing SliTaz partition to upgrade:')" \ 2.292 - "$(gettext 'Specify the partition containing the system to upgrade')" 2.293 + "$(_ 'Existing SliTaz partition to upgrade:')" \ 2.294 + "$(_ 'Specify the partition containing the system to upgrade')" 2.295 error="$?" 2.296 else 2.297 label "root_uuid" \ 2.298 - "$(gettext 'Install SliTaz to partition:')" \ 2.299 - "$(gettext 'Specify the partition where to install SliTaz')" 2.300 + "$(_ 'Install SliTaz to partition:')" \ 2.301 + "$(_ 'Specify the partition where to install SliTaz')" 2.302 error="$?" 2.303 fi 2.304 select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \ 2.305 @@ -377,12 +377,12 @@ 2.306 <!-- home_uuid selection --> 2.307 2.308 <fieldset> 2.309 - <legend>$(gettext "home partition")</legend> 2.310 + <legend>$(_ 'home partition')</legend> 2.311 2.312 $( 2.313 label "home_uuid" \ 2.314 - "$(gettext 'Separate partition for /home:')" \ 2.315 - "$(gettext 'Specify the partition containing /home')" 2.316 + "$(_ 'Separate partition for %s:' '/home')" \ 2.317 + "$(_ 'Specify the partition containing %s' '/home')" 2.318 select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \ 2.319 "$home_uuid" \ 2.320 "HOME_UUID" \ 2.321 @@ -413,17 +413,17 @@ 2.322 <!-- hostname selection --> 2.323 2.324 <fieldset> 2.325 - <legend>$(gettext "Hostname")</legend> 2.326 + <legend>$(_ 'Hostname')</legend> 2.327 $( 2.328 label "hostname" \ 2.329 - "$(gettext 'Set Hostname to:')" \ 2.330 - "$(gettext 'Hostname configuration allows you to specify the machine name')" 2.331 + "$(_ 'Set Hostname to:')" \ 2.332 + "$(_ 'Hostname configuration allows you to specify the machine name')" 2.333 error=$? 2.334 input "text" \ 2.335 "HOSTNAME" \ 2.336 "$hostname" \ 2.337 "" \ 2.338 - "$(gettext 'Name of your system')" 2.339 + "$(_ 'Name of your system')" 2.340 error_msg "$error" \ 2.341 "hostname" \ 2.342 2 2.343 @@ -440,17 +440,17 @@ 2.344 <!-- root_pwd selection --> 2.345 2.346 <fieldset> 2.347 - <legend>$(gettext "Root superuser")</legend> 2.348 + <legend>$(_ 'Root superuser')</legend> 2.349 $( 2.350 label "root_pwd" \ 2.351 - "$(gettext 'Root passwd:')" \ 2.352 - "$(gettext 'Enter the password for root')" 2.353 + "$(_ 'Root password:')" \ 2.354 + "$(_ 'Enter the password for root')" 2.355 error="$?" 2.356 input "text" \ 2.357 "ROOT_PWD" \ 2.358 "$root_pwd" \ 2.359 "" \ 2.360 - "$(gettext 'Password of root')" 2.361 + "$(_ 'Password of root')" 2.362 error_msg "$error" \ 2.363 "root_pwd" 2.364 ) 2.365 @@ -466,17 +466,17 @@ 2.366 <!-- user_login selection --> 2.367 2.368 <fieldset> 2.369 - <legend>$(gettext "User")</legend> 2.370 + <legend>$(_ 'User')</legend> 2.371 $( 2.372 label "user_login" \ 2.373 - "$(gettext 'User login:')" \ 2.374 - "$(gettext 'Enter the name of the first user')" 2.375 + "$(_ 'User login:')" \ 2.376 + "$(_ 'Enter the name of the first user')" 2.377 error="$?" 2.378 input "text" \ 2.379 "USER_LOGIN" \ 2.380 "$user_login" \ 2.381 "" \ 2.382 - "$(gettext 'Name of the first user')" 2.383 + "$(_ 'Name of the first user')" 2.384 error_msg "$error" \ 2.385 "user_login" \ 2.386 2 2.387 @@ -491,14 +491,14 @@ 2.388 local user_pwd="$(/usr/sbin/tazinst get user_pwd "$INSTFILE")" error 2.389 2.390 label "user_pwd" \ 2.391 - "$(gettext 'User passwd:')" \ 2.392 - "$(gettext 'The password for default user')" 2.393 + "$(_ 'User password:')" \ 2.394 + "$(_ 'The password for default user')" 2.395 error="$?" 2.396 input "text" \ 2.397 "USER_PWD" \ 2.398 "$user_pwd" \ 2.399 "" \ 2.400 - "$(gettext 'Password of the first user')" 2.401 + "$(_ 'Password of the first user')" 2.402 error_msg "$error" \ 2.403 "user_pwd" 2.404 cat <<EOT 2.405 @@ -515,7 +515,7 @@ 2.406 <!-- bootloader selection --> 2.407 2.408 <fieldset> 2.409 - <legend>$(gettext "Bootloader")</legend> 2.410 + <legend>$(_ 'Bootloader')</legend> 2.411 2.412 $( 2.413 input "checkbox" \ 2.414 @@ -523,8 +523,8 @@ 2.415 "auto" \ 2.416 "$bootloader" 2.417 label "bootloader" \ 2.418 - "$(gettext 'Install a bootloader.')" \ 2.419 - "$(gettext "Usually you should answer yes, unless you want to install \ 2.420 + "$(_ 'Install a bootloader.')" \ 2.421 + "$(_ "Usually you should answer yes, unless you want to install \ 2.422 a bootloader by hand yourself.")" 2.423 error="$?" 2.424 error_msg "$error" \ 2.425 @@ -545,8 +545,8 @@ 2.426 "auto" \ 2.427 "$winboot" 2.428 label "winboot" \ 2.429 - "$(gettext 'Enable Windows Dual-Boot.')" \ 2.430 - "$(gettext "At start-up, you will be asked whether you want to boot \ 2.431 + "$(_ 'Enable Windows Dual-Boot.')" \ 2.432 + "$(_ "At start-up, you will be asked whether you want to boot \ 2.433 into Windows™ or SliTaz GNU/Linux.")" 2.434 error="$?" 2.435 error_msg "$error" \ 2.436 @@ -561,7 +561,7 @@ 2.437 { 2.438 if [ "$CHECK" ]; then 2.439 echo '<span class="alert">' 2.440 - p "$(gettext "Errors found. Please check your settings.")" 2.441 + p "$(_ "Errors found. Please check your settings.")" 2.442 echo '</span>' 2.443 fi 2.444 } 2.445 @@ -574,14 +574,14 @@ 2.446 2.447 cat<<EOT 2.448 <fieldset> 2.449 - <legend>$(gettext "Select source media:")</legend> 2.450 + <legend>$(_ 'Select source media:')</legend> 2.451 2.452 <div class="media">$(select_source)</div> 2.453 </fieldset> 2.454 2.455 2.456 <fieldset> 2.457 - <legend>$(gettext "Select destination")</legend> 2.458 + <legend>$(_ 'Select destination')</legend> 2.459 2.460 <div>$( 2.461 select_root_uuid 2.462 @@ -591,7 +591,7 @@ 2.463 2.464 2.465 <fieldset id="options"> 2.466 - <legend>$(gettext 'Options')</legend> 2.467 + <legend>$(_ 'Options')</legend> 2.468 2.469 <div class="options">$( 2.470 printf '%s' "$settings" | grep -q "home_uuid" && select_home_uuid 2.471 @@ -619,7 +619,7 @@ 2.472 2.473 save_settings() 2.474 { 2.475 - h5 "$(gettext "Checking settings...")" 2.476 + h5 "$(_ 'Checking settings...')" 2.477 2.478 # install type 2.479 /usr/sbin/tazinst set media "$(GET MEDIA)" "$INSTFILE" 2.480 @@ -686,7 +686,7 @@ 2.481 tazinst_run() 2.482 { 2.483 local mode="$(/usr/sbin/tazinst get mode "$INSTFILE")" error 2.484 - h4 "$(gettext 'Proceeding to:') $(gettext "$mode")" 2.485 + h4 "$(_ 'Proceeding to: %s' "$(gettext "$mode")")" 2.486 /usr/sbin/tazinst execute "$INSTFILE" | /bin/busybox awk '{ 2.487 num=$1+0 2.488 if (num>0 && num<=100){ 2.489 @@ -704,7 +704,7 @@ 2.490 echo "<script type=\"text/javascript\">" 2.491 printf "document.write(\047<div id=\"progress\">" 2.492 printf "<img src=\"/styles/default/images/stop.png\" />" 2.493 - printf "$(gettext 'Errors encountered.')" 2.494 + _n 'Errors encountered.' 2.495 printf "</div>\047)\n" 2.496 echo "</script>" 2.497 br 2.498 @@ -717,13 +717,13 @@ 2.499 echo "<script type=\"text/javascript\">" 2.500 printf "document.write(\047<div id=\"progress\">" 2.501 printf "<img src=\"/styles/default/images/tux.png\" />" 2.502 - printf "$(gettext 'Process completed!')" 2.503 + _n 'Process completed!' 2.504 printf "</div>\047)\n" 2.505 echo "</script>" 2.506 br 2.507 br 2.508 br 2.509 - p $(gettext "Installation is now finished, you can exit the installer \ 2.510 + p $(_ "Installation is now finished, you can exit the installer \ 2.511 or reboot on your new SliTaz GNU/Linux operating system.") 2.512 fi 2.513 return "$error" 2.514 @@ -733,7 +733,7 @@ 2.515 2.516 tazinst_log() 2.517 { 2.518 - h4 "$(gettext "Tazinst log")" 2.519 + h4 "$(_ "Tazinst log")" 2.520 printf '<pre>%s</pre>' "$(/usr/sbin/tazinst log | sed 's/\%/ percent/g')" 2.521 } 2.522 2.523 @@ -747,9 +747,9 @@ 2.524 case $mode in 2.525 install) 2.526 cat <<EOT 2.527 -<h2>$(gettext "Install SliTaz")</h2> 2.528 +<h2>$(_ 'Install SliTaz')</h2> 2.529 2.530 -<p>$(gettext "You're going to install SliTaz on a partition of \ 2.531 +<p>$(_ "You're going to install SliTaz on a partition of \ 2.532 your hard disk drive. If you decide to format your HDD, all data will be \ 2.533 lost. If you do not format, all data except for any existing /home \ 2.534 directory will be removed (the home directory will be kept as is).")</p> 2.535 @@ -757,9 +757,9 @@ 2.536 ;; 2.537 upgrade) 2.538 cat <<EOT 2.539 -<h2>$(gettext "Upgrade SliTaz")</h2> 2.540 +<h2>$(_ 'Upgrade SliTaz')</h2> 2.541 2.542 -<p>$(gettext "You're going to upgrade an already installed SliTaz \ 2.543 +<p>$(_ "You're going to upgrade an already installed SliTaz \ 2.544 system on your hard disk drive. Your /home /etc /var/www directories \ 2.545 will be kept, all other directories will be removed. Any additional \ 2.546 packages added to your old SliTaz system will be updated as long you \ 2.547 @@ -776,24 +776,24 @@ 2.548 2.549 case "$back_page" in 2.550 partitioning) 2.551 - back_msg=$(gettext 'Back to partitioning') ;; 2.552 + back_msg=$(_ 'Back to partitioning') ;; 2.553 input) 2.554 - back_msg=$(gettext 'Back to entering settings') ;; 2.555 + back_msg=$(_ 'Back to entering settings') ;; 2.556 *) 2.557 - back_msg=$(gettext 'Back to Installer Start Page') ;; 2.558 + back_msg=$(_ 'Back to Installer Start Page') ;; 2.559 esac 2.560 2.561 case "$next_page" in 2.562 execute|run) 2.563 - next_msg=$(gettext 'Proceed to SliTaz installation') ;; 2.564 + next_msg=$(_ 'Proceed to SliTaz installation') ;; 2.565 reboot) 2.566 - next_msg=$(gettext 'Installation complete. You can now restart') ;; 2.567 + next_msg=$(_ 'Installation complete. You can now restart') ;; 2.568 failed) 2.569 - next_msg=$(gettext 'Installation failed. See log') ;; 2.570 + next_msg=$(_ 'Installation failed. See log') ;; 2.571 input) 2.572 - next_msg=$(gettext 'Continue installation.') ;; 2.573 + next_msg=$(_ 'Continue installation.') ;; 2.574 *) 2.575 - next_msg=$(gettext 'Back to Installer Start Page') ;; 2.576 + next_msg=$(_ 'Back to Installer Start Page') ;; 2.577 esac 2.578 2.579 cat <<EOT 2.580 @@ -810,7 +810,7 @@ 2.581 cat <<EOT 2.582 <form> 2.583 <button name="page" value="home" data-icon="back" 2.584 - >$(gettext 'Back to Installer Start Page')</button> 2.585 + >$(_ 'Back to Installer Start Page')</button> 2.586 </form> 2.587 EOT 2.588 } 2.589 @@ -823,15 +823,15 @@ 2.590 <html> 2.591 <head> 2.592 <meta charset="UTF-8"> 2.593 -<title>$(gettext "A web page that points a browser to a different page after \ 2.594 +<title>$(_ "A web page that points a browser to a different page after \ 2.595 2 seconds")</title> 2.596 <meta http-equiv="refresh" content="0; URL=$SCRIPT_NAME?page=$1"> 2.597 <meta name="keywords" content="automatic redirection"> 2.598 </head> 2.599 <body> 2.600 -<p>$(gettext "If your browser doesn't automatically redirect within a few \ 2.601 -seconds, you may want to go there manually") 2.602 -<a href="$SCRIPT_NAME?page=$page">$(gettext "here")</a></p> 2.603 +<p>$(_ "If your browser doesn't automatically redirect within a few \ 2.604 +seconds, you may want to go there manually [here]" | \ 2.605 +sed "s|\[|<a href=\"?page=$page\">|; s|\]|</a>|")</p> 2.606 </body> 2.607 </html> 2.608 EOT 2.609 @@ -846,11 +846,11 @@ 2.610 local errorcode=0 2.611 comment "check_ressources" 2.612 if ! [ -x /usr/sbin/tazinst ] ; then 2.613 - h4 $(gettext "Tazinst Error") 2.614 - p $(gettext "<strong>tazinst</strong>, the backend to slitaz-installer \ 2.615 -is missing. Any installation can not be done without tazinst.") 2.616 - p $(gettext "Check tazinst permissions, or reinstall the \ 2.617 -slitaz-installer package.") 2.618 + h4 $(_ 'Tazinst Error') 2.619 + p $(_ '%s, the backend to %s is missing.' '<strong>tazinst</strong>' 'slitaz-installer'; 2.620 + _ 'Any installation can not be done without %s.' 'tazinst') 2.621 + p $(_ "Check %s permissions, or reinstall the %s package." \ 2.622 + 'tazinst' 'slitaz-installer') 2.623 errorcode=1 2.624 else 2.625 # check tazinst minimum version 2.626 @@ -858,12 +858,12 @@ 2.627 r=$TAZINST_MINIMUM_VERSION 2.628 if ! (printf '%s' "$v" | /bin/busybox awk -v r=$r \ 2.629 '{v=$v+0}{ if (v < r) exit 1}') ; then 2.630 - h4 $(gettext "Tazinst Error") 2.631 - p $(gettext "<strong>tazinst</strong>, the slitaz-installer \ 2.632 -backend, is not at the minimum required version. Any installation \ 2.633 -cannot be done without tazinst.") 2.634 - p $(gettext "Reinstall the slitaz-installer package, or use \ 2.635 -tazinst in CLI mode.") 2.636 + h4 $(_ 'Tazinst Error') 2.637 + p $(_ '%s, the %s backend, is not at the minimum required version.' \ 2.638 + '<strong>tazinst</strong>' 'slitaz-installer'; 2.639 + _ 'Any installation can not be done without %s.' 'tazinst') 2.640 + p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \ 2.641 + 'slitaz-installer' 'tazinst') 2.642 errorcode=1 2.643 fi 2.644 # check tazinst maximum version 2.645 @@ -871,12 +871,12 @@ 2.646 r=$TAZINST_MAXIMUM_VERSION 2.647 if ! (printf '%s' "$v" | /bin/busybox awk -v r=$r \ 2.648 '{v=$v+0}{ if (v > r) exit 1}') ; then 2.649 - h4 $(gettext "Tazinst Error") 2.650 - p $(gettext "<strong>tazinst</strong>, the slitaz-installer \ 2.651 -backend, is at a higher version than the maximum authorized \ 2.652 -by the slitaz-installer. Any installation cannot be done.") 2.653 - p $(gettext "Reinstall the slitaz-installer package, or use \ 2.654 -tazinst in CLI mode.") 2.655 + h4 $(_ 'Tazinst Error') 2.656 + p $(_ "%s, the %s backend, is at a higher version than the maximum authorized \ 2.657 +by the %s." '<strong>tazinst</strong>' 'slitaz-installer' 'slitaz-installer'; 2.658 + _ 'Any installation cannot be done.') 2.659 + p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \ 2.660 + 'slitaz-installer' 'tazinst') 2.661 errorcode=1 2.662 fi 2.663 fi 2.664 @@ -902,8 +902,8 @@ 2.665 2.666 a() { 2.667 local page="$1" text="$2" 2.668 - printf '<a class="button" value="%s" href="%s?page=%s">%s</a>\n' \ 2.669 - "$page" "$SCRIPT_NAME" "$page" "$text" 2.670 + printf '<a class="button" value="%s" href="?page=%s">%s</a>\n' \ 2.671 + "$page" "$page" "$text" 2.672 } 2.673 2.674 button() { 2.675 @@ -992,11 +992,11 @@ 2.676 select() { 2.677 local list="$1" selected="$2" name="$3" type="$4" 2.678 printf '%s' "$list" | \ 2.679 - /bin/busybox awk -v SELECTED="$selected" -v NONE="$(gettext "None")" \ 2.680 + /bin/busybox awk -v SELECTED="$selected" -v NONE="$(_ 'None')" \ 2.681 -v NAME="$name" -v TYPE="$type" 'BEGIN{ 2.682 TYPE=TYPE+0 2.683 print "<select name=\"" NAME "\">" 2.684 - print "<option value=>< " NONE " ></option>" 2.685 + print "<option value=>< " NONE " ></option>" 2.686 } 2.687 { 2.688 printf "<option value=\"" $1 "\"" 2.689 @@ -1049,7 +1049,7 @@ 2.690 2.691 # workaround ..end 2.692 printf '%s' "$list" | \ 2.693 - /bin/busybox awk -v NONE="$(gettext "None")" 'BEGIN{ 2.694 + /bin/busybox awk -v NONE="$(_ 'None')" 'BEGIN{ 2.695 line=0 2.696 } 2.697 { 2.698 @@ -1060,7 +1060,7 @@ 2.699 } 2.700 END{ 2.701 if (line < 1) 2.702 - printf "<option value=>< %s ></option>\n", NONE 2.703 + printf "<option value=>< %s ></option>\n", NONE 2.704 }' 2.705 echo "</select>" 2.706 echo "</datalist>" 2.707 @@ -1068,11 +1068,11 @@ 2.708 2.709 format() 2.710 { 2.711 - list_fs="$1" selected="$2" name="$3" none="$(gettext 'Do not format')" 2.712 + list_fs="$1" selected="$2" name="$3" none="$(_ 'Do not format')" 2.713 printf '<label for="%s" ' "$name" 2.714 - printf 'title="%s">' "$(gettext "To format this partition, select a \ 2.715 + printf 'title="%s">' "$(_ "To format this partition, select a \ 2.716 filesystem, usually it's safe to use ext4")" 2.717 - printf '%s</label>\n' "$(gettext "Formatting option:")" 2.718 + printf '%s</label>\n' "$(_ 'Formatting option:')" 2.719 printf '%s' "$list_fs" | \ 2.720 /bin/busybox awk -v SELECTED=$selected -v NONE="$none" -v NAME="$name" ' 2.721 BEGIN{
3.1 --- a/po/installer/el.po Wed Apr 06 09:52:43 2016 +0300 3.2 +++ b/po/installer/el.po Sat Apr 09 17:22:22 2016 +0300 3.3 @@ -7,7 +7,7 @@ 3.4 msgstr "" 3.5 "Project-Id-Version: installer.cgi\n" 3.6 "Report-Msgid-Bugs-To: \n" 3.7 -"POT-Creation-Date: 2016-04-05 19:03+0100\n" 3.8 +"POT-Creation-Date: 2016-04-09 17:07+0300\n" 3.9 "PO-Revision-Date: 2012-06-10 17:15+0200\n" 3.10 "Last-Translator: Douros Dimitris <dourosdimitris@gmail.com>\n" 3.11 "Language-Team: \n" 3.12 @@ -127,11 +127,7 @@ 3.13 msgstr "Αναβάθμιση SliTaz" 3.14 3.15 #: installer.cgi:141 3.16 -msgid "Evaluate:" 3.17 -msgstr "" 3.18 - 3.19 -#: installer.cgi:141 3.20 -msgid "Without Partitioning / Formating" 3.21 +msgid "Evaluate: Without Partitioning / Formating" 3.22 msgstr "" 3.23 3.24 #: installer.cgi:144 3.25 @@ -140,8 +136,7 @@ 3.26 3.27 #: installer.cgi:145 3.28 msgid "" 3.29 -"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous " 3.30 -"century..." 3.31 +"SliTaz will be in the %s directory like UMSDOS did in the previous century..." 3.32 msgstr "" 3.33 3.34 #: installer.cgi:154 3.35 @@ -149,7 +144,7 @@ 3.36 msgstr "" 3.37 3.38 #: installer.cgi:155 3.39 -msgid "set /dev/cdrom for a physical CD-ROM" 3.40 +msgid "set %s for a physical CD-ROM" 3.41 msgstr "" 3.42 3.43 #: installer.cgi:158 3.44 @@ -268,9 +263,7 @@ 3.45 msgstr "Ζωντανό USB" 3.46 3.47 #: installer.cgi:271 3.48 -msgid "" 3.49 -"Enter the partition where SliTaz Live is located on\n" 3.50 -" your USB Key" 3.51 +msgid "Enter the partition where SliTaz Live is located on your USB Key" 3.52 msgstr "" 3.53 3.54 #: installer.cgi:286 3.55 @@ -294,7 +287,7 @@ 3.56 msgstr "" 3.57 3.58 #: installer.cgi:322 installer.cgi:329 3.59 -msgid "Select a version or enter the full url to an ISO file" 3.60 +msgid "Select a version or enter the full URL to an ISO file" 3.61 msgstr "" 3.62 3.63 #: installer.cgi:345 3.64 @@ -318,14 +311,13 @@ 3.65 msgstr "Διαμέρισμα home" 3.66 3.67 #: installer.cgi:384 3.68 -#, fuzzy 3.69 -msgid "Separate partition for /home:" 3.70 -msgstr "Χρησιμοποιήστε ξεχωριστό διαμέρισμα για το /home:" 3.71 +msgid "Separate partition for %s:" 3.72 +msgstr "Χρησιμοποιήστε ξεχωριστό διαμέρισμα για το %s:" 3.73 3.74 #: installer.cgi:385 3.75 #, fuzzy 3.76 -msgid "Specify the partition containing /home" 3.77 -msgstr "Χρησιμοποιήστε ξεχωριστό διαμέρισμα για το /home:" 3.78 +msgid "Specify the partition containing %s" 3.79 +msgstr "Χρησιμοποιήστε ξεχωριστό διαμέρισμα για το %s:" 3.80 3.81 #: installer.cgi:416 3.82 msgid "Hostname" 3.83 @@ -348,7 +340,7 @@ 3.84 msgstr "" 3.85 3.86 #: installer.cgi:446 3.87 -msgid "Root passwd:" 3.88 +msgid "Root password:" 3.89 msgstr "Κωδικός διαχειριστή:" 3.90 3.91 #: installer.cgi:447 3.92 @@ -378,7 +370,7 @@ 3.93 msgstr "Όνομα του πρώτου χρήστη" 3.94 3.95 #: installer.cgi:494 3.96 -msgid "User passwd:" 3.97 +msgid "User password:" 3.98 msgstr "Κωδικός χρήστη:" 3.99 3.100 #: installer.cgi:495 3.101 @@ -442,7 +434,7 @@ 3.102 msgstr "Έλεγχος για αναβαθμίσεις..." 3.103 3.104 #: installer.cgi:689 3.105 -msgid "Proceeding to:" 3.106 +msgid "Proceeding to: %s" 3.107 msgstr "" 3.108 3.109 #: installer.cgi:707 3.110 @@ -531,14 +523,10 @@ 3.111 #: installer.cgi:832 3.112 msgid "" 3.113 "If your browser doesn't automatically redirect within a few seconds, you may " 3.114 -"want to go there manually" 3.115 +"want to go there manually [here]" 3.116 msgstr "" 3.117 "Αν το πρόγραμμα περιήγησής σας δεν ανακατευθυνθεί αυτόματα μέσα σε λίγα " 3.118 -"δευτερόλεπτα, μπορεί να θέλετε να πάτε εκεί χειροκίνητα" 3.119 - 3.120 -#: installer.cgi:834 3.121 -msgid "here" 3.122 -msgstr "" 3.123 +"δευτερόλεπτα, μπορεί να θέλετε να πάτε εκεί χειροκίνητα [here]" 3.124 3.125 #: installer.cgi:849 installer.cgi:861 installer.cgi:874 3.126 msgid "Tazinst Error" 3.127 @@ -546,44 +534,41 @@ 3.128 3.129 #: installer.cgi:850 3.130 #, fuzzy 3.131 -msgid "" 3.132 -"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any " 3.133 -"installation can not be done without tazinst." 3.134 +msgid "%s, the backend to %s is missing." 3.135 msgstr "" 3.136 -"<strong>tazinst</strong>, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz " 3.137 -"σε σκληρό δίσκο. Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το " 3.138 -"tazinst." 3.139 +"%s, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz (%s) σε σκληρό δίσκο. " 3.140 + 3.141 +#: installer.cgi:851 installer.cgi:864 3.142 +msgid "Any installation can not be done without %s." 3.143 +msgstr "Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το %s." 3.144 3.145 #: installer.cgi:852 3.146 -#, fuzzy 3.147 -msgid "Check tazinst permissions, or reinstall the slitaz-installer package." 3.148 -msgstr "" 3.149 -"Ελέγξτε τα δικαιώματα του tazinst ή επανεγκαταστήστε το πακέτο slitaz-tools:" 3.150 +msgid "Check %s permissions, or reinstall the %s package." 3.151 +msgstr "Ελέγξτε τα δικαιώματα του %s ή επανεγκαταστήστε το πακέτο %s." 3.152 3.153 #: installer.cgi:862 3.154 #, fuzzy 3.155 -msgid "" 3.156 -"<strong>tazinst</strong>, the slitaz-installer backend, is not at the " 3.157 -"minimum required version. Any installation cannot be done without tazinst." 3.158 +msgid "%s, the %s backend, is not at the minimum required version." 3.159 msgstr "" 3.160 -"<strong>tazinst</strong>, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz " 3.161 -"σε σκληρό δίσκο. Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το " 3.162 -"tazinst." 3.163 +"%s, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz (%s) σε σκληρό δίσκο." 3.164 3.165 #: installer.cgi:865 installer.cgi:878 3.166 -msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode." 3.167 +msgid "Reinstall the %s package, or use %s in CLI mode." 3.168 msgstr "" 3.169 3.170 #: installer.cgi:875 3.171 #, fuzzy 3.172 msgid "" 3.173 -"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher " 3.174 -"version than the maximum authorized by the slitaz-installer. Any " 3.175 -"installation cannot be done." 3.176 +"%s, the %s backend, is at a higher version than the maximum authorized by " 3.177 +"the %s." 3.178 msgstr "" 3.179 -"<strong>tazinst</strong>, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz " 3.180 -"σε σκληρό δίσκο. Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το " 3.181 -"tazinst." 3.182 +"%s, Λείπει το ελαφρύ πρόγραμμα εγκατάστασης του SliTaz (%s) σε σκληρό δίσκο " 3.183 +"%s." 3.184 + 3.185 +#: installer.cgi:877 3.186 +#, fuzzy 3.187 +msgid "Any installation cannot be done." 3.188 +msgstr "Δεν μπορούν να πραγματοποιηθούν εγκαταστάσεις χωρίς το." 3.189 3.190 #: installer.cgi:995 installer.cgi:1052 3.191 msgid "None"
4.1 --- a/po/installer/es.po Wed Apr 06 09:52:43 2016 +0300 4.2 +++ b/po/installer/es.po Sat Apr 09 17:22:22 2016 +0300 4.3 @@ -7,7 +7,7 @@ 4.4 msgstr "" 4.5 "Project-Id-Version: installer.cgi\n" 4.6 "Report-Msgid-Bugs-To: \n" 4.7 -"POT-Creation-Date: 2016-04-05 19:03+0100\n" 4.8 +"POT-Creation-Date: 2016-04-09 17:07+0300\n" 4.9 "PO-Revision-Date: 2012-06-11 03:13-0000\n" 4.10 "Last-Translator: kevin fabian quintero <kefaquin@gmail.com>\n" 4.11 "Language-Team: \n" 4.12 @@ -126,11 +126,7 @@ 4.13 msgstr "Actualizar SliTaz" 4.14 4.15 #: installer.cgi:141 4.16 -msgid "Evaluate:" 4.17 -msgstr "" 4.18 - 4.19 -#: installer.cgi:141 4.20 -msgid "Without Partitioning / Formating" 4.21 +msgid "Evaluate: Without Partitioning / Formating" 4.22 msgstr "" 4.23 4.24 #: installer.cgi:144 4.25 @@ -139,8 +135,7 @@ 4.26 4.27 #: installer.cgi:145 4.28 msgid "" 4.29 -"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous " 4.30 -"century..." 4.31 +"SliTaz will be in the %s directory like UMSDOS did in the previous century..." 4.32 msgstr "" 4.33 4.34 #: installer.cgi:154 4.35 @@ -148,7 +143,7 @@ 4.36 msgstr "" 4.37 4.38 #: installer.cgi:155 4.39 -msgid "set /dev/cdrom for a physical CD-ROM" 4.40 +msgid "set %s for a physical CD-ROM" 4.41 msgstr "" 4.42 4.43 #: installer.cgi:158 4.44 @@ -265,9 +260,7 @@ 4.45 msgstr "USB Vivo:" 4.46 4.47 #: installer.cgi:271 4.48 -msgid "" 4.49 -"Enter the partition where SliTaz Live is located on\n" 4.50 -" your USB Key" 4.51 +msgid "Enter the partition where SliTaz Live is located on your USB Key" 4.52 msgstr "" 4.53 4.54 #: installer.cgi:286 4.55 @@ -291,7 +284,7 @@ 4.56 msgstr "" 4.57 4.58 #: installer.cgi:322 installer.cgi:329 4.59 -msgid "Select a version or enter the full url to an ISO file" 4.60 +msgid "Select a version or enter the full URL to an ISO file" 4.61 msgstr "" 4.62 4.63 #: installer.cgi:345 4.64 @@ -315,14 +308,13 @@ 4.65 msgstr "Partición Home" 4.66 4.67 #: installer.cgi:384 4.68 -#, fuzzy 4.69 -msgid "Separate partition for /home:" 4.70 -msgstr "Usar otra partición para /home:" 4.71 +msgid "Separate partition for %s:" 4.72 +msgstr "Usar otra partición para %s:" 4.73 4.74 #: installer.cgi:385 4.75 #, fuzzy 4.76 -msgid "Specify the partition containing /home" 4.77 -msgstr "Usar otra partición para /home:" 4.78 +msgid "Specify the partition containing %s" 4.79 +msgstr "Usar otra partición para %s:" 4.80 4.81 #: installer.cgi:416 4.82 msgid "Hostname" 4.83 @@ -345,7 +337,7 @@ 4.84 msgstr "" 4.85 4.86 #: installer.cgi:446 4.87 -msgid "Root passwd:" 4.88 +msgid "Root password:" 4.89 msgstr "Contraseña Root:" 4.90 4.91 #: installer.cgi:447 4.92 @@ -375,7 +367,7 @@ 4.93 msgstr "Nombre de usuario" 4.94 4.95 #: installer.cgi:494 4.96 -msgid "User passwd:" 4.97 +msgid "User password:" 4.98 msgstr "Contraseña de usuario:" 4.99 4.100 #: installer.cgi:495 4.101 @@ -439,7 +431,7 @@ 4.102 msgstr "Comprobar actualizaciónes..." 4.103 4.104 #: installer.cgi:689 4.105 -msgid "Proceeding to:" 4.106 +msgid "Proceeding to: %s" 4.107 msgstr "" 4.108 4.109 #: installer.cgi:707 4.110 @@ -526,14 +518,10 @@ 4.111 #: installer.cgi:832 4.112 msgid "" 4.113 "If your browser doesn't automatically redirect within a few seconds, you may " 4.114 -"want to go there manually" 4.115 +"want to go there manually [here]" 4.116 msgstr "" 4.117 "Si su navegador no lo redirige de manera automatica en unos segundos,usted " 4.118 -"puede ir de manera manual" 4.119 - 4.120 -#: installer.cgi:834 4.121 -msgid "here" 4.122 -msgstr "" 4.123 +"puede ir de manera manual [here]" 4.124 4.125 #: installer.cgi:849 installer.cgi:861 installer.cgi:874 4.126 msgid "Tazinst Error" 4.127 @@ -541,40 +529,37 @@ 4.128 4.129 #: installer.cgi:850 4.130 #, fuzzy 4.131 -msgid "" 4.132 -"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any " 4.133 -"installation can not be done without tazinst." 4.134 -msgstr "" 4.135 -"<strong>tazinst</strong>, El instalador de SliTaz no se encuentra,no se " 4.136 -"puede realizar la instalacion sin tazinst." 4.137 +msgid "%s, the backend to %s is missing." 4.138 +msgstr "%s, El instalador de SliTaz (%s) no se encuentra." 4.139 + 4.140 +#: installer.cgi:851 installer.cgi:864 4.141 +msgid "Any installation can not be done without %s." 4.142 +msgstr "No se puede realizar la instalacion sin %s." 4.143 4.144 #: installer.cgi:852 4.145 -#, fuzzy 4.146 -msgid "Check tazinst permissions, or reinstall the slitaz-installer package." 4.147 -msgstr "Verifique los permisos tazinst' , o reinstale el paquete slitaz-tools:" 4.148 +msgid "Check %s permissions, or reinstall the %s package." 4.149 +msgstr "Verifique los permisos %s, o reinstale el paquete %s." 4.150 4.151 #: installer.cgi:862 4.152 #, fuzzy 4.153 -msgid "" 4.154 -"<strong>tazinst</strong>, the slitaz-installer backend, is not at the " 4.155 -"minimum required version. Any installation cannot be done without tazinst." 4.156 -msgstr "" 4.157 -"<strong>tazinst</strong>, El instalador de SliTaz no se encuentra,no se " 4.158 -"puede realizar la instalacion sin tazinst." 4.159 +msgid "%s, the %s backend, is not at the minimum required version." 4.160 +msgstr "%s, El instalador de SliTaz (%s) no se encuentra." 4.161 4.162 #: installer.cgi:865 installer.cgi:878 4.163 -msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode." 4.164 +msgid "Reinstall the %s package, or use %s in CLI mode." 4.165 msgstr "" 4.166 4.167 #: installer.cgi:875 4.168 #, fuzzy 4.169 msgid "" 4.170 -"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher " 4.171 -"version than the maximum authorized by the slitaz-installer. Any " 4.172 -"installation cannot be done." 4.173 -msgstr "" 4.174 -"<strong>tazinst</strong>, El instalador de SliTaz no se encuentra,no se " 4.175 -"puede realizar la instalacion sin tazinst." 4.176 +"%s, the %s backend, is at a higher version than the maximum authorized by " 4.177 +"the %s." 4.178 +msgstr "%s, El instalador de SliTaz (%s) no se encuentra." 4.179 + 4.180 +#: installer.cgi:877 4.181 +#, fuzzy 4.182 +msgid "Any installation cannot be done." 4.183 +msgstr "No se puede realizar la instalacion." 4.184 4.185 #: installer.cgi:995 installer.cgi:1052 4.186 msgid "None"
5.1 --- a/po/installer/fr.po Wed Apr 06 09:52:43 2016 +0300 5.2 +++ b/po/installer/fr.po Sat Apr 09 17:22:22 2016 +0300 5.3 @@ -8,7 +8,7 @@ 5.4 msgstr "" 5.5 "Project-Id-Version: installer.cgi\n" 5.6 "Report-Msgid-Bugs-To: \n" 5.7 -"POT-Creation-Date: 2016-04-04 11:45+0200\n" 5.8 +"POT-Creation-Date: 2016-04-09 17:07+0300\n" 5.9 "PO-Revision-Date: 2016-04-04 11:45+0200\n" 5.10 "Last-Translator: Pascal Bellard <pascal.bellard@slitaz.org>\n" 5.11 "Language-Team: French\n" 5.12 @@ -57,7 +57,7 @@ 5.13 "hard disk." 5.14 msgstr "" 5.15 "Les utilisateurs de Windows™ pouvent évaluer SliTaz dans le répertoire " 5.16 -"\\slitaz de leur disque dur."" 5.17 +"\\slitaz de leur disque dur." 5.18 5.19 #: installer.cgi:76 5.20 msgid "Which type of installation do you want to start?" 5.21 @@ -119,12 +119,8 @@ 5.22 msgstr "Mettre à jour SliTaz" 5.23 5.24 #: installer.cgi:141 5.25 -msgid "Evaluate:" 5.26 -msgstr "Evaluer :" 5.27 - 5.28 -#: installer.cgi:141 5.29 -msgid "Without Partitioning / Formating" 5.30 -msgstr "Sans partitionner ni formater" 5.31 +msgid "Evaluate: Without Partitioning / Formating" 5.32 +msgstr "Evaluer : Sans partitionner ni formater" 5.33 5.34 #: installer.cgi:144 5.35 msgid "SliTaz and Windows™ can coexist in the same partition." 5.36 @@ -132,19 +128,17 @@ 5.37 5.38 #: installer.cgi:145 5.39 msgid "" 5.40 -"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous " 5.41 -"century..." 5.42 +"SliTaz will be in the %s directory like UMSDOS did in the previous century..." 5.43 msgstr "" 5.44 -"SliTaz sera dans le répertoire \\slitaz comme UMSDOS faisait au siècle " 5.45 -"dernier..." 5.46 +"SliTaz sera dans le répertoire %s comme UMSDOS faisait au siècle dernier..." 5.47 5.48 #: installer.cgi:154 5.49 msgid "ISO image file full path" 5.50 msgstr "Chemin complet de l'image ISO" 5.51 5.52 #: installer.cgi:155 5.53 -msgid "set /dev/cdrom for a physical CD-ROM" 5.54 -msgstr "Mettre /dev/cdrom pour indiquer le lecteur de CD-ROM" 5.55 +msgid "set %s for a physical CD-ROM" 5.56 +msgstr "Mettre %s pour indiquer le lecteur de CD-ROM" 5.57 5.58 #: installer.cgi:158 5.59 msgid "Target partition" 5.60 @@ -249,9 +243,7 @@ 5.61 msgstr "LiveUSB" 5.62 5.63 #: installer.cgi:271 5.64 -msgid "" 5.65 -"Enter the partition where SliTaz Live is located on\n" 5.66 -" your USB Key" 5.67 +msgid "Enter the partition where SliTaz Live is located on your USB Key" 5.68 msgstr "Sur quelle partition de la clef USB se trouve SliTaz Live ?" 5.69 5.70 #: installer.cgi:286 5.71 @@ -275,7 +267,7 @@ 5.72 msgstr "Choisissez une version de SliTaz sur le Web" 5.73 5.74 #: installer.cgi:322 installer.cgi:329 5.75 -msgid "Select a version or enter the full url to an ISO file" 5.76 +msgid "Select a version or enter the full URL to an ISO file" 5.77 msgstr "Choisissez une version ou entrez l'URL vers le fichier ISO" 5.78 5.79 #: installer.cgi:345 5.80 @@ -299,12 +291,12 @@ 5.81 msgstr "Partition /home" 5.82 5.83 #: installer.cgi:384 5.84 -msgid "Separate partition for /home:" 5.85 -msgstr "Utiliser une autre partition pour /home" 5.86 +msgid "Separate partition for %s:" 5.87 +msgstr "Utiliser une autre partition pour %s :" 5.88 5.89 #: installer.cgi:385 5.90 -msgid "Specify the partition containing /home" 5.91 -msgstr "Spécifiez la partition pour /home" 5.92 +msgid "Specify the partition containing %s" 5.93 +msgstr "Spécifiez la partition pour %s" 5.94 5.95 #: installer.cgi:416 5.96 msgid "Hostname" 5.97 @@ -328,7 +320,7 @@ 5.98 msgstr "administrateur Root" 5.99 5.100 #: installer.cgi:446 5.101 -msgid "Root passwd:" 5.102 +msgid "Root password:" 5.103 msgstr "Mot de passe de root :" 5.104 5.105 #: installer.cgi:447 5.106 @@ -356,7 +348,7 @@ 5.107 msgstr "Nom du premier compte d'utilisateur" 5.108 5.109 #: installer.cgi:494 5.110 -msgid "User passwd:" 5.111 +msgid "User password:" 5.112 msgstr "Mot de passe utilisateur :" 5.113 5.114 #: installer.cgi:495 5.115 @@ -416,8 +408,8 @@ 5.116 msgstr "Vérification des mises à jours..." 5.117 5.118 #: installer.cgi:689 5.119 -msgid "Proceeding to:" 5.120 -msgstr "Lancement de :" 5.121 +msgid "Proceeding to: %s" 5.122 +msgstr "Lancement de : %s" 5.123 5.124 #: installer.cgi:707 5.125 msgid "Errors encountered." 5.126 @@ -499,55 +491,49 @@ 5.127 #: installer.cgi:832 5.128 msgid "" 5.129 "If your browser doesn't automatically redirect within a few seconds, you may " 5.130 -"want to go there manually" 5.131 +"want to go there manually [here]" 5.132 msgstr "" 5.133 "Si votre navigateur ne vous redirige pas automatiquement dans quelques " 5.134 -"secondes, vous devrez le faire manuellement" 5.135 - 5.136 -#: installer.cgi:834 5.137 -msgid "here" 5.138 -msgstr "ici" 5.139 +"secondes, vous devrez le faire manuellement [ici]" 5.140 5.141 #: installer.cgi:849 installer.cgi:861 installer.cgi:874 5.142 msgid "Tazinst Error" 5.143 msgstr "Erreur de Tazinst" 5.144 5.145 #: installer.cgi:850 5.146 -msgid "" 5.147 -"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any " 5.148 -"installation can not be done without tazinst." 5.149 -msgstr "" 5.150 -"L'installeur léger de SliTaz n'a pas été trouvé. Aucune installation ne peut " 5.151 -"être entreprise sans <strong>tazinst</strong>." 5.152 +#, fuzzy 5.153 +msgid "%s, the backend to %s is missing." 5.154 +msgstr "%s, L'installeur léger de SliTaz (%s) n'a pas été trouvé." 5.155 + 5.156 +#: installer.cgi:851 installer.cgi:864 5.157 +msgid "Any installation can not be done without %s." 5.158 +msgstr "Aucune installation ne peut être entreprise sans %s." 5.159 5.160 #: installer.cgi:852 5.161 -msgid "Check tazinst permissions, or reinstall the slitaz-installer package." 5.162 -msgstr "" 5.163 -"Vérifiez les permissions de tazinst, ou réinstallez le paquet slitaz-" 5.164 -"installer :" 5.165 +msgid "Check %s permissions, or reinstall the %s package." 5.166 +msgstr "Vérifiez les permissions de %s, ou réinstallez le paquet %s." 5.167 5.168 #: installer.cgi:862 5.169 -msgid "" 5.170 -"<strong>tazinst</strong>, the slitaz-installer backend, is not at the " 5.171 -"minimum required version. Any installation cannot be done without tazinst." 5.172 +#, fuzzy 5.173 +msgid "%s, the %s backend, is not at the minimum required version." 5.174 msgstr "" 5.175 -"L'installeur léger de SliTaz n'a pas la version minimum requise. Aucune " 5.176 -"installation ne peut être entreprise sans <strong>tazinst</strong>." 5.177 +"%s, L'installeur léger de SliTaz (%s) n'a pas la version minimum requise." 5.178 5.179 #: installer.cgi:865 installer.cgi:878 5.180 -msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode." 5.181 -msgstr "" 5.182 -"Réinstallez le paquet slitaz-installer, ou lancez tazinst en ligne de " 5.183 -"commande" 5.184 +msgid "Reinstall the %s package, or use %s in CLI mode." 5.185 +msgstr "Réinstallez le paquet %s, ou lancez %s en ligne de commande" 5.186 5.187 #: installer.cgi:875 5.188 msgid "" 5.189 -"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher " 5.190 -"version than the maximum authorized by the slitaz-installer. Any " 5.191 -"installation cannot be done." 5.192 +"%s, the %s backend, is at a higher version than the maximum authorized by " 5.193 +"the %s." 5.194 msgstr "" 5.195 -"L'installeur léger de SliTaz n'a pas la version maximum requise. Aucune " 5.196 -"installation ne peut être entreprise sans <strong>tazinst</strong>." 5.197 +"%s, L'installeur léger de SliTaz (%s) n'a pas la version maximum requise " 5.198 +"(%s)." 5.199 + 5.200 +#: installer.cgi:877 5.201 +msgid "Any installation cannot be done." 5.202 +msgstr "Aucune installation ne peut être entreprise." 5.203 5.204 #: installer.cgi:995 installer.cgi:1052 5.205 msgid "None"
6.1 --- a/po/installer/installer.pot Wed Apr 06 09:52:43 2016 +0300 6.2 +++ b/po/installer/installer.pot Sat Apr 09 17:22:22 2016 +0300 6.3 @@ -8,7 +8,7 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: installer.cgi \n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2016-04-05 19:03+0100\n" 6.8 +"POT-Creation-Date: 2016-04-09 17:07+0300\n" 6.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 6.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 6.11 "Language-Team: LANGUAGE <LL@li.org>\n" 6.12 @@ -102,11 +102,7 @@ 6.13 msgstr "" 6.14 6.15 #: installer.cgi:141 6.16 -msgid "Evaluate:" 6.17 -msgstr "" 6.18 - 6.19 -#: installer.cgi:141 6.20 -msgid "Without Partitioning / Formating" 6.21 +msgid "Evaluate: Without Partitioning / Formating" 6.22 msgstr "" 6.23 6.24 #: installer.cgi:144 6.25 @@ -115,8 +111,7 @@ 6.26 6.27 #: installer.cgi:145 6.28 msgid "" 6.29 -"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous " 6.30 -"century..." 6.31 +"SliTaz will be in the %s directory like UMSDOS did in the previous century..." 6.32 msgstr "" 6.33 6.34 #: installer.cgi:154 6.35 @@ -124,7 +119,7 @@ 6.36 msgstr "" 6.37 6.38 #: installer.cgi:155 6.39 -msgid "set /dev/cdrom for a physical CD-ROM" 6.40 +msgid "set %s for a physical CD-ROM" 6.41 msgstr "" 6.42 6.43 #: installer.cgi:158 6.44 @@ -208,9 +203,7 @@ 6.45 msgstr "" 6.46 6.47 #: installer.cgi:271 6.48 -msgid "" 6.49 -"Enter the partition where SliTaz Live is located on\n" 6.50 -" your USB Key" 6.51 +msgid "Enter the partition where SliTaz Live is located on your USB Key" 6.52 msgstr "" 6.53 6.54 #: installer.cgi:286 6.55 @@ -234,7 +227,7 @@ 6.56 msgstr "" 6.57 6.58 #: installer.cgi:322 installer.cgi:329 6.59 -msgid "Select a version or enter the full url to an ISO file" 6.60 +msgid "Select a version or enter the full URL to an ISO file" 6.61 msgstr "" 6.62 6.63 #: installer.cgi:345 6.64 @@ -258,11 +251,11 @@ 6.65 msgstr "" 6.66 6.67 #: installer.cgi:384 6.68 -msgid "Separate partition for /home:" 6.69 +msgid "Separate partition for %s:" 6.70 msgstr "" 6.71 6.72 #: installer.cgi:385 6.73 -msgid "Specify the partition containing /home" 6.74 +msgid "Specify the partition containing %s" 6.75 msgstr "" 6.76 6.77 #: installer.cgi:416 6.78 @@ -286,7 +279,7 @@ 6.79 msgstr "" 6.80 6.81 #: installer.cgi:446 6.82 -msgid "Root passwd:" 6.83 +msgid "Root password:" 6.84 msgstr "" 6.85 6.86 #: installer.cgi:447 6.87 @@ -314,7 +307,7 @@ 6.88 msgstr "" 6.89 6.90 #: installer.cgi:494 6.91 -msgid "User passwd:" 6.92 +msgid "User password:" 6.93 msgstr "" 6.94 6.95 #: installer.cgi:495 6.96 @@ -370,7 +363,7 @@ 6.97 msgstr "" 6.98 6.99 #: installer.cgi:689 6.100 -msgid "Proceeding to:" 6.101 +msgid "Proceeding to: %s" 6.102 msgstr "" 6.103 6.104 #: installer.cgi:707 6.105 @@ -442,11 +435,7 @@ 6.106 #: installer.cgi:832 6.107 msgid "" 6.108 "If your browser doesn't automatically redirect within a few seconds, you may " 6.109 -"want to go there manually" 6.110 -msgstr "" 6.111 - 6.112 -#: installer.cgi:834 6.113 -msgid "here" 6.114 +"want to go there manually [here]" 6.115 msgstr "" 6.116 6.117 #: installer.cgi:849 installer.cgi:861 installer.cgi:874 6.118 @@ -454,30 +443,33 @@ 6.119 msgstr "" 6.120 6.121 #: installer.cgi:850 6.122 -msgid "" 6.123 -"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any " 6.124 -"installation can not be done without tazinst." 6.125 +msgid "%s, the backend to %s is missing." 6.126 +msgstr "" 6.127 + 6.128 +#: installer.cgi:851 installer.cgi:864 6.129 +msgid "Any installation can not be done without %s." 6.130 msgstr "" 6.131 6.132 #: installer.cgi:852 6.133 -msgid "Check tazinst permissions, or reinstall the slitaz-installer package." 6.134 +msgid "Check %s permissions, or reinstall the %s package." 6.135 msgstr "" 6.136 6.137 #: installer.cgi:862 6.138 -msgid "" 6.139 -"<strong>tazinst</strong>, the slitaz-installer backend, is not at the " 6.140 -"minimum required version. Any installation cannot be done without tazinst." 6.141 +msgid "%s, the %s backend, is not at the minimum required version." 6.142 msgstr "" 6.143 6.144 #: installer.cgi:865 installer.cgi:878 6.145 -msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode." 6.146 +msgid "Reinstall the %s package, or use %s in CLI mode." 6.147 msgstr "" 6.148 6.149 #: installer.cgi:875 6.150 msgid "" 6.151 -"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher " 6.152 -"version than the maximum authorized by the slitaz-installer. Any " 6.153 -"installation cannot be done." 6.154 +"%s, the %s backend, is at a higher version than the maximum authorized by " 6.155 +"the %s." 6.156 +msgstr "" 6.157 + 6.158 +#: installer.cgi:877 6.159 +msgid "Any installation cannot be done." 6.160 msgstr "" 6.161 6.162 #: installer.cgi:995 installer.cgi:1052
7.1 --- a/po/installer/pt_BR.po Wed Apr 06 09:52:43 2016 +0300 7.2 +++ b/po/installer/pt_BR.po Sat Apr 09 17:22:22 2016 +0300 7.3 @@ -7,7 +7,7 @@ 7.4 msgstr "" 7.5 "Project-Id-Version: installer.cgi\n" 7.6 "Report-Msgid-Bugs-To: \n" 7.7 -"POT-Creation-Date: 2016-04-05 19:03+0100\n" 7.8 +"POT-Creation-Date: 2016-04-09 17:07+0300\n" 7.9 "PO-Revision-Date: 2016-03-28 05:01-0300\n" 7.10 "Last-Translator: Leonardo Laporte <hackdorte@sapo.pt>\n" 7.11 "Language-Team: Portuguese <i18n@slitaz.org>\n" 7.12 @@ -119,12 +119,8 @@ 7.13 msgstr "Atualizar o SliTaz" 7.14 7.15 #: installer.cgi:141 7.16 -msgid "Evaluate:" 7.17 -msgstr "" 7.18 - 7.19 -#: installer.cgi:141 7.20 -msgid "Without Partitioning / Formating" 7.21 -msgstr "Sem partições / Formatação" 7.22 +msgid "Evaluate: Without Partitioning / Formating" 7.23 +msgstr "Evaluate: Sem partições / Formatação" 7.24 7.25 #: installer.cgi:144 7.26 msgid "SliTaz and Windows™ can coexist in the same partition." 7.27 @@ -133,16 +129,15 @@ 7.28 #: installer.cgi:145 7.29 #, fuzzy 7.30 msgid "" 7.31 -"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous " 7.32 -"century..." 7.33 -msgstr "SliTaz estará no diretório \\slitaz como previsto anteriormente..." 7.34 +"SliTaz will be in the %s directory like UMSDOS did in the previous century..." 7.35 +msgstr "SliTaz estará no diretório %s como previsto anteriormente..." 7.36 7.37 #: installer.cgi:154 7.38 msgid "ISO image file full path" 7.39 msgstr "" 7.40 7.41 #: installer.cgi:155 7.42 -msgid "set /dev/cdrom for a physical CD-ROM" 7.43 +msgid "set %s for a physical CD-ROM" 7.44 msgstr "" 7.45 7.46 #: installer.cgi:158 7.47 @@ -246,12 +241,8 @@ 7.48 msgstr "LiveUSB" 7.49 7.50 #: installer.cgi:271 7.51 -msgid "" 7.52 -"Enter the partition where SliTaz Live is located on\n" 7.53 -" your USB Key" 7.54 -msgstr "" 7.55 -"Informe a partição da mídia USB onde o SliTaz Live\n" 7.56 -"está localizado" 7.57 +msgid "Enter the partition where SliTaz Live is located on your USB Key" 7.58 +msgstr "Informe a partição da mídia USB onde o SliTaz Live está localizado" 7.59 7.60 #: installer.cgi:286 7.61 msgid "ISO file:" 7.62 @@ -274,7 +265,7 @@ 7.63 msgstr "Selecionar uma versão do SliTaz na Web" 7.64 7.65 #: installer.cgi:322 installer.cgi:329 7.66 -msgid "Select a version or enter the full url to an ISO file" 7.67 +msgid "Select a version or enter the full URL to an ISO file" 7.68 msgstr "Selecionar uma versão ou informar url completa para arquivo ISO" 7.69 7.70 #: installer.cgi:345 7.71 @@ -298,12 +289,12 @@ 7.72 msgstr "Partição home" 7.73 7.74 #: installer.cgi:384 7.75 -msgid "Separate partition for /home:" 7.76 -msgstr "Usar uma partição separada para a /home:" 7.77 +msgid "Separate partition for %s:" 7.78 +msgstr "Usar uma partição separada para a %s:" 7.79 7.80 #: installer.cgi:385 7.81 -msgid "Specify the partition containing /home" 7.82 -msgstr "Definir uma partição separada para a /home:" 7.83 +msgid "Specify the partition containing %s" 7.84 +msgstr "Definir uma partição separada para a %s:" 7.85 7.86 #: installer.cgi:416 7.87 msgid "Hostname" 7.88 @@ -326,7 +317,7 @@ 7.89 msgstr "Usuário root" 7.90 7.91 #: installer.cgi:446 7.92 -msgid "Root passwd:" 7.93 +msgid "Root password:" 7.94 msgstr "Senha do root:" 7.95 7.96 #: installer.cgi:447 7.97 @@ -354,7 +345,7 @@ 7.98 msgstr "Nome do primeiro usuário" 7.99 7.100 #: installer.cgi:494 7.101 -msgid "User passwd:" 7.102 +msgid "User password:" 7.103 msgstr "Senha do usuário:" 7.104 7.105 #: installer.cgi:495 7.106 @@ -414,7 +405,7 @@ 7.107 msgstr "Checando configurações..." 7.108 7.109 #: installer.cgi:689 7.110 -msgid "Proceeding to:" 7.111 +msgid "Proceeding to: %s" 7.112 msgstr "" 7.113 7.114 #: installer.cgi:707 7.115 @@ -496,51 +487,48 @@ 7.116 #: installer.cgi:832 7.117 msgid "" 7.118 "If your browser doesn't automatically redirect within a few seconds, you may " 7.119 -"want to go there manually" 7.120 +"want to go there manually [here]" 7.121 msgstr "" 7.122 "Se o navegador não for redirecionado automaticamente após alguns segundos, " 7.123 -"deve-se ir ao endereço manualmente" 7.124 - 7.125 -#: installer.cgi:834 7.126 -msgid "here" 7.127 -msgstr "aqui" 7.128 +"deve-se ir ao endereço manualmente [aqui]" 7.129 7.130 #: installer.cgi:849 installer.cgi:861 installer.cgi:874 7.131 msgid "Tazinst Error" 7.132 msgstr "Erro do Tazinst" 7.133 7.134 #: installer.cgi:850 7.135 -msgid "" 7.136 -"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any " 7.137 -"installation can not be done without tazinst." 7.138 -msgstr "" 7.139 -"<strong>Tazinst</strong>, o instalador do SliTaz não foi encontrado. A " 7.140 -"instalação ou atualização não pode ser feita sem ele." 7.141 +#, fuzzy 7.142 +msgid "%s, the backend to %s is missing." 7.143 +msgstr "%s, o instalador do SliTaz (%s) não foi encontrado." 7.144 + 7.145 +#: installer.cgi:851 installer.cgi:864 7.146 +msgid "Any installation can not be done without %s." 7.147 +msgstr "A instalação ou atualização não pode ser feita sem ele %s." 7.148 7.149 #: installer.cgi:852 7.150 -msgid "Check tazinst permissions, or reinstall the slitaz-installer package." 7.151 -msgstr "Checar permissões do Tazinst, ou reinstalar o pacote slitaz-instaler." 7.152 +msgid "Check %s permissions, or reinstall the %s package." 7.153 +msgstr "Checar permissões do %s, ou reinstalar o pacote %s." 7.154 7.155 #: installer.cgi:862 7.156 -msgid "" 7.157 -"<strong>tazinst</strong>, the slitaz-installer backend, is not at the " 7.158 -"minimum required version. Any installation cannot be done without tazinst." 7.159 -msgstr "" 7.160 -"<strong>Tazinst</strong>, o instalador do SliTaz não foi encontrado. A " 7.161 -"instalação ou atualização não pode ser feita sem ele." 7.162 +#, fuzzy 7.163 +msgid "%s, the %s backend, is not at the minimum required version." 7.164 +msgstr "%s, o instalador do SliTaz (%s) não foi encontrado." 7.165 7.166 #: installer.cgi:865 installer.cgi:878 7.167 -msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode." 7.168 -msgstr "Reinstalar o pacote slitaz-instaler, ou usar o tazinst em modo texto." 7.169 +msgid "Reinstall the %s package, or use %s in CLI mode." 7.170 +msgstr "Reinstalar o pacote %s, ou usar o %s em modo texto." 7.171 7.172 #: installer.cgi:875 7.173 +#, fuzzy 7.174 msgid "" 7.175 -"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher " 7.176 -"version than the maximum authorized by the slitaz-installer. Any " 7.177 -"installation cannot be done." 7.178 -msgstr "" 7.179 -"<strong>Tazinst</strong>, o instalador do SliTaz não foi encontrado. A " 7.180 -"instalação ou atualização não pode ser feita sem ele." 7.181 +"%s, the %s backend, is at a higher version than the maximum authorized by " 7.182 +"the %s." 7.183 +msgstr "%s, o instalador do SliTaz (%s) não foi encontrado (%s)." 7.184 + 7.185 +#: installer.cgi:877 7.186 +#, fuzzy 7.187 +msgid "Any installation cannot be done." 7.188 +msgstr "A instalação ou atualização não pode ser feita sem ele." 7.189 7.190 #: installer.cgi:995 installer.cgi:1052 7.191 msgid "None"
8.1 --- a/po/installer/ru.po Wed Apr 06 09:52:43 2016 +0300 8.2 +++ b/po/installer/ru.po Sat Apr 09 17:22:22 2016 +0300 8.3 @@ -7,7 +7,7 @@ 8.4 msgstr "" 8.5 "Project-Id-Version: installer.cgi\n" 8.6 "Report-Msgid-Bugs-To: \n" 8.7 -"POT-Creation-Date: 2016-04-04 19:19+0100\n" 8.8 +"POT-Creation-Date: 2016-04-09 17:07+0300\n" 8.9 "PO-Revision-Date: 2016-04-05 10:51+0300\n" 8.10 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 8.11 "Language-Team: \n" 8.12 @@ -119,12 +119,8 @@ 8.13 msgstr "Обновить SliTaz" 8.14 8.15 #: installer.cgi:141 8.16 -msgid "Evaluate:" 8.17 -msgstr "Оценить:" 8.18 - 8.19 -#: installer.cgi:141 8.20 -msgid "Without Partitioning / Formating" 8.21 -msgstr "без изменения разделов и форматирования" 8.22 +msgid "Evaluate: Without Partitioning / Formating" 8.23 +msgstr "Оценить: без изменения разделов и форматирования" 8.24 8.25 #: installer.cgi:144 8.26 msgid "SliTaz and Windows™ can coexist in the same partition." 8.27 @@ -132,19 +128,17 @@ 8.28 8.29 #: installer.cgi:145 8.30 msgid "" 8.31 -"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous " 8.32 -"century..." 8.33 +"SliTaz will be in the %s directory like UMSDOS did in the previous century..." 8.34 msgstr "" 8.35 -"SliTaz будет располагаться в папке \\slitaz как это было с UMSDOS в прошлом " 8.36 -"веке…" 8.37 +"SliTaz будет располагаться в папке %s как это было с UMSDOS в прошлом веке…" 8.38 8.39 #: installer.cgi:154 8.40 msgid "ISO image file full path" 8.41 msgstr "Полный путь к образу ISO" 8.42 8.43 #: installer.cgi:155 8.44 -msgid "set /dev/cdrom for a physical CD-ROM" 8.45 -msgstr "выберите /dev/cdrom для доступа к физическому CD-ROM" 8.46 +msgid "set %s for a physical CD-ROM" 8.47 +msgstr "выберите %s для доступа к физическому CD-ROM" 8.48 8.49 #: installer.cgi:158 8.50 msgid "Target partition" 8.51 @@ -249,9 +243,7 @@ 8.52 msgstr "LiveUSB:" 8.53 8.54 #: installer.cgi:271 8.55 -msgid "" 8.56 -"Enter the partition where SliTaz Live is located on\n" 8.57 -" your USB Key" 8.58 +msgid "Enter the partition where SliTaz Live is located on your USB Key" 8.59 msgstr "Введите раздел USB-накопителя, на котором находится SliTaz Live" 8.60 8.61 #: installer.cgi:286 8.62 @@ -275,7 +267,7 @@ 8.63 msgstr "Выберите версию SliTaz в интернете" 8.64 8.65 #: installer.cgi:322 installer.cgi:329 8.66 -msgid "Select a version or enter the full url to an ISO file" 8.67 +msgid "Select a version or enter the full URL to an ISO file" 8.68 msgstr "" 8.69 "Выберите версию либо введите URL, по которому можно получить файл образа ISO" 8.70 8.71 @@ -300,12 +292,12 @@ 8.72 msgstr "домашняя папка" 8.73 8.74 #: installer.cgi:384 8.75 -msgid "Separate partition for /home:" 8.76 -msgstr "Отдельный раздел для /home:" 8.77 +msgid "Separate partition for %s:" 8.78 +msgstr "Отдельный раздел для %s:" 8.79 8.80 #: installer.cgi:385 8.81 -msgid "Specify the partition containing /home" 8.82 -msgstr "Укажите раздел для /home" 8.83 +msgid "Specify the partition containing %s" 8.84 +msgstr "Укажите раздел для %s" 8.85 8.86 #: installer.cgi:416 8.87 msgid "Hostname" 8.88 @@ -328,7 +320,7 @@ 8.89 msgstr "Администратор root" 8.90 8.91 #: installer.cgi:446 8.92 -msgid "Root passwd:" 8.93 +msgid "Root password:" 8.94 msgstr "Пароль root:" 8.95 8.96 #: installer.cgi:447 8.97 @@ -356,7 +348,7 @@ 8.98 msgstr "Имя первого пользователя" 8.99 8.100 #: installer.cgi:494 8.101 -msgid "User passwd:" 8.102 +msgid "User password:" 8.103 msgstr "Пароль пользователя:" 8.104 8.105 #: installer.cgi:495 8.106 @@ -416,8 +408,8 @@ 8.107 msgstr "Проверка настроек…" 8.108 8.109 #: installer.cgi:689 8.110 -msgid "Proceeding to:" 8.111 -msgstr "Перейти к:" 8.112 +msgid "Proceeding to: %s" 8.113 +msgstr "Переход к %s" 8.114 8.115 #: installer.cgi:707 8.116 msgid "Errors encountered." 8.117 @@ -499,54 +491,44 @@ 8.118 #: installer.cgi:832 8.119 msgid "" 8.120 "If your browser doesn't automatically redirect within a few seconds, you may " 8.121 -"want to go there manually" 8.122 +"want to go there manually [here]" 8.123 msgstr "" 8.124 "Если через несколько секунд ваш браузер не перейдет дальше автоматически, " 8.125 -"сделайте это вручную" 8.126 - 8.127 -#: installer.cgi:834 8.128 -msgid "here" 8.129 -msgstr "(перейти)" 8.130 +"сделайте это вручную ([перейти])" 8.131 8.132 #: installer.cgi:849 installer.cgi:861 installer.cgi:874 8.133 msgid "Tazinst Error" 8.134 msgstr "Ошибка TazInst" 8.135 8.136 #: installer.cgi:850 8.137 -msgid "" 8.138 -"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any " 8.139 -"installation can not be done without tazinst." 8.140 -msgstr "" 8.141 -"Отсутствует <strong>tazinst</strong>, установщик SliTaz на жесткий диск. Без " 8.142 -"tazinst ничего не удастся установить." 8.143 +msgid "%s, the backend to %s is missing." 8.144 +msgstr "Отсутствует %s, бэкенд к %s." 8.145 + 8.146 +#: installer.cgi:851 installer.cgi:864 8.147 +msgid "Any installation can not be done without %s." 8.148 +msgstr "Без %s ничего не удастся установить." 8.149 8.150 #: installer.cgi:852 8.151 -msgid "Check tazinst permissions, or reinstall the slitaz-installer package." 8.152 -msgstr "" 8.153 -"Проверьте права доступа tazinst, либо переустановите пакет slitaz-installer:" 8.154 +msgid "Check %s permissions, or reinstall the %s package." 8.155 +msgstr "Проверьте права доступа %s, либо переустановите пакет %s." 8.156 8.157 #: installer.cgi:862 8.158 -msgid "" 8.159 -"<strong>tazinst</strong>, the slitaz-installer backend, is not at the " 8.160 -"minimum required version. Any installation cannot be done without tazinst." 8.161 -msgstr "" 8.162 -"<strong>tazinst</strong>, установщик SliTaz на жесткий диск, старее " 8.163 -"минимально необходимой версии. Без tazinst ничего не удастся установить." 8.164 +msgid "%s, the %s backend, is not at the minimum required version." 8.165 +msgstr "%s, бэкенд к %s, старее минимально необходимой версии." 8.166 8.167 #: installer.cgi:865 installer.cgi:878 8.168 -msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode." 8.169 -msgstr "" 8.170 -"Переустановите пакет slitaz-installer, либо используйте tazinst в консольном " 8.171 -"режиме." 8.172 +msgid "Reinstall the %s package, or use %s in CLI mode." 8.173 +msgstr "Переустановите пакет %s, либо используйте %s в консольном режиме." 8.174 8.175 #: installer.cgi:875 8.176 msgid "" 8.177 -"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher " 8.178 -"version than the maximum authorized by the slitaz-installer. Any " 8.179 -"installation cannot be done." 8.180 -msgstr "" 8.181 -"<strong>tazinst</strong>, установщик SliTaz на жесткий диск, более новой " 8.182 -"версии, чем поддерживается slitaz-installer. Ничего не удастся установить." 8.183 +"%s, the %s backend, is at a higher version than the maximum authorized by " 8.184 +"the %s." 8.185 +msgstr "%s, бэкенд %s, более новой версии, чем поддерживается %s." 8.186 + 8.187 +#: installer.cgi:877 8.188 +msgid "Any installation cannot be done." 8.189 +msgstr "Ничего не удастся установить." 8.190 8.191 #: installer.cgi:995 installer.cgi:1052 8.192 msgid "None"
9.1 --- a/po/installer/sv.po Wed Apr 06 09:52:43 2016 +0300 9.2 +++ b/po/installer/sv.po Sat Apr 09 17:22:22 2016 +0300 9.3 @@ -7,7 +7,7 @@ 9.4 msgstr "" 9.5 "Project-Id-Version: installer.cgi\n" 9.6 "Report-Msgid-Bugs-To: \n" 9.7 -"POT-Creation-Date: 2016-04-05 19:03+0100\n" 9.8 +"POT-Creation-Date: 2016-04-09 17:07+0300\n" 9.9 "PO-Revision-Date: 2012-07-11 11:33-0000\n" 9.10 "Last-Translator: Emil Eklund <emileklund123@gmail.com>\n" 9.11 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" 9.12 @@ -126,11 +126,7 @@ 9.13 msgstr "Upgradera SliTaz" 9.14 9.15 #: installer.cgi:141 9.16 -msgid "Evaluate:" 9.17 -msgstr "" 9.18 - 9.19 -#: installer.cgi:141 9.20 -msgid "Without Partitioning / Formating" 9.21 +msgid "Evaluate: Without Partitioning / Formating" 9.22 msgstr "" 9.23 9.24 #: installer.cgi:144 9.25 @@ -139,8 +135,7 @@ 9.26 9.27 #: installer.cgi:145 9.28 msgid "" 9.29 -"SliTaz will be in the \\slitaz directory like UMSDOS did in the previous " 9.30 -"century..." 9.31 +"SliTaz will be in the %s directory like UMSDOS did in the previous century..." 9.32 msgstr "" 9.33 9.34 #: installer.cgi:154 9.35 @@ -148,7 +143,7 @@ 9.36 msgstr "" 9.37 9.38 #: installer.cgi:155 9.39 -msgid "set /dev/cdrom for a physical CD-ROM" 9.40 +msgid "set %s for a physical CD-ROM" 9.41 msgstr "" 9.42 9.43 #: installer.cgi:158 9.44 @@ -263,9 +258,7 @@ 9.45 msgstr "LiveUSB:" 9.46 9.47 #: installer.cgi:271 9.48 -msgid "" 9.49 -"Enter the partition where SliTaz Live is located on\n" 9.50 -" your USB Key" 9.51 +msgid "Enter the partition where SliTaz Live is located on your USB Key" 9.52 msgstr "" 9.53 9.54 #: installer.cgi:286 9.55 @@ -289,7 +282,7 @@ 9.56 msgstr "" 9.57 9.58 #: installer.cgi:322 installer.cgi:329 9.59 -msgid "Select a version or enter the full url to an ISO file" 9.60 +msgid "Select a version or enter the full URL to an ISO file" 9.61 msgstr "" 9.62 9.63 #: installer.cgi:345 9.64 @@ -313,14 +306,13 @@ 9.65 msgstr "hem partition" 9.66 9.67 #: installer.cgi:384 9.68 -#, fuzzy 9.69 -msgid "Separate partition for /home:" 9.70 -msgstr "Använd en separat partition för /home:" 9.71 +msgid "Separate partition for %s:" 9.72 +msgstr "Använd en separat partition för %s:" 9.73 9.74 #: installer.cgi:385 9.75 #, fuzzy 9.76 -msgid "Specify the partition containing /home" 9.77 -msgstr "Använd en separat partition för /home:" 9.78 +msgid "Specify the partition containing %s" 9.79 +msgstr "Använd en separat partition för %s:" 9.80 9.81 #: installer.cgi:416 9.82 msgid "Hostname" 9.83 @@ -343,7 +335,7 @@ 9.84 msgstr "" 9.85 9.86 #: installer.cgi:446 9.87 -msgid "Root passwd:" 9.88 +msgid "Root password:" 9.89 msgstr "Root lösenord:" 9.90 9.91 #: installer.cgi:447 9.92 @@ -373,7 +365,7 @@ 9.93 msgstr "Den första användarens namn" 9.94 9.95 #: installer.cgi:494 9.96 -msgid "User passwd:" 9.97 +msgid "User password:" 9.98 msgstr "Användar lösenord:" 9.99 9.100 #: installer.cgi:495 9.101 @@ -437,7 +429,7 @@ 9.102 msgstr "Kollar efter uppdateringar..." 9.103 9.104 #: installer.cgi:689 9.105 -msgid "Proceeding to:" 9.106 +msgid "Proceeding to: %s" 9.107 msgstr "" 9.108 9.109 #: installer.cgi:707 9.110 @@ -523,14 +515,10 @@ 9.111 #: installer.cgi:832 9.112 msgid "" 9.113 "If your browser doesn't automatically redirect within a few seconds, you may " 9.114 -"want to go there manually" 9.115 +"want to go there manually [here]" 9.116 msgstr "" 9.117 "Om du inte skickas vidare automatiskt inom några sekunder så kan du pröva " 9.118 -"manuellt." 9.119 - 9.120 -#: installer.cgi:834 9.121 -msgid "here" 9.122 -msgstr "" 9.123 +"manuellt [here]" 9.124 9.125 #: installer.cgi:849 installer.cgi:861 installer.cgi:874 9.126 msgid "Tazinst Error" 9.127 @@ -538,41 +526,37 @@ 9.128 9.129 #: installer.cgi:850 9.130 #, fuzzy 9.131 -msgid "" 9.132 -"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any " 9.133 -"installation can not be done without tazinst." 9.134 -msgstr "" 9.135 -"<strong>tazinst</strong>, den lättviktiga SliTaz HDD installer saknas. Någon " 9.136 -"installation kan inte utföras utan tazinst." 9.137 +msgid "%s, the backend to %s is missing." 9.138 +msgstr "%s, den lättviktiga SliTaz HDD installer (%s) saknas." 9.139 + 9.140 +#: installer.cgi:851 installer.cgi:864 9.141 +msgid "Any installation can not be done without %s." 9.142 +msgstr "Någon installation kan inte utföras utan %s." 9.143 9.144 #: installer.cgi:852 9.145 -#, fuzzy 9.146 -msgid "Check tazinst permissions, or reinstall the slitaz-installer package." 9.147 -msgstr "" 9.148 -"Kontrollera tazinst's rättighete eller installera om slitaz-tools paketet:" 9.149 +msgid "Check %s permissions, or reinstall the %s package." 9.150 +msgstr "Kontrollera %s's rättighete eller installera om %s paketet." 9.151 9.152 #: installer.cgi:862 9.153 #, fuzzy 9.154 -msgid "" 9.155 -"<strong>tazinst</strong>, the slitaz-installer backend, is not at the " 9.156 -"minimum required version. Any installation cannot be done without tazinst." 9.157 -msgstr "" 9.158 -"<strong>tazinst</strong>, den lättviktiga SliTaz HDD installer saknas. Någon " 9.159 -"installation kan inte utföras utan tazinst." 9.160 +msgid "%s, the %s backend, is not at the minimum required version." 9.161 +msgstr "%s, den lättviktiga SliTaz HDD installer (%s) saknas." 9.162 9.163 #: installer.cgi:865 installer.cgi:878 9.164 -msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode." 9.165 +msgid "Reinstall the %s package, or use %s in CLI mode." 9.166 msgstr "" 9.167 9.168 #: installer.cgi:875 9.169 #, fuzzy 9.170 msgid "" 9.171 -"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher " 9.172 -"version than the maximum authorized by the slitaz-installer. Any " 9.173 -"installation cannot be done." 9.174 -msgstr "" 9.175 -"<strong>tazinst</strong>, den lättviktiga SliTaz HDD installer saknas. Någon " 9.176 -"installation kan inte utföras utan tazinst." 9.177 +"%s, the %s backend, is at a higher version than the maximum authorized by " 9.178 +"the %s." 9.179 +msgstr "%s, den lättviktiga SliTaz HDD installer (%s) saknas (%s)." 9.180 + 9.181 +#: installer.cgi:877 9.182 +#, fuzzy 9.183 +msgid "Any installation cannot be done." 9.184 +msgstr "Någon installation kan inte utföras." 9.185 9.186 #: installer.cgi:995 installer.cgi:1052 9.187 msgid "None"
10.1 --- a/po/installer/zh_CN.po Wed Apr 06 09:52:43 2016 +0300 10.2 +++ b/po/installer/zh_CN.po Sat Apr 09 17:22:22 2016 +0300 10.3 @@ -198,7 +198,7 @@ 10.4 msgstr "从网站上选择一个 SliTaz 版本" 10.5 10.6 #: installer.cgi:223 installer.cgi:230 10.7 -msgid "Select a version or enter the full url to an ISO file" 10.8 +msgid "Select a version or enter the full URL to an ISO file" 10.9 msgstr "选择版本或输入完整镜像文件链接" 10.10 10.11 #: installer.cgi:246 10.12 @@ -226,12 +226,12 @@ 10.13 msgstr "home 分区" 10.14 10.15 #: installer.cgi:285 10.16 -msgid "Separate partition for /home:" 10.17 -msgstr "单独的 /home 分区" 10.18 +msgid "Separate partition for %s:" 10.19 +msgstr "单独的 %s 分区" 10.20 10.21 #: installer.cgi:286 10.22 -msgid "Specify the partition containing /home" 10.23 -msgstr "指定含有 /home 的分区" 10.24 +msgid "Specify the partition containing %s" 10.25 +msgstr "指定含有 %s 的分区" 10.26 10.27 #: installer.cgi:307 10.28 msgid "Hostname" 10.29 @@ -254,7 +254,7 @@ 10.30 msgstr "Root 超级用户" 10.31 10.32 #: installer.cgi:328 10.33 -msgid "Root passwd:" 10.34 +msgid "Root password:" 10.35 msgstr "Root 密码：" 10.36 10.37 #: installer.cgi:329 10.38 @@ -282,7 +282,7 @@ 10.39 msgstr "第一个用户名" 10.40 10.41 #: installer.cgi:364 10.42 -msgid "User passwd:" 10.43 +msgid "User password:" 10.44 msgstr "用户密码：" 10.45 10.46 #: installer.cgi:365 10.47 @@ -420,37 +420,35 @@ 10.48 msgstr "Tazinst 错误" 10.49 10.50 #: installer.cgi:670 10.51 -msgid "" 10.52 -"<strong>tazinst</strong>, the backend to slitaz-installer is missing. Any " 10.53 -"installation can not be done without tazinst." 10.54 -msgstr "" 10.55 -"<strong>tazinst</strong>, slitaz-installer 安装工具的后台进程丢失. 没有 " 10.56 -"tazinst ,任何安装都不能完成的." 10.57 +msgid "%s, the backend to %s is missing." 10.58 +msgstr "%s, %s 安装工具的后台进程丢失." 10.59 + 10.60 +#: installer.cgi:671 installer.cgi:864 10.61 +msgid "Any installation can not be done without %s." 10.62 +msgstr "没有 %s,任何安装都不能完成的." 10.63 10.64 #: installer.cgi:672 10.65 -msgid "Check tazinst permissions, or reinstall the slitaz-installer package." 10.66 -msgstr "检察 tazinst 权限,或重新安装 slitaz-installer 软件包。" 10.67 +msgid "Check %s permissions, or reinstall the %s package." 10.68 +msgstr "检察 %s 权限,或重新安装 %s 软件包。" 10.69 10.70 #: installer.cgi:682 10.71 -msgid "" 10.72 -"<strong>tazinst</strong>, the slitaz-installer backend, is not at the " 10.73 -"minimum required version. Any installation cannot be done without tazinst." 10.74 -msgstr "" 10.75 -"<strong>tazinst</strong>, slitaz-installer 软件后台进程，不是要求的最低版本，" 10.76 -"没有 tazinst ,任何安装都不能完成的." 10.77 +msgid "%s, the %s backend, is not at the minimum required version." 10.78 +msgstr "%s, %s 软件后台进程，不是要求的最低版本。" 10.79 10.80 #: installer.cgi:685 installer.cgi:698 10.81 -msgid "Reinstall the slitaz-installer package, or use tazinst in CLI mode." 10.82 -msgstr "重新安装 slitaz-installer 软件包或使用 tazinst 的 CLI 模式" 10.83 +msgid "Reinstall the %s package, or use %s in CLI mode." 10.84 +msgstr "重新安装 %s 软件包或使用 %s 的 CLI 模式" 10.85 10.86 #: installer.cgi:695 10.87 msgid "" 10.88 -"<strong>tazinst</strong>, the slitaz-installer backend, is at a higher " 10.89 -"version than the maximum authorized by the slitaz-installer. Any " 10.90 -"installation cannot be done." 10.91 -msgstr "" 10.92 -"<strong>tazinst</strong>, slitaz-installer 软件后台进程，版本已经高过 slitaz-" 10.93 -"installer 要求版本。没有 tazinst ,任何安装都不能完成的." 10.94 +"%s, the %s backend, is at a higher version than the maximum authorized by " 10.95 +"the %s." 10.96 +msgstr "%s, %s 软件后台进程，版本已经高过 %s 要求版本。" 10.97 + 10.98 +#: installer.cgi:697 10.99 +#, fuzzy 10.100 +msgid "Any installation cannot be done." 10.101 +msgstr "没有 tazinst ,任何安装都不能完成的." 10.102 10.103 #: installer.cgi:825 installer.cgi:873 10.104 msgid "None"
11.1 --- a/po/slitaz-installer/fr.po Wed Apr 06 09:52:43 2016 +0300 11.2 +++ b/po/slitaz-installer/fr.po Sat Apr 09 17:22:22 2016 +0300 11.3 @@ -18,8 +18,8 @@ 11.4 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 11.5 11.6 #: slitaz-installer:23 11.7 -msgid "Welcome to the slitaz-installer" 11.8 -msgstr "Bienvenue dans l'installeur SliTaz" 11.9 +msgid "Welcome to the slitaz-installer." 11.10 +msgstr "Bienvenue dans l'installeur SliTaz." 11.11 11.12 #: slitaz-installer:24 11.13 msgid "Which type of installation do you want to start?" 11.14 @@ -34,39 +34,39 @@ 11.15 msgstr "Sélectionnez un media dans la liste suivante :" 11.16 11.17 #: slitaz-installer:29 11.18 -msgid "You have selected the option to install SliTaz from an USB Key" 11.19 -msgstr "Vous avez choisi d'installer SliTaz depuis une clé USB" 11.20 +msgid "You have selected the option to install SliTaz from an USB Key." 11.21 +msgstr "Vous avez choisi d'installer SliTaz depuis une clé USB." 11.22 11.23 -#: slitaz-installer:31 11.24 +#: slitaz-installer:30 11.25 msgid "Enter the partition where SliTaz Live is located:" 11.26 msgstr "Entrez la partition où se trouve SliTaz Live :" 11.27 11.28 -#: slitaz-installer:33 11.29 +#: slitaz-installer:32 11.30 msgid "" 11.31 "You have selected the option to install SliTaz from an ISO file located on a " 11.32 "local disk." 11.33 msgstr "" 11.34 "Vous avez choisi d'installer SliTaz depuis un fichier ISO du disque dur." 11.35 11.36 -#: slitaz-installer:35 11.37 +#: slitaz-installer:34 11.38 msgid "Please, select a file below:" 11.39 msgstr "Veuillez choisir un fichier ci-dessous :" 11.40 11.41 +#: slitaz-installer:36 11.42 +msgid "You have selected the option to install SliTaz from the web." 11.43 +msgstr "Vous avez choisi d'installer SliTaz depuis le web." 11.44 + 11.45 #: slitaz-installer:37 11.46 -msgid "You have selected the option to install SliTaz from the web" 11.47 -msgstr "Vous avez choisi d'installer SliTaz depuis le web" 11.48 - 11.49 -#: slitaz-installer:38 11.50 msgid "Please, select a version:" 11.51 msgstr "Veuillez choisir une version :" 11.52 11.53 -#: slitaz-installer:40 11.54 -msgid "Select the source" 11.55 -msgstr "Selectionnez la source" 11.56 +#: slitaz-installer:39 11.57 +msgid "Select the source:" 11.58 +msgstr "Selectionnez la source :" 11.59 11.60 -#: slitaz-installer:42 11.61 -msgid "\\nDrive selection" 11.62 -msgstr "\\nChoix du disque" 11.63 +#: slitaz-installer:41 11.64 +msgid "Drive selection" 11.65 +msgstr "Choix du disque" 11.66 11.67 #: slitaz-installer:42 11.68 msgid "Please specify the partition where to install SliTaz:" 11.69 @@ -78,15 +78,17 @@ 11.70 "configuration files and the list of installed packages. Then, it will clean " 11.71 "the partition and install the new version of SliTaz, restore the " 11.72 "configuration files and reinstall any packages which are not present on the " 11.73 -"cdrom.\n" 11.74 -"You will need an active internet connection before upgrading." 11.75 +"CD-ROM." 11.76 msgstr "" 11.77 "L'installeur va mettre à jour un système SliTaz existant en " 11.78 "sauvagardant tous les fichiers de configuration et la liste des paquets " 11.79 "installés. Ensuite, il effacera la partition et installera la nouvelle " 11.80 "version de SliTaz, restorera les fichiers de configuration et réinstallera " 11.81 -"les paquets absents du cdrom.\n" 11.82 -"Vous devez avoir un connexion active pour la mise à jour." 11.83 +"les paquets absents du cdrom." 11.84 + 11.85 +#: slitaz-installer:49 11.86 +msgid "You will need an active internet connection before upgrading." 11.87 +msgstr "Vous devez avoir un connexion active pour la mise à jour." 11.88 11.89 #: slitaz-installer:50 11.90 msgid "Partition containing the system to upgrade:" 11.91 @@ -96,14 +98,18 @@ 11.92 msgid "" 11.93 "Only the filesystems actually installed on your system are listed. If you " 11.94 "intend to use another filesystem, you have to install it before. Unless you " 11.95 -"know what you are doing, it is safe to use ext2, ext3 or ext4.\\n\\n\\Z2To " 11.96 -"format this partition, please select a filesystem below:" 11.97 +"know what you are doing, it is safe to use ext2, ext3 or ext4." 11.98 msgstr "" 11.99 "Seuls les systèmes de fichiers installés sur votre système sont listés. " 11.100 "Si vous voulez utiliser un autre système de fichiers, vous devez " 11.101 "l'installer auparavant. A moins de savoir ce que vous faîtes, vous pouvez " 11.102 -"utiliser ext2, ext3 or ext4.\\n\\n\\Z2Pour formatter cette partition, " 11.103 -"veuillez choisir un des systèmes de fichiers ci-dessous :" 11.104 +"utiliser ext2, ext3 or ext4." 11.105 + 11.106 +#: slitaz-installer:56 11.107 +msgid "To format this partition, please select a filesystem below:" 11.108 +msgstr "" 11.109 +"Pour formatter cette partition, veuillez choisir un des systèmes de fichiers " 11.110 +"ci-dessous :" 11.111 11.112 #: slitaz-installer:58 11.113 msgid "Separate /home partition" 11.114 @@ -117,13 +123,16 @@ 11.115 msgid "" 11.116 "Hostname configuration allows you to specify the machine name. The hostname " 11.117 "is used internally to identify the host on the network. This value can be " 11.118 -"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n" 11.119 +"changed after the system is installed." 11.120 msgstr "" 11.121 "La configuration du nom d'hôte ou 'hostname' vous permet de donner un nom " 11.122 "à la machine. Le hostname est utilisé en interne pour identifier la " 11.123 "machine sur le réseau. Il peut être changé après l'installation du " 11.124 -"système.\\n\\n\\Z2Entrez le hostname :\\Zn\\n" 11.125 -"" 11.126 +"système." 11.127 + 11.128 +#: slitaz-installer:64 11.129 +msgid "Enter a hostname:" 11.130 +msgstr "Entrez le hostname :" 11.131 11.132 #: slitaz-installer:66 11.133 msgid "" 11.134 @@ -136,11 +145,11 @@ 11.135 "vous devriez toujours choisir un mot de passe compliqué avec des " 11.136 "caractères spéciaux et/ou des chiffres." 11.137 11.138 -#: slitaz-installer:70 11.139 +#: slitaz-installer:69 11.140 msgid "Enter the password for root:" 11.141 msgstr "Entrez le mot de passe de root :" 11.142 11.143 -#: slitaz-installer:72 11.144 +#: slitaz-installer:71 11.145 msgid "" 11.146 "The default user for the system will have their personal files stored in /" 11.147 "home/*user* (and will be automatically added to the audio group)" 11.148 @@ -153,8 +162,8 @@ 11.149 msgstr "Entrer le nom du premier utilisateur :" 11.150 11.151 #: slitaz-installer:76 11.152 -msgid "The password for default user" 11.153 -msgstr "Le mot de passe du premier utilisateur" 11.154 +msgid "The password for default user." 11.155 +msgstr "Le mot de passe du premier utilisateur." 11.156 11.157 #: slitaz-installer:77 11.158 msgid "" 11.159 @@ -171,62 +180,74 @@ 11.160 #: slitaz-installer:81 11.161 msgid "" 11.162 "Installation is now finished, you can exit the installer or reboot on your " 11.163 -"new SliTaz GNU/Linux operating system" 11.164 +"new SliTaz GNU/Linux operating system." 11.165 msgstr "" 11.166 "L'installation est maintenant terminée, vous pouvez sortir de l'installeur " 11.167 -"ou redémarrer sur votre nouveau système GNU/Linux" 11.168 +"ou redémarrer sur votre nouveau système GNU/Linux." 11.169 11.170 #: slitaz-installer:87 11.171 msgid "" 11.172 "The next step lets you format the target partition. Choose between robust, " 11.173 "stable and/or journaled filesystem. If the partition is already formated you " 11.174 -"can skip this stage, if not just accept.\\n\n" 11.175 -"Warning! formating a partition will destroy all current data.\\n\n" 11.176 -"\\Z2Do you wish to format the partition ?\\Zn" 11.177 +"can skip this stage, if not just accept." 11.178 msgstr "" 11.179 "L'étape suivante consiste à formater la partition cible. Choisissez un " 11.180 "système de fichiers stable, robuste et/ou journalé. Si la partition est " 11.181 -"déjà formattée, vous pouvez passer cette étape, sinon acceptez.\\n\n" 11.182 -"Attention ! le formatage de la partition va détruire toute vos données.\\n\n" 11.183 -"\\Z2Voulez vous formater la partition ?\\Zn" 11.184 +"déjà formattée, vous pouvez passer cette étape, sinon acceptez." 11.185 + 11.186 +#: slitaz-installer:90 slitaz-installer:101 11.187 +msgid "Warning! formating a partition will destroy all current data." 11.188 +msgstr "" 11.189 +"Attention ! le formatage de la partition va détruire toute vos données." 11.190 + 11.191 +#: slitaz-installer:91 11.192 +msgid "Do you wish to format the partition?" 11.193 +msgstr "Voulez vous formater la partition ?" 11.194 11.195 #: slitaz-installer:93 11.196 msgid "" 11.197 "On most GNU/Linux systems users personal files are stored in the directory /" 11.198 -"home. Home can be on a separate partition or another hard disk.\\n\n" 11.199 -"\\Z2DO you want to use a separate Home partition ?\\Zn" 11.200 +"home. Home can be on a separate partition or another hard disk." 11.201 msgstr "" 11.202 "Sur la plupart des systèmes GNU/Linux, les fichiers personnels des " 11.203 "utilisateurs sont placés dans le répertoire /home. /home peut être sur " 11.204 -"une partition séparée ou sur un autre disque.\\n\n" 11.205 -"\\Z2Voulez-vous utiliser une partition séparée pour /home ?\\2n" 11.206 +"une partition séparée ou sur un autre disque." 11.207 + 11.208 +#: slitaz-installer:96 11.209 +msgid "Do you want to use a separate Home partition?" 11.210 +msgstr "Voulez-vous utiliser une partition séparée pour /home ?" 11.211 11.212 #: slitaz-installer:98 11.213 msgid "" 11.214 "/home will be installed on a separate partition. The next step lets you " 11.215 "format the /home partition. If the partition is already formated you can " 11.216 -"skip this stage, if not just accept. Warning formating a partition will " 11.217 -"destroy all current data.\\n\n" 11.218 -"\\Z2Do you wish to format the /home partition ?\\Zn" 11.219 +"skip this stage, if not just accept." 11.220 msgstr "" 11.221 "/home sera installé sur une partition séparée. A l'étape suivante " 11.222 "vous pouvez formater la partition /home. Si la partition est déjà " 11.223 -"formattée vous pouvez passer cette étape, sinon acceptez. " 11.224 -"Attention le formatage de la partititon va détruire toutes les données.\\n\n" 11.225 -"\\Z2Voulez vous formater la partition /home ?\\Zn" 11.226 +"formattée vous pouvez passer cette étape, sinon acceptez." 11.227 + 11.228 +#: slitaz-installer:102 11.229 +msgid "Do you wish to format the /home partition?" 11.230 +msgstr "Voulez vous formater la partition /home ?" 11.231 11.232 #: slitaz-installer:104 11.233 msgid "" 11.234 "You have now the option to install a bootloader which is capable of booting " 11.235 -"almost any kind of operating system.\\n\\nIf you want to use an existing " 11.236 -"bootloader installation, skip this step and configure your bootloader to " 11.237 -"boot SliTaz (refer to your bootloader documentation on how to do this)" 11.238 +"almost any kind of operating system." 11.239 msgstr "" 11.240 "Vous pouvez maintenant installer un bootloader qui peut démarrer presque " 11.241 -"n'importe quel système d'exploitation.\\n\\nSi vous désirez utiliser un " 11.242 -"bootloader déjà présent, passez cette étape et configurez votre " 11.243 -"bootloader pour pouvoir lancer SliTaz (référez vous à sa documentation " 11.244 -"pour savoir comment faire)" 11.245 +"n'importe quel système d'exploitation." 11.246 + 11.247 +#: slitaz-installer:106 11.248 +msgid "" 11.249 +"If you want to use an existing bootloader installation, skip this step and " 11.250 +"configure your bootloader to boot SliTaz (refer to your bootloader " 11.251 +"documentation on how to do this)." 11.252 +msgstr "" 11.253 +"Si vous désirez utiliser un bootloader déjà présent, passez cette étape et " 11.254 +"configurez votre bootloader pour pouvoir lancer SliTaz (référez vous à sa " 11.255 +"documentation pour savoir comment faire)." 11.256 11.257 #: slitaz-installer:109 11.258 msgid "Install a bootloader?" 11.259 @@ -235,12 +256,14 @@ 11.260 #: slitaz-installer:111 11.261 msgid "" 11.262 "Do you want to implement a dual-boot with Windows? At start-up, you will be " 11.263 -"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n" 11.264 -"\\Z2Install a dual-boot with Windows ?" 11.265 +"asked whether you want to boot into Windows or SliTaz GNU/Linux." 11.266 msgstr "" 11.267 "Voulez vous avoir un double boot avec Windows ? A démarrage, on vous " 11.268 -"demandera si vous voulez démarrer Windows ou SliTaz GNU/Linux.\\n\n" 11.269 -"\\Z2Installer le double boot avec Windows ?" 11.270 +"demandera si vous voulez démarrer Windows ou SliTaz GNU/Linux." 11.271 + 11.272 +#: slitaz-installer:114 11.273 +msgid "Install a dual-boot with Windows?" 11.274 +msgstr "Installer le double boot avec Windows ?" 11.275 11.276 #: slitaz-installer:116 11.277 msgid "" 11.278 @@ -250,45 +273,59 @@ 11.279 "Résumé des paramètres d'installation et dernière chance pour abandonner " 11.280 "ou recommencer toutes les étapes de l'installation." 11.281 11.282 +#: slitaz-installer:118 11.283 +msgid "Go and install SliTaz?" 11.284 +msgstr "" 11.285 + 11.286 #: slitaz-installer:120 11.287 msgid "Sorry, no device, nor file found or available." 11.288 msgstr "Désolé, pas de périphérique et de fichier trouvé ou disponible." 11.289 11.290 #: slitaz-installer:131 slitaz-installer:140 11.291 -msgid "Error 2: " 11.292 +msgid "Error 2:" 11.293 msgstr "Erreur 2 :" 11.294 11.295 #: slitaz-installer:132 11.296 +msgid "The lightweight SliTaz HDD installer '%s' is missing." 11.297 +msgstr "Il manque '%s', l'installeur SliTaz léger pour disque dur." 11.298 + 11.299 +#: slitaz-installer:133 11.300 +msgid "Check permissions, or reinstall the %s package." 11.301 +msgstr "Vérifiez les permissions, ou réinstallez le paquet %s." 11.302 + 11.303 +#: slitaz-installer:141 11.304 msgid "" 11.305 -"The lightweight SliTaz HDD installer 'tazinst' is missing.\n" 11.306 -"Check permissions, or reinstall the slitaz-tools package." 11.307 +"The lightweight SliTaz HDD installer tazinst (%s) is not at the required " 11.308 +"version (%s)." 11.309 msgstr "" 11.310 -"Il manque 'tazinst', l'installeur SliTaz léger pour disque dur.\n" 11.311 -"Vérifiez les permissions, ou réinstallez le paquet tazinst." 11.312 + 11.313 +#: slitaz-installer:143 11.314 +msgid "Use %s in an xterm or reinstall the %s package." 11.315 +msgstr "" 11.316 11.317 #: slitaz-installer:268 11.318 -msgid "Mode" 11.319 -msgstr "Mode" 11.320 +msgid "Mode: %s" 11.321 +msgstr "Mode : %s" 11.322 11.323 #: slitaz-installer:271 11.324 -msgid "From media" 11.325 -msgstr "Depuis le media" 11.326 +msgid "From media: %s" 11.327 +msgstr "Depuis le media : %s" 11.328 11.329 #: slitaz-installer:276 11.330 -msgid "To the disk" 11.331 -msgstr "Vers le disque" 11.332 +msgid "To the disk: %s" 11.333 +msgstr "Vers le disque : %s" 11.334 11.335 #: slitaz-installer:280 slitaz-installer:290 11.336 -msgid "(Formatting as" 11.337 -msgstr "(Formatage en" 11.338 +msgid "(Formatting as %s)" 11.339 +msgstr "(Formatage en %s)" 11.340 11.341 #: slitaz-installer:281 11.342 msgid "(No formatting)" 11.343 msgstr "(Sans formatage)" 11.344 11.345 #: slitaz-installer:285 11.346 -msgid "Separate /home is" 11.347 -msgstr "/home est séparé sur" 11.348 +msgid "Separate /home is: %s" 11.349 +msgstr "/home est séparé sur : %s" 11.350 11.351 #: slitaz-installer:286 11.352 msgid "No separate /home partition" 11.353 @@ -298,9 +335,13 @@ 11.354 msgid "(No /home formatting)" 11.355 msgstr "(Pas de formatage de /home)" 11.356 11.357 +#: slitaz-installer:293 11.358 +msgid "Hostname: %s" 11.359 +msgstr "" 11.360 + 11.361 #: slitaz-installer:295 11.362 -msgid "User login" 11.363 -msgstr "Login de l'utilisateur" 11.364 +msgid "User login: %s" 11.365 +msgstr "Login de l'utilisateur : %s" 11.366 11.367 #: slitaz-installer:299 11.368 msgid "Bootloader: installed" 11.369 @@ -318,6 +359,11 @@ 11.370 msgid ", no dual-boot" 11.371 msgstr ", sans double boot" 11.372 11.373 +#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350 11.374 +#: slitaz-installer:378 slitaz-installer:391 11.375 +msgid "Select %s" 11.376 +msgstr "" 11.377 + 11.378 #: slitaz-installer:325 slitaz-installer:379 11.379 msgid "Next" 11.380 msgstr "Suite" 11.381 @@ -334,10 +380,42 @@ 11.382 msgid "No" 11.383 msgstr "Non" 11.384 11.385 +#: slitaz-installer:409 11.386 +msgid "Summary" 11.387 +msgstr "" 11.388 + 11.389 #: slitaz-installer:419 11.390 msgid "SliTaz install cancelled." 11.391 msgstr "Installation de SliTaz avortée." 11.392 11.393 +#: slitaz-installer:567 11.394 +msgid "SliTaz Installer" 11.395 +msgstr "" 11.396 + 11.397 +#: slitaz-installer:567 11.398 +msgid "Installing..." 11.399 +msgstr "" 11.400 + 11.401 +#: slitaz-installer:573 11.402 +msgid "Installation complete" 11.403 +msgstr "" 11.404 + 11.405 +#: slitaz-installer:575 11.406 +msgid "Exit" 11.407 +msgstr "" 11.408 + 11.409 +#: slitaz-installer:576 11.410 +msgid "Reboot" 11.411 +msgstr "" 11.412 + 11.413 +#: slitaz-installer:585 slitaz-installer:597 11.414 +msgid "ESC pressed." 11.415 +msgstr "" 11.416 + 11.417 +#: slitaz-installer:588 11.418 +msgid "Process not completed" 11.419 +msgstr "" 11.420 + 11.421 #~ msgid "Ok" 11.422 #~ msgstr "Ok" 11.423
12.1 --- a/po/slitaz-installer/pt_BR.po Wed Apr 06 09:52:43 2016 +0300 12.2 +++ b/po/slitaz-installer/pt_BR.po Sat Apr 09 17:22:22 2016 +0300 12.3 @@ -7,7 +7,7 @@ 12.4 msgstr "" 12.5 "Project-Id-Version: slitaz-installer\n" 12.6 "Report-Msgid-Bugs-To: \n" 12.7 -"POT-Creation-Date: 2015-03-23 17:11+0100\n" 12.8 +"POT-Creation-Date: 2016-04-09 16:49+0300\n" 12.9 "PO-Revision-Date: 2016-03-28 05:04-0300\n" 12.10 "Last-Translator: Leonardo Laporte <hackdorte@sapo.pt>\n" 12.11 "Language-Team: Brazilian Portuguese <i18n@slitaz.org>\n" 12.12 @@ -19,8 +19,8 @@ 12.13 "X-Generator: Poedit 1.8.6\n" 12.14 12.15 #: slitaz-installer:23 12.16 -msgid "Welcome to the slitaz-installer" 12.17 -msgstr "Bem vindo ao instalador do SliTaz" 12.18 +msgid "Welcome to the slitaz-installer." 12.19 +msgstr "Bem vindo ao instalador do SliTaz." 12.20 12.21 #: slitaz-installer:24 12.22 msgid "Which type of installation do you want to start?" 12.23 @@ -35,14 +35,14 @@ 12.24 msgstr "Selecione uma mídia na lista a seguir:" 12.25 12.26 #: slitaz-installer:29 12.27 -msgid "You have selected the option to install SliTaz from an USB Key" 12.28 -msgstr "Você selecionou a opção para instalar a partir de uma mídia USB" 12.29 +msgid "You have selected the option to install SliTaz from an USB Key." 12.30 +msgstr "Você selecionou a opção para instalar a partir de uma mídia USB." 12.31 12.32 -#: slitaz-installer:31 12.33 +#: slitaz-installer:30 12.34 msgid "Enter the partition where SliTaz Live is located:" 12.35 msgstr "Informe a partição na qual o SliTaz Live está localizado:" 12.36 12.37 -#: slitaz-installer:33 12.38 +#: slitaz-installer:32 12.39 msgid "" 12.40 "You have selected the option to install SliTaz from an ISO file located on a " 12.41 "local disk." 12.42 @@ -50,25 +50,25 @@ 12.43 "Você selecionou a opção para instalar o SliTaz a partir de uma imagem ISO " 12.44 "localizada no disco local." 12.45 12.46 -#: slitaz-installer:35 12.47 +#: slitaz-installer:34 12.48 msgid "Please, select a file below:" 12.49 msgstr "Selecione um arquivo abaixo:" 12.50 12.51 +#: slitaz-installer:36 12.52 +msgid "You have selected the option to install SliTaz from the web." 12.53 +msgstr "Você selecionou a opção para instalar o SliTaz a partir da web." 12.54 + 12.55 #: slitaz-installer:37 12.56 -msgid "You have selected the option to install SliTaz from the web" 12.57 -msgstr "Você selecionou a opção para instalar o SliTaz a partir da web" 12.58 - 12.59 -#: slitaz-installer:38 12.60 msgid "Please, select a version:" 12.61 msgstr "Selecione uma versão:" 12.62 12.63 -#: slitaz-installer:40 12.64 -msgid "Select the source" 12.65 -msgstr "Selecione a origem" 12.66 +#: slitaz-installer:39 12.67 +msgid "Select the source:" 12.68 +msgstr "Selecione a origem:" 12.69 12.70 -#: slitaz-installer:42 12.71 -msgid "\\nDrive selection" 12.72 -msgstr "\\nSeleção de Drive" 12.73 +#: slitaz-installer:41 12.74 +msgid "Drive selection" 12.75 +msgstr "Seleção de Drive" 12.76 12.77 #: slitaz-installer:42 12.78 msgid "Please specify the partition where to install SliTaz:" 12.79 @@ -80,14 +80,16 @@ 12.80 "configuration files and the list of installed packages. Then, it will clean " 12.81 "the partition and install the new version of SliTaz, restore the " 12.82 "configuration files and reinstall any packages which are not present on the " 12.83 -"cdrom.\n" 12.84 -"You will need an active internet connection before upgrading." 12.85 +"CD-ROM." 12.86 msgstr "" 12.87 "O instalador atualizará um sistema SliTaz existente, salvando todos os " 12.88 "arquivos de configuração e uma lista dos pacotes instalados. Então irá " 12.89 "limpar a partição e instalar a nova versão do sistema, restaurando os " 12.90 -"arquivos de configuração e reinstalando os pacotes anterioremente " 12.91 -"existentes.\n" 12.92 +"arquivos de configuração e reinstalando os pacotes anterioremente existentes." 12.93 + 12.94 +#: slitaz-installer:49 12.95 +msgid "You will need an active internet connection before upgrading." 12.96 +msgstr "" 12.97 "Será necessária uma conexão à internet antes do processo de atualização." 12.98 12.99 #: slitaz-installer:50 12.100 @@ -98,14 +100,16 @@ 12.101 msgid "" 12.102 "Only the filesystems actually installed on your system are listed. If you " 12.103 "intend to use another filesystem, you have to install it before. Unless you " 12.104 -"know what you are doing, it is safe to use ext2, ext3 or ext4.\\n\\n\\Z2To " 12.105 -"format this partition, please select a filesystem below:" 12.106 +"know what you are doing, it is safe to use ext2, ext3 or ext4." 12.107 msgstr "" 12.108 "Somente os sistemas de arquivo existentes atualmente no sistema serão " 12.109 "listados. Se você pretende utilizar outro sistema de arquivos, será " 12.110 "necessário instalá-lo primeiro. A não ser que você saiba o que está fazendo, " 12.111 -"é seguro usar ext2, ext3 ou ext4.\\n\\n\\Z2 Para formatar esta partição, " 12.112 -"selecione o sistema de arquivos abaixo:" 12.113 +"é seguro usar ext2, ext3 ou ext4." 12.114 + 12.115 +#: slitaz-installer:56 12.116 +msgid "To format this partition, please select a filesystem below:" 12.117 +msgstr "Para formatar esta partição, selecione o sistema de arquivos abaixo:" 12.118 12.119 #: slitaz-installer:58 12.120 msgid "Separate /home partition" 12.121 @@ -119,12 +123,15 @@ 12.122 msgid "" 12.123 "Hostname configuration allows you to specify the machine name. The hostname " 12.124 "is used internally to identify the host on the network. This value can be " 12.125 -"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n" 12.126 +"changed after the system is installed." 12.127 msgstr "" 12.128 "A configuração de hostname permite especificar um nome para a máquina. O " 12.129 "hostname é usado internamente pelo sistema para encontrar uma máquina na " 12.130 -"rede. Este valor pode ser mudado após o sistema ter sido instalado.\\n\\n" 12.131 -"\\Z2Informe o hostname:\\Zn\\n" 12.132 +"rede. Este valor pode ser mudado após o sistema ter sido instalado." 12.133 + 12.134 +#: slitaz-installer:64 12.135 +msgid "Enter a hostname:" 12.136 +msgstr "Informe o hostname:" 12.137 12.138 #: slitaz-installer:66 12.139 msgid "" 12.140 @@ -136,11 +143,11 @@ 12.141 "sistema. O usuário root pode danificar o sistema por isso é necessário " 12.142 "sempre escolher uma senha forte com caracteres especiais e/ou números." 12.143 12.144 -#: slitaz-installer:70 12.145 +#: slitaz-installer:69 12.146 msgid "Enter the password for root:" 12.147 msgstr "Informe a senha para o root:" 12.148 12.149 -#: slitaz-installer:72 12.150 +#: slitaz-installer:71 12.151 msgid "" 12.152 "The default user for the system will have their personal files stored in /" 12.153 "home/*user* (and will be automatically added to the audio group)" 12.154 @@ -153,8 +160,8 @@ 12.155 msgstr "Informe o nome do primeiro usuário:" 12.156 12.157 #: slitaz-installer:76 12.158 -msgid "The password for default user" 12.159 -msgstr "Senha para o usuário padrão" 12.160 +msgid "The password for default user." 12.161 +msgstr "Senha para o usuário padrão." 12.162 12.163 #: slitaz-installer:77 12.164 msgid "" 12.165 @@ -171,62 +178,73 @@ 12.166 #: slitaz-installer:81 12.167 msgid "" 12.168 "Installation is now finished, you can exit the installer or reboot on your " 12.169 -"new SliTaz GNU/Linux operating system" 12.170 +"new SliTaz GNU/Linux operating system." 12.171 msgstr "" 12.172 "A instalação foi finalizada, você pode fechar o instalador ou reiniciar seu " 12.173 -"novo sistema operacional SliTaz GNU/Linux" 12.174 +"novo sistema operacional SliTaz GNU/Linux." 12.175 12.176 #: slitaz-installer:87 12.177 msgid "" 12.178 "The next step lets you format the target partition. Choose between robust, " 12.179 "stable and/or journaled filesystem. If the partition is already formated you " 12.180 -"can skip this stage, if not just accept.\\n\n" 12.181 -"Warning! formating a partition will destroy all current data.\\n\n" 12.182 -"\\Z2Do you wish to format the partition ?\\Zn" 12.183 +"can skip this stage, if not just accept." 12.184 msgstr "" 12.185 "O próximo passo permite formatar a partição alvo. Escolha entre sistemas de " 12.186 "arquivos robustos, estáveis e/ou com suporte a journaling. Se a partição já " 12.187 -"estiver formatada você pode pular esse passo, caso contrário confirme.\\n\n" 12.188 -"Aviso! Formatar a partição irá apagar todos os dados nela encontrados.\\n\n" 12.189 -"\\Z2Você deseja formatar a partição?\\Zn" 12.190 +"estiver formatada você pode pular esse passo, caso contrário confirme." 12.191 + 12.192 +#: slitaz-installer:90 slitaz-installer:101 12.193 +msgid "Warning! formating a partition will destroy all current data." 12.194 +msgstr "Aviso! Formatar a partição irá apagar todos os dados nela encontrados." 12.195 + 12.196 +#: slitaz-installer:91 12.197 +msgid "Do you wish to format the partition?" 12.198 +msgstr "Você deseja formatar a partição?" 12.199 12.200 #: slitaz-installer:93 12.201 msgid "" 12.202 "On most GNU/Linux systems users personal files are stored in the directory /" 12.203 -"home. Home can be on a separate partition or another hard disk.\\n\n" 12.204 -"\\Z2DO you want to use a separate Home partition ?\\Zn" 12.205 +"home. Home can be on a separate partition or another hard disk." 12.206 msgstr "" 12.207 "Na maioria dos sistemas GNU/Linux os arquivos pessoais dos usuários são " 12.208 "armazenados no diretório /home, que pode estar numa partição em separado ou " 12.209 -"outro dísco rígido.\\n\n" 12.210 -"\\Z2Você deseja utilizar /home em separado?\\Zn" 12.211 +"outro dísco rígido." 12.212 + 12.213 +#: slitaz-installer:96 12.214 +msgid "Do you want to use a separate Home partition?" 12.215 +msgstr "Você deseja utilizar /home em separado?" 12.216 12.217 #: slitaz-installer:98 12.218 msgid "" 12.219 "/home will be installed on a separate partition. The next step lets you " 12.220 "format the /home partition. If the partition is already formated you can " 12.221 -"skip this stage, if not just accept. Warning formating a partition will " 12.222 -"destroy all current data.\\n\n" 12.223 -"\\Z2Do you wish to format the /home partition ?\\Zn" 12.224 +"skip this stage, if not just accept." 12.225 msgstr "" 12.226 "/home será instala numa partição em separado. O próximo passo permite " 12.227 "formatar a partição. Se a partição já estiver formatada pule esse passo, " 12.228 -"caso contrário confirme. Aviso! Formatar a partição irá apagar todos os " 12.229 -"dados nela encontrados.\\n\n" 12.230 -"\\Z2Você deseja formatar a partição /home?\\Zn" 12.231 +"caso contrário confirme." 12.232 + 12.233 +#: slitaz-installer:102 12.234 +msgid "Do you wish to format the /home partition?" 12.235 +msgstr "Você deseja formatar a partição /home?" 12.236 12.237 #: slitaz-installer:104 12.238 msgid "" 12.239 "You have now the option to install a bootloader which is capable of booting " 12.240 -"almost any kind of operating system.\\n\\nIf you want to use an existing " 12.241 -"bootloader installation, skip this step and configure your bootloader to " 12.242 -"boot SliTaz (refer to your bootloader documentation on how to do this)" 12.243 +"almost any kind of operating system." 12.244 msgstr "" 12.245 "Você pode instalar o gerenciador de boot, que é capaz de iniciar " 12.246 -"praticamente todos os tipos de sistema operacional.\\n\\n Se você deseja " 12.247 -"usar um gerenciador de boot existente, pule este passo e configure seu " 12.248 -"gerenciador para iniciar o SliTaz (consulte a documentação do gerenciador de " 12.249 -"boot)" 12.250 +"praticamente todos os tipos de sistema operacional." 12.251 + 12.252 +#: slitaz-installer:106 12.253 +msgid "" 12.254 +"If you want to use an existing bootloader installation, skip this step and " 12.255 +"configure your bootloader to boot SliTaz (refer to your bootloader " 12.256 +"documentation on how to do this)." 12.257 +msgstr "" 12.258 +"Se você deseja usar um gerenciador de boot existente, pule este passo e " 12.259 +"configure seu gerenciador para iniciar o SliTaz (consulte a documentação do " 12.260 +"gerenciador de boot)." 12.261 12.262 #: slitaz-installer:109 12.263 msgid "Install a bootloader?" 12.264 @@ -235,12 +253,14 @@ 12.265 #: slitaz-installer:111 12.266 msgid "" 12.267 "Do you want to implement a dual-boot with Windows? At start-up, you will be " 12.268 -"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n" 12.269 -"\\Z2Install a dual-boot with Windows ?" 12.270 +"asked whether you want to boot into Windows or SliTaz GNU/Linux." 12.271 msgstr "" 12.272 "Deseja ativar o dual-boot com Windows? Na inicialização do sistema você " 12.273 -"deverá escolher se quer usar o Windows ou o SliTaz GNU/Linux.\\n\n" 12.274 -"\\Z2Ativar o dual-boot com Windows?" 12.275 +"deverá escolher se quer usar o Windows ou o SliTaz GNU/Linux." 12.276 + 12.277 +#: slitaz-installer:114 12.278 +msgid "Install a dual-boot with Windows?" 12.279 +msgstr "Ativar o dual-boot com Windows?" 12.280 12.281 #: slitaz-installer:116 12.282 msgid "" 12.283 @@ -250,45 +270,59 @@ 12.284 "Resumo das configurações de instalação e última chance para cancelar ou " 12.285 "reiniciar todos os passos da instalação." 12.286 12.287 +#: slitaz-installer:118 12.288 +msgid "Go and install SliTaz?" 12.289 +msgstr "" 12.290 + 12.291 #: slitaz-installer:120 12.292 msgid "Sorry, no device, nor file found or available." 12.293 msgstr "Nenhum dispositivo ou arquivo encontrado ou disponível." 12.294 12.295 #: slitaz-installer:131 slitaz-installer:140 12.296 -msgid "Error 2: " 12.297 +msgid "Error 2:" 12.298 msgstr "Erro 2:" 12.299 12.300 #: slitaz-installer:132 12.301 +msgid "The lightweight SliTaz HDD installer '%s' is missing." 12.302 +msgstr "O Instalador do SliTaz (%s) não foi encontrado." 12.303 + 12.304 +#: slitaz-installer:133 12.305 +msgid "Check permissions, or reinstall the %s package." 12.306 +msgstr "Cheque as permissões ou reinstale o pacote %s." 12.307 + 12.308 +#: slitaz-installer:141 12.309 msgid "" 12.310 -"The lightweight SliTaz HDD installer 'tazinst' is missing.\n" 12.311 -"Check permissions, or reinstall the slitaz-tools package." 12.312 +"The lightweight SliTaz HDD installer tazinst (%s) is not at the required " 12.313 +"version (%s)." 12.314 msgstr "" 12.315 -"O Instalador do SliTaz (tazinst) não foi encontrado.\n" 12.316 -"Cheque as permissões ou reinstale o pacote slitaz-tools." 12.317 + 12.318 +#: slitaz-installer:143 12.319 +msgid "Use %s in an xterm or reinstall the %s package." 12.320 +msgstr "" 12.321 12.322 #: slitaz-installer:268 12.323 -msgid "Mode" 12.324 -msgstr "Modo" 12.325 +msgid "Mode: %s" 12.326 +msgstr "Modo: %s" 12.327 12.328 #: slitaz-installer:271 12.329 -msgid "From media" 12.330 -msgstr "À partir da mídia" 12.331 +msgid "From media: %s" 12.332 +msgstr "À partir da mídia: %s" 12.333 12.334 #: slitaz-installer:276 12.335 -msgid "To the disk" 12.336 -msgstr "Para o disco" 12.337 +msgid "To the disk: %s" 12.338 +msgstr "Para o disco: %s" 12.339 12.340 #: slitaz-installer:280 slitaz-installer:290 12.341 -msgid "(Formatting as" 12.342 -msgstr "(Formatando como" 12.343 +msgid "(Formatting as %s)" 12.344 +msgstr "(Formatando como %s)" 12.345 12.346 #: slitaz-installer:281 12.347 msgid "(No formatting)" 12.348 msgstr "(Sem formatar)" 12.349 12.350 #: slitaz-installer:285 12.351 -msgid "Separate /home is" 12.352 -msgstr "/home em separado é" 12.353 +msgid "Separate /home is: %s" 12.354 +msgstr "/home em separado é: %s" 12.355 12.356 #: slitaz-installer:286 12.357 msgid "No separate /home partition" 12.358 @@ -298,9 +332,13 @@ 12.359 msgid "(No /home formatting)" 12.360 msgstr "(Sem formatar /home)" 12.361 12.362 +#: slitaz-installer:293 12.363 +msgid "Hostname: %s" 12.364 +msgstr "" 12.365 + 12.366 #: slitaz-installer:295 12.367 -msgid "User login" 12.368 -msgstr "Login de usuário" 12.369 +msgid "User login: %s" 12.370 +msgstr "Login de usuário: %s" 12.371 12.372 #: slitaz-installer:299 12.373 msgid "Bootloader: installed" 12.374 @@ -318,6 +356,11 @@ 12.375 msgid ", no dual-boot" 12.376 msgstr ", sem dual-boot" 12.377 12.378 +#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350 12.379 +#: slitaz-installer:378 slitaz-installer:391 12.380 +msgid "Select %s" 12.381 +msgstr "" 12.382 + 12.383 #: slitaz-installer:325 slitaz-installer:379 12.384 msgid "Next" 12.385 msgstr "Próximo" 12.386 @@ -334,10 +377,42 @@ 12.387 msgid "No" 12.388 msgstr "Não" 12.389 12.390 +#: slitaz-installer:409 12.391 +msgid "Summary" 12.392 +msgstr "" 12.393 + 12.394 #: slitaz-installer:419 12.395 msgid "SliTaz install cancelled." 12.396 msgstr "Instalação do SliTaz cancelada." 12.397 12.398 +#: slitaz-installer:567 12.399 +msgid "SliTaz Installer" 12.400 +msgstr "" 12.401 + 12.402 +#: slitaz-installer:567 12.403 +msgid "Installing..." 12.404 +msgstr "" 12.405 + 12.406 +#: slitaz-installer:573 12.407 +msgid "Installation complete" 12.408 +msgstr "" 12.409 + 12.410 +#: slitaz-installer:575 12.411 +msgid "Exit" 12.412 +msgstr "" 12.413 + 12.414 +#: slitaz-installer:576 12.415 +msgid "Reboot" 12.416 +msgstr "" 12.417 + 12.418 +#: slitaz-installer:585 slitaz-installer:597 12.419 +msgid "ESC pressed." 12.420 +msgstr "" 12.421 + 12.422 +#: slitaz-installer:588 12.423 +msgid "Process not completed" 12.424 +msgstr "" 12.425 + 12.426 #~ msgid "Ok" 12.427 #~ msgstr "Ok" 12.428
13.1 --- a/po/slitaz-installer/ru.po Wed Apr 06 09:52:43 2016 +0300 13.2 +++ b/po/slitaz-installer/ru.po Sat Apr 09 17:22:22 2016 +0300 13.3 @@ -8,7 +8,7 @@ 13.4 msgstr "" 13.5 "Project-Id-Version: slitaz-installer\n" 13.6 "Report-Msgid-Bugs-To: \n" 13.7 -"POT-Creation-Date: 2015-03-23 17:11+0100\n" 13.8 +"POT-Creation-Date: 2016-04-09 16:49+0300\n" 13.9 "PO-Revision-Date: 2016-04-05 10:55+0300\n" 13.10 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 13.11 "Language-Team: \n" 13.12 @@ -21,8 +21,8 @@ 13.13 "X-Generator: Poedit 1.8.6\n" 13.14 13.15 #: slitaz-installer:23 13.16 -msgid "Welcome to the slitaz-installer" 13.17 -msgstr "Вас приветствует программа установки SliTaz" 13.18 +msgid "Welcome to the slitaz-installer." 13.19 +msgstr "Вас приветствует программа установки SliTaz." 13.20 13.21 #: slitaz-installer:24 13.22 msgid "Which type of installation do you want to start?" 13.23 @@ -37,39 +37,39 @@ 13.24 msgstr "Выберите носитель из следующего списка:" 13.25 13.26 #: slitaz-installer:29 13.27 -msgid "You have selected the option to install SliTaz from an USB Key" 13.28 -msgstr "Вы хотите установить SliTaz с USB-флешки" 13.29 +msgid "You have selected the option to install SliTaz from an USB Key." 13.30 +msgstr "Вы хотите установить SliTaz с USB-флешки." 13.31 13.32 -#: slitaz-installer:31 13.33 +#: slitaz-installer:30 13.34 msgid "Enter the partition where SliTaz Live is located:" 13.35 msgstr "Введите раздел диска, где находится SliTaz Live:" 13.36 13.37 -#: slitaz-installer:33 13.38 +#: slitaz-installer:32 13.39 msgid "" 13.40 "You have selected the option to install SliTaz from an ISO file located on a " 13.41 "local disk." 13.42 msgstr "" 13.43 "Вы хотите установить SliTaz с ISO-образа, расположенного на локальном диске." 13.44 13.45 -#: slitaz-installer:35 13.46 +#: slitaz-installer:34 13.47 msgid "Please, select a file below:" 13.48 msgstr "Выберите файл:" 13.49 13.50 +#: slitaz-installer:36 13.51 +msgid "You have selected the option to install SliTaz from the web." 13.52 +msgstr "Вы хотите установить SliTaz из интернета." 13.53 + 13.54 #: slitaz-installer:37 13.55 -msgid "You have selected the option to install SliTaz from the web" 13.56 -msgstr "Вы хотите установить SliTaz из интернета" 13.57 - 13.58 -#: slitaz-installer:38 13.59 msgid "Please, select a version:" 13.60 msgstr "Выберите версию:" 13.61 13.62 -#: slitaz-installer:40 13.63 -msgid "Select the source" 13.64 -msgstr "Выберите источник" 13.65 +#: slitaz-installer:39 13.66 +msgid "Select the source:" 13.67 +msgstr "Выберите источник:" 13.68 13.69 -#: slitaz-installer:42 13.70 -msgid "\\nDrive selection" 13.71 -msgstr "\\nВыбор привода" 13.72 +#: slitaz-installer:41 13.73 +msgid "Drive selection" 13.74 +msgstr "Выбор привода" 13.75 13.76 #: slitaz-installer:42 13.77 msgid "Please specify the partition where to install SliTaz:" 13.78 @@ -81,13 +81,16 @@ 13.79 "configuration files and the list of installed packages. Then, it will clean " 13.80 "the partition and install the new version of SliTaz, restore the " 13.81 "configuration files and reinstall any packages which are not present on the " 13.82 -"cdrom.\n" 13.83 -"You will need an active internet connection before upgrading." 13.84 +"CD-ROM." 13.85 msgstr "" 13.86 "Обновление существующей системы SliTaz: сначала будут сохранены все файлы " 13.87 "настроек и список установленных пакетов. Затем, раздел будет очищен и " 13.88 "установлена новая версия SliTaz, восстановлены файлы настроек и " 13.89 -"переустановлены все пакеты, отсутствующие на CD-ROM.\n" 13.90 +"переустановлены все пакеты, отсутствующие на CD-ROM." 13.91 + 13.92 +#: slitaz-installer:49 13.93 +msgid "You will need an active internet connection before upgrading." 13.94 +msgstr "" 13.95 "Перед началом обновления убедитесь в наличии работающего соединения с " 13.96 "интернетом." 13.97 13.98 @@ -99,13 +102,16 @@ 13.99 msgid "" 13.100 "Only the filesystems actually installed on your system are listed. If you " 13.101 "intend to use another filesystem, you have to install it before. Unless you " 13.102 -"know what you are doing, it is safe to use ext2, ext3 or ext4.\\n\\n\\Z2To " 13.103 -"format this partition, please select a filesystem below:" 13.104 +"know what you are doing, it is safe to use ext2, ext3 or ext4." 13.105 msgstr "" 13.106 "Список содержит только файловые системы, присутствующие в вашей системе. " 13.107 "Если вы собираетесь использовать другую файловую систему, сначала вы должны " 13.108 "создать ее. Если вы не знаете, что выбрать, хорошим решением будут ext2, " 13.109 -"ext3 или ext4.\\n\\n\\Z2В какую файловую систему форматировать этот раздел:" 13.110 +"ext3 или ext4." 13.111 + 13.112 +#: slitaz-installer:56 13.113 +msgid "To format this partition, please select a filesystem below:" 13.114 +msgstr "В какую файловую систему форматировать этот раздел:" 13.115 13.116 #: slitaz-installer:58 13.117 msgid "Separate /home partition" 13.118 @@ -119,11 +125,14 @@ 13.119 msgid "" 13.120 "Hostname configuration allows you to specify the machine name. The hostname " 13.121 "is used internally to identify the host on the network. This value can be " 13.122 -"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n" 13.123 +"changed after the system is installed." 13.124 msgstr "" 13.125 "Здесь вы можете выбрать имя вашего хоста. Оно используется для идентификации " 13.126 -"в сети. Его можно изменить после установки.\\n\\n\\Z2Введите имя хоста:\\Zn" 13.127 -"\\n" 13.128 +"в сети. Его можно изменить после установки." 13.129 + 13.130 +#: slitaz-installer:64 13.131 +msgid "Enter a hostname:" 13.132 +msgstr "Введите имя хоста:" 13.133 13.134 #: slitaz-installer:66 13.135 msgid "" 13.136 @@ -135,11 +144,11 @@ 13.137 "обязательно выберите стойкий пароль, содержащий специальные символы и/или " 13.138 "цифры." 13.139 13.140 -#: slitaz-installer:70 13.141 +#: slitaz-installer:69 13.142 msgid "Enter the password for root:" 13.143 msgstr "Введите пароль root:" 13.144 13.145 -#: slitaz-installer:72 13.146 +#: slitaz-installer:71 13.147 msgid "" 13.148 "The default user for the system will have their personal files stored in /" 13.149 "home/*user* (and will be automatically added to the audio group)" 13.150 @@ -152,8 +161,8 @@ 13.151 msgstr "Введите имя первого пользователя:" 13.152 13.153 #: slitaz-installer:76 13.154 -msgid "The password for default user" 13.155 -msgstr "Пароль первого пользователя" 13.156 +msgid "The password for default user." 13.157 +msgstr "Пароль пользователя по умолчанию." 13.158 13.159 #: slitaz-installer:77 13.160 msgid "" 13.161 @@ -170,61 +179,73 @@ 13.162 #: slitaz-installer:81 13.163 msgid "" 13.164 "Installation is now finished, you can exit the installer or reboot on your " 13.165 -"new SliTaz GNU/Linux operating system" 13.166 +"new SliTaz GNU/Linux operating system." 13.167 msgstr "" 13.168 "Установка завершена, вы можете покинуть программу инсталляции, или " 13.169 -"перезагрузиться в свежеустановленную систему SliTaz GNU/Linux" 13.170 +"перезагрузиться в свежеустановленную систему SliTaz GNU/Linux." 13.171 13.172 #: slitaz-installer:87 13.173 msgid "" 13.174 "The next step lets you format the target partition. Choose between robust, " 13.175 "stable and/or journaled filesystem. If the partition is already formated you " 13.176 -"can skip this stage, if not just accept.\\n\n" 13.177 -"Warning! formating a partition will destroy all current data.\\n\n" 13.178 -"\\Z2Do you wish to format the partition ?\\Zn" 13.179 +"can skip this stage, if not just accept." 13.180 msgstr "" 13.181 "Теперь можно отформатировать раздел. Выберите между надежной, стабильной и/" 13.182 "или журналируемой файловой системой. Вы можете пропустить этот шаг, " 13.183 -"например, если раздел уже отформатирован.\\n\n" 13.184 -"Внимание! Форматирование раздела уничтожит все текущие данные на нём.\\n" 13.185 -"\\Z2Хотите форматировать раздел?\\Zn" 13.186 +"например, если раздел уже отформатирован." 13.187 + 13.188 +#: slitaz-installer:90 slitaz-installer:101 13.189 +msgid "Warning! formating a partition will destroy all current data." 13.190 +msgstr "Внимание! Форматирование раздела уничтожит все текущие данные на нём." 13.191 + 13.192 +#: slitaz-installer:91 13.193 +msgid "Do you wish to format the partition?" 13.194 +msgstr "Хотите форматировать раздел?" 13.195 13.196 #: slitaz-installer:93 13.197 msgid "" 13.198 "On most GNU/Linux systems users personal files are stored in the directory /" 13.199 -"home. Home can be on a separate partition or another hard disk.\\n\n" 13.200 -"\\Z2DO you want to use a separate Home partition ?\\Zn" 13.201 +"home. Home can be on a separate partition or another hard disk." 13.202 msgstr "" 13.203 "Обычно в системах GNU/Linux пользовательские файлы хранятся в папке /home. " 13.204 "Эта папка может находиться на другом разделе жесткого диска, или вообще на " 13.205 -"другом диске.\\n\n" 13.206 -"\\Z2Использовать ли отдельный раздел для папки /home?\\Zn" 13.207 +"другом диске." 13.208 + 13.209 +#: slitaz-installer:96 13.210 +msgid "Do you want to use a separate Home partition?" 13.211 +msgstr "Использовать ли отдельный раздел для папки /home?" 13.212 13.213 #: slitaz-installer:98 13.214 msgid "" 13.215 "/home will be installed on a separate partition. The next step lets you " 13.216 "format the /home partition. If the partition is already formated you can " 13.217 -"skip this stage, if not just accept. Warning formating a partition will " 13.218 -"destroy all current data.\\n\n" 13.219 -"\\Z2Do you wish to format the /home partition ?\\Zn" 13.220 +"skip this stage, if not just accept." 13.221 msgstr "" 13.222 "Папка /home будет установлена на отдельный раздел, сейчас речь идет о том, " 13.223 "чтобы его отформатировать. Вы можете пропустить этот шаг, например, если он " 13.224 -"уже отформатирован. Внимание! Форматирование раздела уничтожит все текущие " 13.225 -"данные на нём.\\n\n" 13.226 -"\\Z2Хотите форматировать раздел /home?\\Zn" 13.227 +"уже отформатирован." 13.228 + 13.229 +#: slitaz-installer:102 13.230 +msgid "Do you wish to format the /home partition?" 13.231 +msgstr "Хотите форматировать раздел /home?" 13.232 13.233 #: slitaz-installer:104 13.234 msgid "" 13.235 "You have now the option to install a bootloader which is capable of booting " 13.236 -"almost any kind of operating system.\\n\\nIf you want to use an existing " 13.237 -"bootloader installation, skip this step and configure your bootloader to " 13.238 -"boot SliTaz (refer to your bootloader documentation on how to do this)" 13.239 +"almost any kind of operating system." 13.240 msgstr "" 13.241 "Можно установить загрузчик, который поддерживает загрузку практически любой " 13.242 -"операционной системы.\\n\\nЕсли вы хотите использовать существующий " 13.243 -"загрузчик, пропустите этот шаг и настройте ваш загрузчик для запуска SliTaz " 13.244 -"(обратитесь к документации Вашего загрузчика о том, как это сделать)" 13.245 +"операционной системы." 13.246 + 13.247 +#: slitaz-installer:106 13.248 +msgid "" 13.249 +"If you want to use an existing bootloader installation, skip this step and " 13.250 +"configure your bootloader to boot SliTaz (refer to your bootloader " 13.251 +"documentation on how to do this)." 13.252 +msgstr "" 13.253 +"Если вы хотите использовать существующий загрузчик, пропустите этот шаг и " 13.254 +"настройте ваш загрузчик для запуска SliTaz (обратитесь к документации Вашего " 13.255 +"загрузчика о том, как это сделать)." 13.256 13.257 #: slitaz-installer:109 13.258 msgid "Install a bootloader?" 13.259 @@ -233,12 +254,14 @@ 13.260 #: slitaz-installer:111 13.261 msgid "" 13.262 "Do you want to implement a dual-boot with Windows? At start-up, you will be " 13.263 -"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n" 13.264 -"\\Z2Install a dual-boot with Windows ?" 13.265 +"asked whether you want to boot into Windows or SliTaz GNU/Linux." 13.266 msgstr "" 13.267 "Хотите создать режим двойной загрузки с Windows? При включении компьютера " 13.268 -"будет возможность выбрать — загрузиться в Windows или SliTaz GNU/Linux.\\n\n" 13.269 -"\\Z2Создать двойную загрузку с Windows?" 13.270 +"будет возможность выбрать — загрузиться в Windows или SliTaz GNU/Linux." 13.271 + 13.272 +#: slitaz-installer:114 13.273 +msgid "Install a dual-boot with Windows?" 13.274 +msgstr "Создать двойную загрузку с Windows?" 13.275 13.276 #: slitaz-installer:116 13.277 msgid "" 13.278 @@ -247,46 +270,62 @@ 13.279 msgstr "" 13.280 "Итоговые настройки. Это последний шанс отменить, или начать все шаги сначала." 13.281 13.282 +#: slitaz-installer:118 13.283 +msgid "Go and install SliTaz?" 13.284 +msgstr "Перейти к установке SliTaz?" 13.285 + 13.286 #: slitaz-installer:120 13.287 msgid "Sorry, no device, nor file found or available." 13.288 msgstr "" 13.289 "К сожалению, ни устройство, ни файл не найдены. Возможно, они недоступны." 13.290 13.291 #: slitaz-installer:131 slitaz-installer:140 13.292 -msgid "Error 2: " 13.293 -msgstr "Ошибка 2: " 13.294 +msgid "Error 2:" 13.295 +msgstr "Ошибка 2:" 13.296 13.297 #: slitaz-installer:132 13.298 +msgid "The lightweight SliTaz HDD installer '%s' is missing." 13.299 +msgstr "Не удалось запустить %s, легковесный установщик SliTaz." 13.300 + 13.301 +#: slitaz-installer:133 13.302 +msgid "Check permissions, or reinstall the %s package." 13.303 +msgstr "Проверьте права доступа или переустановите пакет %s." 13.304 + 13.305 +#: slitaz-installer:141 13.306 msgid "" 13.307 -"The lightweight SliTaz HDD installer 'tazinst' is missing.\n" 13.308 -"Check permissions, or reinstall the slitaz-tools package." 13.309 +"The lightweight SliTaz HDD installer tazinst (%s) is not at the required " 13.310 +"version (%s)." 13.311 msgstr "" 13.312 -"Не удалось запустить tazinst, легковесный установщик SliTaz.\n" 13.313 -"Проверьте права доступа или переустановите пакет slitaz-installer." 13.314 +"Легковесный установщик SliTaz на жесткий диск tazinst (версия %s) не " 13.315 +"соответствует требуемой версии (%s)." 13.316 + 13.317 +#: slitaz-installer:143 13.318 +msgid "Use %s in an xterm or reinstall the %s package." 13.319 +msgstr "Используйте %s в терминале, либо переустановите пакет %s." 13.320 13.321 #: slitaz-installer:268 13.322 -msgid "Mode" 13.323 -msgstr "Режим" 13.324 +msgid "Mode: %s" 13.325 +msgstr "Режим: %s" 13.326 13.327 #: slitaz-installer:271 13.328 -msgid "From media" 13.329 -msgstr "С носителя" 13.330 +msgid "From media: %s" 13.331 +msgstr "С носителя: %s" 13.332 13.333 #: slitaz-installer:276 13.334 -msgid "To the disk" 13.335 -msgstr "На диск" 13.336 +msgid "To the disk: %s" 13.337 +msgstr "На диск: %s" 13.338 13.339 #: slitaz-installer:280 slitaz-installer:290 13.340 -msgid "(Formatting as" 13.341 -msgstr "(форматировать в" 13.342 +msgid "(Formatting as %s)" 13.343 +msgstr "(форматировать как %s)" 13.344 13.345 #: slitaz-installer:281 13.346 msgid "(No formatting)" 13.347 msgstr "(не форматировать)" 13.348 13.349 #: slitaz-installer:285 13.350 -msgid "Separate /home is" 13.351 -msgstr "Отдельный раздел /home" 13.352 +msgid "Separate /home is: %s" 13.353 +msgstr "Отдельный раздел /home: %s" 13.354 13.355 #: slitaz-installer:286 13.356 msgid "No separate /home partition" 13.357 @@ -296,9 +335,13 @@ 13.358 msgid "(No /home formatting)" 13.359 msgstr "(не форматировать /home)" 13.360 13.361 +#: slitaz-installer:293 13.362 +msgid "Hostname: %s" 13.363 +msgstr "Название хоста: %s" 13.364 + 13.365 #: slitaz-installer:295 13.366 -msgid "User login" 13.367 -msgstr "Логин пользователя" 13.368 +msgid "User login: %s" 13.369 +msgstr "Логин пользователя: %s" 13.370 13.371 #: slitaz-installer:299 13.372 msgid "Bootloader: installed" 13.373 @@ -316,6 +359,11 @@ 13.374 msgid ", no dual-boot" 13.375 msgstr ", без двойной загрузки" 13.376 13.377 +#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350 13.378 +#: slitaz-installer:378 slitaz-installer:391 13.379 +msgid "Select %s" 13.380 +msgstr "Выбор значения %s" 13.381 + 13.382 #: slitaz-installer:325 slitaz-installer:379 13.383 msgid "Next" 13.384 msgstr "Дальше" 13.385 @@ -332,10 +380,42 @@ 13.386 msgid "No" 13.387 msgstr "Нет" 13.388 13.389 +#: slitaz-installer:409 13.390 +msgid "Summary" 13.391 +msgstr "Сводка" 13.392 + 13.393 #: slitaz-installer:419 13.394 msgid "SliTaz install cancelled." 13.395 msgstr "Установка SliTaz отменена." 13.396 13.397 +#: slitaz-installer:567 13.398 +msgid "SliTaz Installer" 13.399 +msgstr "Установщик SliTaz" 13.400 + 13.401 +#: slitaz-installer:567 13.402 +msgid "Installing..." 13.403 +msgstr "Установка…" 13.404 + 13.405 +#: slitaz-installer:573 13.406 +msgid "Installation complete" 13.407 +msgstr "Установка завершена" 13.408 + 13.409 +#: slitaz-installer:575 13.410 +msgid "Exit" 13.411 +msgstr "Выйти" 13.412 + 13.413 +#: slitaz-installer:576 13.414 +msgid "Reboot" 13.415 +msgstr "Перезагрузить" 13.416 + 13.417 +#: slitaz-installer:585 slitaz-installer:597 13.418 +msgid "ESC pressed." 13.419 +msgstr "Была нажата клавиша Esc." 13.420 + 13.421 +#: slitaz-installer:588 13.422 +msgid "Process not completed" 13.423 +msgstr "Процесс не завершен" 13.424 + 13.425 #~ msgid "Ok" 13.426 #~ msgstr "Ок" 13.427
14.1 --- a/po/slitaz-installer/slitaz-installer.pot Wed Apr 06 09:52:43 2016 +0300 14.2 +++ b/po/slitaz-installer/slitaz-installer.pot Sat Apr 09 17:22:22 2016 +0300 14.3 @@ -8,7 +8,7 @@ 14.4 msgstr "" 14.5 "Project-Id-Version: slitaz-installer \n" 14.6 "Report-Msgid-Bugs-To: \n" 14.7 -"POT-Creation-Date: 2016-04-05 19:03+0100\n" 14.8 +"POT-Creation-Date: 2016-04-09 17:07+0300\n" 14.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14.11 "Language-Team: LANGUAGE <LL@li.org>\n" 14.12 @@ -18,7 +18,7 @@ 14.13 "Content-Transfer-Encoding: 8bit\n" 14.14 14.15 #: slitaz-installer:23 14.16 -msgid "Welcome to the slitaz-installer" 14.17 +msgid "Welcome to the slitaz-installer." 14.18 msgstr "" 14.19 14.20 #: slitaz-installer:24 14.21 @@ -34,37 +34,37 @@ 14.22 msgstr "" 14.23 14.24 #: slitaz-installer:29 14.25 -msgid "You have selected the option to install SliTaz from an USB Key" 14.26 +msgid "You have selected the option to install SliTaz from an USB Key." 14.27 msgstr "" 14.28 14.29 -#: slitaz-installer:31 14.30 +#: slitaz-installer:30 14.31 msgid "Enter the partition where SliTaz Live is located:" 14.32 msgstr "" 14.33 14.34 -#: slitaz-installer:33 14.35 +#: slitaz-installer:32 14.36 msgid "" 14.37 "You have selected the option to install SliTaz from an ISO file located on a " 14.38 "local disk." 14.39 msgstr "" 14.40 14.41 -#: slitaz-installer:35 14.42 +#: slitaz-installer:34 14.43 msgid "Please, select a file below:" 14.44 msgstr "" 14.45 14.46 -#: slitaz-installer:37 14.47 -msgid "You have selected the option to install SliTaz from the web" 14.48 +#: slitaz-installer:36 14.49 +msgid "You have selected the option to install SliTaz from the web." 14.50 msgstr "" 14.51 14.52 -#: slitaz-installer:38 14.53 +#: slitaz-installer:37 14.54 msgid "Please, select a version:" 14.55 msgstr "" 14.56 14.57 -#: slitaz-installer:40 14.58 -msgid "Select the source" 14.59 +#: slitaz-installer:39 14.60 +msgid "Select the source:" 14.61 msgstr "" 14.62 14.63 -#: slitaz-installer:42 14.64 -msgid "\\nDrive selection" 14.65 +#: slitaz-installer:41 14.66 +msgid "Drive selection" 14.67 msgstr "" 14.68 14.69 #: slitaz-installer:42 14.70 @@ -77,8 +77,11 @@ 14.71 "configuration files and the list of installed packages. Then, it will clean " 14.72 "the partition and install the new version of SliTaz, restore the " 14.73 "configuration files and reinstall any packages which are not present on the " 14.74 -"cdrom.\n" 14.75 -"You will need an active internet connection before upgrading." 14.76 +"CD-ROM." 14.77 +msgstr "" 14.78 + 14.79 +#: slitaz-installer:49 14.80 +msgid "You will need an active internet connection before upgrading." 14.81 msgstr "" 14.82 14.83 #: slitaz-installer:50 14.84 @@ -89,8 +92,11 @@ 14.85 msgid "" 14.86 "Only the filesystems actually installed on your system are listed. If you " 14.87 "intend to use another filesystem, you have to install it before. Unless you " 14.88 -"know what you are doing, it is safe to use ext2, ext3 or ext4.\\n\\n\\Z2To " 14.89 -"format this partition, please select a filesystem below:" 14.90 +"know what you are doing, it is safe to use ext2, ext3 or ext4." 14.91 +msgstr "" 14.92 + 14.93 +#: slitaz-installer:56 14.94 +msgid "To format this partition, please select a filesystem below:" 14.95 msgstr "" 14.96 14.97 #: slitaz-installer:58 14.98 @@ -105,7 +111,11 @@ 14.99 msgid "" 14.100 "Hostname configuration allows you to specify the machine name. The hostname " 14.101 "is used internally to identify the host on the network. This value can be " 14.102 -"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n" 14.103 +"changed after the system is installed." 14.104 +msgstr "" 14.105 + 14.106 +#: slitaz-installer:64 14.107 +msgid "Enter a hostname:" 14.108 msgstr "" 14.109 14.110 #: slitaz-installer:66 14.111 @@ -115,11 +125,11 @@ 14.112 "strong password with special characters and/or numbers." 14.113 msgstr "" 14.114 14.115 -#: slitaz-installer:70 14.116 +#: slitaz-installer:69 14.117 msgid "Enter the password for root:" 14.118 msgstr "" 14.119 14.120 -#: slitaz-installer:72 14.121 +#: slitaz-installer:71 14.122 msgid "" 14.123 "The default user for the system will have their personal files stored in /" 14.124 "home/*user* (and will be automatically added to the audio group)" 14.125 @@ -130,7 +140,7 @@ 14.126 msgstr "" 14.127 14.128 #: slitaz-installer:76 14.129 -msgid "The password for default user" 14.130 +msgid "The password for default user." 14.131 msgstr "" 14.132 14.133 #: slitaz-installer:77 14.134 @@ -146,40 +156,56 @@ 14.135 #: slitaz-installer:81 14.136 msgid "" 14.137 "Installation is now finished, you can exit the installer or reboot on your " 14.138 -"new SliTaz GNU/Linux operating system" 14.139 +"new SliTaz GNU/Linux operating system." 14.140 msgstr "" 14.141 14.142 #: slitaz-installer:87 14.143 msgid "" 14.144 "The next step lets you format the target partition. Choose between robust, " 14.145 "stable and/or journaled filesystem. If the partition is already formated you " 14.146 -"can skip this stage, if not just accept.\\n\n" 14.147 -"Warning! formating a partition will destroy all current data.\\n\n" 14.148 -"\\Z2Do you wish to format the partition ?\\Zn" 14.149 +"can skip this stage, if not just accept." 14.150 +msgstr "" 14.151 + 14.152 +#: slitaz-installer:90 slitaz-installer:101 14.153 +msgid "Warning! formating a partition will destroy all current data." 14.154 +msgstr "" 14.155 + 14.156 +#: slitaz-installer:91 14.157 +msgid "Do you wish to format the partition?" 14.158 msgstr "" 14.159 14.160 #: slitaz-installer:93 14.161 msgid "" 14.162 "On most GNU/Linux systems users personal files are stored in the directory /" 14.163 -"home. Home can be on a separate partition or another hard disk.\\n\n" 14.164 -"\\Z2DO you want to use a separate Home partition ?\\Zn" 14.165 +"home. Home can be on a separate partition or another hard disk." 14.166 +msgstr "" 14.167 + 14.168 +#: slitaz-installer:96 14.169 +msgid "Do you want to use a separate Home partition?" 14.170 msgstr "" 14.171 14.172 #: slitaz-installer:98 14.173 msgid "" 14.174 "/home will be installed on a separate partition. The next step lets you " 14.175 "format the /home partition. If the partition is already formated you can " 14.176 -"skip this stage, if not just accept. Warning formating a partition will " 14.177 -"destroy all current data.\\n\n" 14.178 -"\\Z2Do you wish to format the /home partition ?\\Zn" 14.179 +"skip this stage, if not just accept." 14.180 +msgstr "" 14.181 + 14.182 +#: slitaz-installer:102 14.183 +msgid "Do you wish to format the /home partition?" 14.184 msgstr "" 14.185 14.186 #: slitaz-installer:104 14.187 msgid "" 14.188 "You have now the option to install a bootloader which is capable of booting " 14.189 -"almost any kind of operating system.\\n\\nIf you want to use an existing " 14.190 -"bootloader installation, skip this step and configure your bootloader to " 14.191 -"boot SliTaz (refer to your bootloader documentation on how to do this)" 14.192 +"almost any kind of operating system." 14.193 +msgstr "" 14.194 + 14.195 +#: slitaz-installer:106 14.196 +msgid "" 14.197 +"If you want to use an existing bootloader installation, skip this step and " 14.198 +"configure your bootloader to boot SliTaz (refer to your bootloader " 14.199 +"documentation on how to do this)." 14.200 msgstr "" 14.201 14.202 #: slitaz-installer:109 14.203 @@ -189,8 +215,11 @@ 14.204 #: slitaz-installer:111 14.205 msgid "" 14.206 "Do you want to implement a dual-boot with Windows? At start-up, you will be " 14.207 -"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n" 14.208 -"\\Z2Install a dual-boot with Windows ?" 14.209 +"asked whether you want to boot into Windows or SliTaz GNU/Linux." 14.210 +msgstr "" 14.211 + 14.212 +#: slitaz-installer:114 14.213 +msgid "Install a dual-boot with Windows?" 14.214 msgstr "" 14.215 14.216 #: slitaz-installer:116 14.217 @@ -199,34 +228,50 @@ 14.218 "installation steps." 14.219 msgstr "" 14.220 14.221 +#: slitaz-installer:118 14.222 +msgid "Go and install SliTaz?" 14.223 +msgstr "" 14.224 + 14.225 #: slitaz-installer:120 14.226 msgid "Sorry, no device, nor file found or available." 14.227 msgstr "" 14.228 14.229 #: slitaz-installer:131 slitaz-installer:140 14.230 -msgid "Error 2: " 14.231 +msgid "Error 2:" 14.232 msgstr "" 14.233 14.234 #: slitaz-installer:132 14.235 +msgid "The lightweight SliTaz HDD installer '%s' is missing." 14.236 +msgstr "" 14.237 + 14.238 +#: slitaz-installer:133 14.239 +msgid "Check permissions, or reinstall the %s package." 14.240 +msgstr "" 14.241 + 14.242 +#: slitaz-installer:141 14.243 msgid "" 14.244 -"The lightweight SliTaz HDD installer 'tazinst' is missing.\n" 14.245 -"Check permissions, or reinstall the slitaz-tools package." 14.246 +"The lightweight SliTaz HDD installer tazinst (%s) is not at the required " 14.247 +"version (%s)." 14.248 +msgstr "" 14.249 + 14.250 +#: slitaz-installer:143 14.251 +msgid "Use %s in an xterm or reinstall the %s package." 14.252 msgstr "" 14.253 14.254 #: slitaz-installer:268 14.255 -msgid "Mode" 14.256 +msgid "Mode: %s" 14.257 msgstr "" 14.258 14.259 #: slitaz-installer:271 14.260 -msgid "From media" 14.261 +msgid "From media: %s" 14.262 msgstr "" 14.263 14.264 #: slitaz-installer:276 14.265 -msgid "To the disk" 14.266 +msgid "To the disk: %s" 14.267 msgstr "" 14.268 14.269 #: slitaz-installer:280 slitaz-installer:290 14.270 -msgid "(Formatting as" 14.271 +msgid "(Formatting as %s)" 14.272 msgstr "" 14.273 14.274 #: slitaz-installer:281 14.275 @@ -234,7 +279,7 @@ 14.276 msgstr "" 14.277 14.278 #: slitaz-installer:285 14.279 -msgid "Separate /home is" 14.280 +msgid "Separate /home is: %s" 14.281 msgstr "" 14.282 14.283 #: slitaz-installer:286 14.284 @@ -245,8 +290,12 @@ 14.285 msgid "(No /home formatting)" 14.286 msgstr "" 14.287 14.288 +#: slitaz-installer:293 14.289 +msgid "Hostname: %s" 14.290 +msgstr "" 14.291 + 14.292 #: slitaz-installer:295 14.293 -msgid "User login" 14.294 +msgid "User login: %s" 14.295 msgstr "" 14.296 14.297 #: slitaz-installer:299 14.298 @@ -265,6 +314,11 @@ 14.299 msgid ", no dual-boot" 14.300 msgstr "" 14.301 14.302 +#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350 14.303 +#: slitaz-installer:378 slitaz-installer:391 14.304 +msgid "Select %s" 14.305 +msgstr "" 14.306 + 14.307 #: slitaz-installer:325 slitaz-installer:379 14.308 msgid "Next" 14.309 msgstr "" 14.310 @@ -281,6 +335,38 @@ 14.311 msgid "No" 14.312 msgstr "" 14.313 14.314 +#: slitaz-installer:409 14.315 +msgid "Summary" 14.316 +msgstr "" 14.317 + 14.318 #: slitaz-installer:419 14.319 msgid "SliTaz install cancelled." 14.320 msgstr "" 14.321 + 14.322 +#: slitaz-installer:567 14.323 +msgid "SliTaz Installer" 14.324 +msgstr "" 14.325 + 14.326 +#: slitaz-installer:567 14.327 +msgid "Installing..." 14.328 +msgstr "" 14.329 + 14.330 +#: slitaz-installer:573 14.331 +msgid "Installation complete" 14.332 +msgstr "" 14.333 + 14.334 +#: slitaz-installer:575 14.335 +msgid "Exit" 14.336 +msgstr "" 14.337 + 14.338 +#: slitaz-installer:576 14.339 +msgid "Reboot" 14.340 +msgstr "" 14.341 + 14.342 +#: slitaz-installer:585 slitaz-installer:597 14.343 +msgid "ESC pressed." 14.344 +msgstr "" 14.345 + 14.346 +#: slitaz-installer:588 14.347 +msgid "Process not completed" 14.348 +msgstr ""
15.1 --- a/po/slitaz-installer/zh_CN.po Wed Apr 06 09:52:43 2016 +0300 15.2 +++ b/po/slitaz-installer/zh_CN.po Sat Apr 09 17:22:22 2016 +0300 15.3 @@ -19,8 +19,8 @@ 15.4 "Language: zh_CN\n" 15.5 15.6 #: slitaz-installer:23 15.7 -msgid "Welcome to the slitaz-installer" 15.8 -msgstr "欢迎使用 slitaz-installer" 15.9 +msgid "Welcome to the slitaz-installer." 15.10 +msgstr "欢迎使用 slitaz-installer。" 15.11 15.12 #: slitaz-installer:24 15.13 msgid "Which type of installation do you want to start?" 15.14 @@ -35,37 +35,37 @@ 15.15 msgstr "请从下面的列表中选择一个媒介：" 15.16 15.17 #: slitaz-installer:29 15.18 -msgid "You have selected the option to install SliTaz from an USB Key" 15.19 -msgstr "你选择了一个选项来从 USB设备中安装系统" 15.20 +msgid "You have selected the option to install SliTaz from an USB Key." 15.21 +msgstr "你选择了一个选项来从 USB设备中安装系统。" 15.22 15.23 -#: slitaz-installer:31 15.24 +#: slitaz-installer:30 15.25 msgid "Enter the partition where SliTaz Live is located:" 15.26 msgstr "请输入 SliTaz Live 系统所在位置：" 15.27 15.28 -#: slitaz-installer:33 15.29 +#: slitaz-installer:32 15.30 msgid "" 15.31 "You have selected the option to install SliTaz from an ISO file located on a " 15.32 "local disk." 15.33 msgstr "你选择了一个选项从本地硬盘的 ISO 文件来安装系统" 15.34 15.35 -#: slitaz-installer:35 15.36 +#: slitaz-installer:34 15.37 msgid "Please, select a file below:" 15.38 msgstr "请从下面选择一个文件：" 15.39 15.40 +#: slitaz-installer:36 15.41 +msgid "You have selected the option to install SliTaz from the web." 15.42 +msgstr "你已经选择了从网络安装系统。" 15.43 + 15.44 #: slitaz-installer:37 15.45 -msgid "You have selected the option to install SliTaz from the web" 15.46 -msgstr "你已经选择了从网络安装系统" 15.47 - 15.48 -#: slitaz-installer:38 15.49 msgid "Please, select a version:" 15.50 msgstr "请选择一个版本：" 15.51 15.52 -#: slitaz-installer:40 15.53 -msgid "Select the source" 15.54 -msgstr "请选择源" 15.55 +#: slitaz-installer:39 15.56 +msgid "Select the source:" 15.57 +msgstr "请选择源：" 15.58 15.59 -#: slitaz-installer:42 15.60 -msgid "\\nDrive selection" 15.61 +#: slitaz-installer:41 15.62 +msgid "Drive selection" 15.63 msgstr "盘区选择" 15.64 15.65 #: slitaz-installer:42 15.66 @@ -78,12 +78,15 @@ 15.67 "configuration files and the list of installed packages. Then, it will clean " 15.68 "the partition and install the new version of SliTaz, restore the " 15.69 "configuration files and reinstall any packages which are not present on the " 15.70 -"cdrom.\n" 15.71 -"You will need an active internet connection before upgrading." 15.72 +"CD-ROM." 15.73 msgstr "" 15.74 "安装工具会升级已经存在的 SliTaz 系统，保存所有的配置文件和已经安装的软件包列" 15.75 "表。然后它会清空分区并安装新版本的 SliTaz 系统，重新载入配置文件，重新安装光" 15.76 -"盘镜像中不存在的软件包。升级前，你需要有效地网络连接。" 15.77 +"盘镜像中不存在的软件包。" 15.78 + 15.79 +#: slitaz-installer:49 15.80 +msgid "You will need an active internet connection before upgrading." 15.81 +msgstr "升级前，你需要有效地网络连接。" 15.82 15.83 #: slitaz-installer:50 15.84 msgid "Partition containing the system to upgrade:" 15.85 @@ -93,12 +96,14 @@ 15.86 msgid "" 15.87 "Only the filesystems actually installed on your system are listed. If you " 15.88 "intend to use another filesystem, you have to install it before. Unless you " 15.89 -"know what you are doing, it's safe to use ext2, ext3 or ext4.\\n\\n\\Z2To " 15.90 -"format this partition, please select a filesystem below:" 15.91 +"know what you are doing, it's safe to use ext2, ext3 or ext4." 15.92 msgstr "" 15.93 "只有你系统中已经安装的文件系统格式被列出。如果你想使用其它的文件系统，你需要" 15.94 -"提前安装。除非你知道你在做什么，安全起见，请使用 ext2, ext3 或 ext4。请选择" 15.95 -"下列的文件格式来格式化分区：" 15.96 +"提前安装。除非你知道你在做什么，安全起见，请使用 ext2, ext3 或 ext4。" 15.97 + 15.98 +#: slitaz-installer:56 15.99 +msgid "To format this partition, please select a filesystem below:" 15.100 +msgstr "请选择下列的文件格式来格式化分区：" 15.101 15.102 #: slitaz-installer:58 15.103 msgid "Separate /home partition" 15.104 @@ -112,10 +117,14 @@ 15.105 msgid "" 15.106 "Hostname configuration allows you to specify the machine name. The hostname " 15.107 "is used internally to identify the host on the network. This value can be " 15.108 -"changed after the system is installed.\\n\\n\\Z2Enter a hostname:\\Zn\\n" 15.109 +"changed after the system is installed." 15.110 msgstr "" 15.111 "主机名是用来指定机器的名字。主机名是用来在网络上辨识主机的。它可以在系统安装" 15.112 -"完后修改。请输入一个主机名：" 15.113 +"完后修改。" 15.114 + 15.115 +#: slitaz-installer:64 15.116 +msgid "Enter a hostname:" 15.117 +msgstr "请输入一个主机名：" 15.118 15.119 #: slitaz-installer:66 15.120 msgid "" 15.121 @@ -126,11 +135,11 @@ 15.122 "根管理员允许你管理和配置整个系统。根用户可以破坏你的系统，因此你应该设置一个" 15.123 "使用特殊字符或数字的强密码。" 15.124 15.125 -#: slitaz-installer:70 15.126 +#: slitaz-installer:69 15.127 msgid "Enter the password for root:" 15.128 msgstr "请输入跟用户密码：" 15.129 15.130 -#: slitaz-installer:72 15.131 +#: slitaz-installer:71 15.132 msgid "" 15.133 "The default user for the system will have their personal files stored in /" 15.134 "home/*user* (and will be automatically added to the audio group)" 15.135 @@ -143,8 +152,8 @@ 15.136 msgstr "请输入第一个用户名：" 15.137 15.138 #: slitaz-installer:76 15.139 -msgid "The password for default user" 15.140 -msgstr "默认用户密码" 15.141 +msgid "The password for default user." 15.142 +msgstr "默认用户密码。" 15.143 15.144 #: slitaz-installer:77 15.145 msgid "" 15.146 @@ -159,49 +168,65 @@ 15.147 #: slitaz-installer:81 15.148 msgid "" 15.149 "Installation is now finished, you can exit the installer or reboot on your " 15.150 -"new SliTaz GNU/Linux operating system" 15.151 +"new SliTaz GNU/Linux operating system." 15.152 msgstr "安装已经完成了，你可以退出你的安装软件或重启你新的 SliTaz系统了。" 15.153 15.154 #: slitaz-installer:87 15.155 msgid "" 15.156 "The next step lets you format the target partition. Choose between robust, " 15.157 "stable and/or journaled filesystem. If the partition is already formated you " 15.158 -"can skip this stage, if not just accept.\\n\n" 15.159 -"Warning! formating a partition will destroy all current data.\\n\n" 15.160 -"\\Z2Do you wish to format the partition ?\\Zn" 15.161 +"can skip this stage, if not just accept." 15.162 msgstr "" 15.163 "下一步是格式化你的目的分区。请选择兼顾坚强、稳定或有日志功能的文件系统。如果" 15.164 -"你已经分区了，请跳过本步骤。注意：格式化分区会丢失现有数据。" 15.165 +"你已经分区了，请跳过本步骤。" 15.166 + 15.167 +#: slitaz-installer:90 slitaz-installer:101 15.168 +msgid "Warning! formating a partition will destroy all current data." 15.169 +msgstr "注意：格式化分区会丢失现有数据。" 15.170 + 15.171 +#: slitaz-installer:91 15.172 +msgid "Do you wish to format the partition?" 15.173 +msgstr "" 15.174 15.175 #: slitaz-installer:93 15.176 msgid "" 15.177 "On most GNU/Linux systems users personal files are stored in the directory /" 15.178 -"home. Home can be on a separate partition or another hard disk.\\n\n" 15.179 -"\\Z2DO you want to use a separate Home partition ?\\Zn" 15.180 +"home. Home can be on a separate partition or another hard disk." 15.181 msgstr "" 15.182 "大多数 GNU/Linux 系统用户个人文件存储在 /home 目录下。 Home 目录可以放在单独" 15.183 -"的分区uo其它硬盘上。你想要使用单独的 Home 分区吗？" 15.184 +"的分区uo其它硬盘上。" 15.185 + 15.186 +#: slitaz-installer:96 15.187 +msgid "Do you want to use a separate Home partition?" 15.188 +msgstr "你想要使用单独的 Home 分区吗？" 15.189 15.190 #: slitaz-installer:98 15.191 msgid "" 15.192 "/home will be installed on a separate partition. The next step lets you " 15.193 "format the /home partition. If the partition is already formated you can " 15.194 -"skip this stage, if not just accept. Warning formating a partition will " 15.195 -"destroy all current data.\\n\n" 15.196 -"\\Z2Do you wish to format the /home partition ?\\Zn" 15.197 +"skip this stage, if not just accept." 15.198 msgstr "" 15.199 "/home 即将被安装在单独的分区。下一步需要你格式化 /home 分区。 如果你已经格式" 15.200 -"化，请跳过此步。注意：格式化分区会消除所有现存数据。你想格式化 /home 分区吗？" 15.201 +"化，请跳过此步。" 15.202 + 15.203 +#: slitaz-installer:102 15.204 +msgid "Do you wish to format the /home partition?" 15.205 +msgstr "你想格式化 /home 分区吗？" 15.206 15.207 #: slitaz-installer:104 15.208 msgid "" 15.209 "You have now the option to install a bootloader which is capable of booting " 15.210 -"almost any kind of operating system.\\n\\nIf you want to use an existing " 15.211 -"bootloader installation, skip this step and configure your bootloader to " 15.212 -"boot SliTaz (refer to your bootloader's documentation on how to do this)" 15.213 +"almost any kind of operating system." 15.214 +msgstr "你需要选择安装一个兼容大多数系统的引导。" 15.215 + 15.216 +#: slitaz-installer:106 15.217 +msgid "" 15.218 +"If you want to use an existing bootloader installation, skip this step and " 15.219 +"configure your bootloader to boot SliTaz (refer to your bootloader's " 15.220 +"documentation on how to do this)." 15.221 msgstr "" 15.222 -"你需要选择安装一个兼容大多数系统的引导。如果你想使用已经存在的引导，请跳过此" 15.223 -"步并配置引导来启动 SliTaz （请参考你的引导软件文档来操作）。" 15.224 +"如果你想使用已经存在的引导，请跳过此步并配置引导来启动 SliTaz （请参考你的引" 15.225 +"导软件文档来操作）。" 15.226 15.227 #: slitaz-installer:109 15.228 msgid "Install a bootloader?" 15.229 @@ -210,11 +235,14 @@ 15.230 #: slitaz-installer:111 15.231 msgid "" 15.232 "Do you want to implement a dual-boot with Windows? At start-up, you will be " 15.233 -"asked whether you want to boot into Windows or SliTaz GNU/Linux.\\n\n" 15.234 -"\\Z2Install a dual-boot with Windows ?" 15.235 +"asked whether you want to boot into Windows or SliTaz GNU/Linux." 15.236 msgstr "" 15.237 "你想实现和 Windows 系统双系统引导吗？开机时，你会被询问引导到 Windows 还是" 15.238 -"SliTaz 系统。安装与 Windows 的双引导？" 15.239 +"SliTaz 系统。" 15.240 + 15.241 +#: slitaz-installer:114 15.242 +msgid "Install a dual-boot with Windows?" 15.243 +msgstr "安装与 Windows 的双引导？" 15.244 15.245 #: slitaz-installer:116 15.246 msgid "" 15.247 @@ -222,43 +250,60 @@ 15.248 "installation steps." 15.249 msgstr "安装设置汇总，也是最后取消或重启安装过程的机会。" 15.250 15.251 +#: slitaz-installer:118 15.252 +msgid "Go and install SliTaz?" 15.253 +msgstr "" 15.254 + 15.255 #: slitaz-installer:120 15.256 msgid "Sorry, no device, nor file found or available." 15.257 msgstr "对不起，没有发现设备或文件。" 15.258 15.259 #: slitaz-installer:131 slitaz-installer:140 15.260 -msgid "Error 2: " 15.261 +msgid "Error 2:" 15.262 msgstr "错误2：" 15.263 15.264 #: slitaz-installer:132 15.265 msgid "" 15.266 -"The lightweight SliTaz HDD installer 'tazinst' is missing.\n" 15.267 -"Check permissions, or reinstall the slitaz-tools package." 15.268 -msgstr "轻量级 SliTaz 硬盘安装工具 tazinst 丢失。请检查权限或重新安装工具包。" 15.269 +"The lightweight SliTaz HDD installer '%s' is missing." 15.270 +msgstr "轻量级 SliTaz 硬盘安装工具 %s 丢失。" 15.271 + 15.272 +#: slitaz-installer:133 15.273 +msgid "Check permissions, or reinstall the %s package." 15.274 +msgstr "请检查权限或重新安装工具包 %s 。" 15.275 + 15.276 +#: slitaz-installer:141 15.277 +msgid "" 15.278 +"The lightweight SliTaz HDD installer tazinst (%s) is not at the required " 15.279 +"version (%s)." 15.280 +msgstr "" 15.281 + 15.282 +#: slitaz-installer:143 15.283 +msgid "Use %s in an xterm or reinstall the %s package." 15.284 +msgstr "" 15.285 15.286 #: slitaz-installer:268 15.287 -msgid "Mode" 15.288 -msgstr "模式" 15.289 +msgid "Mode: %s" 15.290 +msgstr "模式：%s" 15.291 15.292 #: slitaz-installer:271 15.293 -msgid "From media" 15.294 -msgstr "从媒介" 15.295 +msgid "From media: %s" 15.296 +msgstr "从媒介：%s" 15.297 15.298 #: slitaz-installer:276 15.299 -msgid "To the disk" 15.300 -msgstr "到硬盘上" 15.301 +msgid "To the disk: %s" 15.302 +msgstr "到硬盘上：%s" 15.303 15.304 #: slitaz-installer:280 slitaz-installer:290 15.305 -msgid "(Formatting as" 15.306 -msgstr "格式化为" 15.307 +msgid "(Formatting as %s)" 15.308 +msgstr "（格式化为%s）" 15.309 15.310 #: slitaz-installer:281 15.311 msgid "(No formatting)" 15.312 msgstr "（不格式化）" 15.313 15.314 #: slitaz-installer:285 15.315 -msgid "Separate /home is" 15.316 -msgstr "单独 /home 为" 15.317 +msgid "Separate /home is: %s" 15.318 +msgstr "单独 /home 为：%s" 15.319 15.320 #: slitaz-installer:286 15.321 msgid "No separate /home partition" 15.322 @@ -268,9 +313,13 @@ 15.323 msgid "(No /home formatting)" 15.324 msgstr "（不格式化 /home）" 15.325 15.326 +#: slitaz-installer:293 15.327 +msgid "Hostname: %s" 15.328 +msgstr "" 15.329 + 15.330 #: slitaz-installer:295 15.331 -msgid "User login" 15.332 -msgstr "用户登录" 15.333 +msgid "User login: %s" 15.334 +msgstr "用户登录：%s" 15.335 15.336 #: slitaz-installer:299 15.337 msgid "Bootloader: installed" 15.338 @@ -288,6 +337,11 @@ 15.339 msgid ", no dual-boot" 15.340 msgstr "无双引导" 15.341 15.342 +#: slitaz-installer:322 slitaz-installer:336 slitaz-installer:350 15.343 +#: slitaz-installer:378 slitaz-installer:391 15.344 +msgid "Select %s" 15.345 +msgstr "" 15.346 + 15.347 #: slitaz-installer:325 slitaz-installer:379 15.348 msgid "Ok" 15.349 msgstr "确认" 15.350 @@ -303,3 +357,35 @@ 15.351 #: slitaz-installer:354 slitaz-installer:412 15.352 msgid "No" 15.353 msgstr "否" 15.354 + 15.355 +#: slitaz-installer:409 15.356 +msgid "Summary" 15.357 +msgstr "" 15.358 + 15.359 +#: slitaz-installer:567 15.360 +msgid "SliTaz Installer" 15.361 +msgstr "" 15.362 + 15.363 +#: slitaz-installer:567 15.364 +msgid "Installing..." 15.365 +msgstr "" 15.366 + 15.367 +#: slitaz-installer:573 15.368 +msgid "Installation complete" 15.369 +msgstr "" 15.370 + 15.371 +#: slitaz-installer:575 15.372 +msgid "Exit" 15.373 +msgstr "" 15.374 + 15.375 +#: slitaz-installer:576 15.376 +msgid "Reboot" 15.377 +msgstr "" 15.378 + 15.379 +#: slitaz-installer:585 slitaz-installer:597 15.380 +msgid "ESC pressed." 15.381 +msgstr "" 15.382 + 15.383 +#: slitaz-installer:588 15.384 +msgid "Process not completed" 15.385 +msgstr ""
16.1 --- a/po/tazinst/es.po Wed Apr 06 09:52:43 2016 +0300 16.2 +++ b/po/tazinst/es.po Sat Apr 09 17:22:22 2016 +0300 16.3 @@ -7,7 +7,7 @@ 16.4 msgstr "" 16.5 "Project-Id-Version: Tazinst\n" 16.6 "Report-Msgid-Bugs-To: \n" 16.7 -"POT-Creation-Date: 2016-04-04 11:45+0200\n" 16.8 +"POT-Creation-Date: 2016-04-09 16:49+0300\n" 16.9 "PO-Revision-Date: 2011-08-11 20:52-0300\n" 16.10 "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n" 16.11 "Language-Team: LANGUAGE <LL@li.org>\n" 16.12 @@ -77,7 +77,7 @@ 16.13 msgstr "" 16.14 16.15 #: tazinst:83 16.16 -msgid "Grub legacy bootloader" 16.17 +msgid "GRUB legacy bootloader" 16.18 msgstr "" 16.19 16.20 #: tazinst:84 16.21 @@ -101,7 +101,7 @@ 16.22 msgstr "" 16.23 16.24 #: tazinst:99 16.25 -msgid "Stable basic graphic version with only Gtk" 16.26 +msgid "Stable basic graphic version with only GTK" 16.27 msgstr "" 16.28 16.29 #: tazinst:101 16.30 @@ -113,119 +113,113 @@ 16.31 msgstr "" 16.32 16.33 #: tazinst:114 tazinst:138 tazinst:150 16.34 -msgid "SliTaz GNU/Linux Installer - Version:" 16.35 +msgid "SliTaz GNU/Linux Installer - Version: %s" 16.36 msgstr "" 16.37 16.38 +#: tazinst:115 16.39 +msgid "Usage:" 16.40 +msgstr "Uso:" 16.41 + 16.42 #: tazinst:116 16.43 -msgid "Usage" 16.44 -msgstr "Uso" 16.45 +#, fuzzy 16.46 +msgid "%s [command] <setting> <value> <file>" 16.47 +msgstr "%s [commando] [config-file|url|optiones]" 16.48 16.49 #: tazinst:117 16.50 -#, fuzzy 16.51 -msgid "tazinst [command] <setting> <value> <file>" 16.52 -msgstr "tazinst [commando] [config-file|url|optiones]" 16.53 +msgid "Commands:" 16.54 +msgstr "Comandos:" 16.55 16.56 #: tazinst:119 16.57 -msgid "Commands" 16.58 -msgstr "Comandos" 16.59 - 16.60 -#: tazinst:120 16.61 msgid "Create a new install file." 16.62 msgstr "" 16.63 16.64 -#: tazinst:121 16.65 +#: tazinst:120 16.66 msgid "Change value of a setting." 16.67 msgstr "" 16.68 16.69 -#: tazinst:122 16.70 +#: tazinst:121 16.71 msgid "Clear a setting." 16.72 msgstr "" 16.73 16.74 -#: tazinst:123 16.75 +#: tazinst:122 16.76 msgid "Get the value of a setting." 16.77 msgstr "" 16.78 16.79 -#: tazinst:124 16.80 +#: tazinst:123 16.81 msgid "Check settings." 16.82 msgstr "" 16.83 16.84 -#: tazinst:125 16.85 +#: tazinst:124 16.86 msgid "Print a short help on settings" 16.87 msgstr "" 16.88 16.89 -#: tazinst:126 16.90 +#: tazinst:125 16.91 msgid "List system resources." 16.92 msgstr "" 16.93 16.94 +#: tazinst:126 16.95 +msgid "Execute a SliTaz installation." 16.96 +msgstr "" 16.97 + 16.98 #: tazinst:127 16.99 -#, fuzzy 16.100 -msgid "Execute a SliTaz installation." 16.101 -msgstr "Tazinst - Instalador SliTaz - Versión" 16.102 - 16.103 -#: tazinst:128 16.104 msgid "Display log file contents." 16.105 msgstr "" 16.106 16.107 -#: tazinst:129 16.108 +#: tazinst:128 16.109 msgid "Clean install and log files." 16.110 msgstr "" 16.111 16.112 -#: tazinst:130 16.113 +#: tazinst:129 16.114 msgid "Print version and exit." 16.115 msgstr "" 16.116 16.117 -#: tazinst:131 16.118 +#: tazinst:130 16.119 msgid "Print this short usage." 16.120 msgstr "Imprime este corto uso." 16.121 16.122 -#: tazinst:141 16.123 -msgid "Unknown command!" 16.124 +#: tazinst:140 16.125 +msgid "'%s': Unknown command!" 16.126 msgstr "" 16.127 16.128 #: tazinst:142 16.129 -msgid "Run" 16.130 +msgid "Run: '%s' to get a list of available commands." 16.131 msgstr "" 16.132 16.133 -#: tazinst:143 16.134 -msgid "to get a list of available commands" 16.135 -msgstr "" 16.136 - 16.137 -#: tazinst:153 16.138 -msgid "Unknown option!" 16.139 +#: tazinst:152 16.140 +msgid "'%s': Unknown option!" 16.141 msgstr "" 16.142 16.143 #: tazinst:154 16.144 -msgid "Please select one of these options" 16.145 +msgid "Please select one of these options:" 16.146 msgstr "" 16.147 16.148 #: tazinst:173 16.149 -#, fuzzy 16.150 msgid "Warning: file already exists." 16.151 -msgstr "Partición en uso" 16.152 +msgstr "" 16.153 16.154 #: tazinst:180 16.155 -#, fuzzy 16.156 msgid "Error: Cannot create file." 16.157 -msgstr "Incapaz de leer el archivo de configuración" 16.158 +msgstr "" 16.159 16.160 #: tazinst:278 tazinst:283 16.161 -#, fuzzy 16.162 -msgid "Error: Unable to read install file" 16.163 -msgstr "Incapaz de leer el archivo de configuración" 16.164 +msgid "Error: Unable to read install file." 16.165 +msgstr "" 16.166 16.167 -#: tazinst:389 16.168 -#, fuzzy 16.169 +#: tazinst:355 16.170 +msgid "Error: '%s' unknown setting." 16.171 +msgstr "" 16.172 + 16.173 +#: tazinst:383 16.174 msgid "Error: Unable to write to install file." 16.175 -msgstr "Incapaz de leer el archivo de configuración" 16.176 +msgstr "" 16.177 16.178 #: tazinst:443 16.179 -msgid "Deleting install file" 16.180 +msgid "Deleting install file: %s" 16.181 msgstr "" 16.182 16.183 #: tazinst:445 16.184 -#, fuzzy 16.185 -msgid "Error: Unable to delete install file" 16.186 -msgstr "Incapaz de leer el archivo de configuración" 16.187 +msgid "Error: Unable to delete install file." 16.188 +msgstr "" 16.189 16.190 #: tazinst:460 16.191 msgid "" 16.192 @@ -241,17 +235,11 @@ 16.193 msgstr "" 16.194 16.195 #: tazinst:485 16.196 -#, fuzzy 16.197 -msgid "Error:" 16.198 -msgstr "Error" 16.199 - 16.200 -#: tazinst:485 16.201 -#, fuzzy 16.202 -msgid "Invalid keyword." 16.203 -msgstr "Fuente inválida" 16.204 +msgid "Error: '%s' Invalid keyword." 16.205 +msgstr "" 16.206 16.207 #: tazinst:486 16.208 -msgid "Select one of these options:" 16.209 +msgid "Select one of these options: %s." 16.210 msgstr "" 16.211 16.212 #: tazinst:487 16.213 @@ -260,32 +248,30 @@ 16.214 16.215 #: tazinst:502 16.216 #, fuzzy 16.217 -msgid "Error: Partition not found" 16.218 +msgid "Error: Partition not found." 16.219 msgstr "Partición no encontrada" 16.220 16.221 #: tazinst:503 16.222 -msgid "To see available partitions, run" 16.223 +msgid "To see available partitions, run '%s'." 16.224 msgstr "" 16.225 16.226 #: tazinst:518 16.227 -#, fuzzy 16.228 -msgid "Error: Source file not found" 16.229 -msgstr "Archivo no encontrado" 16.230 +msgid "Error: Source file not found." 16.231 +msgstr "" 16.232 16.233 #: tazinst:533 16.234 -msgid "Error: invalid URL" 16.235 +msgid "Error: invalid URL." 16.236 msgstr "" 16.237 16.238 -#: tazinst:549 16.239 +#: tazinst:548 16.240 msgid "Error: multiple assignations for a disk." 16.241 msgstr "" 16.242 16.243 #: tazinst:562 16.244 -#, fuzzy 16.245 -msgid "Error: password too long" 16.246 -msgstr "Partición no encontrada" 16.247 +msgid "Error: password too long." 16.248 +msgstr "" 16.249 16.250 -#: tazinst:568 16.251 +#: tazinst:567 16.252 msgid "Error: Unallowed characters in password." 16.253 msgstr "" 16.254 16.255 @@ -297,12 +283,16 @@ 16.256 msgid "Warning: no password!" 16.257 msgstr "" 16.258 16.259 +#: tazinst:590 16.260 +msgid "%s Error: Too short." 16.261 +msgstr "" 16.262 + 16.263 #: tazinst:594 16.264 -msgid "Error: Too long." 16.265 +msgid "%s Error: Too long." 16.266 msgstr "" 16.267 16.268 #: tazinst:599 16.269 -msgid "Error: Invalid chars." 16.270 +msgid "%s Error: Invalid chars." 16.271 msgstr "" 16.272 16.273 #: tazinst:611 16.274 @@ -310,7 +300,7 @@ 16.275 msgstr "" 16.276 16.277 #: tazinst:625 16.278 -msgid "Error: Unsupported Partition Table" 16.279 +msgid "Error: Unsupported Partition Table." 16.280 msgstr "" 16.281 16.282 #: tazinst:630 16.283 @@ -326,82 +316,82 @@ 16.284 msgstr "" 16.285 16.286 #: tazinst:753 16.287 -msgid "Type: tazinst help web" 16.288 +msgid "Type: %s" 16.289 msgstr "" 16.290 16.291 #: tazinst:758 16.292 +msgid "List of settings:" 16.293 +msgstr "" 16.294 + 16.295 +#: tazinst:760 16.296 #, fuzzy 16.297 msgid "Mode of install" 16.298 msgstr "No está instalado." 16.299 16.300 -#: tazinst:759 16.301 +#: tazinst:761 16.302 msgid "Media containing the SliTaz source files" 16.303 msgstr "" 16.304 16.305 -#: tazinst:760 16.306 +#: tazinst:762 16.307 #, fuzzy 16.308 msgid "Source file containing SliTaz" 16.309 msgstr "Archivo no encontrado" 16.310 16.311 -#: tazinst:761 16.312 +#: tazinst:763 16.313 #, fuzzy 16.314 msgid "The name of the target partition" 16.315 msgstr "Desmontando objetivo" 16.316 16.317 -#: tazinst:762 16.318 +#: tazinst:764 16.319 #, fuzzy 16.320 msgid "Format of the target partition" 16.321 msgstr "Formato partición /home" 16.322 16.323 -#: tazinst:763 16.324 +#: tazinst:765 16.325 #, fuzzy 16.326 msgid "Separate home partition" 16.327 msgstr "Formato partición /home" 16.328 16.329 -#: tazinst:764 16.330 +#: tazinst:766 16.331 #, fuzzy 16.332 msgid "Format of the root partition" 16.333 msgstr "Formato partición /home" 16.334 16.335 -#: tazinst:765 tazinst:811 16.336 +#: tazinst:767 tazinst:811 16.337 msgid "Name of the system" 16.338 msgstr "" 16.339 16.340 -#: tazinst:766 tazinst:813 16.341 +#: tazinst:768 tazinst:813 16.342 msgid "Superuser password" 16.343 msgstr "" 16.344 16.345 -#: tazinst:767 tazinst:815 16.346 +#: tazinst:769 tazinst:815 16.347 msgid "First user name" 16.348 msgstr "" 16.349 16.350 -#: tazinst:768 tazinst:817 16.351 +#: tazinst:770 tazinst:817 16.352 msgid "First user password" 16.353 msgstr "" 16.354 16.355 -#: tazinst:769 16.356 +#: tazinst:771 16.357 msgid "Install a bootloader" 16.358 msgstr "" 16.359 16.360 -#: tazinst:770 16.361 +#: tazinst:772 16.362 #, fuzzy 16.363 msgid "Partition to dualboot Windows from" 16.364 msgstr "Partición no encontrada" 16.365 16.366 -#: tazinst:771 16.367 -msgid "List of settings:" 16.368 -msgstr "" 16.369 - 16.370 #: tazinst:790 16.371 msgid "CD. Automatically set" 16.372 msgstr "" 16.373 16.374 #: tazinst:793 16.375 -msgid "USB partition. For a list, type: tazinst list usb" 16.376 +msgid "USB partition. For a list, type: %s" 16.377 msgstr "" 16.378 16.379 #: tazinst:796 16.380 -msgid "ISO file name. For a list, type: tazinst list iso" 16.381 +msgid "ISO file name. For a list, type: %s" 16.382 msgstr "" 16.383 16.384 #: tazinst:822 16.385 @@ -409,29 +399,31 @@ 16.386 msgstr "" 16.387 16.388 #: tazinst:1127 16.389 -msgid "No mirror list found, run tazpkg recharge." 16.390 +msgid "No mirror list found, run %s." 16.391 msgstr "" 16.392 16.393 #: tazinst:1139 16.394 -msgid "Downloading:" 16.395 +msgid "Downloading: %s" 16.396 msgstr "" 16.397 16.398 #: tazinst:1146 16.399 -#, fuzzy 16.400 msgid "Download completed." 16.401 -msgstr "Falló al descargar." 16.402 - 16.403 -#: tazinst:1148 16.404 -#, fuzzy 16.405 -msgid "Download failed." 16.406 -msgstr "Falló al descargar." 16.407 +msgstr "" 16.408 16.409 #: tazinst:1157 16.410 -msgid "Installing package to the current system:" 16.411 +msgid "Installing package %s to the current system." 16.412 +msgstr "" 16.413 + 16.414 +#: tazinst:1159 16.415 +msgid "Cannot install %s." 16.416 msgstr "" 16.417 16.418 #: tazinst:1167 16.419 -msgid "Adding package to the target system:" 16.420 +msgid "Adding package %s to the target system..." 16.421 +msgstr "" 16.422 + 16.423 +#: tazinst:1182 16.424 +msgid "=== Tazinst: started on %s ===" 16.425 msgstr "" 16.426 16.427 #: tazinst:1208 16.428 @@ -439,8 +431,12 @@ 16.429 msgstr "" 16.430 16.431 #: tazinst:1209 tazinst:1213 16.432 -msgid "Error" 16.433 -msgstr "Error" 16.434 +msgid "Error: %s" 16.435 +msgstr "Error: %s" 16.436 + 16.437 +#: tazinst:1216 16.438 +msgid "=== Tazinst error on %s ===" 16.439 +msgstr "" 16.440 16.441 #: tazinst:1225 16.442 #, fuzzy 16.443 @@ -452,21 +448,26 @@ 16.444 msgstr "Cancelado por usuario" 16.445 16.446 #: tazinst:1251 16.447 -msgid "Using files from" 16.448 +msgid "Using files from %s." 16.449 msgstr "" 16.450 16.451 #: tazinst:1253 16.452 -msgid "Mount failed" 16.453 +msgid "%s: Mount failed." 16.454 msgstr "" 16.455 16.456 -#: tazinst:1262 tazinst:1267 16.457 +#: tazinst:1262 16.458 #, fuzzy 16.459 -msgid "Using files from USB device" 16.460 +msgid "Using files from USB device..." 16.461 +msgstr "Falló el montaje del dispositivo USB..." 16.462 + 16.463 +#: tazinst:1267 16.464 +#, fuzzy 16.465 +msgid "Using files from USB device %s." 16.466 msgstr "Falló el montaje del dispositivo USB" 16.467 16.468 #: tazinst:1269 16.469 -msgid "Failed to mount USB device" 16.470 -msgstr "Falló el montaje del dispositivo USB" 16.471 +msgid "%s: Failed to mount USB device." 16.472 +msgstr "%s: Falló el montaje del dispositivo USB." 16.473 16.474 #: tazinst:1284 16.475 msgid "md5sum error, file corrupted." 16.476 @@ -474,19 +475,19 @@ 16.477 16.478 #: tazinst:1287 16.479 #, fuzzy 16.480 -msgid "md5 file not found, cannot check integrity." 16.481 -msgstr "archivo md5 no encontrado. Incapaz de comprobar integridad." 16.482 +msgid "%s: md5 file not found, cannot check integrity." 16.483 +msgstr "%s: archivo md5 no encontrado. Incapaz de comprobar integridad." 16.484 16.485 #: tazinst:1292 16.486 -msgid "Using files from ISO" 16.487 +msgid "Using files from ISO %s." 16.488 msgstr "" 16.489 16.490 #: tazinst:1294 16.491 -msgid "Failed to mount ISO." 16.492 -msgstr "Falló al montar ISO." 16.493 +msgid "%s: Failed to mount ISO." 16.494 +msgstr "%s: Falló al montar ISO." 16.495 16.496 #: tazinst:1316 tazinst:1404 16.497 -msgid "Creating mount point:" 16.498 +msgid "Creating mount point: %s..." 16.499 msgstr "" 16.500 16.501 #: tazinst:1332 16.502 @@ -502,9 +503,14 @@ 16.503 msgstr "" 16.504 16.505 #: tazinst:1349 16.506 -msgid "Format" 16.507 +msgid "Format %s (%s)" 16.508 msgstr "" 16.509 16.510 +#: tazinst:1354 tazinst:1366 16.511 +#, fuzzy 16.512 +msgid "Formatting has failed" 16.513 +msgstr "Formatear partición principal:" 16.514 + 16.515 #: tazinst:1373 16.516 #, fuzzy 16.517 msgid "Preparing target partition..." 16.518 @@ -521,48 +527,46 @@ 16.519 msgstr "Partición en uso" 16.520 16.521 #: tazinst:1389 16.522 -msgid "The partition will be cleaned..." 16.523 +msgid "%s: The partition will be cleaned..." 16.524 msgstr "" 16.525 16.526 #: tazinst:1398 16.527 -msgid "The partition will be kept..." 16.528 +msgid "%s: The partition will be kept..." 16.529 msgstr "" 16.530 16.531 #: tazinst:1413 16.532 -#, fuzzy 16.533 -msgid "Unable to mount partition" 16.534 -msgstr "Formato partición root" 16.535 +msgid "%s: Unable to mount partition" 16.536 +msgstr "" 16.537 16.538 #: tazinst:1427 16.539 -#, fuzzy 16.540 -msgid "Unmounting target partition:" 16.541 -msgstr "Desmontando objetivo" 16.542 +msgid "Unmounting target partition: %s" 16.543 +msgstr "" 16.544 16.545 #: tazinst:1433 16.546 -#, fuzzy 16.547 -msgid "Unmounting:" 16.548 -msgstr "Desmontando" 16.549 +msgid "Unmounting: %s" 16.550 +msgstr "" 16.551 16.552 #: tazinst:1437 16.553 -#, fuzzy 16.554 -msgid "Unlinking:" 16.555 -msgstr "Desmontando" 16.556 +msgid "Unlinking: %s" 16.557 +msgstr "" 16.558 16.559 #: tazinst:1443 16.560 -msgid "Ejecting cdrom..." 16.561 +msgid "Ejecting CD-ROM..." 16.562 msgstr "eyectando cdrom..." 16.563 16.564 #: tazinst:1452 16.565 #, fuzzy 16.566 -msgid "Process completed. You can now restart (reboot)" 16.567 -msgstr "Instalación completa. Puede reiniciar" 16.568 +msgid "" 16.569 +"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux " 16.570 +"system." 16.571 +msgstr "Instalación completa. Puede reiniciar de su sistema SliTaz GNU/Linux." 16.572 16.573 -#: tazinst:1453 16.574 -msgid "from your SliTaz GNU/Linux system." 16.575 -msgstr "de su sistema SliTaz GNU/Linux" 16.576 +#: tazinst:1454 16.577 +msgid "=== Tazinst ended on %s ===" 16.578 +msgstr "" 16.579 16.580 #: tazinst:1457 16.581 -msgid "Copying log to /var/log/tazinst.log" 16.582 +msgid "Copying log to %s" 16.583 msgstr "" 16.584 16.585 #: tazinst:1493 16.586 @@ -574,61 +578,75 @@ 16.587 msgstr "Activando inicio dual Windows" 16.588 16.589 #: tazinst:1610 16.590 +msgid "Installing GRUB on: %s" 16.591 +msgstr "" 16.592 + 16.593 +#: tazinst:1611 16.594 #, fuzzy 16.595 -msgid "Installing grub on:" 16.596 -msgstr "Instalando SliTaz en" 16.597 +msgid "GRUB not found" 16.598 +msgstr "Archivo no encontrado" 16.599 16.600 #: tazinst:1615 16.601 msgid "Setting the boot flag" 16.602 msgstr "" 16.603 16.604 #: tazinst:1620 tazinst:1748 16.605 -#, fuzzy 16.606 msgid "Copying splash image" 16.607 -msgstr "Copiando archivos log" 16.608 +msgstr "" 16.609 16.610 #: tazinst:1710 16.611 +msgid "Installing Syslinux" 16.612 +msgstr "" 16.613 + 16.614 +#: tazinst:1720 16.615 #, fuzzy 16.616 -msgid "Installing syslinux" 16.617 -msgstr "Instalando SliTaz en" 16.618 +msgid "Syslinux not found" 16.619 +msgstr "Archivo no encontrado" 16.620 16.621 #: tazinst:1724 16.622 msgid "Setting the boot flag on" 16.623 msgstr "" 16.624 16.625 +#: tazinst:1727 16.626 +#, fuzzy 16.627 +msgid "mbr.bin not found" 16.628 +msgstr "Archivo no encontrado" 16.629 + 16.630 #: tazinst:1728 16.631 -#, fuzzy 16.632 -msgid "Installing mbr" 16.633 -msgstr "Instalar Grub" 16.634 +msgid "Installing MBR" 16.635 +msgstr "" 16.636 16.637 #: tazinst:1732 16.638 msgid "Setting the legacy_boot flag on" 16.639 msgstr "" 16.640 16.641 #: tazinst:1741 16.642 +msgid "Installing GPTMBR" 16.643 +msgstr "" 16.644 + 16.645 +#: tazinst:1742 16.646 #, fuzzy 16.647 -msgid "Installing gptmbr" 16.648 -msgstr "Instalar Grub" 16.649 +msgid "gptmbr.bin not found" 16.650 +msgstr "Archivo no encontrado" 16.651 16.652 #: tazinst:1781 16.653 -#, fuzzy 16.654 -msgid "Cleaning the root partition" 16.655 -msgstr "Desmontando objetivo" 16.656 +msgid "Cleaning the root partition (%s)..." 16.657 +msgstr "" 16.658 16.659 #: tazinst:1790 tazinst:2063 16.660 -msgid "keeping /home found on:" 16.661 +msgid "keeping /home found on: %s" 16.662 msgstr "" 16.663 16.664 -#: tazinst:1795 16.665 -msgid "removing target:" 16.666 +#: tazinst:1795 tazinst:2077 16.667 +msgid "removing target: %s" 16.668 msgstr "" 16.669 16.670 #: tazinst:1813 16.671 -msgid "Kernel name not found, falling back to:" 16.672 +msgid "Kernel name not found, falling back to: %s" 16.673 msgstr "" 16.674 16.675 #: tazinst:1819 16.676 -msgid "install_kernel:" 16.677 +msgid "install_kernel: %s" 16.678 msgstr "" 16.679 16.680 #: tazinst:1905 16.681 @@ -637,61 +655,61 @@ 16.682 msgstr "Restaurando /etc, /home" 16.683 16.684 #: tazinst:1911 16.685 -msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..." 16.686 +msgid "Adding / partition and CHECK_FS to file %s..." 16.687 msgstr "" 16.688 16.689 #: tazinst:1914 16.690 -msgid "Configuring host name:" 16.691 -msgstr "Configurando el nombre de host:" 16.692 +msgid "Configuring host name: %s" 16.693 +msgstr "Configurando el nombre de host: %s" 16.694 16.695 #: tazinst:1977 16.696 #, fuzzy 16.697 -msgid "Configuring partition to be used as /home:" 16.698 -msgstr "Configurando partición para ser usada como /home..." 16.699 +msgid "Configuring partition to be used as /home: %s" 16.700 +msgstr "Configurando partición para ser usada como /home: %s" 16.701 16.702 #: tazinst:1996 16.703 #, fuzzy 16.704 -msgid "Installing SliTaz on:" 16.705 +msgid "Installing SliTaz on: %s" 16.706 msgstr "Instalando SliTaz en" 16.707 16.708 #: tazinst:1997 tazinst:2176 16.709 -msgid "Checking settings" 16.710 +msgid "Checking settings..." 16.711 msgstr "" 16.712 16.713 #: tazinst:2001 tazinst:2180 16.714 -msgid "Preparing source media" 16.715 +msgid "Preparing source media..." 16.716 msgstr "" 16.717 16.718 #: tazinst:2004 tazinst:2183 16.719 -msgid "Preparing target disk" 16.720 +msgid "Preparing target disk..." 16.721 msgstr "" 16.722 16.723 #: tazinst:2007 16.724 -msgid "Cleaning the root partition if necessary" 16.725 +msgid "Cleaning the root partition if necessary..." 16.726 msgstr "" 16.727 16.728 #: tazinst:2010 tazinst:2192 16.729 -msgid "Extracting the root system" 16.730 +msgid "Extracting the root system..." 16.731 msgstr "" 16.732 16.733 #: tazinst:2013 tazinst:2198 16.734 #, fuzzy 16.735 -msgid "Installing the kernel" 16.736 +msgid "Installing the Kernel..." 16.737 msgstr "Instalando SliTaz en" 16.738 16.739 #: tazinst:2016 16.740 #, fuzzy 16.741 -msgid "Preconfiguring the system" 16.742 +msgid "Preconfiguring the system..." 16.743 msgstr "Configurando el nombre de host:" 16.744 16.745 #: tazinst:2019 16.746 #, fuzzy 16.747 -msgid "Configuring root and default user account" 16.748 +msgid "Configuring root and default user account..." 16.749 msgstr "Configurando root y cuenta de usuario predeterminada..." 16.750 16.751 #: tazinst:2022 16.752 #, fuzzy 16.753 -msgid "Configuring /home" 16.754 +msgid "Configuring /home..." 16.755 msgstr "Configurando el nombre de host:" 16.756 16.757 #: tazinst:2025 16.758 @@ -703,31 +721,31 @@ 16.759 msgstr "" 16.760 16.761 #: tazinst:2042 16.762 -msgid "Preparing upgrade of SliTaz release:" 16.763 -msgstr "Preparando actualización de SliTaz, versión:" 16.764 +msgid "Preparing upgrade of SliTaz release: %s" 16.765 +msgstr "Preparando actualización de SliTaz, versión: %s" 16.766 16.767 #: tazinst:2044 16.768 msgid "" 16.769 -"This partition doesn't appear to contain a valid SliTaz system, the file: /" 16.770 -"etc/slitaz-release doesn't exist." 16.771 +"%s: This partition doesn't appear to contain a valid SliTaz system, the " 16.772 +"file: %s doesn't exist." 16.773 msgstr "" 16.774 -"Esta partición no parece contener un sistema válido SliTaz. La fila: /etc/" 16.775 -"slitaz-release no existe." 16.776 +"%s: Esta partición no parece contener un sistema válido SliTaz. La fila: %s " 16.777 +"no existe." 16.778 16.779 #: tazinst:2067 16.780 -msgid "keeping /etc found on:" 16.781 +msgid "keeping /etc found on: %s" 16.782 msgstr "" 16.783 16.784 #: tazinst:2071 16.785 -msgid "keeping /var/www found on:" 16.786 +msgid "keeping /var/www found on: %s" 16.787 msgstr "" 16.788 16.789 #: tazinst:2098 16.790 -msgid "backups restored:" 16.791 +msgid "backups restored: %s" 16.792 msgstr "" 16.793 16.794 #: tazinst:2105 16.795 -msgid "backups saved in /var/lib/tazinst" 16.796 +msgid "backups saved in %s" 16.797 msgstr "" 16.798 16.799 #: tazinst:2112 16.800 @@ -745,7 +763,7 @@ 16.801 16.802 #: tazinst:2132 16.803 #, fuzzy 16.804 -msgid "Installing:" 16.805 +msgid "Installing: %s..." 16.806 msgstr "Instalando SliTaz en" 16.807 16.808 #: tazinst:2141 16.809 @@ -757,12 +775,8 @@ 16.810 msgid "Creating package lists..." 16.811 msgstr "Actualizando paquetes agregados..." 16.812 16.813 -#: tazinst:2152 16.814 -msgid "packages-source.list: done" 16.815 -msgstr "" 16.816 - 16.817 -#: tazinst:2156 16.818 -msgid "packages-selection.diff: done" 16.819 +#: tazinst:2152 tazinst:2156 16.820 +msgid "%s: done" 16.821 msgstr "" 16.822 16.823 #: tazinst:2163 16.824 @@ -770,44 +784,39 @@ 16.825 msgid "" 16.826 "The list of available packages on the mirror could not be downloaded. No " 16.827 "missing packages will be reinstalled now, but you can do so later by looking " 16.828 -"at the following list:\n" 16.829 -"/var/lib/tazinst/packages-selection.diff" 16.830 +"at the following list:" 16.831 msgstr "" 16.832 "La lista de los paquetes disponibles en el espejo, no pueden ser " 16.833 "descargados. No missing packages will be reinstalled now, pero puedes luego " 16.834 -"mirar en la siguiente lista: /var/lib/tazinst/packages-selection.diff" 16.835 +"mirar en la siguiente lista:" 16.836 16.837 #: tazinst:2175 16.838 -msgid "Upgrading SliTaz on:" 16.839 -msgstr "Actualizando SliTaz en :" 16.840 +msgid "Upgrading SliTaz on: %s" 16.841 +msgstr "Actualizando SliTaz en : %s" 16.842 16.843 #: tazinst:2186 16.844 -msgid "Searching for /etc/slitaz-release" 16.845 +msgid "Searching for %s..." 16.846 msgstr "" 16.847 16.848 #: tazinst:2189 16.849 -msgid "Backup /etc, /home and the packages list" 16.850 -msgstr "Hacer copias de seguridad de /etc, /home y la lista de paquetes" 16.851 +msgid "Backup /etc, /home and the packages list..." 16.852 +msgstr "Hacer copias de seguridad de /etc, /home y la lista de paquetes..." 16.853 16.854 #: tazinst:2195 16.855 #, fuzzy 16.856 -msgid "Restoring configuration files" 16.857 +msgid "Restoring configuration files..." 16.858 msgstr "Restaurando archivos de configuración..." 16.859 16.860 #: tazinst:2201 16.861 #, fuzzy 16.862 -msgid "Upgrading added packages" 16.863 +msgid "Upgrading added packages..." 16.864 msgstr "Actualizando paquetes agregados..." 16.865 16.866 #: tazinst:2204 16.867 -msgid "Bootloader" 16.868 +msgid "Bootloader..." 16.869 msgstr "" 16.870 16.871 #, fuzzy 16.872 -#~ msgid "Using files from USB device..." 16.873 -#~ msgstr "Falló el montaje del dispositivo USB" 16.874 - 16.875 -#, fuzzy 16.876 #~ msgid "Install SliTaz on HDD using setup file contents." 16.877 #~ msgstr "Instala SliTaz en un disco duro usando un archivo de configuración." 16.878 16.879 @@ -849,10 +858,6 @@ 16.880 #~ msgstr "No provista de un archivo de configuración" 16.881 16.882 #, fuzzy 16.883 -#~ msgid "URL not found" 16.884 -#~ msgstr "Archivo no encontrado" 16.885 - 16.886 -#, fuzzy 16.887 #~ msgid "Unknown filesystem (/)" 16.888 #~ msgstr "Sistema de archivos desconocido" 16.889 16.890 @@ -891,9 +896,6 @@ 16.891 #~ msgid "Grub update" 16.892 #~ msgstr "Actualizar Grub" 16.893 16.894 -#~ msgid "Backup /etc, /home and the packages list..." 16.895 -#~ msgstr "Creando copia de seguridad /etc, /home y la lista de paquetes..." 16.896 - 16.897 #, fuzzy 16.898 #~ msgid "Upgrade finished. You can now restart (reboot)" 16.899 #~ msgstr "" 16.900 @@ -997,9 +999,6 @@ 16.901 #~ msgid "Continue:(y/n)" 16.902 #~ msgstr "Continuar:(y/n)" 16.903 16.904 -#~ msgid "Formatting main partition:" 16.905 -#~ msgstr "Formatear partición principal:" 16.906 - 16.907 #~ msgid "Can't mount" 16.908 #~ msgstr "No se puede montar" 16.909
17.1 --- a/po/tazinst/fr.po Wed Apr 06 09:52:43 2016 +0300 17.2 +++ b/po/tazinst/fr.po Sat Apr 09 17:22:22 2016 +0300 17.3 @@ -8,7 +8,7 @@ 17.4 msgstr "" 17.5 "Project-Id-Version: 3.0\n" 17.6 "Report-Msgid-Bugs-To: \n" 17.7 -"POT-Creation-Date: 2016-04-04 11:45+0200\n" 17.8 +"POT-Creation-Date: 2016-04-09 16:49+0300\n" 17.9 "PO-Revision-Date: 2012-05-19 11:20+0200\n" 17.10 "Last-Translator: Dominique Corbex <domcox@slitaz.org>\n" 17.11 "Language-Team: French\n" 17.12 @@ -79,7 +79,7 @@ 17.13 msgstr "Sélection automatique" 17.14 17.15 #: tazinst:83 17.16 -msgid "Grub legacy bootloader" 17.17 +msgid "GRUB legacy bootloader" 17.18 msgstr "L'amorceur originel Grub" 17.19 17.20 #: tazinst:84 17.21 @@ -103,7 +103,7 @@ 17.22 msgstr "Version stable graphique de base sans applications graphiques" 17.23 17.24 #: tazinst:99 17.25 -msgid "Stable basic graphic version with only Gtk" 17.26 +msgid "Stable basic graphic version with only GTK" 17.27 msgstr "Version stable graphique avec Gtk uniquement" 17.28 17.29 #: tazinst:101 17.30 @@ -115,88 +115,84 @@ 17.31 msgstr "Version de développement en temps réel mise à jour chaque jour" 17.32 17.33 #: tazinst:114 tazinst:138 tazinst:150 17.34 -msgid "SliTaz GNU/Linux Installer - Version:" 17.35 -msgstr "Installeur SliTaz GNU/Linux - Version :" 17.36 +msgid "SliTaz GNU/Linux Installer - Version: %s" 17.37 +msgstr "Installeur SliTaz GNU/Linux - Version : %s" 17.38 + 17.39 +#: tazinst:115 17.40 +msgid "Usage:" 17.41 +msgstr "Usage:" 17.42 17.43 #: tazinst:116 17.44 -msgid "Usage" 17.45 -msgstr "Usage" 17.46 +msgid "%s [command] <setting> <value> <file>" 17.47 +msgstr "%s [commande] <paramétrage> <valeur> <fichier>" 17.48 17.49 #: tazinst:117 17.50 -msgid "tazinst [command] <setting> <value> <file>" 17.51 -msgstr "tazinst [commande] <paramétrage> <valeur> <fichier>" 17.52 +msgid "Commands:" 17.53 +msgstr "Commandes:" 17.54 17.55 #: tazinst:119 17.56 -msgid "Commands" 17.57 -msgstr "Commandes" 17.58 - 17.59 -#: tazinst:120 17.60 msgid "Create a new install file." 17.61 msgstr "Crée un nouveau fichier de paramètres." 17.62 17.63 -#: tazinst:121 17.64 +#: tazinst:120 17.65 msgid "Change value of a setting." 17.66 msgstr "Change un paramètre." 17.67 17.68 -#: tazinst:122 17.69 +#: tazinst:121 17.70 msgid "Clear a setting." 17.71 msgstr "Efface un paramètre." 17.72 17.73 -#: tazinst:123 17.74 +#: tazinst:122 17.75 msgid "Get the value of a setting." 17.76 msgstr "Lit un paramètre" 17.77 17.78 -#: tazinst:124 17.79 +#: tazinst:123 17.80 msgid "Check settings." 17.81 msgstr "Vérifie les paramètres." 17.82 17.83 -#: tazinst:125 17.84 +#: tazinst:124 17.85 msgid "Print a short help on settings" 17.86 msgstr "Affiche une aide succinte sur les paramètres." 17.87 17.88 -#: tazinst:126 17.89 +#: tazinst:125 17.90 msgid "List system resources." 17.91 msgstr "Liste des ressources système." 17.92 17.93 -#: tazinst:127 17.94 +#: tazinst:126 17.95 msgid "Execute a SliTaz installation." 17.96 msgstr "Lance une installation de SliTaz." 17.97 17.98 -#: tazinst:128 17.99 +#: tazinst:127 17.100 msgid "Display log file contents." 17.101 msgstr "Affiche le contenu du fichier journal." 17.102 17.103 -#: tazinst:129 17.104 +#: tazinst:128 17.105 msgid "Clean install and log files." 17.106 msgstr "Efface les fichiers journal et installation." 17.107 17.108 -#: tazinst:130 17.109 +#: tazinst:129 17.110 msgid "Print version and exit." 17.111 msgstr "Affiche la version et s'arrête." 17.112 17.113 -#: tazinst:131 17.114 +#: tazinst:130 17.115 msgid "Print this short usage." 17.116 msgstr "Affiche cette aide succinte." 17.117 17.118 -#: tazinst:141 17.119 -msgid "Unknown command!" 17.120 -msgstr "Commande inconnue !" 17.121 +#: tazinst:140 17.122 +msgid "'%s': Unknown command!" 17.123 +msgstr "'%s' : Commande inconnue !" 17.124 17.125 #: tazinst:142 17.126 -msgid "Run" 17.127 -msgstr "Lance" 17.128 +msgid "Run: '%s' to get a list of available commands." 17.129 +msgstr "Lance : '%s' pour avoir la liste de commandes disponibles." 17.130 17.131 -#: tazinst:143 17.132 -msgid "to get a list of available commands" 17.133 -msgstr "pour avoir la liste de commandes disponibles" 17.134 - 17.135 -#: tazinst:153 17.136 -msgid "Unknown option!" 17.137 -msgstr "Option inconnue !" 17.138 +#: tazinst:152 17.139 +msgid "'%s': Unknown option!" 17.140 +msgstr "'%s' : Option inconnue !" 17.141 17.142 #: tazinst:154 17.143 -msgid "Please select one of these options" 17.144 -msgstr "Veuillez choisir une option" 17.145 +msgid "Please select one of these options:" 17.146 +msgstr "Veuillez choisir une option :" 17.147 17.148 #: tazinst:173 17.149 msgid "Warning: file already exists." 17.150 @@ -207,20 +203,25 @@ 17.151 msgstr "Erreur : Ne peut créer le fichier." 17.152 17.153 #: tazinst:278 tazinst:283 17.154 -msgid "Error: Unable to read install file" 17.155 -msgstr "Erreur : Impossible de lire le fichier d'installation" 17.156 +msgid "Error: Unable to read install file." 17.157 +msgstr "Erreur : Impossible de lire le fichier d'installation." 17.158 17.159 -#: tazinst:389 17.160 +#: tazinst:355 17.161 +#, fuzzy 17.162 +msgid "Error: '%s' unknown setting." 17.163 +msgstr "'%s' : Option inconnue !" 17.164 + 17.165 +#: tazinst:383 17.166 msgid "Error: Unable to write to install file." 17.167 -msgstr "Erreur : Impossible d'écrire le fichier d'installation" 17.168 +msgstr "Erreur : Impossible d'écrire le fichier d'installation." 17.169 17.170 #: tazinst:443 17.171 -msgid "Deleting install file" 17.172 -msgstr "Efface le fichier d'installation" 17.173 +msgid "Deleting install file: %s" 17.174 +msgstr "Efface le fichier d'installation : %s" 17.175 17.176 #: tazinst:445 17.177 -msgid "Error: Unable to delete install file" 17.178 -msgstr "Erreur : Impossible d'éffacer le fichier d'installation" 17.179 +msgid "Error: Unable to delete install file." 17.180 +msgstr "Erreur : Impossible d'éffacer le fichier d'installation." 17.181 17.182 #: tazinst:460 17.183 msgid "" 17.184 @@ -236,46 +237,42 @@ 17.185 msgstr "Une autre instance de tazinst est en cours." 17.186 17.187 #: tazinst:485 17.188 -msgid "Error:" 17.189 -msgstr "Erreur :" 17.190 - 17.191 -#: tazinst:485 17.192 -msgid "Invalid keyword." 17.193 -msgstr "Mot clé invalide." 17.194 +msgid "Error: '%s' Invalid keyword." 17.195 +msgstr "Erreur : '%s' Mot clé invalide." 17.196 17.197 #: tazinst:486 17.198 -msgid "Select one of these options:" 17.199 -msgstr "Choisissez une option :" 17.200 +msgid "Select one of these options: %s." 17.201 +msgstr "Choisissez une option : %s." 17.202 17.203 #: tazinst:487 17.204 msgid "For more information, see tazinst Manual." 17.205 msgstr "Pour plus d'information, voir le manuel de tazinst." 17.206 17.207 #: tazinst:502 17.208 -msgid "Error: Partition not found" 17.209 -msgstr "Erreur : Partition non trouvée" 17.210 +msgid "Error: Partition not found." 17.211 +msgstr "Erreur : Partition non trouvée." 17.212 17.213 #: tazinst:503 17.214 -msgid "To see available partitions, run" 17.215 -msgstr "Pour voir les partitions disponibles, lancez" 17.216 +msgid "To see available partitions, run '%s'." 17.217 +msgstr "Pour voir les partitions disponibles, lancez « %s »." 17.218 17.219 #: tazinst:518 17.220 -msgid "Error: Source file not found" 17.221 -msgstr "Erreur : Fichier source introuvable" 17.222 +msgid "Error: Source file not found." 17.223 +msgstr "Erreur : Fichier source introuvable." 17.224 17.225 #: tazinst:533 17.226 -msgid "Error: invalid URL" 17.227 -msgstr "Erreur : URL invalide" 17.228 +msgid "Error: invalid URL." 17.229 +msgstr "Erreur : URL invalide." 17.230 17.231 -#: tazinst:549 17.232 +#: tazinst:548 17.233 msgid "Error: multiple assignations for a disk." 17.234 msgstr "Erreur : utilisation multiple du même disque" 17.235 17.236 #: tazinst:562 17.237 -msgid "Error: password too long" 17.238 -msgstr "Erreur : mot de passe trop long" 17.239 +msgid "Error: password too long." 17.240 +msgstr "Erreur : mot de passe trop long." 17.241 17.242 -#: tazinst:568 17.243 +#: tazinst:567 17.244 msgid "Error: Unallowed characters in password." 17.245 msgstr "Erreur : Caractères interdits dans le mot de passe" 17.246 17.247 @@ -287,21 +284,25 @@ 17.248 msgid "Warning: no password!" 17.249 msgstr "Attention : pas mot de passe !" 17.250 17.251 +#: tazinst:590 17.252 +msgid "%s Error: Too short." 17.253 +msgstr "" 17.254 + 17.255 #: tazinst:594 17.256 -msgid "Error: Too long." 17.257 -msgstr "Erreur : Trop long" 17.258 +msgid "%s Error: Too long." 17.259 +msgstr "%s Erreur : Trop long" 17.260 17.261 #: tazinst:599 17.262 -msgid "Error: Invalid chars." 17.263 -msgstr "Erreur : Caract..res invalides." 17.264 +msgid "%s Error: Invalid chars." 17.265 +msgstr "%s Erreur : Caract..res invalides." 17.266 17.267 #: tazinst:611 17.268 msgid "Error: Dualboot set with no bootloader." 17.269 msgstr "Erreur : Dualboot choisi sans amorceur." 17.270 17.271 #: tazinst:625 17.272 -msgid "Error: Unsupported Partition Table" 17.273 -msgstr "Erreur : Table Partition non supportée" 17.274 +msgid "Error: Unsupported Partition Table." 17.275 +msgstr "Erreur : Table Partition non supportée." 17.276 17.277 #: tazinst:630 17.278 msgid "Error: No disk selected, cannot install any bootloader." 17.279 @@ -316,112 +317,120 @@ 17.280 msgstr "Nom ou URL de l'image sur le web." 17.281 17.282 #: tazinst:753 17.283 -msgid "Type: tazinst help web" 17.284 -msgstr "Faire : tazinst help web" 17.285 +msgid "Type: %s" 17.286 +msgstr "Faire : %s" 17.287 17.288 #: tazinst:758 17.289 +msgid "List of settings:" 17.290 +msgstr "Liste des paramètres :" 17.291 + 17.292 +#: tazinst:760 17.293 msgid "Mode of install" 17.294 msgstr "Mode d'installation" 17.295 17.296 -#: tazinst:759 17.297 +#: tazinst:761 17.298 msgid "Media containing the SliTaz source files" 17.299 msgstr "Media contenant les fichiers sources SliTaz" 17.300 17.301 -#: tazinst:760 17.302 +#: tazinst:762 17.303 msgid "Source file containing SliTaz" 17.304 msgstr "Fichier source contenant SliTaz" 17.305 17.306 -#: tazinst:761 17.307 +#: tazinst:763 17.308 msgid "The name of the target partition" 17.309 msgstr "Nom de la partition cible" 17.310 17.311 -#: tazinst:762 17.312 +#: tazinst:764 17.313 msgid "Format of the target partition" 17.314 msgstr "Format de la partition cible" 17.315 17.316 -#: tazinst:763 17.317 +#: tazinst:765 17.318 msgid "Separate home partition" 17.319 msgstr "Partition /home séparée" 17.320 17.321 -#: tazinst:764 17.322 +#: tazinst:766 17.323 msgid "Format of the root partition" 17.324 msgstr "Format de la partition racine" 17.325 17.326 -#: tazinst:765 tazinst:811 17.327 +#: tazinst:767 tazinst:811 17.328 msgid "Name of the system" 17.329 msgstr "Nom du système" 17.330 17.331 -#: tazinst:766 tazinst:813 17.332 +#: tazinst:768 tazinst:813 17.333 msgid "Superuser password" 17.334 msgstr "Mot de passe administrateur" 17.335 17.336 -#: tazinst:767 tazinst:815 17.337 +#: tazinst:769 tazinst:815 17.338 msgid "First user name" 17.339 msgstr "Nom du premier utilisateur" 17.340 17.341 -#: tazinst:768 tazinst:817 17.342 +#: tazinst:770 tazinst:817 17.343 msgid "First user password" 17.344 msgstr "Mot de passe du premier utilisateur" 17.345 17.346 -#: tazinst:769 17.347 +#: tazinst:771 17.348 msgid "Install a bootloader" 17.349 msgstr "Installe un amorceur" 17.350 17.351 -#: tazinst:770 17.352 +#: tazinst:772 17.353 msgid "Partition to dualboot Windows from" 17.354 msgstr "Partition d'où amorcer Windows en dualboot" 17.355 17.356 -#: tazinst:771 17.357 -msgid "List of settings:" 17.358 -msgstr "Liste des paramètres :" 17.359 - 17.360 #: tazinst:790 17.361 msgid "CD. Automatically set" 17.362 msgstr "CD. Choisi automatiquement" 17.363 17.364 #: tazinst:793 17.365 -msgid "USB partition. For a list, type: tazinst list usb" 17.366 -msgstr "Partition USB. Pour la liste, tapez : tazinst list usb" 17.367 +msgid "USB partition. For a list, type: %s" 17.368 +msgstr "Partition USB. Pour la liste, tapez : %s" 17.369 17.370 #: tazinst:796 17.371 -msgid "ISO file name. For a list, type: tazinst list iso" 17.372 -msgstr "Nom de fichier ISO. Pour la liste, tapez : tazinst list iso" 17.373 +msgid "ISO file name. For a list, type: %s" 17.374 +msgstr "Nom de fichier ISO. Pour la liste, tapez : %s" 17.375 17.376 #: tazinst:822 17.377 msgid "Partition containing Windows, or 'auto'" 17.378 msgstr "Partition contenant Windows, ou 'auto'" 17.379 17.380 #: tazinst:1127 17.381 -msgid "No mirror list found, run tazpkg recharge." 17.382 -msgstr "Mirroir introuvable, lancer tazpkg recharge." 17.383 +msgid "No mirror list found, run %s." 17.384 +msgstr "Mirroir introuvable, lancer %s." 17.385 17.386 #: tazinst:1139 17.387 -msgid "Downloading:" 17.388 -msgstr "Téléchargement :" 17.389 +msgid "Downloading: %s" 17.390 +msgstr "Téléchargement : %s" 17.391 17.392 #: tazinst:1146 17.393 msgid "Download completed." 17.394 msgstr "Téléchargement réussi." 17.395 17.396 -#: tazinst:1148 17.397 -msgid "Download failed." 17.398 -msgstr "Téléchargement échoué." 17.399 +#: tazinst:1157 17.400 +msgid "Installing package %s to the current system." 17.401 +msgstr "Installation du paquet sur le système actuel : %s." 17.402 17.403 -#: tazinst:1157 17.404 -msgid "Installing package to the current system:" 17.405 -msgstr "Installation du paquet sur le système actuel :" 17.406 +#: tazinst:1159 17.407 +msgid "Cannot install %s." 17.408 +msgstr "" 17.409 17.410 #: tazinst:1167 17.411 -msgid "Adding package to the target system:" 17.412 -msgstr "Ajout du paquet sur le syst..me cible :" 17.413 +msgid "Adding package %s to the target system..." 17.414 +msgstr "Ajout du paquet sur le syst..me cible : %s..." 17.415 + 17.416 +#: tazinst:1182 17.417 +msgid "=== Tazinst: started on %s ===" 17.418 +msgstr "" 17.419 17.420 #: tazinst:1208 17.421 msgid "Process not completed" 17.422 msgstr "Action en cours" 17.423 17.424 #: tazinst:1209 tazinst:1213 17.425 -msgid "Error" 17.426 -msgstr "Erreur" 17.427 +msgid "Error: %s" 17.428 +msgstr "Erreur : %s" 17.429 + 17.430 +#: tazinst:1216 17.431 +msgid "=== Tazinst error on %s ===" 17.432 +msgstr "" 17.433 17.434 #: tazinst:1225 17.435 msgid "Internal error" 17.436 @@ -432,40 +441,44 @@ 17.437 msgstr "Annulé par l'utilisateur" 17.438 17.439 #: tazinst:1251 17.440 -msgid "Using files from" 17.441 -msgstr "Utilise les fichiers de" 17.442 +msgid "Using files from %s." 17.443 +msgstr "Utilise les fichiers de %s." 17.444 17.445 #: tazinst:1253 17.446 -msgid "Mount failed" 17.447 -msgstr "Échec du montage" 17.448 +msgid "%s: Mount failed." 17.449 +msgstr "%s : Échec du montage." 17.450 17.451 -#: tazinst:1262 tazinst:1267 17.452 -msgid "Using files from USB device" 17.453 -msgstr "Utilise les fichiers du périphérique USB" 17.454 +#: tazinst:1262 17.455 +msgid "Using files from USB device..." 17.456 +msgstr "Utilise les fichiers du périphérique USB..." 17.457 + 17.458 +#: tazinst:1267 17.459 +msgid "Using files from USB device %s." 17.460 +msgstr "Utilise les fichiers du périphérique USB %s." 17.461 17.462 #: tazinst:1269 17.463 -msgid "Failed to mount USB device" 17.464 -msgstr "Impossible de monter le périphérique USB" 17.465 +msgid "%s: Failed to mount USB device." 17.466 +msgstr "%s : Impossible de monter le périphérique USB." 17.467 17.468 #: tazinst:1284 17.469 msgid "md5sum error, file corrupted." 17.470 msgstr "Erreur md5sum, fichier corrompu." 17.471 17.472 #: tazinst:1287 17.473 -msgid "md5 file not found, cannot check integrity." 17.474 -msgstr "fichier md5 introuvable, impossible de vérifier l'intégrité." 17.475 +msgid "%s: md5 file not found, cannot check integrity." 17.476 +msgstr "%s : fichier md5 introuvable, impossible de vérifier l'intégrité." 17.477 17.478 #: tazinst:1292 17.479 -msgid "Using files from ISO" 17.480 -msgstr "Utilise les fichiers de l'ISO" 17.481 +msgid "Using files from ISO %s." 17.482 +msgstr "Utilise les fichiers de l'ISO %s." 17.483 17.484 #: tazinst:1294 17.485 -msgid "Failed to mount ISO." 17.486 -msgstr "Impossible de monter l'image ISO." 17.487 +msgid "%s: Failed to mount ISO." 17.488 +msgstr "%s : Impossible de monter l'image ISO." 17.489 17.490 #: tazinst:1316 tazinst:1404 17.491 -msgid "Creating mount point:" 17.492 -msgstr "Création du point de montage :" 17.493 +msgid "Creating mount point: %s..." 17.494 +msgstr "Création du point de montage : %s..." 17.495 17.496 #: tazinst:1332 17.497 msgid "Checking installation media..." 17.498 @@ -480,9 +493,14 @@ 17.499 msgstr "Vérification du media d'installation réussie" 17.500 17.501 #: tazinst:1349 17.502 -msgid "Format" 17.503 +msgid "Format %s (%s)" 17.504 msgstr "" 17.505 17.506 +#: tazinst:1354 tazinst:1366 17.507 +#, fuzzy 17.508 +msgid "Formatting has failed" 17.509 +msgstr "Formatage de la partition principale :" 17.510 + 17.511 #: tazinst:1373 17.512 msgid "Preparing target partition..." 17.513 msgstr "Prepare la partition cible..." 17.514 @@ -496,44 +514,48 @@ 17.515 msgstr "Partition déjà utilisée" 17.516 17.517 #: tazinst:1389 17.518 -msgid "The partition will be cleaned..." 17.519 -msgstr "La partition sera effacée..." 17.520 +msgid "%s: The partition will be cleaned..." 17.521 +msgstr "%s : La partition sera effacée..." 17.522 17.523 #: tazinst:1398 17.524 -msgid "The partition will be kept..." 17.525 -msgstr "La partition sera conservée..." 17.526 +msgid "%s: The partition will be kept..." 17.527 +msgstr "%s : La partition sera conservée..." 17.528 17.529 #: tazinst:1413 17.530 -msgid "Unable to mount partition" 17.531 -msgstr "Impossible de monter la partition" 17.532 +msgid "%s: Unable to mount partition" 17.533 +msgstr "%s : Impossible de monter la partition" 17.534 17.535 #: tazinst:1427 17.536 -msgid "Unmounting target partition:" 17.537 -msgstr "Démontage de la partition cible :" 17.538 +msgid "Unmounting target partition: %s" 17.539 +msgstr "Démontage de la partition cible : %s" 17.540 17.541 #: tazinst:1433 17.542 -msgid "Unmounting:" 17.543 -msgstr "Démontage :" 17.544 +msgid "Unmounting: %s" 17.545 +msgstr "Démontage : %s" 17.546 17.547 #: tazinst:1437 17.548 -msgid "Unlinking:" 17.549 -msgstr "Effaçage de :" 17.550 +msgid "Unlinking: %s" 17.551 +msgstr "Effaçage de : %s" 17.552 17.553 #: tazinst:1443 17.554 -msgid "Ejecting cdrom..." 17.555 +msgid "Ejecting CD-ROM..." 17.556 msgstr "Éjection du CD-Rom..." 17.557 17.558 #: tazinst:1452 17.559 -msgid "Process completed. You can now restart (reboot)" 17.560 -msgstr "Installation terminée. Vous pouvez maintenant redémarrer " 17.561 +msgid "" 17.562 +"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux " 17.563 +"system." 17.564 +msgstr "" 17.565 +"Installation terminée. Vous pouvez maintenant redémarrer votre système " 17.566 +"SliTaz GNU/Linux." 17.567 17.568 -#: tazinst:1453 17.569 -msgid "from your SliTaz GNU/Linux system." 17.570 -msgstr "votre système SliTaz GNU/Linux." 17.571 +#: tazinst:1454 17.572 +msgid "=== Tazinst ended on %s ===" 17.573 +msgstr "" 17.574 17.575 #: tazinst:1457 17.576 -msgid "Copying log to /var/log/tazinst.log" 17.577 -msgstr "Copie le journal dans /var/log/tazinst.log" 17.578 +msgid "Copying log to %s" 17.579 +msgstr "Copie le journal dans %s" 17.580 17.581 #: tazinst:1493 17.582 msgid "No bootloader to install." 17.583 @@ -544,8 +566,13 @@ 17.584 msgstr "Activation du Dual-boot avec Windows" 17.585 17.586 #: tazinst:1610 17.587 -msgid "Installing grub on:" 17.588 -msgstr "Installation de grub sur :" 17.589 +msgid "Installing GRUB on: %s" 17.590 +msgstr "Installation de grub sur : %s" 17.591 + 17.592 +#: tazinst:1611 17.593 +#, fuzzy 17.594 +msgid "GRUB not found" 17.595 +msgstr "URL non trouvée" 17.596 17.597 #: tazinst:1615 17.598 msgid "Setting the boot flag" 17.599 @@ -556,15 +583,25 @@ 17.600 msgstr "Copie de l'image de fond" 17.601 17.602 #: tazinst:1710 17.603 -msgid "Installing syslinux" 17.604 +msgid "Installing Syslinux" 17.605 msgstr "Installation de syslinux" 17.606 17.607 +#: tazinst:1720 17.608 +#, fuzzy 17.609 +msgid "Syslinux not found" 17.610 +msgstr "URL non trouvée" 17.611 + 17.612 #: tazinst:1724 17.613 msgid "Setting the boot flag on" 17.614 msgstr "Activation du boot flag" 17.615 17.616 +#: tazinst:1727 17.617 +#, fuzzy 17.618 +msgid "mbr.bin not found" 17.619 +msgstr "URL non trouvée" 17.620 + 17.621 #: tazinst:1728 17.622 -msgid "Installing mbr" 17.623 +msgid "Installing MBR" 17.624 msgstr "Installe le mbr" 17.625 17.626 #: tazinst:1732 17.627 @@ -572,27 +609,32 @@ 17.628 msgstr "Activation du legacy_boot flag" 17.629 17.630 #: tazinst:1741 17.631 -msgid "Installing gptmbr" 17.632 +msgid "Installing GPTMBR" 17.633 msgstr "Installe gptmbr" 17.634 17.635 +#: tazinst:1742 17.636 +#, fuzzy 17.637 +msgid "gptmbr.bin not found" 17.638 +msgstr "URL non trouvée" 17.639 + 17.640 #: tazinst:1781 17.641 -msgid "Cleaning the root partition" 17.642 -msgstr "Nettoyage de la partition racine" 17.643 +msgid "Cleaning the root partition (%s)..." 17.644 +msgstr "Nettoyage de la partition racine (%s)..." 17.645 17.646 #: tazinst:1790 tazinst:2063 17.647 -msgid "keeping /home found on:" 17.648 -msgstr "garde /home sur :" 17.649 +msgid "keeping /home found on: %s" 17.650 +msgstr "garde /home sur : %s" 17.651 17.652 -#: tazinst:1795 17.653 -msgid "removing target:" 17.654 -msgstr "retire la cible :" 17.655 +#: tazinst:1795 tazinst:2077 17.656 +msgid "removing target: %s" 17.657 +msgstr "retire la cible : %s" 17.658 17.659 #: tazinst:1813 17.660 -msgid "Kernel name not found, falling back to:" 17.661 -msgstr "Nom du noyau introuvable, retour à :" 17.662 +msgid "Kernel name not found, falling back to: %s" 17.663 +msgstr "Nom du noyau introuvable, retour à : %s" 17.664 17.665 #: tazinst:1819 17.666 -msgid "install_kernel:" 17.667 +msgid "install_kernel: %s" 17.668 msgstr "" 17.669 17.670 #: tazinst:1905 17.671 @@ -600,56 +642,56 @@ 17.672 msgstr "Restauration de /home..." 17.673 17.674 #: tazinst:1911 17.675 -msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..." 17.676 -msgstr "Ajoute la partition / et CHECK_FS au fichier /etc/rcS.conf..." 17.677 +msgid "Adding / partition and CHECK_FS to file %s..." 17.678 +msgstr "Ajoute la partition / et CHECK_FS au fichier %s..." 17.679 17.680 #: tazinst:1914 17.681 -msgid "Configuring host name:" 17.682 -msgstr "Configuration du Hostname :" 17.683 +msgid "Configuring host name: %s" 17.684 +msgstr "Configuration du Hostname : %s" 17.685 17.686 #: tazinst:1977 17.687 -msgid "Configuring partition to be used as /home:" 17.688 -msgstr "Configuration de la partition à utiliser comme /home :" 17.689 +msgid "Configuring partition to be used as /home: %s" 17.690 +msgstr "Configuration de la partition à utiliser comme /home : %s" 17.691 17.692 #: tazinst:1996 17.693 -msgid "Installing SliTaz on:" 17.694 -msgstr "Installation de SliTaz sur :" 17.695 +msgid "Installing SliTaz on: %s" 17.696 +msgstr "Installation de SliTaz sur : %s" 17.697 17.698 #: tazinst:1997 tazinst:2176 17.699 -msgid "Checking settings" 17.700 -msgstr "Vérification des paramètres" 17.701 +msgid "Checking settings..." 17.702 +msgstr "Vérification des paramètres..." 17.703 17.704 #: tazinst:2001 tazinst:2180 17.705 -msgid "Preparing source media" 17.706 -msgstr "Préparation du media source" 17.707 +msgid "Preparing source media..." 17.708 +msgstr "Préparation du media source..." 17.709 17.710 #: tazinst:2004 tazinst:2183 17.711 -msgid "Preparing target disk" 17.712 -msgstr "Préparation du disque cible" 17.713 +msgid "Preparing target disk..." 17.714 +msgstr "Préparation du disque cible..." 17.715 17.716 #: tazinst:2007 17.717 -msgid "Cleaning the root partition if necessary" 17.718 -msgstr "Nettoyage de la partition racine si nécessaire" 17.719 +msgid "Cleaning the root partition if necessary..." 17.720 +msgstr "Nettoyage de la partition racine si nécessaire..." 17.721 17.722 #: tazinst:2010 tazinst:2192 17.723 -msgid "Extracting the root system" 17.724 -msgstr "Extrait le système racine" 17.725 +msgid "Extracting the root system..." 17.726 +msgstr "Extrait le système racine..." 17.727 17.728 #: tazinst:2013 tazinst:2198 17.729 -msgid "Installing the kernel" 17.730 -msgstr "Installation du noyau" 17.731 +msgid "Installing the Kernel..." 17.732 +msgstr "Installation du noyau..." 17.733 17.734 #: tazinst:2016 17.735 -msgid "Preconfiguring the system" 17.736 -msgstr "Préconfiguration du système" 17.737 +msgid "Preconfiguring the system..." 17.738 +msgstr "Préconfiguration du système..." 17.739 17.740 #: tazinst:2019 17.741 -msgid "Configuring root and default user account" 17.742 -msgstr "Configuration des comptes de root et de l'utilisateur par défaut" 17.743 +msgid "Configuring root and default user account..." 17.744 +msgstr "Configuration des comptes de root et de l'utilisateur par défaut..." 17.745 17.746 #: tazinst:2022 17.747 -msgid "Configuring /home" 17.748 -msgstr "Configuration de /home" 17.749 +msgid "Configuring /home..." 17.750 +msgstr "Configuration de /home..." 17.751 17.752 #: tazinst:2025 17.753 msgid "Checking bootloader installation..." 17.754 @@ -660,32 +702,32 @@ 17.755 msgstr "Installation des fichiers réussie" 17.756 17.757 #: tazinst:2042 17.758 -msgid "Preparing upgrade of SliTaz release:" 17.759 -msgstr "Préparation de la mise à jour de la version de SliTaz :" 17.760 +msgid "Preparing upgrade of SliTaz release: %s" 17.761 +msgstr "Préparation de la mise à jour de la version de SliTaz : %s" 17.762 17.763 #: tazinst:2044 17.764 msgid "" 17.765 -"This partition doesn't appear to contain a valid SliTaz system, the file: /" 17.766 -"etc/slitaz-release doesn't exist." 17.767 +"%s: This partition doesn't appear to contain a valid SliTaz system, the " 17.768 +"file: %s doesn't exist." 17.769 msgstr "" 17.770 -"Cette partition ne semble pas contenir un système SliTaz valide, le " 17.771 -"fichier : /etc/slitaz-release n'existe pas." 17.772 +"%s: Cette partition ne semble pas contenir un système SliTaz valide, le " 17.773 +"fichier : %s n'existe pas." 17.774 17.775 #: tazinst:2067 17.776 -msgid "keeping /etc found on:" 17.777 -msgstr "conserve /etc sur :" 17.778 +msgid "keeping /etc found on: %s" 17.779 +msgstr "conserve /etc sur : %s" 17.780 17.781 #: tazinst:2071 17.782 -msgid "keeping /var/www found on:" 17.783 -msgstr "conserve /var/www sur :" 17.784 +msgid "keeping /var/www found on: %s" 17.785 +msgstr "conserve /var/www sur : %s" 17.786 17.787 #: tazinst:2098 17.788 -msgid "backups restored:" 17.789 -msgstr "sauvegardes restorées :" 17.790 +msgid "backups restored: %s" 17.791 +msgstr "sauvegardes restorées : %s" 17.792 17.793 #: tazinst:2105 17.794 -msgid "backups saved in /var/lib/tazinst" 17.795 -msgstr "sauvegardes placées dans /var/lib/tazinst" 17.796 +msgid "backups saved in %s" 17.797 +msgstr "sauvegardes placées dans %s" 17.798 17.799 #: tazinst:2112 17.800 msgid "Checking the availability of packages..." 17.801 @@ -700,8 +742,8 @@ 17.802 msgstr "Aucun paquet à installer." 17.803 17.804 #: tazinst:2132 17.805 -msgid "Installing:" 17.806 -msgstr "Installation :" 17.807 +msgid "Installing: %s..." 17.808 +msgstr "Installation : %s..." 17.809 17.810 #: tazinst:2141 17.811 msgid "Installation of packages complete..." 17.812 @@ -711,52 +753,46 @@ 17.813 msgid "Creating package lists..." 17.814 msgstr "Crée la liste de paquets..." 17.815 17.816 -#: tazinst:2152 17.817 -msgid "packages-source.list: done" 17.818 -msgstr "packages-source.list : fait" 17.819 - 17.820 -#: tazinst:2156 17.821 -msgid "packages-selection.diff: done" 17.822 -msgstr "packages-selection.diff : fait" 17.823 +#: tazinst:2152 tazinst:2156 17.824 +msgid "%s: done" 17.825 +msgstr "%s : fait" 17.826 17.827 #: tazinst:2163 17.828 msgid "" 17.829 "The list of available packages on the mirror could not be downloaded. No " 17.830 "missing packages will be reinstalled now, but you can do so later by looking " 17.831 -"at the following list:\n" 17.832 -"/var/lib/tazinst/packages-selection.diff" 17.833 +"at the following list:" 17.834 msgstr "" 17.835 "La liste des paquets disponibles sur le miroir ne peut être téléchargée. " 17.836 "Aucun paquet manquant ne peut être réinstallé maintenant, mais il est " 17.837 -"possible de le faire ultérieurement à l'aide de la liste suivante : /var/lib/" 17.838 -"tazinst/packages-selection.diff" 17.839 +"possible de le faire ultérieurement à l'aide de la liste suivante :" 17.840 17.841 #: tazinst:2175 17.842 -msgid "Upgrading SliTaz on:" 17.843 -msgstr "Mise à jour de SliTaz sur :" 17.844 +msgid "Upgrading SliTaz on: %s" 17.845 +msgstr "Mise à jour de SliTaz sur : %s" 17.846 17.847 #: tazinst:2186 17.848 -msgid "Searching for /etc/slitaz-release" 17.849 -msgstr "Recherche de /etc/slitaz-release" 17.850 +msgid "Searching for %s..." 17.851 +msgstr "Recherche de %s..." 17.852 17.853 #: tazinst:2189 17.854 -msgid "Backup /etc, /home and the packages list" 17.855 -msgstr "Sauvegarde de /etc, /home et de la liste des paquets" 17.856 +msgid "Backup /etc, /home and the packages list..." 17.857 +msgstr "Sauvegarde de /etc, /home et de la liste des paquets..." 17.858 17.859 #: tazinst:2195 17.860 -msgid "Restoring configuration files" 17.861 +msgid "Restoring configuration files..." 17.862 msgstr "Restauration des fichiers de configuration..." 17.863 17.864 #: tazinst:2201 17.865 -msgid "Upgrading added packages" 17.866 +msgid "Upgrading added packages..." 17.867 msgstr "Mise à jour des paquets additionnels..." 17.868 17.869 #: tazinst:2204 17.870 -msgid "Bootloader" 17.871 -msgstr "Amorceur" 17.872 +msgid "Bootloader..." 17.873 +msgstr "Amorceur..." 17.874 17.875 -#~ msgid "Using files from USB device..." 17.876 -#~ msgstr "Utilise les fichiers du périphérique USB..." 17.877 +#~ msgid "%s: Download failed." 17.878 +#~ msgstr "%s : Téléchargement échoué." 17.879 17.880 #~ msgid "Install SliTaz on HDD using setup file contents." 17.881 #~ msgstr "Installe SliTaz sur HDD à l'aide d'un fichier de paramètres." 17.882 @@ -794,9 +830,6 @@ 17.883 #~ msgid "Unknown source type" 17.884 #~ msgstr "Type de source inconnu" 17.885 17.886 -#~ msgid "URL not found" 17.887 -#~ msgstr "URL non trouvée" 17.888 - 17.889 #~ msgid "Target and source partitions should be different" 17.890 #~ msgstr "Les partitions cible et source doivent etre différentes" 17.891 17.892 @@ -839,9 +872,6 @@ 17.893 #~ msgid "Grub update" 17.894 #~ msgstr "Mise à jour de Grub" 17.895 17.896 -#~ msgid "Backup /etc, /home and the packages list..." 17.897 -#~ msgstr "Sauvegarde de /etc, /home et de la liste des paquets..." 17.898 - 17.899 #~ msgid "Upgrade finished. You can now restart (reboot)" 17.900 #~ msgstr "La mise à jour est terminée. Vous pouvez redémarrer" 17.901 17.902 @@ -948,9 +978,6 @@ 17.903 #~ msgid "Continue:(y/n)" 17.904 #~ msgstr "Continuer : (o/n)" 17.905 17.906 -#~ msgid "Formatting main partition:" 17.907 -#~ msgstr "Formatage de la partition principale :" 17.908 - 17.909 #~ msgid "Can't mount" 17.910 #~ msgstr "Montage impossible" 17.911
18.1 --- a/po/tazinst/pt_BR.po Wed Apr 06 09:52:43 2016 +0300 18.2 +++ b/po/tazinst/pt_BR.po Sat Apr 09 17:22:22 2016 +0300 18.3 @@ -7,7 +7,7 @@ 18.4 msgstr "" 18.5 "Project-Id-Version: Tazinst\n" 18.6 "Report-Msgid-Bugs-To: \n" 18.7 -"POT-Creation-Date: 2016-04-04 11:45+0200\n" 18.8 +"POT-Creation-Date: 2016-04-09 16:49+0300\n" 18.9 "PO-Revision-Date: 2016-03-28 05:14-0300\n" 18.10 "Last-Translator: Leonardo Laporte <hackdorte@sapo.pt>\n" 18.11 "Language-Team: Brazilian Portuguese (i18n@slitaz.org>\n" 18.12 @@ -79,7 +79,7 @@ 18.13 msgstr "Seleção automática" 18.14 18.15 #: tazinst:83 18.16 -msgid "Grub legacy bootloader" 18.17 +msgid "GRUB legacy bootloader" 18.18 msgstr "Gerenciador de boot grub" 18.19 18.20 #: tazinst:84 18.21 @@ -103,7 +103,7 @@ 18.22 msgstr "Versão estável básica em modo gráfico sem demais aplicativos gráficos" 18.23 18.24 #: tazinst:99 18.25 -msgid "Stable basic graphic version with only Gtk" 18.26 +msgid "Stable basic graphic version with only GTK" 18.27 msgstr "Versão estável básica em modo gráfico com Gtk" 18.28 18.29 #: tazinst:101 18.30 @@ -115,88 +115,84 @@ 18.31 msgstr "Versão de desenvolvimento atualizada diariamente" 18.32 18.33 #: tazinst:114 tazinst:138 tazinst:150 18.34 -msgid "SliTaz GNU/Linux Installer - Version:" 18.35 -msgstr "SliTaz GNU/Linux Instalador - Versão:" 18.36 +msgid "SliTaz GNU/Linux Installer - Version: %s" 18.37 +msgstr "SliTaz GNU/Linux Instalador - Versão: %s" 18.38 + 18.39 +#: tazinst:115 18.40 +msgid "Usage:" 18.41 +msgstr "Utilização:" 18.42 18.43 #: tazinst:116 18.44 -msgid "Usage" 18.45 -msgstr "Utilização" 18.46 +msgid "%s [command] <setting> <value> <file>" 18.47 +msgstr "%s [comando] <configuração> <valor> <arquivo>" 18.48 18.49 #: tazinst:117 18.50 -msgid "tazinst [command] <setting> <value> <file>" 18.51 -msgstr "tazinst [comando] <configuração> <valor> <arquivo>" 18.52 +msgid "Commands:" 18.53 +msgstr "Comandos:" 18.54 18.55 #: tazinst:119 18.56 -msgid "Commands" 18.57 -msgstr "Comandos" 18.58 - 18.59 -#: tazinst:120 18.60 msgid "Create a new install file." 18.61 msgstr "Cria um novo arquivo de instalação." 18.62 18.63 -#: tazinst:121 18.64 +#: tazinst:120 18.65 msgid "Change value of a setting." 18.66 msgstr "Muda o valor de uma configuração" 18.67 18.68 -#: tazinst:122 18.69 +#: tazinst:121 18.70 msgid "Clear a setting." 18.71 msgstr "Limpa uma configuração." 18.72 18.73 -#: tazinst:123 18.74 +#: tazinst:122 18.75 msgid "Get the value of a setting." 18.76 msgstr "Obtém o valor de uma configuração." 18.77 18.78 -#: tazinst:124 18.79 +#: tazinst:123 18.80 msgid "Check settings." 18.81 msgstr "Checa as configurações." 18.82 18.83 -#: tazinst:125 18.84 +#: tazinst:124 18.85 msgid "Print a short help on settings" 18.86 msgstr "Mostra uma pequena ajuda sobre as configurações" 18.87 18.88 -#: tazinst:126 18.89 +#: tazinst:125 18.90 msgid "List system resources." 18.91 msgstr "Lista os recursos do sistema." 18.92 18.93 -#: tazinst:127 18.94 +#: tazinst:126 18.95 msgid "Execute a SliTaz installation." 18.96 msgstr "Executa uma instalação do SliTaz." 18.97 18.98 -#: tazinst:128 18.99 +#: tazinst:127 18.100 msgid "Display log file contents." 18.101 msgstr "Mostra o conteúdo do arquivo de log." 18.102 18.103 -#: tazinst:129 18.104 +#: tazinst:128 18.105 msgid "Clean install and log files." 18.106 msgstr "Limpa os arquivos de log da instalação." 18.107 18.108 -#: tazinst:130 18.109 +#: tazinst:129 18.110 msgid "Print version and exit." 18.111 msgstr "Mostra a versão e sai." 18.112 18.113 -#: tazinst:131 18.114 +#: tazinst:130 18.115 msgid "Print this short usage." 18.116 msgstr "Exibe esta utilização" 18.117 18.118 -#: tazinst:141 18.119 -msgid "Unknown command!" 18.120 -msgstr "Comando desconhecido!" 18.121 +#: tazinst:140 18.122 +msgid "'%s': Unknown command!" 18.123 +msgstr "'%s': Comando desconhecido!" 18.124 18.125 #: tazinst:142 18.126 -msgid "Run" 18.127 -msgstr "Executar" 18.128 +msgid "Run: '%s' to get a list of available commands." 18.129 +msgstr "Executar: '%s' para obter a lista de comandos disponíveis." 18.130 18.131 -#: tazinst:143 18.132 -msgid "to get a list of available commands" 18.133 -msgstr "para obter a lista de comandos disponíveis" 18.134 - 18.135 -#: tazinst:153 18.136 -msgid "Unknown option!" 18.137 -msgstr "Opção desconhecida!" 18.138 +#: tazinst:152 18.139 +msgid "'%s': Unknown option!" 18.140 +msgstr "'%s': Opção desconhecida!" 18.141 18.142 #: tazinst:154 18.143 -msgid "Please select one of these options" 18.144 -msgstr "Selecione uma das seguintes opções" 18.145 +msgid "Please select one of these options:" 18.146 +msgstr "Selecione uma das seguintes opções:" 18.147 18.148 #: tazinst:173 18.149 msgid "Warning: file already exists." 18.150 @@ -207,20 +203,25 @@ 18.151 msgstr "Erro: impossível criar arquivo." 18.152 18.153 #: tazinst:278 tazinst:283 18.154 -msgid "Error: Unable to read install file" 18.155 -msgstr "Erro: Não foi possível ler o arquivo de instalação" 18.156 +msgid "Error: Unable to read install file." 18.157 +msgstr "Erro: Não foi possível ler o arquivo de instalação." 18.158 18.159 -#: tazinst:389 18.160 +#: tazinst:355 18.161 +#, fuzzy 18.162 +msgid "Error: '%s' unknown setting." 18.163 +msgstr "'%s': Opção desconhecida!" 18.164 + 18.165 +#: tazinst:383 18.166 msgid "Error: Unable to write to install file." 18.167 msgstr "Erro: Não foi possível gravar o arquivo de instalação." 18.168 18.169 #: tazinst:443 18.170 -msgid "Deleting install file" 18.171 -msgstr "Deletando arquivo de instalação" 18.172 +msgid "Deleting install file: %s" 18.173 +msgstr "Deletando arquivo de instalação: %s" 18.174 18.175 #: tazinst:445 18.176 -msgid "Error: Unable to delete install file" 18.177 -msgstr "Erro: Não foi possível apagar o arquivo de instalação" 18.178 +msgid "Error: Unable to delete install file." 18.179 +msgstr "Erro: Não foi possível apagar o arquivo de instalação." 18.180 18.181 #: tazinst:460 18.182 msgid "" 18.183 @@ -235,46 +236,42 @@ 18.184 msgstr "Outra instância do tazinst está em execução." 18.185 18.186 #: tazinst:485 18.187 -msgid "Error:" 18.188 -msgstr "Erro:" 18.189 - 18.190 -#: tazinst:485 18.191 -msgid "Invalid keyword." 18.192 -msgstr "Palavra-chave inválida." 18.193 +msgid "Error: '%s' Invalid keyword." 18.194 +msgstr "Erro: '%s' Palavra-chave inválida." 18.195 18.196 #: tazinst:486 18.197 -msgid "Select one of these options:" 18.198 -msgstr "Selecione uma das seguintes opções:" 18.199 +msgid "Select one of these options: %s." 18.200 +msgstr "Selecione uma das seguintes opções: %s." 18.201 18.202 #: tazinst:487 18.203 msgid "For more information, see tazinst Manual." 18.204 msgstr "Para maiores informações, consulte o manual do tazinst." 18.205 18.206 #: tazinst:502 18.207 -msgid "Error: Partition not found" 18.208 -msgstr "Erro: Partição não encontrada" 18.209 +msgid "Error: Partition not found." 18.210 +msgstr "Erro: Partição não encontrada." 18.211 18.212 #: tazinst:503 18.213 -msgid "To see available partitions, run" 18.214 -msgstr "Para ver as partições disponíveis, execute" 18.215 +msgid "To see available partitions, run '%s'." 18.216 +msgstr "Para ver as partições disponíveis, execute '%s'." 18.217 18.218 #: tazinst:518 18.219 -msgid "Error: Source file not found" 18.220 -msgstr "Erro: Arquivo fonte não encontrado" 18.221 +msgid "Error: Source file not found." 18.222 +msgstr "Erro: Arquivo fonte não encontrado." 18.223 18.224 #: tazinst:533 18.225 -msgid "Error: invalid URL" 18.226 -msgstr "Erro: URL inválida" 18.227 +msgid "Error: invalid URL." 18.228 +msgstr "Erro: URL inválida." 18.229 18.230 -#: tazinst:549 18.231 +#: tazinst:548 18.232 msgid "Error: multiple assignations for a disk." 18.233 msgstr "Erro: designações múltiplas para disco rígido." 18.234 18.235 #: tazinst:562 18.236 -msgid "Error: password too long" 18.237 -msgstr "Erro: senha muito grande" 18.238 +msgid "Error: password too long." 18.239 +msgstr "Erro: senha muito grande." 18.240 18.241 -#: tazinst:568 18.242 +#: tazinst:567 18.243 msgid "Error: Unallowed characters in password." 18.244 msgstr "Erro: caracteres não permitidos na senha." 18.245 18.246 @@ -286,21 +283,25 @@ 18.247 msgid "Warning: no password!" 18.248 msgstr "Aviso: sem senha!" 18.249 18.250 +#: tazinst:590 18.251 +msgid "%s Error: Too short." 18.252 +msgstr "" 18.253 + 18.254 #: tazinst:594 18.255 -msgid "Error: Too long." 18.256 -msgstr "Erro: muito grande." 18.257 +msgid "%s Error: Too long." 18.258 +msgstr "%s Erro: muito grande." 18.259 18.260 #: tazinst:599 18.261 -msgid "Error: Invalid chars." 18.262 -msgstr "Erro: caracteres inválidos." 18.263 +msgid "%s Error: Invalid chars." 18.264 +msgstr "%s Erro: caracteres inválidos." 18.265 18.266 #: tazinst:611 18.267 msgid "Error: Dualboot set with no bootloader." 18.268 msgstr "Erro: dual-boot configurado sem gerenciador de boot." 18.269 18.270 #: tazinst:625 18.271 -msgid "Error: Unsupported Partition Table" 18.272 -msgstr "Erro: tábua de partição não suportada" 18.273 +msgid "Error: Unsupported Partition Table." 18.274 +msgstr "Erro: tábua de partição não suportada." 18.275 18.276 #: tazinst:630 18.277 msgid "Error: No disk selected, cannot install any bootloader." 18.278 @@ -316,112 +317,120 @@ 18.279 msgstr "Nome ou URL da imagem na web." 18.280 18.281 #: tazinst:753 18.282 -msgid "Type: tazinst help web" 18.283 -msgstr "Digite: tazinst help web" 18.284 +msgid "Type: %s" 18.285 +msgstr "Digite: %s" 18.286 18.287 #: tazinst:758 18.288 +msgid "List of settings:" 18.289 +msgstr "Lista de configurações:" 18.290 + 18.291 +#: tazinst:760 18.292 msgid "Mode of install" 18.293 msgstr "Modo de instalação" 18.294 18.295 -#: tazinst:759 18.296 +#: tazinst:761 18.297 msgid "Media containing the SliTaz source files" 18.298 msgstr "Mídia contendo os arquivos fontes do SliTaz" 18.299 18.300 -#: tazinst:760 18.301 +#: tazinst:762 18.302 msgid "Source file containing SliTaz" 18.303 msgstr "Arquivo fonte contendo o SliTaz" 18.304 18.305 -#: tazinst:761 18.306 +#: tazinst:763 18.307 msgid "The name of the target partition" 18.308 msgstr "Nome da partição alvo" 18.309 18.310 -#: tazinst:762 18.311 +#: tazinst:764 18.312 msgid "Format of the target partition" 18.313 msgstr "Formatação da partição alvo" 18.314 18.315 -#: tazinst:763 18.316 +#: tazinst:765 18.317 msgid "Separate home partition" 18.318 msgstr "Partição home separada" 18.319 18.320 -#: tazinst:764 18.321 +#: tazinst:766 18.322 msgid "Format of the root partition" 18.323 msgstr "Formatação da partição root" 18.324 18.325 -#: tazinst:765 tazinst:811 18.326 +#: tazinst:767 tazinst:811 18.327 msgid "Name of the system" 18.328 msgstr "Nome do sistema" 18.329 18.330 -#: tazinst:766 tazinst:813 18.331 +#: tazinst:768 tazinst:813 18.332 msgid "Superuser password" 18.333 msgstr "Senha do usuário root" 18.334 18.335 -#: tazinst:767 tazinst:815 18.336 +#: tazinst:769 tazinst:815 18.337 msgid "First user name" 18.338 msgstr "Nome do primeiro usuário" 18.339 18.340 -#: tazinst:768 tazinst:817 18.341 +#: tazinst:770 tazinst:817 18.342 msgid "First user password" 18.343 msgstr "Senha do primeiro usuário" 18.344 18.345 -#: tazinst:769 18.346 +#: tazinst:771 18.347 msgid "Install a bootloader" 18.348 msgstr "Instalar um gerenciador de boot" 18.349 18.350 -#: tazinst:770 18.351 +#: tazinst:772 18.352 msgid "Partition to dualboot Windows from" 18.353 msgstr "Partição para dual-boot com Windows de" 18.354 18.355 -#: tazinst:771 18.356 -msgid "List of settings:" 18.357 -msgstr "Lista de configurações:" 18.358 - 18.359 #: tazinst:790 18.360 msgid "CD. Automatically set" 18.361 msgstr "Configurado automaticamente" 18.362 18.363 #: tazinst:793 18.364 -msgid "USB partition. For a list, type: tazinst list usb" 18.365 -msgstr "Partição USB. Para uma lista, digite: tazinst list usb" 18.366 +msgid "USB partition. For a list, type: %s" 18.367 +msgstr "Partição USB. Para uma lista, digite: %s" 18.368 18.369 #: tazinst:796 18.370 -msgid "ISO file name. For a list, type: tazinst list iso" 18.371 -msgstr "Nome da imagem ISO. Para uma lista, digite: tazinst list iso" 18.372 +msgid "ISO file name. For a list, type: %s" 18.373 +msgstr "Nome da imagem ISO. Para uma lista, digite: %s" 18.374 18.375 #: tazinst:822 18.376 msgid "Partition containing Windows, or 'auto'" 18.377 msgstr "Partição contendo o Windows, ou 'auto'" 18.378 18.379 #: tazinst:1127 18.380 -msgid "No mirror list found, run tazpkg recharge." 18.381 -msgstr "Nenhuma lista de mirror encontrada, execute 'tazpkg recharge'" 18.382 +msgid "No mirror list found, run %s." 18.383 +msgstr "Nenhuma lista de mirror encontrada, execute '%s'." 18.384 18.385 #: tazinst:1139 18.386 -msgid "Downloading:" 18.387 -msgstr "Baixando:" 18.388 +msgid "Downloading: %s" 18.389 +msgstr "Baixando: %s" 18.390 18.391 #: tazinst:1146 18.392 msgid "Download completed." 18.393 msgstr "Download completo." 18.394 18.395 -#: tazinst:1148 18.396 -msgid "Download failed." 18.397 -msgstr "Download falhou." 18.398 +#: tazinst:1157 18.399 +msgid "Installing package %s to the current system." 18.400 +msgstr "Instalando o pacote para o sistema atual: %s." 18.401 18.402 -#: tazinst:1157 18.403 -msgid "Installing package to the current system:" 18.404 -msgstr "Instalando o pacote para o sistema atual:" 18.405 +#: tazinst:1159 18.406 +msgid "Cannot install %s." 18.407 +msgstr "" 18.408 18.409 #: tazinst:1167 18.410 -msgid "Adding package to the target system:" 18.411 -msgstr "Adicionando o pacote para o sistema alvo:" 18.412 +msgid "Adding package %s to the target system..." 18.413 +msgstr "Adicionando o pacote para o sistema alvo: %s..." 18.414 + 18.415 +#: tazinst:1182 18.416 +msgid "=== Tazinst: started on %s ===" 18.417 +msgstr "" 18.418 18.419 #: tazinst:1208 18.420 msgid "Process not completed" 18.421 msgstr "Processo não completado" 18.422 18.423 #: tazinst:1209 tazinst:1213 18.424 -msgid "Error" 18.425 -msgstr "Erro" 18.426 +msgid "Error: %s" 18.427 +msgstr "Erro: %s" 18.428 + 18.429 +#: tazinst:1216 18.430 +msgid "=== Tazinst error on %s ===" 18.431 +msgstr "" 18.432 18.433 #: tazinst:1225 18.434 msgid "Internal error" 18.435 @@ -432,40 +441,44 @@ 18.436 msgstr "Cancelado pelo usuário" 18.437 18.438 #: tazinst:1251 18.439 -msgid "Using files from" 18.440 -msgstr "Usando arquivos de" 18.441 +msgid "Using files from %s." 18.442 +msgstr "Usando arquivos de %s." 18.443 18.444 #: tazinst:1253 18.445 -msgid "Mount failed" 18.446 -msgstr "Comando mount falhou" 18.447 +msgid "%s: Mount failed." 18.448 +msgstr "%s: Comando mount falhou." 18.449 18.450 -#: tazinst:1262 tazinst:1267 18.451 -msgid "Using files from USB device" 18.452 -msgstr "Usando arquivos do dispositivo USB" 18.453 +#: tazinst:1262 18.454 +msgid "Using files from USB device..." 18.455 +msgstr "Usando arquivos do dispositivo USB..." 18.456 + 18.457 +#: tazinst:1267 18.458 +msgid "Using files from USB device %s." 18.459 +msgstr "Usando arquivos do dispositivo USB %s." 18.460 18.461 #: tazinst:1269 18.462 -msgid "Failed to mount USB device" 18.463 -msgstr "Falha ao montar dispositivo USB" 18.464 +msgid "%s: Failed to mount USB device." 18.465 +msgstr "%s: Falha ao montar dispositivo USB." 18.466 18.467 #: tazinst:1284 18.468 msgid "md5sum error, file corrupted." 18.469 msgstr "Divergência de md5sum, arquivo corrompido" 18.470 18.471 #: tazinst:1287 18.472 -msgid "md5 file not found, cannot check integrity." 18.473 -msgstr "Arquivo md5 não existe, impossível checar integridade." 18.474 +msgid "%s: md5 file not found, cannot check integrity." 18.475 +msgstr "%s: Arquivo md5 não existe, impossível checar integridade." 18.476 18.477 #: tazinst:1292 18.478 -msgid "Using files from ISO" 18.479 -msgstr "Usando arquivos da ISO" 18.480 +msgid "Using files from ISO %s." 18.481 +msgstr "Usando arquivos da ISO %s." 18.482 18.483 #: tazinst:1294 18.484 -msgid "Failed to mount ISO." 18.485 -msgstr "Falha ao montar imagem ISO." 18.486 +msgid "%s: Failed to mount ISO." 18.487 +msgstr "%s: Falha ao montar imagem ISO." 18.488 18.489 #: tazinst:1316 tazinst:1404 18.490 -msgid "Creating mount point:" 18.491 -msgstr "Criando ponto de montagem:" 18.492 +msgid "Creating mount point: %s..." 18.493 +msgstr "Criando ponto de montagem: %s..." 18.494 18.495 #: tazinst:1332 18.496 msgid "Checking installation media..." 18.497 @@ -480,8 +493,12 @@ 18.498 msgstr "Checagem de mídia de instalação ok" 18.499 18.500 #: tazinst:1349 18.501 -msgid "Format" 18.502 -msgstr "Formatar" 18.503 +msgid "Format %s (%s)" 18.504 +msgstr "Formatar %s (%s)" 18.505 + 18.506 +#: tazinst:1354 tazinst:1366 18.507 +msgid "Formatting has failed" 18.508 +msgstr "" 18.509 18.510 #: tazinst:1373 18.511 msgid "Preparing target partition..." 18.512 @@ -496,44 +513,48 @@ 18.513 msgstr "Partição em uso." 18.514 18.515 #: tazinst:1389 18.516 -msgid "The partition will be cleaned..." 18.517 -msgstr "A partição será limpa..." 18.518 +msgid "%s: The partition will be cleaned..." 18.519 +msgstr "%s: A partição será limpa..." 18.520 18.521 #: tazinst:1398 18.522 -msgid "The partition will be kept..." 18.523 -msgstr "A partição será mantida..." 18.524 +msgid "%s: The partition will be kept..." 18.525 +msgstr "%s: A partição será mantida..." 18.526 18.527 #: tazinst:1413 18.528 -msgid "Unable to mount partition" 18.529 -msgstr "Falha ao montar partição" 18.530 +msgid "%s: Unable to mount partition" 18.531 +msgstr "%s: Falha ao montar partição" 18.532 18.533 #: tazinst:1427 18.534 -msgid "Unmounting target partition:" 18.535 -msgstr "Desmontando partição alvo:" 18.536 +msgid "Unmounting target partition: %s" 18.537 +msgstr "Desmontando partição alvo: %s" 18.538 18.539 #: tazinst:1433 18.540 -msgid "Unmounting:" 18.541 -msgstr "Desmontando:" 18.542 +msgid "Unmounting: %s" 18.543 +msgstr "Desmontando: %s" 18.544 18.545 #: tazinst:1437 18.546 -msgid "Unlinking:" 18.547 -msgstr "Desfazendo ligação:" 18.548 +msgid "Unlinking: %s" 18.549 +msgstr "Desfazendo ligação: %s" 18.550 18.551 #: tazinst:1443 18.552 -msgid "Ejecting cdrom..." 18.553 +msgid "Ejecting CD-ROM..." 18.554 msgstr "Ejetando cdrom..." 18.555 18.556 #: tazinst:1452 18.557 -msgid "Process completed. You can now restart (reboot)" 18.558 -msgstr "Instalação completa. Você pode reiniciar (reboot)" 18.559 +msgid "" 18.560 +"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux " 18.561 +"system." 18.562 +msgstr "" 18.563 +"Instalação completa. Você pode reiniciar (reboot) do seu sistema SliTaz GNU/" 18.564 +"Linux." 18.565 18.566 -#: tazinst:1453 18.567 -msgid "from your SliTaz GNU/Linux system." 18.568 -msgstr "do seu sistema SliTaz GNU/Linux." 18.569 +#: tazinst:1454 18.570 +msgid "=== Tazinst ended on %s ===" 18.571 +msgstr "" 18.572 18.573 #: tazinst:1457 18.574 -msgid "Copying log to /var/log/tazinst.log" 18.575 -msgstr "Copiando log para /var/log/tazinst.log" 18.576 +msgid "Copying log to %s" 18.577 +msgstr "Copiando log para %s" 18.578 18.579 #: tazinst:1493 18.580 msgid "No bootloader to install." 18.581 @@ -544,8 +565,13 @@ 18.582 msgstr "Habilitando dual-boot com windows" 18.583 18.584 #: tazinst:1610 18.585 -msgid "Installing grub on:" 18.586 -msgstr "Instalando grub em:" 18.587 +msgid "Installing GRUB on: %s" 18.588 +msgstr "Instalando grub em: %s" 18.589 + 18.590 +#: tazinst:1611 18.591 +#, fuzzy 18.592 +msgid "GRUB not found" 18.593 +msgstr "URL não encontrada" 18.594 18.595 #: tazinst:1615 18.596 msgid "Setting the boot flag" 18.597 @@ -556,15 +582,25 @@ 18.598 msgstr "Copiando imagem splash" 18.599 18.600 #: tazinst:1710 18.601 -msgid "Installing syslinux" 18.602 +msgid "Installing Syslinux" 18.603 msgstr "Instalando syslinux" 18.604 18.605 +#: tazinst:1720 18.606 +#, fuzzy 18.607 +msgid "Syslinux not found" 18.608 +msgstr "URL não encontrada" 18.609 + 18.610 #: tazinst:1724 18.611 msgid "Setting the boot flag on" 18.612 msgstr "Configurando flag de boot em" 18.613 18.614 +#: tazinst:1727 18.615 +#, fuzzy 18.616 +msgid "mbr.bin not found" 18.617 +msgstr "URL não encontrada" 18.618 + 18.619 #: tazinst:1728 18.620 -msgid "Installing mbr" 18.621 +msgid "Installing MBR" 18.622 msgstr "Instalando mbr" 18.623 18.624 #: tazinst:1732 18.625 @@ -572,84 +608,89 @@ 18.626 msgstr "Configurando flag legacy_boot em" 18.627 18.628 #: tazinst:1741 18.629 -msgid "Installing gptmbr" 18.630 +msgid "Installing GPTMBR" 18.631 msgstr "Instalando gptmbr" 18.632 18.633 +#: tazinst:1742 18.634 +#, fuzzy 18.635 +msgid "gptmbr.bin not found" 18.636 +msgstr "URL não encontrada" 18.637 + 18.638 #: tazinst:1781 18.639 -msgid "Cleaning the root partition" 18.640 -msgstr "Limpando partição alvo" 18.641 +msgid "Cleaning the root partition (%s)..." 18.642 +msgstr "Limpando partição alvo (%s)..." 18.643 18.644 #: tazinst:1790 tazinst:2063 18.645 -msgid "keeping /home found on:" 18.646 -msgstr "mantendo /home encontrada em:" 18.647 +msgid "keeping /home found on: %s" 18.648 +msgstr "mantendo /home encontrada em: %s" 18.649 18.650 -#: tazinst:1795 18.651 -msgid "removing target:" 18.652 -msgstr "removendo alvo:" 18.653 +#: tazinst:1795 tazinst:2077 18.654 +msgid "removing target: %s" 18.655 +msgstr "removendo alvo: %s" 18.656 18.657 #: tazinst:1813 18.658 -msgid "Kernel name not found, falling back to:" 18.659 -msgstr "Nome do Kernel não encontrado, voltando a:" 18.660 +msgid "Kernel name not found, falling back to: %s" 18.661 +msgstr "Nome do Kernel não encontrado, voltando a: %s" 18.662 18.663 #: tazinst:1819 18.664 -msgid "install_kernel:" 18.665 -msgstr "install_kernel:" 18.666 +msgid "install_kernel: %s" 18.667 +msgstr "install_kernel: %s" 18.668 18.669 #: tazinst:1905 18.670 msgid "Restoring directory: /home..." 18.671 msgstr "Restaurando diretório: /home..." 18.672 18.673 #: tazinst:1911 18.674 -msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..." 18.675 -msgstr "Adicionando partição / e CHECK_FS ao arquivo /etc/rcS.conf..." 18.676 +msgid "Adding / partition and CHECK_FS to file %s..." 18.677 +msgstr "Adicionando partição / e CHECK_FS ao arquivo %s..." 18.678 18.679 #: tazinst:1914 18.680 -msgid "Configuring host name:" 18.681 -msgstr "Configurando nome do host:" 18.682 +msgid "Configuring host name: %s" 18.683 +msgstr "Configurando nome do host: %s" 18.684 18.685 #: tazinst:1977 18.686 -msgid "Configuring partition to be used as /home:" 18.687 -msgstr "Configurando partição a ser usada com /home:" 18.688 +msgid "Configuring partition to be used as /home: %s" 18.689 +msgstr "Configurando partição a ser usada com /home: %s" 18.690 18.691 #: tazinst:1996 18.692 -msgid "Installing SliTaz on:" 18.693 -msgstr "Instalando SliTaz em:" 18.694 +msgid "Installing SliTaz on: %s" 18.695 +msgstr "Instalando SliTaz em: %s" 18.696 18.697 #: tazinst:1997 tazinst:2176 18.698 -msgid "Checking settings" 18.699 -msgstr "Checando configurações" 18.700 +msgid "Checking settings..." 18.701 +msgstr "Checando configurações..." 18.702 18.703 #: tazinst:2001 tazinst:2180 18.704 -msgid "Preparing source media" 18.705 -msgstr "Preparando mídia fonte" 18.706 +msgid "Preparing source media..." 18.707 +msgstr "Preparando mídia fonte..." 18.708 18.709 #: tazinst:2004 tazinst:2183 18.710 -msgid "Preparing target disk" 18.711 -msgstr "Preparando disco alvo" 18.712 +msgid "Preparing target disk..." 18.713 +msgstr "Preparando disco alvo..." 18.714 18.715 #: tazinst:2007 18.716 -msgid "Cleaning the root partition if necessary" 18.717 -msgstr "Limpando partição root se necessário" 18.718 +msgid "Cleaning the root partition if necessary..." 18.719 +msgstr "Limpando partição root se necessário..." 18.720 18.721 #: tazinst:2010 tazinst:2192 18.722 -msgid "Extracting the root system" 18.723 -msgstr "Extraindo o sistema de arquivos raiz" 18.724 +msgid "Extracting the root system..." 18.725 +msgstr "Extraindo o sistema de arquivos raiz..." 18.726 18.727 #: tazinst:2013 tazinst:2198 18.728 -msgid "Installing the kernel" 18.729 -msgstr "Instalando o kernel" 18.730 +msgid "Installing the Kernel..." 18.731 +msgstr "Instalando o kernel..." 18.732 18.733 #: tazinst:2016 18.734 -msgid "Preconfiguring the system" 18.735 -msgstr "Pré-configurando o sistema" 18.736 +msgid "Preconfiguring the system..." 18.737 +msgstr "Pré-configurando o sistema..." 18.738 18.739 #: tazinst:2019 18.740 -msgid "Configuring root and default user account" 18.741 -msgstr "Configurando conta dos usuários padrão e root" 18.742 +msgid "Configuring root and default user account..." 18.743 +msgstr "Configurando conta dos usuários padrão e root..." 18.744 18.745 #: tazinst:2022 18.746 -msgid "Configuring /home" 18.747 -msgstr "Configurando /home" 18.748 +msgid "Configuring /home..." 18.749 +msgstr "Configurando /home..." 18.750 18.751 #: tazinst:2025 18.752 msgid "Checking bootloader installation..." 18.753 @@ -660,32 +701,32 @@ 18.754 msgstr "Instalação dos arquivos completa" 18.755 18.756 #: tazinst:2042 18.757 -msgid "Preparing upgrade of SliTaz release:" 18.758 -msgstr "Preparando atualização do SliTaz:" 18.759 +msgid "Preparing upgrade of SliTaz release: %s" 18.760 +msgstr "Preparando atualização do SliTaz: %s" 18.761 18.762 #: tazinst:2044 18.763 msgid "" 18.764 -"This partition doesn't appear to contain a valid SliTaz system, the file: /" 18.765 -"etc/slitaz-release doesn't exist." 18.766 +"%s: This partition doesn't appear to contain a valid SliTaz system, the " 18.767 +"file: %s doesn't exist." 18.768 msgstr "" 18.769 -"Esta partição parece não conter um sistema SliTaz válido, o arquivo: /etc/" 18.770 -"slitaz-release não existe." 18.771 +"%s: Esta partição parece não conter um sistema SliTaz válido, o arquivo: %s " 18.772 +"não existe." 18.773 18.774 #: tazinst:2067 18.775 -msgid "keeping /etc found on:" 18.776 -msgstr "Mantendo /etc encontrado em:" 18.777 +msgid "keeping /etc found on: %s" 18.778 +msgstr "Mantendo /etc encontrado em: %s" 18.779 18.780 #: tazinst:2071 18.781 -msgid "keeping /var/www found on:" 18.782 -msgstr "Mantendo /var/www encontrado em:" 18.783 +msgid "keeping /var/www found on: %s" 18.784 +msgstr "Mantendo /var/www encontrado em: %s" 18.785 18.786 #: tazinst:2098 18.787 -msgid "backups restored:" 18.788 -msgstr "backups restaurados:" 18.789 +msgid "backups restored: %s" 18.790 +msgstr "backups restaurados: %s" 18.791 18.792 #: tazinst:2105 18.793 -msgid "backups saved in /var/lib/tazinst" 18.794 -msgstr "backups salvos em /var/lib/tazinst" 18.795 +msgid "backups saved in %s" 18.796 +msgstr "backups salvos em %s" 18.797 18.798 #: tazinst:2112 18.799 msgid "Checking the availability of packages..." 18.800 @@ -700,8 +741,8 @@ 18.801 msgstr "pacotes para instalar: 0" 18.802 18.803 #: tazinst:2132 18.804 -msgid "Installing:" 18.805 -msgstr "Instalando:" 18.806 +msgid "Installing: %s..." 18.807 +msgstr "Instalando: %s..." 18.808 18.809 #: tazinst:2141 18.810 msgid "Installation of packages complete..." 18.811 @@ -711,51 +752,46 @@ 18.812 msgid "Creating package lists..." 18.813 msgstr "Criando lista de pacotes..." 18.814 18.815 -#: tazinst:2152 18.816 -msgid "packages-source.list: done" 18.817 -msgstr "packages-source.list: feito" 18.818 - 18.819 -#: tazinst:2156 18.820 -msgid "packages-selection.diff: done" 18.821 -msgstr "packages-selection.diff: feito" 18.822 +#: tazinst:2152 tazinst:2156 18.823 +msgid "%s: done" 18.824 +msgstr "%s: feito" 18.825 18.826 #: tazinst:2163 18.827 msgid "" 18.828 "The list of available packages on the mirror could not be downloaded. No " 18.829 "missing packages will be reinstalled now, but you can do so later by looking " 18.830 -"at the following list:\n" 18.831 -"/var/lib/tazinst/packages-selection.diff" 18.832 +"at the following list:" 18.833 msgstr "" 18.834 "A lista de pacotes disponíveis no mirror não pode ser obtida. Nenhum pacote " 18.835 "perdido será reinstalado, mas pode-se fazer isso depois mediante verificação " 18.836 -"da seguinte lista: /var/lib/tazinst/packages-selection.diff" 18.837 +"da seguinte lista:" 18.838 18.839 #: tazinst:2175 18.840 -msgid "Upgrading SliTaz on:" 18.841 -msgstr "Atualizando SliTaz em:" 18.842 +msgid "Upgrading SliTaz on: %s" 18.843 +msgstr "Atualizando SliTaz em: %s" 18.844 18.845 #: tazinst:2186 18.846 -msgid "Searching for /etc/slitaz-release" 18.847 -msgstr "Procurando por /etc/slitaz-release" 18.848 +msgid "Searching for %s..." 18.849 +msgstr "Procurando por %s..." 18.850 18.851 #: tazinst:2189 18.852 -msgid "Backup /etc, /home and the packages list" 18.853 -msgstr "Backup de /etc/, /home e da lista de pacotes" 18.854 +msgid "Backup /etc, /home and the packages list..." 18.855 +msgstr "Backup de /etc/, /home e da lista de pacotes..." 18.856 18.857 #: tazinst:2195 18.858 -msgid "Restoring configuration files" 18.859 -msgstr "Restaurando arquivos de configuração" 18.860 +msgid "Restoring configuration files..." 18.861 +msgstr "Restaurando arquivos de configuração..." 18.862 18.863 #: tazinst:2201 18.864 -msgid "Upgrading added packages" 18.865 -msgstr "Atualizando pacotes adicionados" 18.866 +msgid "Upgrading added packages..." 18.867 +msgstr "Atualizando pacotes adicionados..." 18.868 18.869 #: tazinst:2204 18.870 -msgid "Bootloader" 18.871 -msgstr "Gerenciador de boot" 18.872 +msgid "Bootloader..." 18.873 +msgstr "Gerenciador de boot..." 18.874 18.875 -#~ msgid "Using files from USB device..." 18.876 -#~ msgstr "Usando arquivos do dispositivo USB..." 18.877 +#~ msgid "%s: Download failed." 18.878 +#~ msgstr "%s: Download falhou." 18.879 18.880 #~ msgid "Error: Missing parameter." 18.881 #~ msgstr "Erro: parâmetro não encontrado." 18.882 @@ -799,9 +835,6 @@ 18.883 #~ msgid "Unknown source type" 18.884 #~ msgstr "Tipo de arquivo fonte desconhecido" 18.885 18.886 -#~ msgid "URL not found" 18.887 -#~ msgstr "URL não encontrada" 18.888 - 18.889 #~ msgid "Target and source partitions should be different" 18.890 #~ msgstr "Partição alvo e fonte devem ser diferentes" 18.891
19.1 --- a/po/tazinst/ru.po Wed Apr 06 09:52:43 2016 +0300 19.2 +++ b/po/tazinst/ru.po Sat Apr 09 17:22:22 2016 +0300 19.3 @@ -7,7 +7,7 @@ 19.4 msgstr "" 19.5 "Project-Id-Version: TazInst\n" 19.6 "Report-Msgid-Bugs-To: \n" 19.7 -"POT-Creation-Date: 2016-04-04 11:45+0200\n" 19.8 +"POT-Creation-Date: 2016-04-09 16:49+0300\n" 19.9 "PO-Revision-Date: 2016-04-06 09:48+0300\n" 19.10 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 19.11 "Language-Team: \n" 19.12 @@ -82,8 +82,8 @@ 19.13 msgstr "автоматический выбор" 19.14 19.15 #: tazinst:83 19.16 -msgid "Grub legacy bootloader" 19.17 -msgstr "загрузчик Grub legacy" 19.18 +msgid "GRUB legacy bootloader" 19.19 +msgstr "загрузчик GRUB legacy" 19.20 19.21 #: tazinst:84 19.22 msgid "Lightweight bootloader" 19.23 @@ -106,7 +106,7 @@ 19.24 msgstr "стабильная основная графическая версия без графических программ" 19.25 19.26 #: tazinst:99 19.27 -msgid "Stable basic graphic version with only Gtk" 19.28 +msgid "Stable basic graphic version with only GTK" 19.29 msgstr "стабильная основная графическая версия только с GTK" 19.30 19.31 #: tazinst:101 19.32 @@ -118,88 +118,84 @@ 19.33 msgstr "свежайшая нестабильная версия, обновляющаяся ежедневно" 19.34 19.35 #: tazinst:114 tazinst:138 tazinst:150 19.36 -msgid "SliTaz GNU/Linux Installer - Version:" 19.37 -msgstr "Установщик SliTaz GNU/Linux, версия" 19.38 +msgid "SliTaz GNU/Linux Installer - Version: %s" 19.39 +msgstr "Установщик SliTaz GNU/Linux, версия %s" 19.40 + 19.41 +#: tazinst:115 19.42 +msgid "Usage:" 19.43 +msgstr "Использование:" 19.44 19.45 #: tazinst:116 19.46 -msgid "Usage" 19.47 -msgstr "Использование" 19.48 +msgid "%s [command] <setting> <value> <file>" 19.49 +msgstr "%s [команда] <параметр> <значение> <файл>" 19.50 19.51 #: tazinst:117 19.52 -msgid "tazinst [command] <setting> <value> <file>" 19.53 -msgstr "tazinst [команда] <параметр> <значение> <файл>" 19.54 +msgid "Commands:" 19.55 +msgstr "Команды:" 19.56 19.57 #: tazinst:119 19.58 -msgid "Commands" 19.59 -msgstr "Команды" 19.60 - 19.61 -#: tazinst:120 19.62 msgid "Create a new install file." 19.63 msgstr "Создать новый файл установки." 19.64 19.65 -#: tazinst:121 19.66 +#: tazinst:120 19.67 msgid "Change value of a setting." 19.68 msgstr "Изменить значение параметра." 19.69 19.70 -#: tazinst:122 19.71 +#: tazinst:121 19.72 msgid "Clear a setting." 19.73 msgstr "Очистить параметр." 19.74 19.75 -#: tazinst:123 19.76 +#: tazinst:122 19.77 msgid "Get the value of a setting." 19.78 msgstr "Получить значение параметра." 19.79 19.80 -#: tazinst:124 19.81 +#: tazinst:123 19.82 msgid "Check settings." 19.83 msgstr "Проверить параметры." 19.84 19.85 -#: tazinst:125 19.86 +#: tazinst:124 19.87 msgid "Print a short help on settings" 19.88 msgstr "Выдать короткую справку о параметрах" 19.89 19.90 -#: tazinst:126 19.91 +#: tazinst:125 19.92 msgid "List system resources." 19.93 msgstr "Список системных ресурсов." 19.94 19.95 -#: tazinst:127 19.96 +#: tazinst:126 19.97 msgid "Execute a SliTaz installation." 19.98 msgstr "Запустить установку SliTaz." 19.99 19.100 -#: tazinst:128 19.101 +#: tazinst:127 19.102 msgid "Display log file contents." 19.103 msgstr "Показать содержимое журнала." 19.104 19.105 -#: tazinst:129 19.106 +#: tazinst:128 19.107 msgid "Clean install and log files." 19.108 msgstr "Очистить файлы установки и журнала." 19.109 19.110 -#: tazinst:130 19.111 +#: tazinst:129 19.112 msgid "Print version and exit." 19.113 msgstr "Показать версию и выйти." 19.114 19.115 -#: tazinst:131 19.116 +#: tazinst:130 19.117 msgid "Print this short usage." 19.118 msgstr "Показать эту короткую справку об использовании." 19.119 19.120 -#: tazinst:141 19.121 -msgid "Unknown command!" 19.122 -msgstr "Неизвестная команда!" 19.123 +#: tazinst:140 19.124 +msgid "'%s': Unknown command!" 19.125 +msgstr "Неизвестная команда «%s»!" 19.126 19.127 #: tazinst:142 19.128 -msgid "Run" 19.129 -msgstr "Запустите" 19.130 +msgid "Run: '%s' to get a list of available commands." 19.131 +msgstr "Запустите «%s», чтобы получить список доступных команд." 19.132 19.133 -#: tazinst:143 19.134 -msgid "to get a list of available commands" 19.135 -msgstr ", чтобы получить список доступных команд" 19.136 - 19.137 -#: tazinst:153 19.138 -msgid "Unknown option!" 19.139 -msgstr "Неизвестный параметр!" 19.140 +#: tazinst:152 19.141 +msgid "'%s': Unknown option!" 19.142 +msgstr "Неизвестный параметр «%s»!" 19.143 19.144 #: tazinst:154 19.145 -msgid "Please select one of these options" 19.146 -msgstr "Выберите один из параметров" 19.147 +msgid "Please select one of these options:" 19.148 +msgstr "Выберите один из параметров:" 19.149 19.150 #: tazinst:173 19.151 msgid "Warning: file already exists." 19.152 @@ -210,20 +206,24 @@ 19.153 msgstr "Ошибка: Не удалось создать файл." 19.154 19.155 #: tazinst:278 tazinst:283 19.156 -msgid "Error: Unable to read install file" 19.157 -msgstr "Ошибка: Не удалось прочитать установочный файл" 19.158 +msgid "Error: Unable to read install file." 19.159 +msgstr "Ошибка: Не удалось прочитать установочный файл." 19.160 19.161 -#: tazinst:389 19.162 +#: tazinst:355 19.163 +msgid "Error: '%s' unknown setting." 19.164 +msgstr "Ошибка: Неизвестная настройка «%s»." 19.165 + 19.166 +#: tazinst:383 19.167 msgid "Error: Unable to write to install file." 19.168 msgstr "Ошибка: Не удалось записать установочный файл." 19.169 19.170 #: tazinst:443 19.171 -msgid "Deleting install file" 19.172 -msgstr "Удаление установочного файла" 19.173 +msgid "Deleting install file: %s" 19.174 +msgstr "Удаление установочного файла %s" 19.175 19.176 #: tazinst:445 19.177 -msgid "Error: Unable to delete install file" 19.178 -msgstr "Ошибка: Не удалось удалить установочный файл" 19.179 +msgid "Error: Unable to delete install file." 19.180 +msgstr "Ошибка: Не удалось удалить установочный файл." 19.181 19.182 #: tazinst:460 19.183 msgid "" 19.184 @@ -239,46 +239,42 @@ 19.185 msgstr "Tazinst уже был запущен." 19.186 19.187 #: tazinst:485 19.188 -msgid "Error:" 19.189 -msgstr "Ошибка:" 19.190 - 19.191 -#: tazinst:485 19.192 -msgid "Invalid keyword." 19.193 -msgstr "Недопустимое ключевое слово." 19.194 +msgid "Error: '%s' Invalid keyword." 19.195 +msgstr "Ошибка: Недопустимое ключевое слово «%s»." 19.196 19.197 #: tazinst:486 19.198 -msgid "Select one of these options:" 19.199 -msgstr "Выберите один из параметров:" 19.200 +msgid "Select one of these options: %s." 19.201 +msgstr "Выберите один из параметров: %s." 19.202 19.203 #: tazinst:487 19.204 msgid "For more information, see tazinst Manual." 19.205 msgstr "Просмотрите руководство TazInst, чтобы получить больше информации." 19.206 19.207 #: tazinst:502 19.208 -msgid "Error: Partition not found" 19.209 -msgstr "Ошибка: Раздел не найден" 19.210 +msgid "Error: Partition not found." 19.211 +msgstr "Ошибка: Раздел не найден." 19.212 19.213 #: tazinst:503 19.214 -msgid "To see available partitions, run" 19.215 -msgstr "Запустите, чтобы увидеть доступные разделы" 19.216 +msgid "To see available partitions, run '%s'." 19.217 +msgstr "Запустите «%s», чтобы увидеть доступные разделы." 19.218 19.219 #: tazinst:518 19.220 -msgid "Error: Source file not found" 19.221 -msgstr "Ошибка: файл источника не найден" 19.222 +msgid "Error: Source file not found." 19.223 +msgstr "Ошибка: файл источника не найден." 19.224 19.225 #: tazinst:533 19.226 -msgid "Error: invalid URL" 19.227 -msgstr "Ошибка: недопустимый URL" 19.228 +msgid "Error: invalid URL." 19.229 +msgstr "Ошибка: недопустимый URL." 19.230 19.231 -#: tazinst:549 19.232 +#: tazinst:548 19.233 msgid "Error: multiple assignations for a disk." 19.234 msgstr "Ошибка: множественные назначения для диска." 19.235 19.236 #: tazinst:562 19.237 -msgid "Error: password too long" 19.238 -msgstr "Ошибка: пароль слишком длинный" 19.239 +msgid "Error: password too long." 19.240 +msgstr "Ошибка: пароль слишком длинный." 19.241 19.242 -#: tazinst:568 19.243 +#: tazinst:567 19.244 msgid "Error: Unallowed characters in password." 19.245 msgstr "Ошибка: неразрешенные символы в пароле." 19.246 19.247 @@ -290,21 +286,25 @@ 19.248 msgid "Warning: no password!" 19.249 msgstr "Предупреждение: нет пароля!" 19.250 19.251 +#: tazinst:590 19.252 +msgid "%s Error: Too short." 19.253 +msgstr "%s Ошибка: слишком коротко." 19.254 + 19.255 #: tazinst:594 19.256 -msgid "Error: Too long." 19.257 -msgstr "Ошибка: слишком длинно." 19.258 +msgid "%s Error: Too long." 19.259 +msgstr "%s Ошибка: слишком длинно." 19.260 19.261 #: tazinst:599 19.262 -msgid "Error: Invalid chars." 19.263 -msgstr "Ошибка: недопустимые символы." 19.264 +msgid "%s Error: Invalid chars." 19.265 +msgstr "%s Ошибка: недопустимые символы." 19.266 19.267 #: tazinst:611 19.268 msgid "Error: Dualboot set with no bootloader." 19.269 msgstr "Ошибка: включена двойная загрузка без загрузчика." 19.270 19.271 #: tazinst:625 19.272 -msgid "Error: Unsupported Partition Table" 19.273 -msgstr "Ошибка: неподдерживаемая таблица разделов" 19.274 +msgid "Error: Unsupported Partition Table." 19.275 +msgstr "Ошибка: неподдерживаемая таблица разделов." 19.276 19.277 #: tazinst:630 19.278 msgid "Error: No disk selected, cannot install any bootloader." 19.279 @@ -319,113 +319,120 @@ 19.280 msgstr "Название или URL образа в интернете." 19.281 19.282 #: tazinst:753 19.283 -msgid "Type: tazinst help web" 19.284 -msgstr "Напечатайте: tazinst help web" 19.285 +msgid "Type: %s" 19.286 +msgstr "Напечатайте: %s" 19.287 19.288 #: tazinst:758 19.289 +msgid "List of settings:" 19.290 +msgstr "Список параметров:" 19.291 + 19.292 +#: tazinst:760 19.293 msgid "Mode of install" 19.294 msgstr "Режим установки" 19.295 19.296 -#: tazinst:759 19.297 +#: tazinst:761 19.298 msgid "Media containing the SliTaz source files" 19.299 msgstr "Носитель, содержащий исходные файлы SliTaz" 19.300 19.301 -#: tazinst:760 19.302 +#: tazinst:762 19.303 msgid "Source file containing SliTaz" 19.304 msgstr "Исходный файл, содержащий SliTaz" 19.305 19.306 -#: tazinst:761 19.307 +#: tazinst:763 19.308 msgid "The name of the target partition" 19.309 msgstr "Название целевого раздела" 19.310 19.311 -#: tazinst:762 19.312 +#: tazinst:764 19.313 msgid "Format of the target partition" 19.314 msgstr "Формат целевого раздела" 19.315 19.316 -#: tazinst:763 19.317 +#: tazinst:765 19.318 msgid "Separate home partition" 19.319 msgstr "Отдельный домашний раздел" 19.320 19.321 -#: tazinst:764 19.322 +#: tazinst:766 19.323 msgid "Format of the root partition" 19.324 msgstr "Формат корневого раздела" 19.325 19.326 -#: tazinst:765 tazinst:811 19.327 +#: tazinst:767 tazinst:811 19.328 msgid "Name of the system" 19.329 msgstr "Название системы" 19.330 19.331 -#: tazinst:766 tazinst:813 19.332 +#: tazinst:768 tazinst:813 19.333 msgid "Superuser password" 19.334 msgstr "Пароль администратора" 19.335 19.336 -#: tazinst:767 tazinst:815 19.337 +#: tazinst:769 tazinst:815 19.338 msgid "First user name" 19.339 msgstr "Логин первого пользователя" 19.340 19.341 -#: tazinst:768 tazinst:817 19.342 +#: tazinst:770 tazinst:817 19.343 msgid "First user password" 19.344 msgstr "Пароль первого пользователя" 19.345 19.346 -#: tazinst:769 19.347 +#: tazinst:771 19.348 msgid "Install a bootloader" 19.349 msgstr "Установить загрузчик" 19.350 19.351 -#: tazinst:770 19.352 +#: tazinst:772 19.353 msgid "Partition to dualboot Windows from" 19.354 msgstr "Раздел из которого будет двойная загрузка Windows" 19.355 19.356 -#: tazinst:771 19.357 -msgid "List of settings:" 19.358 -msgstr "Список параметров:" 19.359 - 19.360 #: tazinst:790 19.361 msgid "CD. Automatically set" 19.362 msgstr "Компакт-диск. Автоматически установлено" 19.363 19.364 #: tazinst:793 19.365 -msgid "USB partition. For a list, type: tazinst list usb" 19.366 -msgstr "Раздел USB. Чтобы получить список, напечатайте: tazinst list usb" 19.367 +msgid "USB partition. For a list, type: %s" 19.368 +msgstr "Раздел USB. Чтобы получить список, напечатайте: %s" 19.369 19.370 #: tazinst:796 19.371 -msgid "ISO file name. For a list, type: tazinst list iso" 19.372 -msgstr "" 19.373 -"Название файла ISO. Чтобы получить список, напечатайте: tazinst list iso" 19.374 +msgid "ISO file name. For a list, type: %s" 19.375 +msgstr "Название файла ISO. Чтобы получить список, напечатайте: %s" 19.376 19.377 #: tazinst:822 19.378 msgid "Partition containing Windows, or 'auto'" 19.379 msgstr "Раздел, содержащий Windows, или «auto»" 19.380 19.381 #: tazinst:1127 19.382 -msgid "No mirror list found, run tazpkg recharge." 19.383 -msgstr "Список зеркал не найден, запустите tazpkg recharge." 19.384 +msgid "No mirror list found, run %s." 19.385 +msgstr "Список зеркал не найден, запустите %s." 19.386 19.387 #: tazinst:1139 19.388 -msgid "Downloading:" 19.389 -msgstr "Загружается:" 19.390 +msgid "Downloading: %s" 19.391 +msgstr "Загружается: %s" 19.392 19.393 #: tazinst:1146 19.394 msgid "Download completed." 19.395 msgstr "Загрузка завершена." 19.396 19.397 -#: tazinst:1148 19.398 -msgid "Download failed." 19.399 -msgstr "Ошибка загрузки." 19.400 +#: tazinst:1157 19.401 +msgid "Installing package %s to the current system." 19.402 +msgstr "Установка пакета %s на текущую систему." 19.403 19.404 -#: tazinst:1157 19.405 -msgid "Installing package to the current system:" 19.406 -msgstr "Установка пакета на текущую систему:" 19.407 +#: tazinst:1159 19.408 +msgid "Cannot install %s." 19.409 +msgstr "Не удалось установить %s." 19.410 19.411 #: tazinst:1167 19.412 -msgid "Adding package to the target system:" 19.413 -msgstr "Добавление пакета в целевую систему:" 19.414 +msgid "Adding package %s to the target system..." 19.415 +msgstr "Добавление пакета %s на целевую систему…" 19.416 + 19.417 +#: tazinst:1182 19.418 +msgid "=== Tazinst: started on %s ===" 19.419 +msgstr "=== Tazinst запущен %s ===" 19.420 19.421 #: tazinst:1208 19.422 msgid "Process not completed" 19.423 msgstr "Процесс не завершен" 19.424 19.425 #: tazinst:1209 tazinst:1213 19.426 -msgid "Error" 19.427 -msgstr "Ошибка" 19.428 +msgid "Error: %s" 19.429 +msgstr "Ошибка: %s" 19.430 + 19.431 +#: tazinst:1216 19.432 +msgid "=== Tazinst error on %s ===" 19.433 +msgstr "=== Ошибка tazinst %s ===" 19.434 19.435 #: tazinst:1225 19.436 msgid "Internal error" 19.437 @@ -436,40 +443,45 @@ 19.438 msgstr "Отменено пользователем" 19.439 19.440 #: tazinst:1251 19.441 -msgid "Using files from" 19.442 -msgstr "Используя файлы из" 19.443 +msgid "Using files from %s." 19.444 +msgstr "Используются файлы из %s." 19.445 19.446 #: tazinst:1253 19.447 -msgid "Mount failed" 19.448 -msgstr "Подключение не удалось" 19.449 +msgid "%s: Mount failed." 19.450 +msgstr "Подключение %s не удалось." 19.451 19.452 -#: tazinst:1262 tazinst:1267 19.453 -msgid "Using files from USB device" 19.454 -msgstr "Используя файлы с накопителя USB" 19.455 +#: tazinst:1262 19.456 +msgid "Using files from USB device..." 19.457 +msgstr "Используются файлы с накопителя USB…" 19.458 + 19.459 +#: tazinst:1267 19.460 +msgid "Using files from USB device %s." 19.461 +msgstr "Используются файлы с накопителя USB %s." 19.462 19.463 #: tazinst:1269 19.464 -msgid "Failed to mount USB device" 19.465 -msgstr "Не удалось подключить накопитель USB" 19.466 +msgid "%s: Failed to mount USB device." 19.467 +msgstr "Не удалось подключить накопитель USB %s." 19.468 19.469 #: tazinst:1284 19.470 msgid "md5sum error, file corrupted." 19.471 msgstr "Ошибка контрольной суммы, файл поврежден." 19.472 19.473 #: tazinst:1287 19.474 -msgid "md5 file not found, cannot check integrity." 19.475 -msgstr "Файл контрольной суммы не найден, проверить целостность невозможно." 19.476 +msgid "%s: md5 file not found, cannot check integrity." 19.477 +msgstr "" 19.478 +"Файл контрольной суммы не найден на %s, проверить целостность невозможно." 19.479 19.480 #: tazinst:1292 19.481 -msgid "Using files from ISO" 19.482 -msgstr "Используя файлы из ISO" 19.483 +msgid "Using files from ISO %s." 19.484 +msgstr "Используются файлы из ISO %s." 19.485 19.486 #: tazinst:1294 19.487 -msgid "Failed to mount ISO." 19.488 -msgstr "Не удалось подключить ISO." 19.489 +msgid "%s: Failed to mount ISO." 19.490 +msgstr "Не удалось подключить ISO %s." 19.491 19.492 #: tazinst:1316 tazinst:1404 19.493 -msgid "Creating mount point:" 19.494 -msgstr "Создание точки подключения:" 19.495 +msgid "Creating mount point: %s..." 19.496 +msgstr "Создание точки подключения %s…" 19.497 19.498 #: tazinst:1332 19.499 msgid "Checking installation media..." 19.500 @@ -484,8 +496,12 @@ 19.501 msgstr "Установочный носитель в порядке" 19.502 19.503 #: tazinst:1349 19.504 -msgid "Format" 19.505 -msgstr "Форматирование" 19.506 +msgid "Format %s (%s)" 19.507 +msgstr "Форматирование %s (%s)" 19.508 + 19.509 +#: tazinst:1354 tazinst:1366 19.510 +msgid "Formatting has failed" 19.511 +msgstr "Форматирование завершилось ошибкой" 19.512 19.513 #: tazinst:1373 19.514 msgid "Preparing target partition..." 19.515 @@ -500,44 +516,48 @@ 19.516 msgstr "Раздел уже используется." 19.517 19.518 #: tazinst:1389 19.519 -msgid "The partition will be cleaned..." 19.520 -msgstr "Раздел будет очищен…" 19.521 +msgid "%s: The partition will be cleaned..." 19.522 +msgstr "Раздел %s будет очищен…" 19.523 19.524 #: tazinst:1398 19.525 -msgid "The partition will be kept..." 19.526 -msgstr "Раздел будет сохранен…" 19.527 +msgid "%s: The partition will be kept..." 19.528 +msgstr "Раздел %s будет сохранен…" 19.529 19.530 #: tazinst:1413 19.531 -msgid "Unable to mount partition" 19.532 -msgstr "Не удалось подключить раздел" 19.533 +msgid "%s: Unable to mount partition" 19.534 +msgstr "Не удалось подключить раздел %s" 19.535 19.536 #: tazinst:1427 19.537 -msgid "Unmounting target partition:" 19.538 -msgstr "Отключение целевого раздела:" 19.539 +msgid "Unmounting target partition: %s" 19.540 +msgstr "Отключение целевого раздела %s" 19.541 19.542 #: tazinst:1433 19.543 -msgid "Unmounting:" 19.544 -msgstr "Отключение:" 19.545 +msgid "Unmounting: %s" 19.546 +msgstr "Отключение %s" 19.547 19.548 #: tazinst:1437 19.549 -msgid "Unlinking:" 19.550 -msgstr "Удаление ссылки:" 19.551 +msgid "Unlinking: %s" 19.552 +msgstr "Удаление ссылки %s" 19.553 19.554 #: tazinst:1443 19.555 -msgid "Ejecting cdrom..." 19.556 +msgid "Ejecting CD-ROM..." 19.557 msgstr "Извлечение CD-ROM…" 19.558 19.559 #: tazinst:1452 19.560 -msgid "Process completed. You can now restart (reboot)" 19.561 -msgstr "Процесс завершен. Теперь вы можете перезагрузить" 19.562 +msgid "" 19.563 +"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux " 19.564 +"system." 19.565 +msgstr "" 19.566 +"Процесс завершен. Теперь вы можете перезагрузить вашу систему SliTaz GNU/" 19.567 +"Linux." 19.568 19.569 -#: tazinst:1453 19.570 -msgid "from your SliTaz GNU/Linux system." 19.571 -msgstr "вашу систему SliTaz GNU/Linux." 19.572 +#: tazinst:1454 19.573 +msgid "=== Tazinst ended on %s ===" 19.574 +msgstr "=== Tazinst завершен %s ===" 19.575 19.576 #: tazinst:1457 19.577 -msgid "Copying log to /var/log/tazinst.log" 19.578 -msgstr "Копирование журнала в /var/log/tazinst.log" 19.579 +msgid "Copying log to %s" 19.580 +msgstr "Копирование журнала в %s" 19.581 19.582 #: tazinst:1493 19.583 msgid "No bootloader to install." 19.584 @@ -548,8 +568,12 @@ 19.585 msgstr "Включение двойной загрузки Windows" 19.586 19.587 #: tazinst:1610 19.588 -msgid "Installing grub on:" 19.589 -msgstr "Установка GRUB на:" 19.590 +msgid "Installing GRUB on: %s" 19.591 +msgstr "Установка GRUB на %s" 19.592 + 19.593 +#: tazinst:1611 19.594 +msgid "GRUB not found" 19.595 +msgstr "GRUB не обнаружен" 19.596 19.597 #: tazinst:1615 19.598 msgid "Setting the boot flag" 19.599 @@ -560,15 +584,23 @@ 19.600 msgstr "Копирование изображения заставки" 19.601 19.602 #: tazinst:1710 19.603 -msgid "Installing syslinux" 19.604 -msgstr "Установка syslinux" 19.605 +msgid "Installing Syslinux" 19.606 +msgstr "Установка Syslinux" 19.607 + 19.608 +#: tazinst:1720 19.609 +msgid "Syslinux not found" 19.610 +msgstr "Syslinux не обнаружен" 19.611 19.612 #: tazinst:1724 19.613 msgid "Setting the boot flag on" 19.614 msgstr "Включение загрузочного флага" 19.615 19.616 +#: tazinst:1727 19.617 +msgid "mbr.bin not found" 19.618 +msgstr "Файл mbr.bin не обнаружен" 19.619 + 19.620 #: tazinst:1728 19.621 -msgid "Installing mbr" 19.622 +msgid "Installing MBR" 19.623 msgstr "Установка MBR" 19.624 19.625 #: tazinst:1732 19.626 @@ -576,84 +608,88 @@ 19.627 msgstr "Включение флага legacy_boot" 19.628 19.629 #: tazinst:1741 19.630 -msgid "Installing gptmbr" 19.631 +msgid "Installing GPTMBR" 19.632 msgstr "Установка GPTMBR" 19.633 19.634 +#: tazinst:1742 19.635 +msgid "gptmbr.bin not found" 19.636 +msgstr "Файл gptmbr.bin не обнаружен" 19.637 + 19.638 #: tazinst:1781 19.639 -msgid "Cleaning the root partition" 19.640 -msgstr "Очистка корневого раздела" 19.641 +msgid "Cleaning the root partition (%s)..." 19.642 +msgstr "Очистка корневого раздела (%s)…" 19.643 19.644 #: tazinst:1790 tazinst:2063 19.645 -msgid "keeping /home found on:" 19.646 -msgstr "не будет удалена папка /home, найденная на:" 19.647 +msgid "keeping /home found on: %s" 19.648 +msgstr "не будет удалена папка /home, найденная на %s" 19.649 19.650 -#: tazinst:1795 19.651 -msgid "removing target:" 19.652 -msgstr "удаление цели:" 19.653 +#: tazinst:1795 tazinst:2077 19.654 +msgid "removing target: %s" 19.655 +msgstr "удаление цели %s" 19.656 19.657 #: tazinst:1813 19.658 -msgid "Kernel name not found, falling back to:" 19.659 -msgstr "Название ядра не найдено, откат к:" 19.660 +msgid "Kernel name not found, falling back to: %s" 19.661 +msgstr "Название ядра не найдено, принимается название %s" 19.662 19.663 #: tazinst:1819 19.664 -msgid "install_kernel:" 19.665 -msgstr "install_kernel:" 19.666 +msgid "install_kernel: %s" 19.667 +msgstr "install_kernel %s" 19.668 19.669 #: tazinst:1905 19.670 msgid "Restoring directory: /home..." 19.671 msgstr "Восстановление папки /home…" 19.672 19.673 #: tazinst:1911 19.674 -msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..." 19.675 -msgstr "Добавление корневого раздела и CHECK_FS в файл /etc/rcS.conf…" 19.676 +msgid "Adding / partition and CHECK_FS to file %s..." 19.677 +msgstr "Добавление корневого раздела и CHECK_FS в файл %s…" 19.678 19.679 #: tazinst:1914 19.680 -msgid "Configuring host name:" 19.681 -msgstr "Настройка названия хоста:" 19.682 +msgid "Configuring host name: %s" 19.683 +msgstr "Настройка названия хоста: %s" 19.684 19.685 #: tazinst:1977 19.686 -msgid "Configuring partition to be used as /home:" 19.687 -msgstr "Настройка раздела для использования как /home:" 19.688 +msgid "Configuring partition to be used as /home: %s" 19.689 +msgstr "Настройка раздела %s для использования как /home" 19.690 19.691 #: tazinst:1996 19.692 -msgid "Installing SliTaz on:" 19.693 -msgstr "Установка SliTaz на:" 19.694 +msgid "Installing SliTaz on: %s" 19.695 +msgstr "Установка SliTaz на %s" 19.696 19.697 #: tazinst:1997 tazinst:2176 19.698 -msgid "Checking settings" 19.699 -msgstr "Проверка настроек" 19.700 +msgid "Checking settings..." 19.701 +msgstr "Проверка настроек…" 19.702 19.703 #: tazinst:2001 tazinst:2180 19.704 -msgid "Preparing source media" 19.705 -msgstr "Подготовка исходного носителя" 19.706 +msgid "Preparing source media..." 19.707 +msgstr "Подготовка исходного носителя…" 19.708 19.709 #: tazinst:2004 tazinst:2183 19.710 -msgid "Preparing target disk" 19.711 -msgstr "Подготовка целевого диска" 19.712 +msgid "Preparing target disk..." 19.713 +msgstr "Подготовка целевого диска…" 19.714 19.715 #: tazinst:2007 19.716 -msgid "Cleaning the root partition if necessary" 19.717 -msgstr "Очистка корневого раздела при необходимости" 19.718 +msgid "Cleaning the root partition if necessary..." 19.719 +msgstr "Очистка корневого раздела при необходимости…" 19.720 19.721 #: tazinst:2010 tazinst:2192 19.722 -msgid "Extracting the root system" 19.723 -msgstr "Извлечение корневой системы" 19.724 +msgid "Extracting the root system..." 19.725 +msgstr "Извлечение корневой системы…" 19.726 19.727 #: tazinst:2013 tazinst:2198 19.728 -msgid "Installing the kernel" 19.729 -msgstr "Установка ядра" 19.730 +msgid "Installing the Kernel..." 19.731 +msgstr "Установка ядра…" 19.732 19.733 #: tazinst:2016 19.734 -msgid "Preconfiguring the system" 19.735 -msgstr "Перенастройка системы" 19.736 +msgid "Preconfiguring the system..." 19.737 +msgstr "Перенастройка системы…" 19.738 19.739 #: tazinst:2019 19.740 -msgid "Configuring root and default user account" 19.741 -msgstr "Настройка учетных записей root и пользователя по умолчанию" 19.742 +msgid "Configuring root and default user account..." 19.743 +msgstr "Настройка учетных записей root и пользователя по умолчанию…" 19.744 19.745 #: tazinst:2022 19.746 -msgid "Configuring /home" 19.747 -msgstr "Настройка /home" 19.748 +msgid "Configuring /home..." 19.749 +msgstr "Настройка /home…" 19.750 19.751 #: tazinst:2025 19.752 msgid "Checking bootloader installation..." 19.753 @@ -664,32 +700,32 @@ 19.754 msgstr "Установка файлов завершена" 19.755 19.756 #: tazinst:2042 19.757 -msgid "Preparing upgrade of SliTaz release:" 19.758 -msgstr "Подготовка к обновлению выпуска SliTaz:" 19.759 +msgid "Preparing upgrade of SliTaz release: %s" 19.760 +msgstr "Подготовка к обновлению выпуска SliTaz %s" 19.761 19.762 #: tazinst:2044 19.763 msgid "" 19.764 -"This partition doesn't appear to contain a valid SliTaz system, the file: /" 19.765 -"etc/slitaz-release doesn't exist." 19.766 +"%s: This partition doesn't appear to contain a valid SliTaz system, the " 19.767 +"file: %s doesn't exist." 19.768 msgstr "" 19.769 -"Похоже, что этот раздел не содержит допустимую систему SliTaz, отсутствует " 19.770 -"файл /etc/slitaz-release." 19.771 +"Похоже, что раздел %s не содержит допустимую систему SliTaz, отсутствует " 19.772 +"файл %s." 19.773 19.774 #: tazinst:2067 19.775 -msgid "keeping /etc found on:" 19.776 -msgstr "не будет удалена папка /etc, найденная на:" 19.777 +msgid "keeping /etc found on: %s" 19.778 +msgstr "не будет удалена папка /etc, найденная на %s" 19.779 19.780 #: tazinst:2071 19.781 -msgid "keeping /var/www found on:" 19.782 -msgstr "не будет удалена папка /var/www, найденная на:" 19.783 +msgid "keeping /var/www found on: %s" 19.784 +msgstr "не будет удалена папка /var/www, найденная на: %s" 19.785 19.786 #: tazinst:2098 19.787 -msgid "backups restored:" 19.788 -msgstr "резервные копии восстановлены:" 19.789 +msgid "backups restored: %s" 19.790 +msgstr "резервные копии восстановлены %s" 19.791 19.792 #: tazinst:2105 19.793 -msgid "backups saved in /var/lib/tazinst" 19.794 -msgstr "резервные копии сохранены в папке /var/lib/tazinst" 19.795 +msgid "backups saved in %s" 19.796 +msgstr "резервные копии сохранены в папке %s" 19.797 19.798 #: tazinst:2112 19.799 msgid "Checking the availability of packages..." 19.800 @@ -704,8 +740,8 @@ 19.801 msgstr "ничего не нужно устанавливать" 19.802 19.803 #: tazinst:2132 19.804 -msgid "Installing:" 19.805 -msgstr "Установка:" 19.806 +msgid "Installing: %s..." 19.807 +msgstr "Установка %s…" 19.808 19.809 #: tazinst:2141 19.810 msgid "Installation of packages complete..." 19.811 @@ -715,46 +751,43 @@ 19.812 msgid "Creating package lists..." 19.813 msgstr "Создание списка пакетов…" 19.814 19.815 -#: tazinst:2152 19.816 -msgid "packages-source.list: done" 19.817 -msgstr "packages-source.list: готово" 19.818 - 19.819 -#: tazinst:2156 19.820 -msgid "packages-selection.diff: done" 19.821 -msgstr "packages-selection.diff: готово" 19.822 +#: tazinst:2152 tazinst:2156 19.823 +msgid "%s: done" 19.824 +msgstr "%s: готово" 19.825 19.826 #: tazinst:2163 19.827 msgid "" 19.828 "The list of available packages on the mirror could not be downloaded. No " 19.829 "missing packages will be reinstalled now, but you can do so later by looking " 19.830 -"at the following list:\n" 19.831 -"/var/lib/tazinst/packages-selection.diff" 19.832 +"at the following list:" 19.833 msgstr "" 19.834 "Список пакетов, доступных на зеркале, не может быть загружен. Отсутствующие " 19.835 "пакеты сейчас не будут переустановлены, но это можно сделать позже, " 19.836 -"просмотрев следующий список:\n" 19.837 -"/var/lib/tazinst/packages-selection.diff" 19.838 +"просмотрев следующий список:" 19.839 19.840 #: tazinst:2175 19.841 -msgid "Upgrading SliTaz on:" 19.842 -msgstr "Обновление SliTaz на:" 19.843 +msgid "Upgrading SliTaz on: %s" 19.844 +msgstr "Обновление SliTaz на %s" 19.845 19.846 #: tazinst:2186 19.847 -msgid "Searching for /etc/slitaz-release" 19.848 -msgstr "Поиск файла /etc/slitaz-release" 19.849 +msgid "Searching for %s..." 19.850 +msgstr "Поиск файла %s…" 19.851 19.852 #: tazinst:2189 19.853 -msgid "Backup /etc, /home and the packages list" 19.854 -msgstr "Сохранение резервной копии /etc, /home и списка пакетов" 19.855 +msgid "Backup /etc, /home and the packages list..." 19.856 +msgstr "Сохранение резервной копии /etc, /home и списка пакетов…" 19.857 19.858 #: tazinst:2195 19.859 -msgid "Restoring configuration files" 19.860 -msgstr "Восстановление конфигурационных файлов" 19.861 +msgid "Restoring configuration files..." 19.862 +msgstr "Восстановление конфигурационных файлов…" 19.863 19.864 #: tazinst:2201 19.865 -msgid "Upgrading added packages" 19.866 -msgstr "Обновление добавленных пакетов" 19.867 +msgid "Upgrading added packages..." 19.868 +msgstr "Обновление добавленных пакетов…" 19.869 19.870 #: tazinst:2204 19.871 -msgid "Bootloader" 19.872 -msgstr "Загрузчик" 19.873 +msgid "Bootloader..." 19.874 +msgstr "Загрузчик…" 19.875 + 19.876 +#~ msgid "Download failed." 19.877 +#~ msgstr "Ошибка загрузки."
20.1 --- a/po/tazinst/tazinst.pot Wed Apr 06 09:52:43 2016 +0300 20.2 +++ b/po/tazinst/tazinst.pot Sat Apr 09 17:22:22 2016 +0300 20.3 @@ -8,7 +8,7 @@ 20.4 msgstr "" 20.5 "Project-Id-Version: TazInst \n" 20.6 "Report-Msgid-Bugs-To: \n" 20.7 -"POT-Creation-Date: 2016-04-05 19:03+0100\n" 20.8 +"POT-Creation-Date: 2016-04-09 17:07+0300\n" 20.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 20.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 20.11 "Language-Team: LANGUAGE <LL@li.org>\n" 20.12 @@ -78,7 +78,7 @@ 20.13 msgstr "" 20.14 20.15 #: tazinst:83 20.16 -msgid "Grub legacy bootloader" 20.17 +msgid "GRUB legacy bootloader" 20.18 msgstr "" 20.19 20.20 #: tazinst:84 20.21 @@ -102,7 +102,7 @@ 20.22 msgstr "" 20.23 20.24 #: tazinst:99 20.25 -msgid "Stable basic graphic version with only Gtk" 20.26 +msgid "Stable basic graphic version with only GTK" 20.27 msgstr "" 20.28 20.29 #: tazinst:101 20.30 @@ -114,87 +114,83 @@ 20.31 msgstr "" 20.32 20.33 #: tazinst:114 tazinst:138 tazinst:150 20.34 -msgid "SliTaz GNU/Linux Installer - Version:" 20.35 +msgid "SliTaz GNU/Linux Installer - Version: %s" 20.36 +msgstr "" 20.37 + 20.38 +#: tazinst:115 20.39 +msgid "Usage:" 20.40 msgstr "" 20.41 20.42 #: tazinst:116 20.43 -msgid "Usage" 20.44 +msgid "%s [command] <setting> <value> <file>" 20.45 msgstr "" 20.46 20.47 #: tazinst:117 20.48 -msgid "tazinst [command] <setting> <value> <file>" 20.49 +msgid "Commands:" 20.50 msgstr "" 20.51 20.52 #: tazinst:119 20.53 -msgid "Commands" 20.54 +msgid "Create a new install file." 20.55 msgstr "" 20.56 20.57 #: tazinst:120 20.58 -msgid "Create a new install file." 20.59 +msgid "Change value of a setting." 20.60 msgstr "" 20.61 20.62 #: tazinst:121 20.63 -msgid "Change value of a setting." 20.64 +msgid "Clear a setting." 20.65 msgstr "" 20.66 20.67 #: tazinst:122 20.68 -msgid "Clear a setting." 20.69 +msgid "Get the value of a setting." 20.70 msgstr "" 20.71 20.72 #: tazinst:123 20.73 -msgid "Get the value of a setting." 20.74 +msgid "Check settings." 20.75 msgstr "" 20.76 20.77 #: tazinst:124 20.78 -msgid "Check settings." 20.79 +msgid "Print a short help on settings" 20.80 msgstr "" 20.81 20.82 #: tazinst:125 20.83 -msgid "Print a short help on settings" 20.84 +msgid "List system resources." 20.85 msgstr "" 20.86 20.87 #: tazinst:126 20.88 -msgid "List system resources." 20.89 +msgid "Execute a SliTaz installation." 20.90 msgstr "" 20.91 20.92 #: tazinst:127 20.93 -msgid "Execute a SliTaz installation." 20.94 +msgid "Display log file contents." 20.95 msgstr "" 20.96 20.97 #: tazinst:128 20.98 -msgid "Display log file contents." 20.99 +msgid "Clean install and log files." 20.100 msgstr "" 20.101 20.102 #: tazinst:129 20.103 -msgid "Clean install and log files." 20.104 +msgid "Print version and exit." 20.105 msgstr "" 20.106 20.107 #: tazinst:130 20.108 -msgid "Print version and exit." 20.109 -msgstr "" 20.110 - 20.111 -#: tazinst:131 20.112 msgid "Print this short usage." 20.113 msgstr "" 20.114 20.115 -#: tazinst:141 20.116 -msgid "Unknown command!" 20.117 +#: tazinst:140 20.118 +msgid "'%s': Unknown command!" 20.119 msgstr "" 20.120 20.121 #: tazinst:142 20.122 -msgid "Run" 20.123 +msgid "Run: '%s' to get a list of available commands." 20.124 msgstr "" 20.125 20.126 -#: tazinst:143 20.127 -msgid "to get a list of available commands" 20.128 -msgstr "" 20.129 - 20.130 -#: tazinst:153 20.131 -msgid "Unknown option!" 20.132 +#: tazinst:152 20.133 +msgid "'%s': Unknown option!" 20.134 msgstr "" 20.135 20.136 #: tazinst:154 20.137 -msgid "Please select one of these options" 20.138 +msgid "Please select one of these options:" 20.139 msgstr "" 20.140 20.141 #: tazinst:173 20.142 @@ -206,19 +202,23 @@ 20.143 msgstr "" 20.144 20.145 #: tazinst:278 tazinst:283 20.146 -msgid "Error: Unable to read install file" 20.147 +msgid "Error: Unable to read install file." 20.148 msgstr "" 20.149 20.150 -#: tazinst:389 20.151 +#: tazinst:355 20.152 +msgid "Error: '%s' unknown setting." 20.153 +msgstr "" 20.154 + 20.155 +#: tazinst:383 20.156 msgid "Error: Unable to write to install file." 20.157 msgstr "" 20.158 20.159 #: tazinst:443 20.160 -msgid "Deleting install file" 20.161 +msgid "Deleting install file: %s" 20.162 msgstr "" 20.163 20.164 #: tazinst:445 20.165 -msgid "Error: Unable to delete install file" 20.166 +msgid "Error: Unable to delete install file." 20.167 msgstr "" 20.168 20.169 #: tazinst:460 20.170 @@ -232,15 +232,11 @@ 20.171 msgstr "" 20.172 20.173 #: tazinst:485 20.174 -msgid "Error:" 20.175 -msgstr "" 20.176 - 20.177 -#: tazinst:485 20.178 -msgid "Invalid keyword." 20.179 +msgid "Error: '%s' Invalid keyword." 20.180 msgstr "" 20.181 20.182 #: tazinst:486 20.183 -msgid "Select one of these options:" 20.184 +msgid "Select one of these options: %s." 20.185 msgstr "" 20.186 20.187 #: tazinst:487 20.188 @@ -248,30 +244,30 @@ 20.189 msgstr "" 20.190 20.191 #: tazinst:502 20.192 -msgid "Error: Partition not found" 20.193 +msgid "Error: Partition not found." 20.194 msgstr "" 20.195 20.196 #: tazinst:503 20.197 -msgid "To see available partitions, run" 20.198 +msgid "To see available partitions, run '%s'." 20.199 msgstr "" 20.200 20.201 #: tazinst:518 20.202 -msgid "Error: Source file not found" 20.203 +msgid "Error: Source file not found." 20.204 msgstr "" 20.205 20.206 #: tazinst:533 20.207 -msgid "Error: invalid URL" 20.208 +msgid "Error: invalid URL." 20.209 msgstr "" 20.210 20.211 -#: tazinst:549 20.212 +#: tazinst:548 20.213 msgid "Error: multiple assignations for a disk." 20.214 msgstr "" 20.215 20.216 #: tazinst:562 20.217 -msgid "Error: password too long" 20.218 +msgid "Error: password too long." 20.219 msgstr "" 20.220 20.221 -#: tazinst:568 20.222 +#: tazinst:567 20.223 msgid "Error: Unallowed characters in password." 20.224 msgstr "" 20.225 20.226 @@ -283,12 +279,16 @@ 20.227 msgid "Warning: no password!" 20.228 msgstr "" 20.229 20.230 +#: tazinst:590 20.231 +msgid "%s Error: Too short." 20.232 +msgstr "" 20.233 + 20.234 #: tazinst:594 20.235 -msgid "Error: Too long." 20.236 +msgid "%s Error: Too long." 20.237 msgstr "" 20.238 20.239 #: tazinst:599 20.240 -msgid "Error: Invalid chars." 20.241 +msgid "%s Error: Invalid chars." 20.242 msgstr "" 20.243 20.244 #: tazinst:611 20.245 @@ -296,7 +296,7 @@ 20.246 msgstr "" 20.247 20.248 #: tazinst:625 20.249 -msgid "Error: Unsupported Partition Table" 20.250 +msgid "Error: Unsupported Partition Table." 20.251 msgstr "" 20.252 20.253 #: tazinst:630 20.254 @@ -312,75 +312,75 @@ 20.255 msgstr "" 20.256 20.257 #: tazinst:753 20.258 -msgid "Type: tazinst help web" 20.259 +msgid "Type: %s" 20.260 msgstr "" 20.261 20.262 #: tazinst:758 20.263 +msgid "List of settings:" 20.264 +msgstr "" 20.265 + 20.266 +#: tazinst:760 20.267 msgid "Mode of install" 20.268 msgstr "" 20.269 20.270 -#: tazinst:759 20.271 +#: tazinst:761 20.272 msgid "Media containing the SliTaz source files" 20.273 msgstr "" 20.274 20.275 -#: tazinst:760 20.276 +#: tazinst:762 20.277 msgid "Source file containing SliTaz" 20.278 msgstr "" 20.279 20.280 -#: tazinst:761 20.281 +#: tazinst:763 20.282 msgid "The name of the target partition" 20.283 msgstr "" 20.284 20.285 -#: tazinst:762 20.286 +#: tazinst:764 20.287 msgid "Format of the target partition" 20.288 msgstr "" 20.289 20.290 -#: tazinst:763 20.291 +#: tazinst:765 20.292 msgid "Separate home partition" 20.293 msgstr "" 20.294 20.295 -#: tazinst:764 20.296 +#: tazinst:766 20.297 msgid "Format of the root partition" 20.298 msgstr "" 20.299 20.300 -#: tazinst:765 tazinst:811 20.301 +#: tazinst:767 tazinst:811 20.302 msgid "Name of the system" 20.303 msgstr "" 20.304 20.305 -#: tazinst:766 tazinst:813 20.306 +#: tazinst:768 tazinst:813 20.307 msgid "Superuser password" 20.308 msgstr "" 20.309 20.310 -#: tazinst:767 tazinst:815 20.311 +#: tazinst:769 tazinst:815 20.312 msgid "First user name" 20.313 msgstr "" 20.314 20.315 -#: tazinst:768 tazinst:817 20.316 +#: tazinst:770 tazinst:817 20.317 msgid "First user password" 20.318 msgstr "" 20.319 20.320 -#: tazinst:769 20.321 +#: tazinst:771 20.322 msgid "Install a bootloader" 20.323 msgstr "" 20.324 20.325 -#: tazinst:770 20.326 +#: tazinst:772 20.327 msgid "Partition to dualboot Windows from" 20.328 msgstr "" 20.329 20.330 -#: tazinst:771 20.331 -msgid "List of settings:" 20.332 -msgstr "" 20.333 - 20.334 #: tazinst:790 20.335 msgid "CD. Automatically set" 20.336 msgstr "" 20.337 20.338 #: tazinst:793 20.339 -msgid "USB partition. For a list, type: tazinst list usb" 20.340 +msgid "USB partition. For a list, type: %s" 20.341 msgstr "" 20.342 20.343 #: tazinst:796 20.344 -msgid "ISO file name. For a list, type: tazinst list iso" 20.345 +msgid "ISO file name. For a list, type: %s" 20.346 msgstr "" 20.347 20.348 #: tazinst:822 20.349 @@ -388,27 +388,31 @@ 20.350 msgstr "" 20.351 20.352 #: tazinst:1127 20.353 -msgid "No mirror list found, run tazpkg recharge." 20.354 +msgid "No mirror list found, run %s." 20.355 msgstr "" 20.356 20.357 #: tazinst:1139 20.358 -msgid "Downloading:" 20.359 +msgid "Downloading: %s" 20.360 msgstr "" 20.361 20.362 #: tazinst:1146 20.363 msgid "Download completed." 20.364 msgstr "" 20.365 20.366 -#: tazinst:1148 20.367 -msgid "Download failed." 20.368 +#: tazinst:1157 20.369 +msgid "Installing package %s to the current system." 20.370 msgstr "" 20.371 20.372 -#: tazinst:1157 20.373 -msgid "Installing package to the current system:" 20.374 +#: tazinst:1159 20.375 +msgid "Cannot install %s." 20.376 msgstr "" 20.377 20.378 #: tazinst:1167 20.379 -msgid "Adding package to the target system:" 20.380 +msgid "Adding package %s to the target system..." 20.381 +msgstr "" 20.382 + 20.383 +#: tazinst:1182 20.384 +msgid "=== Tazinst: started on %s ===" 20.385 msgstr "" 20.386 20.387 #: tazinst:1208 20.388 @@ -416,7 +420,11 @@ 20.389 msgstr "" 20.390 20.391 #: tazinst:1209 tazinst:1213 20.392 -msgid "Error" 20.393 +msgid "Error: %s" 20.394 +msgstr "" 20.395 + 20.396 +#: tazinst:1216 20.397 +msgid "=== Tazinst error on %s ===" 20.398 msgstr "" 20.399 20.400 #: tazinst:1225 20.401 @@ -428,19 +436,23 @@ 20.402 msgstr "" 20.403 20.404 #: tazinst:1251 20.405 -msgid "Using files from" 20.406 +msgid "Using files from %s." 20.407 msgstr "" 20.408 20.409 #: tazinst:1253 20.410 -msgid "Mount failed" 20.411 +msgid "%s: Mount failed." 20.412 msgstr "" 20.413 20.414 -#: tazinst:1262 tazinst:1267 20.415 -msgid "Using files from USB device" 20.416 +#: tazinst:1262 20.417 +msgid "Using files from USB device..." 20.418 +msgstr "" 20.419 + 20.420 +#: tazinst:1267 20.421 +msgid "Using files from USB device %s." 20.422 msgstr "" 20.423 20.424 #: tazinst:1269 20.425 -msgid "Failed to mount USB device" 20.426 +msgid "%s: Failed to mount USB device." 20.427 msgstr "" 20.428 20.429 #: tazinst:1284 20.430 @@ -448,19 +460,19 @@ 20.431 msgstr "" 20.432 20.433 #: tazinst:1287 20.434 -msgid "md5 file not found, cannot check integrity." 20.435 +msgid "%s: md5 file not found, cannot check integrity." 20.436 msgstr "" 20.437 20.438 #: tazinst:1292 20.439 -msgid "Using files from ISO" 20.440 +msgid "Using files from ISO %s." 20.441 msgstr "" 20.442 20.443 #: tazinst:1294 20.444 -msgid "Failed to mount ISO." 20.445 +msgid "%s: Failed to mount ISO." 20.446 msgstr "" 20.447 20.448 #: tazinst:1316 tazinst:1404 20.449 -msgid "Creating mount point:" 20.450 +msgid "Creating mount point: %s..." 20.451 msgstr "" 20.452 20.453 #: tazinst:1332 20.454 @@ -476,7 +488,11 @@ 20.455 msgstr "" 20.456 20.457 #: tazinst:1349 20.458 -msgid "Format" 20.459 +msgid "Format %s (%s)" 20.460 +msgstr "" 20.461 + 20.462 +#: tazinst:1354 tazinst:1366 20.463 +msgid "Formatting has failed" 20.464 msgstr "" 20.465 20.466 #: tazinst:1373 20.467 @@ -492,43 +508,45 @@ 20.468 msgstr "" 20.469 20.470 #: tazinst:1389 20.471 -msgid "The partition will be cleaned..." 20.472 +msgid "%s: The partition will be cleaned..." 20.473 msgstr "" 20.474 20.475 #: tazinst:1398 20.476 -msgid "The partition will be kept..." 20.477 +msgid "%s: The partition will be kept..." 20.478 msgstr "" 20.479 20.480 #: tazinst:1413 20.481 -msgid "Unable to mount partition" 20.482 +msgid "%s: Unable to mount partition" 20.483 msgstr "" 20.484 20.485 #: tazinst:1427 20.486 -msgid "Unmounting target partition:" 20.487 +msgid "Unmounting target partition: %s" 20.488 msgstr "" 20.489 20.490 #: tazinst:1433 20.491 -msgid "Unmounting:" 20.492 +msgid "Unmounting: %s" 20.493 msgstr "" 20.494 20.495 #: tazinst:1437 20.496 -msgid "Unlinking:" 20.497 +msgid "Unlinking: %s" 20.498 msgstr "" 20.499 20.500 #: tazinst:1443 20.501 -msgid "Ejecting cdrom..." 20.502 +msgid "Ejecting CD-ROM..." 20.503 msgstr "" 20.504 20.505 #: tazinst:1452 20.506 -msgid "Process completed. You can now restart (reboot)" 20.507 +msgid "" 20.508 +"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux " 20.509 +"system." 20.510 msgstr "" 20.511 20.512 -#: tazinst:1453 20.513 -msgid "from your SliTaz GNU/Linux system." 20.514 +#: tazinst:1454 20.515 +msgid "=== Tazinst ended on %s ===" 20.516 msgstr "" 20.517 20.518 #: tazinst:1457 20.519 -msgid "Copying log to /var/log/tazinst.log" 20.520 +msgid "Copying log to %s" 20.521 msgstr "" 20.522 20.523 #: tazinst:1493 20.524 @@ -540,7 +558,11 @@ 20.525 msgstr "" 20.526 20.527 #: tazinst:1610 20.528 -msgid "Installing grub on:" 20.529 +msgid "Installing GRUB on: %s" 20.530 +msgstr "" 20.531 + 20.532 +#: tazinst:1611 20.533 +msgid "GRUB not found" 20.534 msgstr "" 20.535 20.536 #: tazinst:1615 20.537 @@ -552,15 +574,23 @@ 20.538 msgstr "" 20.539 20.540 #: tazinst:1710 20.541 -msgid "Installing syslinux" 20.542 +msgid "Installing Syslinux" 20.543 +msgstr "" 20.544 + 20.545 +#: tazinst:1720 20.546 +msgid "Syslinux not found" 20.547 msgstr "" 20.548 20.549 #: tazinst:1724 20.550 msgid "Setting the boot flag on" 20.551 msgstr "" 20.552 20.553 +#: tazinst:1727 20.554 +msgid "mbr.bin not found" 20.555 +msgstr "" 20.556 + 20.557 #: tazinst:1728 20.558 -msgid "Installing mbr" 20.559 +msgid "Installing MBR" 20.560 msgstr "" 20.561 20.562 #: tazinst:1732 20.563 @@ -568,27 +598,31 @@ 20.564 msgstr "" 20.565 20.566 #: tazinst:1741 20.567 -msgid "Installing gptmbr" 20.568 +msgid "Installing GPTMBR" 20.569 +msgstr "" 20.570 + 20.571 +#: tazinst:1742 20.572 +msgid "gptmbr.bin not found" 20.573 msgstr "" 20.574 20.575 #: tazinst:1781 20.576 -msgid "Cleaning the root partition" 20.577 +msgid "Cleaning the root partition (%s)..." 20.578 msgstr "" 20.579 20.580 #: tazinst:1790 tazinst:2063 20.581 -msgid "keeping /home found on:" 20.582 +msgid "keeping /home found on: %s" 20.583 msgstr "" 20.584 20.585 -#: tazinst:1795 20.586 -msgid "removing target:" 20.587 +#: tazinst:1795 tazinst:2077 20.588 +msgid "removing target: %s" 20.589 msgstr "" 20.590 20.591 #: tazinst:1813 20.592 -msgid "Kernel name not found, falling back to:" 20.593 +msgid "Kernel name not found, falling back to: %s" 20.594 msgstr "" 20.595 20.596 #: tazinst:1819 20.597 -msgid "install_kernel:" 20.598 +msgid "install_kernel: %s" 20.599 msgstr "" 20.600 20.601 #: tazinst:1905 20.602 @@ -596,55 +630,55 @@ 20.603 msgstr "" 20.604 20.605 #: tazinst:1911 20.606 -msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..." 20.607 +msgid "Adding / partition and CHECK_FS to file %s..." 20.608 msgstr "" 20.609 20.610 #: tazinst:1914 20.611 -msgid "Configuring host name:" 20.612 +msgid "Configuring host name: %s" 20.613 msgstr "" 20.614 20.615 #: tazinst:1977 20.616 -msgid "Configuring partition to be used as /home:" 20.617 +msgid "Configuring partition to be used as /home: %s" 20.618 msgstr "" 20.619 20.620 #: tazinst:1996 20.621 -msgid "Installing SliTaz on:" 20.622 +msgid "Installing SliTaz on: %s" 20.623 msgstr "" 20.624 20.625 #: tazinst:1997 tazinst:2176 20.626 -msgid "Checking settings" 20.627 +msgid "Checking settings..." 20.628 msgstr "" 20.629 20.630 #: tazinst:2001 tazinst:2180 20.631 -msgid "Preparing source media" 20.632 +msgid "Preparing source media..." 20.633 msgstr "" 20.634 20.635 #: tazinst:2004 tazinst:2183 20.636 -msgid "Preparing target disk" 20.637 +msgid "Preparing target disk..." 20.638 msgstr "" 20.639 20.640 #: tazinst:2007 20.641 -msgid "Cleaning the root partition if necessary" 20.642 +msgid "Cleaning the root partition if necessary..." 20.643 msgstr "" 20.644 20.645 #: tazinst:2010 tazinst:2192 20.646 -msgid "Extracting the root system" 20.647 +msgid "Extracting the root system..." 20.648 msgstr "" 20.649 20.650 #: tazinst:2013 tazinst:2198 20.651 -msgid "Installing the kernel" 20.652 +msgid "Installing the Kernel..." 20.653 msgstr "" 20.654 20.655 #: tazinst:2016 20.656 -msgid "Preconfiguring the system" 20.657 +msgid "Preconfiguring the system..." 20.658 msgstr "" 20.659 20.660 #: tazinst:2019 20.661 -msgid "Configuring root and default user account" 20.662 +msgid "Configuring root and default user account..." 20.663 msgstr "" 20.664 20.665 #: tazinst:2022 20.666 -msgid "Configuring /home" 20.667 +msgid "Configuring /home..." 20.668 msgstr "" 20.669 20.670 #: tazinst:2025 20.671 @@ -656,29 +690,29 @@ 20.672 msgstr "" 20.673 20.674 #: tazinst:2042 20.675 -msgid "Preparing upgrade of SliTaz release:" 20.676 +msgid "Preparing upgrade of SliTaz release: %s" 20.677 msgstr "" 20.678 20.679 #: tazinst:2044 20.680 msgid "" 20.681 -"This partition doesn't appear to contain a valid SliTaz system, the file: /" 20.682 -"etc/slitaz-release doesn't exist." 20.683 +"%s: This partition doesn't appear to contain a valid SliTaz system, the " 20.684 +"file: %s doesn't exist." 20.685 msgstr "" 20.686 20.687 #: tazinst:2067 20.688 -msgid "keeping /etc found on:" 20.689 +msgid "keeping /etc found on: %s" 20.690 msgstr "" 20.691 20.692 #: tazinst:2071 20.693 -msgid "keeping /var/www found on:" 20.694 +msgid "keeping /var/www found on: %s" 20.695 msgstr "" 20.696 20.697 #: tazinst:2098 20.698 -msgid "backups restored:" 20.699 +msgid "backups restored: %s" 20.700 msgstr "" 20.701 20.702 #: tazinst:2105 20.703 -msgid "backups saved in /var/lib/tazinst" 20.704 +msgid "backups saved in %s" 20.705 msgstr "" 20.706 20.707 #: tazinst:2112 20.708 @@ -694,7 +728,7 @@ 20.709 msgstr "" 20.710 20.711 #: tazinst:2132 20.712 -msgid "Installing:" 20.713 +msgid "Installing: %s..." 20.714 msgstr "" 20.715 20.716 #: tazinst:2141 20.717 @@ -705,42 +739,37 @@ 20.718 msgid "Creating package lists..." 20.719 msgstr "" 20.720 20.721 -#: tazinst:2152 20.722 -msgid "packages-source.list: done" 20.723 -msgstr "" 20.724 - 20.725 -#: tazinst:2156 20.726 -msgid "packages-selection.diff: done" 20.727 +#: tazinst:2152 tazinst:2156 20.728 +msgid "%s: done" 20.729 msgstr "" 20.730 20.731 #: tazinst:2163 20.732 msgid "" 20.733 "The list of available packages on the mirror could not be downloaded. No " 20.734 "missing packages will be reinstalled now, but you can do so later by looking " 20.735 -"at the following list:\n" 20.736 -"/var/lib/tazinst/packages-selection.diff" 20.737 +"at the following list:" 20.738 msgstr "" 20.739 20.740 #: tazinst:2175 20.741 -msgid "Upgrading SliTaz on:" 20.742 +msgid "Upgrading SliTaz on: %s" 20.743 msgstr "" 20.744 20.745 #: tazinst:2186 20.746 -msgid "Searching for /etc/slitaz-release" 20.747 +msgid "Searching for %s..." 20.748 msgstr "" 20.749 20.750 #: tazinst:2189 20.751 -msgid "Backup /etc, /home and the packages list" 20.752 +msgid "Backup /etc, /home and the packages list..." 20.753 msgstr "" 20.754 20.755 #: tazinst:2195 20.756 -msgid "Restoring configuration files" 20.757 +msgid "Restoring configuration files..." 20.758 msgstr "" 20.759 20.760 #: tazinst:2201 20.761 -msgid "Upgrading added packages" 20.762 +msgid "Upgrading added packages..." 20.763 msgstr "" 20.764 20.765 #: tazinst:2204 20.766 -msgid "Bootloader" 20.767 +msgid "Bootloader..." 20.768 msgstr ""
21.1 --- a/po/tazinst/zh_CN.po Wed Apr 06 09:52:43 2016 +0300 21.2 +++ b/po/tazinst/zh_CN.po Sat Apr 09 17:22:22 2016 +0300 21.3 @@ -79,8 +79,8 @@ 21.4 msgstr "自动选择" 21.5 21.6 #: tazinst:84 21.7 -msgid "Grub legacy bootoader" 21.8 -msgstr "Grub 引导" 21.9 +msgid "GRUB legacy bootoader" 21.10 +msgstr "GRUB 引导" 21.11 21.12 #: tazinst:85 21.13 msgid "Lightweight bootloader" 21.14 @@ -103,7 +103,7 @@ 21.15 msgstr "无图形应用图形界面稳定版本" 21.16 21.17 #: tazinst:100 21.18 -msgid "Stable basic graphic version with only Gtk" 21.19 +msgid "Stable basic graphic version with only GTK" 21.20 msgstr "只有 GTK 基本图形稳定版本" 21.21 21.22 #: tazinst:102 21.23 @@ -114,17 +114,17 @@ 21.24 msgid "Bleeding edge development version updated every day" 21.25 msgstr "每日尝鲜开发版本" 21.26 21.27 -#: tazinst:121 21.28 -msgid "Usage" 21.29 -msgstr "用法" 21.30 +#: tazinst:115 21.31 +msgid "Usage:" 21.32 +msgstr "用法：" 21.33 21.34 #: tazinst:121 21.35 -msgid "tazinst [command] <setting> <value> <file>" 21.36 -msgstr "tazinst [command] <setting> <value> <file>" 21.37 +msgid "%s [command] <setting> <value> <file>" 21.38 +msgstr "%s [command] <setting> <value> <file>" 21.39 21.40 #: tazinst:123 21.41 -msgid "Commands" 21.42 -msgstr "命令" 21.43 +msgid "Commands:" 21.44 +msgstr "命令：" 21.45 21.46 #: tazinst:124 21.47 msgid "Create a new install file." 21.48 @@ -178,17 +178,13 @@ 21.49 msgid "Error: Missing parameter." 21.50 msgstr "错误：参数丢失" 21.51 21.52 -#: tazinst:148 21.53 +#: tazinst:140 21.54 msgid "Unknown command." 21.55 msgstr "未知命令" 21.56 21.57 -#: tazinst:152 21.58 -msgid "Run" 21.59 -msgstr "运行" 21.60 - 21.61 -#: tazinst:152 21.62 -msgid "to get a list of available commands" 21.63 -msgstr "获取可用命令列表" 21.64 +#: tazinst:142 21.65 +msgid "Run: '%s' to get a list of available commands" 21.66 +msgstr "运行：%s 获取可用命令列表" 21.67 21.68 #: tazinst:177 21.69 msgid "Warning: file already exists." 21.70 @@ -199,7 +195,7 @@ 21.71 msgstr "错误：文件不能创建" 21.72 21.73 #: tazinst:282 tazinst:287 21.74 -msgid "Error: Unable to read install file" 21.75 +msgid "Error: Unable to read install file." 21.76 msgstr "错误：不能读取安装文件" 21.77 21.78 #: tazinst:392 21.79 @@ -207,11 +203,11 @@ 21.80 msgstr "错误：不能写入安装文件" 21.81 21.82 #: tazinst:446 21.83 -msgid "Deleting install file:" 21.84 -msgstr "删除安装文件：" 21.85 +msgid "Deleting install file: %s" 21.86 +msgstr "删除安装文件：%s" 21.87 21.88 #: tazinst:448 21.89 -msgid "Error: Unable to delete install file" 21.90 +msgid "Error: Unable to delete install file." 21.91 msgstr "错误：不能删除安装文件" 21.92 21.93 #: tazinst:463 21.94 @@ -227,35 +223,31 @@ 21.95 msgstr "另一个 tazinst 已在运行。" 21.96 21.97 #: tazinst:488 21.98 -msgid "Error:" 21.99 -msgstr "错误：" 21.100 - 21.101 -#: tazinst:488 21.102 -msgid "Invalid keyword." 21.103 -msgstr "无效的关键字" 21.104 +msgid "Error: '%s' Invalid keyword." 21.105 +msgstr "错误：%s 无效的关键字" 21.106 21.107 #: tazinst:489 21.108 -msgid "Select one of these options:" 21.109 -msgstr "请选择一个选项：" 21.110 +msgid "Select one of these options: %s." 21.111 +msgstr "请选择一个选项：%s" 21.112 21.113 #: tazinst:490 21.114 msgid "For more information, see tazinst Manual." 21.115 msgstr "可以通过查看 tazinst 手册来获取更多信息。" 21.116 21.117 #: tazinst:504 21.118 -msgid "Error: Partition not found" 21.119 +msgid "Error: Partition not found." 21.120 msgstr "错误：未发现分区" 21.121 21.122 #: tazinst:505 21.123 -msgid "To see available partitions, run" 21.124 -msgstr "运行，查看可用分区" 21.125 +msgid "To see available partitions, run '%s'." 21.126 +msgstr "运行，查看可用分区 %s" 21.127 21.128 #: tazinst:519 21.129 -msgid "Error: Source file not found" 21.130 +msgid "Error: Source file not found." 21.131 msgstr "错误：源文件未找到" 21.132 21.133 #: tazinst:534 21.134 -msgid "Error: invalid URL" 21.135 +msgid "Error: invalid URL." 21.136 msgstr "错误：无效的链接" 21.137 21.138 #: tazinst:549 21.139 @@ -263,7 +255,7 @@ 21.140 msgstr "错误：多个磁盘分配，请检查你的设置。" 21.141 21.142 #: tazinst:563 21.143 -msgid "Error: password too long" 21.144 +msgid "Error: password too long." 21.145 msgstr "错误：密码过长" 21.146 21.147 #: tazinst:568 21.148 @@ -278,24 +270,24 @@ 21.149 msgid "Warning: no password!" 21.150 msgstr "注意：空密码！" 21.151 21.152 -#: tazinst:589 21.153 -msgid "Error: Too short." 21.154 -msgstr "错误：太短。" 21.155 +#: tazinst:590 21.156 +msgid "%s Error: Too short." 21.157 +msgstr "%s 错误：太短。" 21.158 21.159 -#: tazinst:593 21.160 -msgid "Error: Too long." 21.161 -msgstr "错误：太长。" 21.162 +#: tazinst:594 21.163 +msgid "%s Error: Too long." 21.164 +msgstr "%s 错误：太长。" 21.165 21.166 -#: tazinst:598 21.167 -msgid "Error: Invalid chars." 21.168 -msgstr "错误：无效字符" 21.169 +#: tazinst:599 21.170 +msgid "%s Error: Invalid chars." 21.171 +msgstr "%s 错误：无效字符" 21.172 21.173 #: tazinst:609 21.174 msgid "Error: Dualboot set with no bootloader." 21.175 msgstr "错误：双引导设置缺少引导器" 21.176 21.177 #: tazinst:623 21.178 -msgid "Error: Unsupported Partition Table" 21.179 +msgid "Error: Unsupported Partition Table." 21.180 msgstr "错误：不支持的分区表" 21.181 21.182 #: tazinst:627 21.183 @@ -306,9 +298,13 @@ 21.184 msgid "The Source setting depends on the type of media:" 21.185 msgstr "源设置依赖于媒介类型：" 21.186 21.187 -#: tazinst:749 21.188 -msgid "Name or URL of the image on the web. Type: tazinst help web" 21.189 -msgstr "网络镜像名字或链接。请输入： tazinst help web" 21.190 +#: tazinst:752 21.191 +msgid "Name or URL of the image on the web." 21.192 +msgstr "网络镜像名字或链接。" 21.193 + 21.194 +#: tazinst:753 21.195 +msgid "Type: %s" 21.196 +msgstr "请输入：%s" 21.197 21.198 #: tazinst:755 21.199 msgid "Mode of install" 21.200 @@ -371,24 +367,25 @@ 21.201 msgstr "自动设置" 21.202 21.203 #: tazinst:788 21.204 -msgid "USB partition. For a list, type: tazinst list usb" 21.205 -msgstr "USB 分区。获取列表请输入： tazinst list usb" 21.206 +msgid "USB partition. For a list, type: %s" 21.207 +msgstr "USB 分区。获取列表请输入：%s" 21.208 21.209 #: tazinst:790 21.210 -msgid "ISO file name. For a list, type: tazinst list iso" 21.211 -msgstr "镜像文件名字。获取列表请输入： tazinst list iso" 21.212 +msgid "ISO file name. For a list, type: %s" 21.213 +msgstr "镜像文件名字。获取列表请输入：%s" 21.214 21.215 #: tazinst:816 21.216 msgid "Partition containing Windows, or 'auto'" 21.217 msgstr "含 Windows 分区或“auto”" 21.218 21.219 #: tazinst:1120 21.220 -msgid "No mirror list found, run tazpkg recharge." 21.221 +#, fuzzy 21.222 +msgid "No mirror list found, run %s." 21.223 msgstr "没有找到镜像列表，请运行 tazpkg 重新获取" 21.224 21.225 #: tazinst:1132 21.226 -msgid "Downloading:" 21.227 -msgstr "下载中：" 21.228 +msgid "Downloading: %s" 21.229 +msgstr "下载中：%s" 21.230 21.231 #: tazinst:1139 21.232 msgid "Download completed." 21.233 @@ -399,20 +396,26 @@ 21.234 msgstr "下载失败" 21.235 21.236 #: tazinst:1150 21.237 -msgid "Installing package to the current system:" 21.238 -msgstr "安装软件包到现在的系统" 21.239 +#, fuzzy 21.240 +msgid "Installing package %s to the current system." 21.241 +msgstr "安装软件包到现在的系统%s" 21.242 + 21.243 +#: tazinst:1159 21.244 +msgid "Cannot install %s." 21.245 +msgstr "" 21.246 21.247 #: tazinst:1160 21.248 -msgid "Adding package to the target system:" 21.249 -msgstr "添加软件包到目的系统" 21.250 +#, fuzzy 21.251 +msgid "Adding package %s to the target system..." 21.252 +msgstr "添加软件包到目的系统%s" 21.253 21.254 #: tazinst:1201 21.255 msgid "Process not completed" 21.256 msgstr "过程未完成" 21.257 21.258 #: tazinst:1202 tazinst:1206 21.259 -msgid "Error" 21.260 -msgstr "错误" 21.261 +msgid "Error: %s" 21.262 +msgstr "错误：%s" 21.263 21.264 #: tazinst:1218 21.265 msgid "Internal error" 21.266 @@ -423,44 +426,44 @@ 21.267 msgstr "用户取消" 21.268 21.269 #: tazinst:1244 21.270 -msgid "Using files from" 21.271 -msgstr "使用的文件来自" 21.272 +msgid "Using files from %s." 21.273 +msgstr "使用的文件来自%s" 21.274 21.275 #: tazinst:1246 21.276 -msgid "Mount failed" 21.277 -msgstr "挂载失败" 21.278 +msgid "%s: Mount failed" 21.279 +msgstr "%s：挂载失败" 21.280 21.281 #: tazinst:1255 21.282 msgid "Using files from USB device..." 21.283 msgstr "使用 USB 设备的文件……" 21.284 21.285 #: tazinst:1260 21.286 -msgid "Using files from USB device" 21.287 -msgstr "使用 USB 设备的文件" 21.288 +msgid "Using files from USB device %s." 21.289 +msgstr "使用 USB 设备的文件%s" 21.290 21.291 #: tazinst:1262 21.292 -msgid "Failed to mount USB device" 21.293 -msgstr "挂载 USB 设备失败" 21.294 +msgid "%s: Failed to mount USB device." 21.295 +msgstr "%s：挂载 USB 设备失败" 21.296 21.297 #: tazinst:1277 21.298 msgid "md5sum error, file corrupted." 21.299 msgstr "md5sum 验证错误，文件已损坏" 21.300 21.301 #: tazinst:1280 21.302 -msgid "md5 file not found, can't check integrity." 21.303 -msgstr "md5 文件未发现，不能验证完整性" 21.304 +msgid "%s: md5 file not found, cannot check integrity." 21.305 +msgstr "%s：md5 文件未发现，不能验证完整性" 21.306 21.307 #: tazinst:1285 21.308 -msgid "Using files from ISO" 21.309 -msgstr "使用 ISO 镜像文件" 21.310 +msgid "Using files from ISO %s." 21.311 +msgstr "使用 ISO 镜像文件 %s" 21.312 21.313 #: tazinst:1287 21.314 -msgid "Failed to mount ISO." 21.315 -msgstr "加载镜像文件失败" 21.316 +msgid "%s: Failed to mount ISO." 21.317 +msgstr "%s：加载镜像文件失败" 21.318 21.319 #: tazinst:1309 tazinst:1393 21.320 -msgid "Creating mount point:" 21.321 -msgstr "创建挂载点：" 21.322 +msgid "Creating mount point: %s..." 21.323 +msgstr "创建挂载点：%s" 21.324 21.325 #: tazinst:1325 21.326 msgid "Checking installation media..." 21.327 @@ -475,56 +478,54 @@ 21.328 msgstr "安装媒介检查正常" 21.329 21.330 #: tazinst:1342 21.331 -msgid "Format" 21.332 -msgstr "格式化" 21.333 +msgid "Format %s (%s)" 21.334 +msgstr "格式化 %s （%s）" 21.335 21.336 #: tazinst:1366 21.337 msgid "Preparing target partition..." 21.338 -msgstr "准备目的分区" 21.339 +msgstr "准备目的分区……" 21.340 21.341 #: tazinst:1370 21.342 msgid "Partition is already in use." 21.343 msgstr "分区已使用" 21.344 21.345 #: tazinst:1378 21.346 -msgid "The partition will be cleaned..." 21.347 -msgstr "分区即将被清理……" 21.348 +msgid "%s: The partition will be cleaned..." 21.349 +msgstr "%s：分区即将被清理……" 21.350 21.351 #: tazinst:1387 21.352 -msgid "The partition will be kept..." 21.353 -msgstr "分区保持……" 21.354 +msgid "%s: The partition will be kept..." 21.355 +msgstr "%s：分区保持……" 21.356 21.357 #: tazinst:1402 21.358 -msgid "Unable to mount partition" 21.359 -msgstr "无法挂载分区" 21.360 +msgid "%s: Unable to mount partition" 21.361 +msgstr "%s：无法挂载分区" 21.362 21.363 #: tazinst:1416 21.364 -msgid "Unmounting target partition:" 21.365 -msgstr "卸载目的分区：" 21.366 +msgid "Unmounting target partition: %s" 21.367 +msgstr "卸载目的分区：%s" 21.368 21.369 #: tazinst:1422 21.370 -msgid "Unmounting:" 21.371 -msgstr "卸载：" 21.372 +msgid "Unmounting: %s" 21.373 +msgstr "卸载：%s" 21.374 21.375 #: tazinst:1426 21.376 -msgid "Unlinking:" 21.377 -msgstr "解开：" 21.378 +msgid "Unlinking: %s" 21.379 +msgstr "解开：%s" 21.380 21.381 #: tazinst:1432 21.382 -msgid "Ejecting cdrom..." 21.383 +msgid "Ejecting CD-ROM..." 21.384 msgstr "弹出光驱……" 21.385 21.386 #: tazinst:1441 21.387 -msgid "Process completed. You can now restart (reboot)" 21.388 -msgstr "过程完成。可以重启系统了。" 21.389 - 21.390 -#: tazinst:1442 21.391 -msgid "from your SliTaz GNU/Linux system." 21.392 -msgstr "来自你的 SliTaz 系统" 21.393 +msgid "" 21.394 +"Process completed. You can now restart (reboot) from your SliTaz GNU/Linux " 21.395 +"system." 21.396 +msgstr "过程完成。可以重启系统了。来自你的 SliTaz 系统" 21.397 21.398 #: tazinst:1446 21.399 -msgid "Copying log to /var/log/tazinst.log" 21.400 -msgstr "复制日志到 /var/log/tazinst.log" 21.401 +msgid "Copying log to %s" 21.402 +msgstr "复制日志到 %s" 21.403 21.404 #: tazinst:1482 21.405 msgid "No bootloader to install." 21.406 @@ -535,8 +536,8 @@ 21.407 msgstr "开启 Windows 双引导" 21.408 21.409 #: tazinst:1599 21.410 -msgid "Installing grub on:" 21.411 -msgstr "安装 grub 到：" 21.412 +msgid "Installing GRUB on: %s" 21.413 +msgstr "安装 grub 到：%s" 21.414 21.415 #: tazinst:1604 21.416 msgid "Setting the boot flag" 21.417 @@ -547,7 +548,7 @@ 21.418 msgstr "复制 splash 镜像" 21.419 21.420 #: tazinst:1699 21.421 -msgid "Installing syslinux" 21.422 +msgid "Installing Syslinux" 21.423 msgstr "安装 syslinux" 21.424 21.425 #: tazinst:1713 21.426 @@ -555,7 +556,7 @@ 21.427 msgstr "设置启动标示" 21.428 21.429 #: tazinst:1717 21.430 -msgid "Installing mbr" 21.431 +msgid "Installing MBR" 21.432 msgstr "安装 mbr" 21.433 21.434 #: tazinst:1721 21.435 @@ -563,84 +564,84 @@ 21.436 msgstr "设置启动标示" 21.437 21.438 #: tazinst:1730 21.439 -msgid "Installing gptmbr" 21.440 +msgid "Installing GPTMBR" 21.441 msgstr "安装 gptmbr" 21.442 21.443 #: tazinst:1770 21.444 -msgid "Cleaning the root partition" 21.445 -msgstr "清除根分区" 21.446 +msgid "Cleaning the root partition (%s)..." 21.447 +msgstr "清除根分区（%s）……" 21.448 21.449 #: tazinst:1779 tazinst:2051 21.450 -msgid "keeping /home found on:" 21.451 -msgstr "：保留 /home 到" 21.452 +msgid "keeping /home found on: %s" 21.453 +msgstr "：保留 /home 到：%s" 21.454 21.455 -#: tazinst:1784 21.456 -msgid "removing target:" 21.457 -msgstr "移除目标：" 21.458 +#: tazinst:1784 tazinst:2077 21.459 +msgid "removing target: %s" 21.460 +msgstr "移除目标：%s" 21.461 21.462 #: tazinst:1803 21.463 -msgid "Kernel name not found, falling back to:" 21.464 -msgstr "找不到内核，回滚到：" 21.465 +msgid "Kernel name not found, falling back to: %s" 21.466 +msgstr "找不到内核，回滚到：%s" 21.467 21.468 #: tazinst:1807 21.469 -msgid "install_kernel:" 21.470 -msgstr "安装内核：" 21.471 +msgid "install_kernel: %s" 21.472 +msgstr "安装内核：%s" 21.473 21.474 #: tazinst:1893 21.475 msgid "Restoring directory: /home..." 21.476 msgstr "恢复 /home 目录……" 21.477 21.478 #: tazinst:1899 21.479 -msgid "Adding / partition and CHECK_FS to file /etc/rcS.conf..." 21.480 -msgstr "添加 / 分区并检查 /etc/rcS.conf……" 21.481 +msgid "Adding / partition and CHECK_FS to file %s..." 21.482 +msgstr "添加 / 分区并检查 %s……" 21.483 21.484 #: tazinst:1902 21.485 -msgid "Configuring host name:" 21.486 -msgstr "设置主机名：" 21.487 +msgid "Configuring host name: %s" 21.488 +msgstr "设置主机名：%s" 21.489 21.490 #: tazinst:1965 21.491 -msgid "Configuring partition to be used as /home:" 21.492 -msgstr "设置 /home 分区" 21.493 +msgid "Configuring partition to be used as /home: %s" 21.494 +msgstr "设置 /home 分区：%s" 21.495 21.496 #: tazinst:1984 21.497 -msgid "Installing SliTaz on:" 21.498 -msgstr "安装 SliTaz 到：" 21.499 +msgid "Installing SliTaz on: %s" 21.500 +msgstr "安装 SliTaz 到：%s" 21.501 21.502 #: tazinst:1985 tazinst:2164 21.503 -msgid "Checking settings" 21.504 -msgstr "检查设置" 21.505 +msgid "Checking settings..." 21.506 +msgstr "检查设置……" 21.507 21.508 #: tazinst:1989 tazinst:2168 21.509 -msgid "Preparing source media" 21.510 -msgstr "准备源媒介" 21.511 +msgid "Preparing source media..." 21.512 +msgstr "准备源媒介……" 21.513 21.514 #: tazinst:1992 tazinst:2171 21.515 -msgid "Preparing target disk" 21.516 -msgstr "准备安装目的磁盘" 21.517 +msgid "Preparing target disk..." 21.518 +msgstr "准备安装目的磁盘……" 21.519 21.520 #: tazinst:1995 21.521 -msgid "Cleaning the root partition if necessary" 21.522 -msgstr "如有必要，清除根分区" 21.523 +msgid "Cleaning the root partition if necessary..." 21.524 +msgstr "如有必要，清除根分区……" 21.525 21.526 #: tazinst:1998 tazinst:2180 21.527 -msgid "Extracting the root system" 21.528 -msgstr "解压根系统" 21.529 +msgid "Extracting the root system..." 21.530 +msgstr "解压根系统……" 21.531 21.532 #: tazinst:2001 tazinst:2186 21.533 -msgid "Installing the kernel" 21.534 -msgstr "安装内核" 21.535 +msgid "Installing the Kernel..." 21.536 +msgstr "安装内核……" 21.537 21.538 #: tazinst:2004 21.539 -msgid "Preconfiguring the system" 21.540 -msgstr "重设系统" 21.541 +msgid "Preconfiguring the system..." 21.542 +msgstr "重设系统……" 21.543 21.544 #: tazinst:2007 21.545 -msgid "Configuring root and default user account" 21.546 -msgstr "设置根用户和默认用户" 21.547 +msgid "Configuring root and default user account..." 21.548 +msgstr "设置根用户和默认用户……" 21.549 21.550 #: tazinst:2010 21.551 -msgid "Configuring /home" 21.552 -msgstr "设置 /home" 21.553 +msgid "Configuring /home..." 21.554 +msgstr "设置 /home……" 21.555 21.556 #: tazinst:2013 21.557 msgid "Checking bootloader installation..." 21.558 @@ -651,30 +652,30 @@ 21.559 msgstr "文件安装完成" 21.560 21.561 #: tazinst:2030 21.562 -msgid "Preparing upgrade of SliTaz release:" 21.563 -msgstr "准备升级 SliTaz ：" 21.564 +msgid "Preparing upgrade of SliTaz release: %s" 21.565 +msgstr "准备升级 SliTaz ：%s" 21.566 21.567 #: tazinst:2032 21.568 msgid "" 21.569 -"This partition doesn't appear to contain a valid SliTaz system, the file: /" 21.570 -"etc/slitaz-release doesn't exist." 21.571 -msgstr "这个分区没有安装有效地 SliTaz 系统，/etc/slitaz-release 不存在" 21.572 +"%s: This partition doesn't appear to contain a valid SliTaz system, the " 21.573 +"file: %s doesn't exist." 21.574 +msgstr "%s：这个分区没有安装有效地 SliTaz 系统，%s 不存在" 21.575 21.576 #: tazinst:2055 21.577 -msgid "keeping /etc found on:" 21.578 -msgstr "保留 /etc 到：" 21.579 +msgid "keeping /etc found on: %s" 21.580 +msgstr "保留 /etc 到：%s" 21.581 21.582 #: tazinst:2059 21.583 -msgid "keeping /var/www found on:" 21.584 -msgstr "保留 /var/www 到：" 21.585 +msgid "keeping /var/www found on: %s" 21.586 +msgstr "保留 /var/www 到：%s" 21.587 21.588 #: tazinst:2086 21.589 -msgid "backups restored:" 21.590 -msgstr "备份恢复到：" 21.591 +msgid "backups restored: %s" 21.592 +msgstr "备份恢复到：%s" 21.593 21.594 #: tazinst:2093 21.595 -msgid "backups saved in /var/lib/tazinst" 21.596 -msgstr "备份保存在 /var/lib/tazinst " 21.597 +msgid "backups saved in %s" 21.598 +msgstr "备份保存在 %s" 21.599 21.600 #: tazinst:2100 21.601 msgid "Checking the availability of packages..." 21.602 @@ -689,8 +690,8 @@ 21.603 msgstr "已安装软件：0" 21.604 21.605 #: tazinst:2120 21.606 -msgid "Installing:" 21.607 -msgstr "安装：" 21.608 +msgid "Installing: %s..." 21.609 +msgstr "安装：%s……" 21.610 21.611 #: tazinst:2129 21.612 msgid "Installation of packages complete..." 21.613 @@ -700,44 +701,39 @@ 21.614 msgid "Creating package lists..." 21.615 msgstr "创建软件包列表……" 21.616 21.617 -#: tazinst:2140 21.618 -msgid "packages-source.list: done" 21.619 -msgstr "软件包源列表 ; 完成" 21.620 - 21.621 -#: tazinst:2144 21.622 -msgid "packages-selection.diff: done" 21.623 -msgstr "软件包差异：完成" 21.624 +#: tazinst:2152 tazinst:2156 21.625 +msgid "%s: done" 21.626 +msgstr "%s：完成" 21.627 21.628 #: tazinst:2151 21.629 msgid "" 21.630 "The list of available packages on the mirror could not be downloaded. No " 21.631 "missing packages will be reinstalled now, but you can do so later by looking " 21.632 -"at the following list:\n" 21.633 -"/var/lib/tazinst/packages-selection.diff" 21.634 +"at the following list:" 21.635 msgstr "" 21.636 -"镜像上的软件包列表无法下载。现在不能安装丢失的软件，但你可以稍后通过检查 /" 21.637 -"var/lib/tazinst/packages-selection.diff 来完成。" 21.638 +"镜像上的软件包列表无法下载。现在不能安装丢失的软件，但你可以稍后通过检查来完" 21.639 +"成：" 21.640 21.641 #: tazinst:2163 21.642 -msgid "Upgrading SliTaz on:" 21.643 -msgstr "升级 SliTaz ：" 21.644 +msgid "Upgrading SliTaz on: %s" 21.645 +msgstr "升级 SliTaz ：%s" 21.646 21.647 #: tazinst:2174 21.648 -msgid "Searching for /etc/slitaz-release" 21.649 -msgstr "搜索 /etc/slitaz-release" 21.650 +msgid "Searching for %s..." 21.651 +msgstr "搜索 %s……" 21.652 21.653 #: tazinst:2177 21.654 -msgid "Backup /etc, /home and the packages list" 21.655 -msgstr "备份 /etc, /home 和软件宝列表" 21.656 +msgid "Backup /etc, /home and the packages list..." 21.657 +msgstr "备份 /etc, /home 和软件宝列表……" 21.658 21.659 #: tazinst:2183 21.660 -msgid "Restoring configuration files" 21.661 -msgstr "恢复配置文件" 21.662 +msgid "Restoring configuration files..." 21.663 +msgstr "恢复配置文件……" 21.664 21.665 #: tazinst:2189 21.666 -msgid "Upgrading added packages" 21.667 -msgstr "升级额外的软件包" 21.668 +msgid "Upgrading added packages..." 21.669 +msgstr "升级额外的软件包……" 21.670 21.671 #: tazinst:2192 21.672 -msgid "Bootloader" 21.673 -msgstr "引导" 21.674 +msgid "Bootloader..." 21.675 +msgstr "引导……"
22.1 --- a/slitaz-installer Wed Apr 06 09:52:43 2016 +0300 22.2 +++ b/slitaz-installer Sat Apr 09 17:22:22 2016 +0300 22.3 @@ -17,107 +17,107 @@ 22.4 #-------------- 22.5 # msgs section 22.6 #-------------- 22.7 - 22.8 +. /lib/libtaz.sh 22.9 # info msgs 22.10 22.11 -MODE_MSG="\n$(gettext "Welcome to the slitaz-installer").\n 22.12 -\Z2$(gettext "Which type of installation do you want to start?")\Zn\n" 22.13 +MODE_MSG="\n$(_ 'Welcome to the slitaz-installer.')\n 22.14 +\Z2$(_ 'Which type of installation do you want to start?')\Zn\n" 22.15 22.16 -MEDIA_MSG="\n$(gettext "SliTaz can be installed from different media.")\n\n\ 22.17 -\Z2$(gettext "Select a media from the following list:")\Zn\n" 22.18 +MEDIA_MSG="\n$(_ 'SliTaz can be installed from different media.')\n 22.19 +\Z2$(_ 'Select a media from the following list:')\Zn\n" 22.20 22.21 -SOURCE_USB_MSG="\n$(gettext "You have selected the option to install SliTaz \ 22.22 -from an USB Key")\n\n\ 22.23 -\Z2$(gettext "Enter the partition where SliTaz Live is located:"):\Zn\n" 22.24 +SOURCE_USB_MSG="\n$(_ 'You have selected the option to install SliTaz from an USB Key.')\n 22.25 +\Z2$(_ 'Enter the partition where SliTaz Live is located:')\Zn\n" 22.26 22.27 -SOURCE_ISO_MSG="\n$(gettext "You have selected the option to install SliTaz \ 22.28 -from an ISO file located on a local disk.")\n\n\ 22.29 -\Z2$(gettext "Please, select a file below:")\Zn\n" 22.30 +SOURCE_ISO_MSG="\n$(_ "You have selected the option to install SliTaz \ 22.31 +from an ISO file located on a local disk.")\n 22.32 +\Z2$(_ 'Please, select a file below:')\Zn\n" 22.33 22.34 -SOURCE_WEB_MSG="\n$(gettext "You have selected the option to install SliTaz \ 22.35 -from the web")\n\n\\Z2$(gettext "Please, select a version:")\Zn\n" 22.36 +SOURCE_WEB_MSG="\n$(_ 'You have selected the option to install SliTaz from the web.')\n 22.37 +\\Z2$(_ 'Please, select a version:')\Zn\n" 22.38 22.39 -SOURCE_DEF_MSG="\n$(gettext "Select the source"):\n" 22.40 +SOURCE_DEF_MSG="\n$(_ 'Select the source:')\n" 22.41 22.42 -ROOT_UUID_DEFAULT_MSG="$(gettext "\nDrive selection")\n\n\Z2$(gettext "Please specify the partition where to install SliTaz:")\Zn\n" 22.43 +ROOT_UUID_DEFAULT_MSG="\n$(_ 'Drive selection')\n 22.44 +\Z2$(_ 'Please specify the partition where to install SliTaz:')\Zn\n" 22.45 22.46 -ROOT_UUID_UPGRADE_MSG="$(gettext "The installer will upgrade the existing \ 22.47 +ROOT_UUID_UPGRADE_MSG="$(_ "The installer will upgrade the existing \ 22.48 SliTaz system by saving all configuration files and the list of installed \ 22.49 packages. Then, it will clean the partition and install the new version \ 22.50 of SliTaz, restore the configuration files and reinstall any packages which \ 22.51 -are not present on the cdrom. 22.52 -You will need an active internet connection before upgrading.")\n \ 22.53 -\Z2$(gettext "Partition containing the system to upgrade:")\Zn\n" 22.54 +are not present on the CD-ROM.") 22.55 +$(_ 'You will need an active internet connection before upgrading.') 22.56 +\Z2$(_ 'Partition containing the system to upgrade:')\Zn\n" 22.57 22.58 -ROOT_FORMAT_MSG="\n$(gettext "Only the filesystems actually installed on your \ 22.59 +ROOT_FORMAT_MSG="\n$(_ "Only the filesystems actually installed on your \ 22.60 system are listed. If you intend to use another filesystem, you have to \ 22.61 -install it before. \ 22.62 -Unless you know what you are doing, it is safe to use ext2, ext3 or ext4.\n\n\ 22.63 -\Z2To format this partition, please select a filesystem below:")\Zn\n" 22.64 +install it before. Unless you know what you are doing, it is safe to use ext2, \ 22.65 +ext3 or ext4.")\n 22.66 +\Z2$(_ 'To format this partition, please select a filesystem below:')\Zn\n" 22.67 22.68 -HOME_UUID_MSG="\n$(gettext "Separate /home partition")\n\n\ 22.69 -\Z2$(gettext "Please, select the partition to use:")\Zn\n" 22.70 +HOME_UUID_MSG="\n$(_ 'Separate /home partition')\n 22.71 +\Z2$(_ 'Please, select the partition to use:')\Zn\n" 22.72 22.73 -HOSTNAME_MSG="\n$(gettext "Hostname configuration allows you to specify the \ 22.74 +HOSTNAME_MSG="\n$(_ "Hostname configuration allows you to specify the \ 22.75 machine name. The hostname is used internally to identify the host on the \ 22.76 -network. This value can be changed after the system is installed.\n\n\ 22.77 -\Z2Enter a hostname:\Zn\n")" 22.78 +network. This value can be changed after the system is installed.")\n 22.79 +\Z2$(_ 'Enter a hostname:')\Zn\n)" 22.80 22.81 -ROOT_PWD_MSG="\n$(gettext "The root administrator privilege lets you manage \ 22.82 +ROOT_PWD_MSG="\n$(_ "The root administrator privilege lets you manage \ 22.83 and configure the full system. A root user can damage your system so you \ 22.84 -should always setup a strong password with special characters and/or numbers.\ 22.85 -")\n\n\ 22.86 -\Z2$(gettext "Enter the password for root:")\Zn\n" 22.87 +should always setup a strong password with special characters and/or numbers.")\n 22.88 +\Z2$(_ 'Enter the password for root:')\Zn\n" 22.89 22.90 -USER_LOGIN_MSG="\n$(gettext "The default user for the system will have their \ 22.91 +USER_LOGIN_MSG="\n$(_ "The default user for the system will have their \ 22.92 personal files stored in /home/*user* (and will be automatically added to the \ 22.93 -audio group)")\n\n\Z2$(gettext "Enter the name of the first user:")\Zn\n" 22.94 +audio group)")\n 22.95 +\Z2$(_ 'Enter the name of the first user:')\Zn\n" 22.96 22.97 -USER_PWD_MSG="\n$(gettext "The password for default user"). 22.98 -$(gettext "It may be a security risk if too weak and should always be strong \ 22.99 +USER_PWD_MSG="\n$(_ 'The password for default user.') 22.100 +$(_ "It may be a security risk if too weak and should always be strong \ 22.101 if you use a SSH connection through the web.")\n 22.102 -\Z2$(gettext "Enter the password for the default user:")\Zn\n" 22.103 +\Z2$(_ 'Enter the password for the default user:')\Zn\n" 22.104 22.105 -END_OF_INSTALL_MSG="\n$(gettext "Installation is now finished, you can exit \ 22.106 -the installer or reboot on your new SliTaz GNU/Linux operating system")." 22.107 +END_OF_INSTALL_MSG="\n$(_ "Installation is now finished, you can exit \ 22.108 +the installer or reboot on your new SliTaz GNU/Linux operating system.")" 22.109 22.110 22.111 # questions msgs 22.112 22.113 -ASK_ROOT_FORMAT="\n$(gettext "The next step lets you format the target \ 22.114 +ASK_ROOT_FORMAT="\n$(_ "The next step lets you format the target \ 22.115 partition. Choose between robust, stable and/or journaled filesystem. If the \ 22.116 -partition is already formated you can skip this stage, if not just accept.\n 22.117 -Warning! formating a partition will destroy all current data.\n 22.118 -\Z2Do you wish to format the partition ?\Zn")" 22.119 +partition is already formated you can skip this stage, if not just accept.")\n 22.120 +$(_ 'Warning! formating a partition will destroy all current data.')\n 22.121 +\Z2$(_ 'Do you wish to format the partition?')\Zn)" 22.122 22.123 -ASK_HOME_UUID="\n$(gettext "On most GNU/Linux systems users personal \ 22.124 +ASK_HOME_UUID="\n$(_ "On most GNU/Linux systems users personal \ 22.125 files are stored in the directory /home. Home can be on a separate partition \ 22.126 -or another hard disk.\n 22.127 -\Z2DO you want to use a separate Home partition ?\Zn")" 22.128 +or another hard disk.")\n 22.129 +\Z2$(_ 'Do you want to use a separate Home partition?')\Zn)" 22.130 22.131 -ASK_HOME_FORMAT="\n$(gettext "/home will be installed on a separate partition. \ 22.132 +ASK_HOME_FORMAT="\n$(_ "/home will be installed on a separate partition. \ 22.133 The next step lets you format the /home partition. If the partition \ 22.134 -is already formated you can skip this stage, if not just accept. Warning \ 22.135 -formating a partition will destroy all current data.\n 22.136 -\Z2Do you wish to format the /home partition ?\Zn")" 22.137 +is already formated you can skip this stage, if not just accept.") 22.138 +$(_ 'Warning! formating a partition will destroy all current data.')\n 22.139 +\Z2$(_ 'Do you wish to format the /home partition?')\Zn)" 22.140 22.141 -ASK_BOOTLOADER="\n$(gettext "You have now the option to install a \ 22.142 -bootloader which is capable of booting almost any kind of operating system.\n\n\ 22.143 -If you want to use an existing bootloader installation, skip this step \ 22.144 +ASK_BOOTLOADER="\n$(_ "You have now the option to install a \ 22.145 +bootloader which is capable of booting almost any kind of operating system.")\n 22.146 +$(_ "If you want to use an existing bootloader installation, skip this step \ 22.147 and configure your bootloader to boot SliTaz (refer to your bootloader \ 22.148 -documentation on how to do this)").\n\n\ 22.149 -\Z2$(gettext "Install a bootloader?")\Zn\n" 22.150 +documentation on how to do this).")\n 22.151 +\Z2$(_ 'Install a bootloader?')\Zn\n" 22.152 22.153 -ASK_WINBOOT="\n$(gettext "Do you want to implement a dual-boot with \ 22.154 +ASK_WINBOOT="\n$(_ "Do you want to implement a dual-boot with \ 22.155 Windows? At start-up, you will be asked whether you want to boot into \ 22.156 -Windows or SliTaz GNU/Linux.\n 22.157 -\Z2Install a dual-boot with Windows ?")\n" 22.158 +Windows or SliTaz GNU/Linux.")\n 22.159 +\Z2$(_ 'Install a dual-boot with Windows?')\n" 22.160 22.161 -ASK_SUMMARY="$(gettext "Installation settings summary and last chance to \ 22.162 +ASK_SUMMARY="$(_ "Installation settings summary and last chance to \ 22.163 cancel or restart all installation steps.")\n 22.164 -\Z2Go and install SliTaz?\Zn\n\n" 22.165 +\Z2$(_ 'Go and install SliTaz?')\Zn\n\n" 22.166 22.167 -EMPTY_MENU_MSG="\n$(gettext "Sorry, no device, nor file found or available.")" 22.168 +EMPTY_MENU_MSG="\n$(_ 'Sorry, no device, nor file found or available.')" 22.169 22.170 #---------------" 22.171 # check section 22.172 @@ -128,20 +128,20 @@ 22.173 local version 22.174 # search for tazinst 22.175 if ! [ -x /usr/sbin/tazinst ] ; then 22.176 - printf "$(gettext "Error 2: ") 22.177 -$(gettext "The lightweight SliTaz HDD installer 'tazinst' is missing. 22.178 -Check permissions, or reinstall the slitaz-tools package.")\n" 22.179 - exit 2 22.180 + _ 'Error 2:' 22.181 + _ "The lightweight SliTaz HDD installer '%s' is missing." 'tazinst' 22.182 + _ 'Check permissions, or reinstall the %s package.' 'slitaz-installer' 22.183 + newline; exit 2 22.184 fi 22.185 # check version 22.186 version=$(tazinst version | tr -d '[:alpha:]') 22.187 if ! (echo "$version" | awk -v req="$TAZINST_REQUIRED_VERSION" ' 22.188 {ver=$0+0}{ if (ver < req) exit 1}') ; then 22.189 - printf "$(gettext "Error 2: ") 22.190 -$(gettext "The lightweight SliTaz HDD installer tazinst ($version) is not 22.191 -at the required version ($TAZINST_REQUIRED_VERSION), use tazinst in an xterm or 22.192 -reinstall the slitaz-tools package.")\n" 22.193 - exit 2 22.194 + _ 'Error 2:' 22.195 + _ 'The lightweight SliTaz HDD installer tazinst (%s) is not at the required version (%s).' \ 22.196 + "$version" "$TAZINST_REQUIRED_VERSION" 22.197 + _ 'Use %s in an xterm or reinstall the %s package.' 'tazinst' 'slitaz-installer' 22.198 + newline; exit 2 22.199 fi 22.200 } 22.201 22.202 @@ -157,7 +157,7 @@ 22.203 mode) 22.204 printf "$MODE_MSG" ;; 22.205 media) 22.206 - printf "$MEDIA_MSG" ;; 22.207 + printf "$MEDIA_MSG" ;; 22.208 source) 22.209 local media="$(tazinst get media)" 22.210 case "$media" in 22.211 @@ -172,8 +172,8 @@ 22.212 esac ;; 22.213 root_uuid) 22.214 local mode="$(tazinst get mode)" 22.215 - [ "$mode" = "upgrade" ] && printf "$ROOT_UUID_UPGRADE_MSG" \ 22.216 - || printf "$ROOT_UUID_DEFAULT_MSG" ;; 22.217 + if [ "$mode" == 'upgrade' ]; then printf "$ROOT_UUID_UPGRADE_MSG"; 22.218 + else printf "$ROOT_UUID_DEFAULT_MSG"; fi ;; 22.219 root_format|home_format) 22.220 printf "$ROOT_FORMAT_MSG" ;; 22.221 home_uuid) 22.222 @@ -265,44 +265,44 @@ 22.223 case "$option" in 22.224 mode) 22.225 local mode="$(tazinst get mode)" 22.226 - printf "\n\n$(gettext "Mode"): " 22.227 - printf "$(tazinst help mode | grep "$mode")" ;; 22.228 + printf "\n\n$(_ 'Mode: %s')" \ 22.229 + "$(tazinst help mode | grep "$mode")" ;; 22.230 media) 22.231 - printf "\n$(gettext "From media"): $(tazinst get media)" ;; 22.232 + printf "\n$(_ 'From media: %s')" "$(tazinst get media)" ;; 22.233 source) 22.234 local source="$(tazinst get source)" 22.235 [ -n "$source" ] && printf " ($source)" ;; 22.236 root_uuid) 22.237 - printf "\n$(gettext "To the disk"): $(tazinst get root_uuid)" ;; 22.238 + printf "\n$(_ 'To the disk: %s')" "$(tazinst get root_uuid)" ;; 22.239 root_format) 22.240 local root_format="$(tazinst get root_format)" 22.241 - [ -n "$root_format" ] \ 22.242 - && printf " $(gettext "(Formatting as"): $root_format)" \ 22.243 - || printf " $(gettext "(No formatting)")" ;; 22.244 + if [ -n "$root_format" ]; 22.245 + then printf " $(_ '(Formatting as %s)' "$root_format")"; 22.246 + else printf " $(_ '(No formatting)')"; fi ;; 22.247 home_uuid) 22.248 local home_uuid="$(tazinst get home_uuid)" 22.249 - [ -n "$home_uuid" ] \ 22.250 - && printf "\n$(gettext "Separate /home is"): $home_uuid" \ 22.251 - || printf "\n$(gettext "No separate /home partition")" ;; 22.252 + if [ -n "$home_uuid" ]; 22.253 + then printf "\n$(_ 'Separate /home is: %s' "$home_uuid")"; 22.254 + else printf "\n$(_ 'No separate /home partition')"; fi ;; 22.255 home_format) 22.256 local home_format="$(tazinst get home_format)" 22.257 - [ -n "$home_uuid" ] && ([ -n "$home_format" ] \ 22.258 - && printf " $(gettext "(Formatting as"): $home_format)" \ 22.259 - || printf " $(gettext "(No /home formatting)")";) ;; 22.260 + if [ -n "$home_uuid" ]; then if [ -n "$home_format" ]; 22.261 + then printf " $(_ '(Formatting as %s)' "$home_format")"; 22.262 + else printf " $(_ '(No /home formatting)')"; fi; fi ;; 22.263 hostname) 22.264 - printf "\nHostname: $(tazinst get hostname)" ;; 22.265 + printf "\n$(_ 'Hostname: %s' "$(tazinst get hostname)")" ;; 22.266 user_login) 22.267 - printf "\n$(gettext "User login"): $(tazinst get user_login)" ;; 22.268 + printf "\n$(_ 'User login: %s' "$(tazinst get user_login)")" ;; 22.269 bootloader) 22.270 local bootloader="$(tazinst get bootloader)" 22.271 - [ -n "$bootloader" ] \ 22.272 - && printf "\n$(gettext "Bootloader: installed")" \ 22.273 - || printf "\n$(gettext "No bootloader installed")" ;; 22.274 + if [ -n "$bootloader" ]; 22.275 + then printf "\n$(_ 'Bootloader: installed')"; 22.276 + else printf "\n$(_ 'No bootloader installed')"; fi ;; 22.277 winboot) 22.278 local winboot="$(tazinst get winboot)" 22.279 - [ -n "$winboot" ] \ 22.280 - && printf "$(gettext ", with Windows dual-boot")" \ 22.281 - || printf "$(gettext ", no dual-boot")" ;; 22.282 + if [ -n "$winboot" ]; 22.283 + then printf "$(_ ", with Windows dual-boot")"; 22.284 + else printf "$(_ ", no dual-boot")"; fi ;; 22.285 esac 22.286 done 22.287 } 22.288 @@ -319,11 +319,11 @@ 22.289 trap "rm -f $tempfile ; exit 1" $sighup $sigint $sigquit 22.290 "$DIALOG" \ 22.291 --clear --colors \ 22.292 - --title " Select $option " \ 22.293 + --title " $(_ 'Select %s' "$option") " \ 22.294 --backtitle "$BACKLIST" \ 22.295 --default-item "$(tazinst get "$option")" \ 22.296 - --ok-label "$(gettext "Next")" \ 22.297 - --cancel-label "$(gettext "Back")" \ 22.298 + --ok-label "$(_ 'Next')" \ 22.299 + --cancel-label "$(_ 'Back')" \ 22.300 --menu "$(msg $option)" 18 70 6 $items 2> "$tempfile" 22.301 retval="$?" 22.302 choice=$(cat "$tempfile") 22.303 @@ -333,7 +333,7 @@ 22.304 # a '$choice' was selected 22.305 tazinst set "$option" "$choice" && move up || \ 22.306 "$DIALOG" \ 22.307 - --title " Select $option " --clear \ 22.308 + --title " $(_ 'Select %s' "$option") " --clear \ 22.309 --msgbox "\n$(tazinst check "$option" 2>&1)" 10 41 ;; 22.310 1|255) 22.311 # voluntary exit or ESC pressed 22.312 @@ -347,11 +347,11 @@ 22.313 local option="$1" 22.314 "$DIALOG" \ 22.315 --clear --colors \ 22.316 - --title " Select $option " \ 22.317 + --title " $(_ 'Select %s' "$option") " \ 22.318 --backtitle "$BACKLIST" \ 22.319 - --ok-label "$(gettext "Yes")" \ 22.320 - --cancel-label "$(gettext "Back")" \ 22.321 - --extra-button --extra-label "$(gettext "No")" \ 22.322 + --ok-label "$(_ 'Yes')" \ 22.323 + --cancel-label "$(_ 'Back')" \ 22.324 + --extra-button --extra-label "$(_ 'No')" \ 22.325 --yesno "$(ask $option)" 18 70 22.326 retval="$?" 22.327 case "$retval" in 22.328 @@ -375,9 +375,9 @@ 22.329 trap "rm -f $tempfile; exit 1" $sighup $sigint $sigquit 22.330 $DIALOG \ 22.331 --clear --colors \ 22.332 - --title " Select $option " \ 22.333 - --ok-label "$(gettext "Next")" \ 22.334 - --cancel-label "$(gettext "Back")" \ 22.335 + --title " $(_ 'Select %s' "$option") " \ 22.336 + --ok-label "$(_ 'Next')" \ 22.337 + --cancel-label "$(_ 'Back')" \ 22.338 --inputbox "$(msg $option)" 16 51 "$value" 2> "$tempfile" 22.339 retval="$?" 22.340 choice="$(cat $tempfile)" 22.341 @@ -388,7 +388,7 @@ 22.342 retcode=$? 22.343 [ "$retcode" -gt "0" ] && \ 22.344 "$DIALOG" \ 22.345 - --title " Select $option " --clear \ 22.346 + --title " $(_ 'Select %s' "$option") " --clear \ 22.347 --msgbox "\n$(tazinst check "$option" 2>&1)" 10 41 22.348 # continue if no error (0) or only warning (>127) 22.349 [ "$retcode" -le "0" ] && move up 22.350 @@ -406,17 +406,17 @@ 22.351 { 22.352 "$DIALOG" \ 22.353 --clear --colors \ 22.354 - --title " Summary " \ 22.355 + --title " $(_ 'Summary') " \ 22.356 --backtitle "$BACKLIST" \ 22.357 - --yes-label "$(gettext "Yes")" \ 22.358 - --no-label "$(gettext "No")" \ 22.359 + --yes-label "$(_ 'Yes')" \ 22.360 + --no-label "$(_ 'No')" \ 22.361 --yesno "$(ask summary)$(summary_list)" 18 70 22.362 retval="$?" 22.363 case "$retval" in 22.364 0) # yes 22.365 move up ;; 22.366 1) # Cancel 22.367 - gettext "SliTaz install cancelled."; echo 22.368 + _ 'SliTaz install cancelled.'; echo 22.369 exit 1 ;; 22.370 3) # no 22.371 return 3 ;; 22.372 @@ -564,16 +564,16 @@ 22.373 } 22.374 END{ 22.375 print "XXX" 22.376 - }' | $DIALOG --title "SliTaz-Installer" --gauge "Installing.." 20 70 0 22.377 + }' | $DIALOG --title " $(_ 'SliTaz Installer') " --gauge "$(_ 'Installing...')" 20 70 0 22.378 22.379 22.380 # end_of_install 22.381 if tazinst log | grep -q "x-x-" ; then 22.382 tazinst clean 22.383 - $DIALOG --title " Installation complete " \ 22.384 + $DIALOG --title " $(_ 'Installation complete') " \ 22.385 --backtitle "$BACKLIST" \ 22.386 - --yes-label "Exit" \ 22.387 - --no-label "Reboot" \ 22.388 + --yes-label "$(_ 'Exit')" \ 22.389 + --no-label "$(_ 'Reboot')" \ 22.390 --clear --colors --yesno "$END_OF_INSTALL_MSG" 18 70 22.391 retval=$? 22.392 case $retval in 22.393 @@ -582,10 +582,10 @@ 22.394 1) 22.395 reboot || reboot -f ;; 22.396 255) 22.397 - echo -e "ESC pressed.\n" && exit 0 ;; 22.398 + _ 'ESC pressed.'; newline; exit 0 ;; 22.399 esac 22.400 else 22.401 - $DIALOG --title " Process not completed " \ 22.402 + $DIALOG --title " $(_ 'Process not completed') " \ 22.403 --backtitle "$BACKLIST" \ 22.404 --clear --msgbox \ 22.405 "$(tazinst log | awk '$1 == "-x-x-",$1 == "x-x-x"')" 18 70 22.406 @@ -594,6 +594,6 @@ 22.407 0) 22.408 exit 0 ;; 22.409 255) 22.410 - echo -e "ESC pressed.\n" && exit 0 ;; 22.411 + _ 'ESC pressed.'; newline; exit 0 ;; 22.412 esac 22.413 fi
23.1 --- a/tazinst Wed Apr 06 09:52:43 2016 +0300 23.2 +++ b/tazinst Sat Apr 09 17:22:22 2016 +0300 23.3 @@ -36,9 +36,9 @@ 23.4 readonly VERSION=3.95 23.5 23.6 # i18n 23.7 -. /usr/bin/gettext.sh 23.8 -TEXTDOMAIN='tazinst' 23.9 -export TEXTDOMAIN 23.10 +. /lib/libtaz.sh 23.11 +export TEXTDOMAIN='tazinst' 23.12 + 23.13 23.14 # files 23.15 readonly DEFAULT_INSTALL_FILE=./tazinst.rc 23.16 @@ -56,51 +56,51 @@ 23.17 23.18 # modes (key:help) 23.19 readonly LST_MODE=" 23.20 -install:$(gettext 'Fresh install on a HDD') 23.21 -upgrade:$(gettext 'Upgrade an existing system')" 23.22 +install:$(_ 'Fresh install on a HDD') 23.23 +upgrade:$(_ 'Upgrade an existing system')" 23.24 23.25 # media (key:help) 23.26 readonly LST_MEDIA=" 23.27 -cdrom:$(gettext 'LiveCD') 23.28 -usb:$(gettext 'LiveUSB') 23.29 -iso:$(gettext 'ISO image on a local drive') 23.30 -web:$(gettext 'ISO image on the Internet')" 23.31 +cdrom:$(_ 'LiveCD') 23.32 +usb:$(_ 'LiveUSB') 23.33 +iso:$(_ 'ISO image on a local drive') 23.34 +web:$(_ 'ISO image on the Internet')" 23.35 23.36 # formats (key:help) 23.37 readonly LST_FORMAT=" 23.38 -btrfs:$(gettext 'B-tree file system (Oracle)') 23.39 -ext2:$(gettext 'Second extended filesystem (Linux)') 23.40 -ext3:$(gettext 'Third extended filesystem (Linux)') 23.41 -ext4:$(gettext 'Fourth extended file system (Linux)') 23.42 -jfs:$(gettext 'Journaled File System (IBM)') 23.43 -minix:$(gettext 'File system of the MINIX operating system') 23.44 -reiser4:$(gettext 'Journaled computer file system (Namesys)') 23.45 -xfs:$(gettext 'Journaling file system (Silicon Graphics, Inc.)')" 23.46 +btrfs:$(_ 'B-tree file system (Oracle)') 23.47 +ext2:$(_ 'Second extended filesystem (Linux)') 23.48 +ext3:$(_ 'Third extended filesystem (Linux)') 23.49 +ext4:$(_ 'Fourth extended file system (Linux)') 23.50 +jfs:$(_ 'Journaled File System (IBM)') 23.51 +minix:$(_ 'File system of the MINIX operating system') 23.52 +reiser4:$(_ 'Journaled computer file system (Namesys)') 23.53 +xfs:$(_ 'Journaling file system (Silicon Graphics, Inc.)')" 23.54 23.55 # bootloaders (key:help) 23.56 readonly LST_BOOTLOADER=" 23.57 -auto:$(gettext 'Automatic selection') 23.58 -grub:$(gettext 'Grub legacy bootloader') 23.59 -syslinux:$(gettext 'Lightweight bootloader')" 23.60 +auto:$(_ 'Automatic selection') 23.61 +grub:$(_ 'GRUB legacy bootloader') 23.62 +syslinux:$(_ 'Lightweight bootloader')" 23.63 23.64 # predefined iso (key:url:help) 23.65 SLITAZ_VERSION="${SLITAZ_VERSION:-cooking}" 23.66 -[ "$SLITAZ_VERSION" = "cooking" ] && SLITAZ_VERSION="$(($(date "+%y")-8)).0" 23.67 +[ "$SLITAZ_VERSION" == 'cooking' ] && SLITAZ_VERSION="$(($(date "+%y")-8)).0" 23.68 [ -n "$URL_ISO" ] && readonly LST_WEB="$URL_ISO" || readonly LST_WEB=" 23.69 stable:iso/stable/slitaz-$SLITAZ_VERSION.iso \ 23.70 -:$(gettext 'Stable release') $SLITAZ_VERSION 23.71 +:$(_ 'Stable release') $SLITAZ_VERSION 23.72 core:iso/stable/flavors/slitaz-$SLITAZ_VERSION-core.iso \ 23.73 -:$(gettext 'Stable version without nested subsets') 23.74 +:$(_ 'Stable version without nested subsets') 23.75 base:iso/stable/flavors/slitaz-$SLITAZ_VERSION-base.iso \ 23.76 -:$(gettext 'Stable text-only version (8.1MB)') 23.77 +:$(_ 'Stable text-only version (8.1MB)') 23.78 justx:iso/stable/flavors/slitaz-$SLITAZ_VERSION-justx.iso \ 23.79 -:$(gettext 'Stable basic graphic version without graphic apps') 23.80 +:$(_ 'Stable basic graphic version without graphic apps') 23.81 gtkonly:iso/stable/flavors/slitaz-$SLITAZ_VERSION-gtkonly.iso \ 23.82 -:$(gettext 'Stable basic graphic version with only Gtk') 23.83 +:$(_ 'Stable basic graphic version with only GTK') 23.84 cooking:iso/cooking/slitaz-cooking.iso \ 23.85 -:$(gettext 'Development version for testing latest features') 23.86 +:$(_ 'Development version for testing latest features') 23.87 rolling:iso/rolling/slitaz-rolling.iso \ 23.88 -:$(gettext 'Bleeding edge development version updated every day') 23.89 +:$(_ 'Bleeding edge development version updated every day') 23.90 " 23.91 23.92 23.93 @@ -111,48 +111,48 @@ 23.94 # print a short help 23.95 usage() 23.96 { 23.97 - gettext "SliTaz GNU/Linux Installer - Version:" 23.98 - printf ' %s\n' $VERSION 23.99 - echo -e "\033[1m"; gettext 'Usage'; echo -e '\033[0m:' 23.100 - echo -n ' '; gettext 'tazinst [command] <setting> <value> <file>'; echo 23.101 - 23.102 - echo -e "\033[1m"; gettext 'Commands'; echo -e '\033[0m:' 23.103 - printf " %-12s" "new"; gettext "Create a new install file."; echo 23.104 - printf " %-12s" "set"; gettext "Change value of a setting."; echo 23.105 - printf " %-12s" "unset"; gettext "Clear a setting."; echo 23.106 - printf " %-12s" "get"; gettext "Get the value of a setting."; echo 23.107 - printf " %-12s" "check"; gettext "Check settings."; echo 23.108 - printf " %-12s" "help"; gettext "Print a short help on settings"; echo 23.109 - printf " %-12s" "list"; gettext "List system resources."; echo 23.110 - printf " %-12s" "execute"; gettext "Execute a SliTaz installation."; echo 23.111 - printf " %-12s" "log"; gettext "Display log file contents."; echo 23.112 - printf " %-12s" "clean"; gettext "Clean install and log files."; echo 23.113 - printf " %-12s" "version"; gettext "Print version and exit."; echo 23.114 - printf " %-12s" "usage"; gettext "Print this short usage."; echo 23.115 + _ 'SliTaz GNU/Linux Installer - Version: %s' "$VERSION" 23.116 + newline; boldify "$(_ 'Usage:')" 23.117 + echo -n ' '; _ '%s [command] <setting> <value> <file>' 'tazinst' 23.118 + newline; boldify "$(_ 'Commands:')" 23.119 + optlist "\ 23.120 +new $(_ 'Create a new install file.') 23.121 +set $(_ 'Change value of a setting.') 23.122 +unset $(_ 'Clear a setting.') 23.123 +get $(_ 'Get the value of a setting.') 23.124 +check $(_ 'Check settings.') 23.125 +help $(_ 'Print a short help on settings') 23.126 +list $(_ 'List system resources.') 23.127 +execute $(_ 'Execute a SliTaz installation.') 23.128 +log $(_ 'Display log file contents.') 23.129 +clean $(_ 'Clean install and log files.') 23.130 +version $(_ 'Print version and exit.') 23.131 +usage $(_ 'Print this short usage.') 23.132 +" 23.133 exit 0 23.134 } 23.135 23.136 usage_error() 23.137 { 23.138 local cmd="$1" script="$(basename $0)" 23.139 - gettext "SliTaz GNU/Linux Installer - Version:" 23.140 - printf ' %s\n' $VERSION 23.141 - printf "\n'%s': " "$cmd" 23.142 - gettext 'Unknown command!'; echo 23.143 - gettext 'Run'; printf ": '%s' " "$script help" 23.144 - gettext "to get a list of available commands"; echo -e ".\n" 23.145 + _ 'SliTaz GNU/Linux Installer - Version: %s' "$VERSION" 23.146 + newline 23.147 + _ "'%s': Unknown command!" "$cmd" 23.148 + 23.149 + _ "Run: '%s' to get a list of available commands." "$script help" 23.150 exit 1 23.151 } 23.152 23.153 + 23.154 option_error() 23.155 { 23.156 local option="$1" list="$2" 23.157 - gettext "SliTaz GNU/Linux Installer - Version:" 23.158 - printf ' %s\n' $VERSION 23.159 - printf "\n'%s': " "$option" 23.160 - gettext 'Unknown option!'; echo 23.161 - gettext "Please select one of these options" 23.162 - printf ":\n %s\n\n" "$list" 23.163 + _ 'SliTaz GNU/Linux Installer - Version: %s' "$VERSION" 23.164 + newline 23.165 + _ "'%s': Unknown option!" "$option" 23.166 + 23.167 + _ 'Please select one of these options:' 23.168 + printf " %s\n\n" "$list" 23.169 exit 1 23.170 } 23.171 23.172 @@ -170,14 +170,14 @@ 23.173 local install_file=$1 23.174 [ -z "$install_file" ] && install_file="$DEFAULT_INSTALL_FILE" 23.175 if [ -e "$install_file" ]; then 23.176 - printf "%s\n" "$(gettext "Warning: file already exists.")" 1>&2 23.177 + _ 'Warning: file already exists.' 1>&2 23.178 exit 0 23.179 fi 23.180 [ -n "$install_file" ] && touch "$install_file" 23.181 if [ -w "$install_file" ]; then 23.182 write_file "$install_file" 23.183 else 23.184 - printf "%s\n" "$(gettext "Error: Cannot create file.")" 1>&2 23.185 + _ 'Error: Cannot create file.' 1>&2 23.186 exit 2 23.187 fi 23.188 } 23.189 @@ -186,7 +186,7 @@ 23.190 write_file() 23.191 { 23.192 local install_file="$1" 23.193 - cat > "$install_file" << EOT 23.194 + cat > "$install_file" <<EOT 23.195 # SliTaz GNU/Linux Installer - Version: $VERSION 23.196 # 23.197 # Install file. 23.198 @@ -275,12 +275,12 @@ 23.199 local install_file="$1" 23.200 [ -z "$install_file" ] && install_file="$DEFAULT_INSTALL_FILE" 23.201 if ! [ -r "$install_file" ]; then 23.202 - printf "%s\n" "$(gettext "Error: Unable to read install file")" 1>&2 23.203 + _ 'Error: Unable to read install file.' 1>&2 23.204 exit 2 23.205 fi 23.206 # 23.207 if ! CONTENTS="$(cat "$install_file")"; then 23.208 - printf "%s\n" "$(gettext "Error: Unable to read install file")" 1>&2 23.209 + _ 'Error: Unable to read install file.' 1>&2 23.210 exit 2 23.211 fi 23.212 } 23.213 @@ -328,25 +328,20 @@ 23.214 egrep -q "$(regex "$SETTINGS")"; then 23.215 get_value "$setting" 23.216 else 23.217 - if [ "$setting" = "all" ]; then 23.218 - printf "%-15s: %s\n" "mode" "$(get_value mode)" 23.219 - printf "%-15s: %s\n" "media" "$(get_value media)" 23.220 - printf "%-15s: %s\n" "source" "$(get_value source)" 23.221 - printf "%-15s: %s\n" "root_uuid" "$(get_value root_uuid)" 23.222 - printf "%-15s: %s\n" "root_format" "$(get_value root_format)" 23.223 - printf "%-15s: %s\n" "home_uuid" "$(get_value home_uuid)" 23.224 - printf "%-15s: %s\n" "home_format" "$(get_value home_format)" 23.225 - printf "%-15s: %s\n" "hostname" "$(get_value hostname)" 23.226 - printf "%-15s: %s\n" "root_pwd" "$(get_value root_pwd)" 23.227 - printf "%-15s: %s\n" "user_login" "$(get_value user_login)" 23.228 - printf "%-15s: %s\n" "user_pwd" "$(get_value user_pwd)" 23.229 - printf "%-15s: %s\n" "bootloader" "$(get_value bootloader)" 23.230 - printf "%-15s: %s\n" "winboot" "$(get_value winboot)" 23.231 - elif [ "$setting" = "settings" ]; then 23.232 - get_settings 23.233 - else 23.234 - option_error "$1" "$SETTINGS" 23.235 - fi 23.236 + case "$setting" in 23.237 + all) 23.238 + for i in mode media source root_uuid root_format home_uuid home_format \ 23.239 + hostname root_pwd user_login user_pwd bootloader winboot; do 23.240 + printf "%-15s: %s\n" "$i" "$(get_value $i)" 23.241 + done 23.242 + ;; 23.243 + settings) 23.244 + get_settings 23.245 + ;; 23.246 + *) 23.247 + option_error "$1" "$SETTINGS" 23.248 + ;; 23.249 + esac 23.250 fi 23.251 } 23.252 23.253 @@ -357,7 +352,7 @@ 23.254 # validate setting 23.255 if ! printf "%s" "$setting" | \ 23.256 egrep -q "$(regex "$SETTINGS")"; then 23.257 - printf "%s\n" "$(gettext "Error: '$setting' unknown setting.")" 1>&2 23.258 + _ "Error: '%s' unknown setting." "$setting" 1>&2 23.259 exit 1 23.260 fi 23.261 # and file 23.262 @@ -385,8 +380,7 @@ 23.263 read_file "$install_file" 23.264 check "$setting" 23.265 else 23.266 - printf "%s\n" \ 23.267 - "$(gettext "Error: Unable to write to install file.")" 1>&2 23.268 + _ 'Error: Unable to write to install file.' 1>&2 23.269 exit 2 23.270 fi 23.271 } 23.272 @@ -430,6 +424,12 @@ 23.273 || unset WINBOOT 23.274 } 23.275 23.276 + 23.277 + 23.278 + 23.279 + 23.280 + 23.281 + 23.282 # clean command 23.283 clean() 23.284 { 23.285 @@ -440,9 +440,9 @@ 23.286 # rm install file 23.287 local install_file="$1" 23.288 [ -z "$install_file" ] && install_file="$DEFAULT_INSTALL_FILE" 23.289 - printf "%s: %s\n" "$(gettext "Deleting install file")" "$install_file" 23.290 + _ 'Deleting install file: %s' "$install_file" 23.291 if ! [ -w "$install_file" ]; then 23.292 - printf "%s\n" "$(gettext "Error: Unable to delete install file")" 1>&2 23.293 + _ 'Error: Unable to delete install file.' 1>&2 23.294 exit 2 23.295 else 23.296 rm -f "$install_file" 23.297 @@ -456,10 +456,10 @@ 23.298 # exit if user is not root. 23.299 check_root() 23.300 { 23.301 - if test $(id -u) != 0 ; then 23.302 - echo $(gettext "You must be the root user (system administrator) \ 23.303 + if [ $(id -u) -ne 0 ]; then 23.304 + _ "You must be the root user (system administrator) \ 23.305 to install SliTaz, please use 'su' to get a root SHell and restart \ 23.306 -installation.") 1>&2 23.307 +installation." 1>&2 23.308 exit 1 23.309 fi 23.310 } 23.311 @@ -468,7 +468,7 @@ 23.312 check_instance() 23.313 { 23.314 if [ -e "$LOCK" ]; then 23.315 - printf "%s\n" $(gettext "Another instance of tazinst is running.") 1>&2 23.316 + _ 'Another instance of tazinst is running.' 1>&2 23.317 exit 7 23.318 else 23.319 printf "%s" "$$" > $LOCK 23.320 @@ -482,9 +482,9 @@ 23.321 if ! printf "%s" "$keyword" | \ 23.322 egrep -q "$(regex "$keylist")"; then 23.323 msg="$setting=$keyword 23.324 -$(gettext 'Error:') '$keyword' $(gettext 'Invalid keyword.') 23.325 -$(gettext 'Select one of these options:') $keylist 23.326 -$(gettext 'For more information, see tazinst Manual.')" 23.327 +$(_ "Error: '%s' Invalid keyword." "$keyword") 23.328 +$(_ 'Select one of these options: %s.' "$keylist") 23.329 +$(_ 'For more information, see tazinst Manual.')" 23.330 printf "%s\n" "$msg" 1>&2 23.331 exit 1 23.332 fi 23.333 @@ -499,8 +499,8 @@ 23.334 done 23.335 if [ "$found" != "1" ]; then 23.336 msg="$(gettext "$setting")=$value 23.337 -$(gettext 'Error: Partition not found') 23.338 -$(gettext 'To see available partitions, run') 'tazinst list uuid'." 23.339 +$(_ 'Error: Partition not found.') 23.340 +$(_ "To see available partitions, run '%s'." 'tazinst list uuid')" 23.341 printf "%s\n" "$msg" 1>&2 23.342 exit 1 23.343 fi 23.344 @@ -515,7 +515,7 @@ 23.345 check_uuid source ;; 23.346 iso) 23.347 if [ ! -r "$source" ]; then 23.348 - printf "%s.\n" "$(gettext "Error: Source file not found")" 1>&2 23.349 + _ 'Error: Source file not found.' 1>&2 23.350 exit 1 23.351 fi ;; 23.352 web) 23.353 @@ -530,7 +530,7 @@ 23.354 printf "%s" "$source" | \ 23.355 egrep -q "$regexp" && valid=$(($valid+1)) 23.356 if [ "$valid" -le "0" ]; then 23.357 - printf "%s.\n" "$(gettext "Error: invalid URL")" 1>&2 23.358 + _ 'Error: invalid URL.' 1>&2 23.359 exit 1 23.360 fi 23.361 esac 23.362 @@ -545,12 +545,12 @@ 23.363 nodup="$(printf "%s" "$list" | /bin/busybox awk 'BEGIN{RS=" "}{print $0}' \ 23.364 | sort | uniq | wc -w)" 23.365 if [ "$all" != "$nodup" ]; then 23.366 - printf "%s\n" \ 23.367 - "$(gettext "Error: multiple assignations for a disk.")" 1>&2 23.368 + _ 'Error: multiple assignations for a disk.' 1>&2 23.369 exit 1 23.370 fi 23.371 } 23.372 23.373 + 23.374 # exit if a password is invalid 23.375 check_password() 23.376 { 23.377 @@ -559,13 +559,13 @@ 23.378 local errcode=0 23.379 # too long 23.380 if [ "${#pass}" -ge 40 ]; then 23.381 - printf "%s\n" "$(gettext "Error: password too long")" 1>&2 23.382 + _ 'Error: password too long.' 1>&2 23.383 exit 1 23.384 fi 23.385 # bad chars 23.386 if ! (printf "%s" "$pass" | egrep -q "$invalid"); then 23.387 - printf "%s\n" \ 23.388 - "$(gettext "Error: Unallowed characters in password.")" 1>&2 23.389 + _ 'Error: Unallowed characters in password.' 1>&2 23.390 + 23.391 exit 1 23.392 fi 23.393 # short pwd 23.394 @@ -574,9 +574,9 @@ 23.395 [ -z "$pass" ] && errcode=129 23.396 case "$errcode" in 23.397 128) 23.398 - printf "%s\n" "$(gettext "Warning: short password!")" 1>&2 ;; 23.399 + _ 'Warning: short password!' 1>&2 ;; 23.400 129) 23.401 - printf "%s\n" "$(gettext "Warning: no password!")" 1>&2 ;; 23.402 + _ 'Warning: no password!' 1>&2 ;; 23.403 esac 23.404 return "$errcode" 23.405 } 23.406 @@ -586,17 +586,17 @@ 23.407 { 23.408 local name="$1" value="$(get "$1")" msg 23.409 msg="$name=$value" 23.410 - if [ "${#value}" -lt 2 ]; then 23.411 - printf "%s %s\n" "$msg" "(gettext "Error: Too short.")\n" 1>&2 23.412 + if [ "${#value}" -lt 2 ]; then 23.413 + _ '%s Error: Too short.' "$msg" 1>&2 23.414 exit 1 23.415 fi 23.416 if [ "${#value}" -gt 32 ]; then 23.417 - printf "%s %s\n" "$msg" "$(gettext "Error: Too long.")\n" 1>&2 23.418 + _ '%s Error: Too long.' "$msg" 1>&2 23.419 exit 1 23.420 fi 23.421 if printf "%s" "$value" | \ 23.422 grep -q "[[:space:]\&\"\'\(\)\|\*\\#\`\+\:/;<>]"; then 23.423 - printf "%s %s\n" "$msg" "$(gettext "Error: Invalid chars.")\n" 1>&2 23.424 + _ '%s Error: Invalid chars.' "$msg" 1>&2 23.425 exit 1 23.426 fi 23.427 } 23.428 @@ -607,8 +607,8 @@ 23.429 local bootloader=$(get bootloader) 23.430 local winboot=$(get winboot) 23.431 if [ -z "$bootloader" ] && [ -n "$winboot" ]; then 23.432 - printf "%s\n" \ 23.433 - "$(gettext "Error: Dualboot set with no bootloader.")" 1>&2 23.434 + 23.435 + _ 'Error: Dualboot set with no bootloader.' 1>&2 23.436 exit 1 23.437 fi 23.438 } 23.439 @@ -622,12 +622,12 @@ 23.440 if [ "$(/sbin/blkid | grep -c "$uuid")" == "1" ]; then 23.441 if ! printf "%s" "$(p_table $uuid)" | \ 23.442 egrep -q "$(regex "$pt_list")"; then 23.443 - printf "%s\n" "$(gettext "Error: Unsupported Partition Table")" 1>&2 23.444 + _ 'Error: Unsupported Partition Table.' 1>&2 23.445 exit 1 23.446 fi 23.447 else 23.448 - printf "%s\n" \ 23.449 - "$(gettext "Error: No disk selected, cannot install any bootloader.")" 1>&2 23.450 + 23.451 + _ 'Error: No disk selected, cannot install any bootloader.' 1>&2 23.452 exit 1 23.453 fi 23.454 } 23.455 @@ -744,33 +744,33 @@ 23.456 23.457 help_source() 23.458 { 23.459 - printf "%s\n" \ 23.460 - "$(gettext "The Source setting depends on the type of media:")" 23.461 + 23.462 + _ 'The Source setting depends on the type of media:' 23.463 printf "%-12s%s\n" "cdrom" "$(help cdrom)" 23.464 printf "%-12s%s\n" "usb" "$(help usb)" 23.465 printf "%-12s%s\n" "iso" "$(help iso)" 23.466 - printf "%-12s%s" "web" "$(gettext "Name or URL of the image on the web.")" 23.467 - printf "%s\n" "$(gettext "Type: tazinst help web")" 23.468 + printf "%-12s%s" "web" "$(_ 'Name or URL of the image on the web.')" 23.469 + printf "%s\n" "$(_ 'Type: %s' 'tazinst help web')" 23.470 } 23.471 23.472 help_all() 23.473 { 23.474 - local text="mode:$(gettext "Mode of install") 23.475 -media:$(gettext "Media containing the SliTaz source files") 23.476 -source:$(gettext "Source file containing SliTaz") 23.477 -root_uuid:$(gettext "The name of the target partition") 23.478 -root_format:$(gettext "Format of the target partition") 23.479 -home_uuid:$(gettext "Separate home partition") 23.480 -home_format:$(gettext "Format of the root partition") 23.481 -hostname:$(gettext "Name of the system") 23.482 -root_pwd:$(gettext "Superuser password") 23.483 -user_login:$(gettext "First user name") 23.484 -user_pwd:$(gettext "First user password") 23.485 -bootloader:$(gettext "Install a bootloader") 23.486 -winboot:$(gettext "Partition to dualboot Windows from")" 23.487 - printf "%s\n" "$(gettext "List of settings:")" 23.488 - printf "%s" "$text" | \ 23.489 - /bin/busybox awk -F: '/..*/{printf "%-12s%s\n", $1, $2}' 23.490 + _ 'List of settings:' 23.491 + optlist "\ 23.492 +mode $(_ 'Mode of install') 23.493 +media $(_ 'Media containing the SliTaz source files') 23.494 +source $(_ 'Source file containing SliTaz') 23.495 +root_uuid $(_ 'The name of the target partition') 23.496 +root_format $(_ 'Format of the target partition') 23.497 +home_uuid $(_ 'Separate home partition') 23.498 +home_format $(_ 'Format of the root partition') 23.499 +hostname $(_ 'Name of the system') 23.500 +root_pwd $(_ 'Superuser password') 23.501 +user_login $(_ 'First user name') 23.502 +user_pwd $(_ 'First user password') 23.503 +bootloader $(_ 'Install a bootloader') 23.504 +winboot $(_ 'Partition to dualboot Windows from') 23.505 +" 23.506 } 23.507 23.508 # help command 23.509 @@ -787,13 +787,13 @@ 23.510 source) 23.511 help_source ;; 23.512 cdrom) 23.513 - printf "%s\n" "$(gettext "CD. Automatically set")" ;; 23.514 + _ 'CD. Automatically set' ;; 23.515 usb) 23.516 - printf "%s\n" \ 23.517 - "$(gettext "USB partition. For a list, type: tazinst list usb")" ;; 23.518 + 23.519 + _ 'USB partition. For a list, type: %s' 'tazinst list usb' ;; 23.520 iso) 23.521 - printf "%s\n" \ 23.522 - "$(gettext "ISO file name. For a list, type: tazinst list iso")" ;; 23.523 + 23.524 + _ 'ISO file name. For a list, type: %s' 'tazinst list iso' ;; 23.525 web) 23.526 printf "%s" "$LST_WEB" | \ 23.527 /bin/busybox awk -F: '/..*/{printf "%-12s%s\n", $1, $3}' ;; 23.528 @@ -808,20 +808,20 @@ 23.529 printf "%s" "$LST_FORMAT" | \ 23.530 /bin/busybox awk -F: '/..*/{printf "%-12s%s\n", $1, $2}' ;; 23.531 hostname) 23.532 - printf "%s\n" "$(gettext "Name of the system")" ;; 23.533 + _ 'Name of the system' ;; 23.534 root_pwd) 23.535 - printf "%s\n" "$(gettext "Superuser password")" ;; 23.536 + _ 'Superuser password' ;; 23.537 user_login) 23.538 - printf "%s\n" "$(gettext "First user name")" ;; 23.539 + _ 'First user name' ;; 23.540 user_pwd) 23.541 - printf "%s\n" "$(gettext "First user password")" ;; 23.542 + _ 'First user password' ;; 23.543 bootloader) 23.544 printf "%s" "$LST_BOOTLOADER" | \ 23.545 /bin/busybox awk -F: '/..*/{printf "%-12s%s\n",$1,$2}' ;; 23.546 winboot) 23.547 - printf "%s\n" "$(gettext "Partition containing Windows, or 'auto'")" ;; 23.548 + _ "Partition containing Windows, or 'auto'" ;; 23.549 ""|all) 23.550 - help_all ;; 23.551 + help_all ;; 23.552 *) 23.553 option_error "$setting" "$SETTINGS" ;; 23.554 esac 23.555 @@ -883,14 +883,14 @@ 23.556 list_format() 23.557 { 23.558 local fs 23.559 - type mkfs.btrfs > /dev/null && fs="btrfs" 23.560 - type mkfs.ext2 > /dev/null && fs="$fs ext2" 23.561 - type mkfs.ext3 > /dev/null && fs="$fs ext3" 23.562 - type mkfs.ext4 > /dev/null && fs="$fs ext4" 23.563 - type mkfs.jfs > /dev/null && fs="$fs jfs" 23.564 - type mkfs.minix > /dev/null && fs="$fs minix" 23.565 + type mkfs.btrfs > /dev/null && fs="btrfs" 23.566 + type mkfs.ext2 > /dev/null && fs="$fs ext2" 23.567 + type mkfs.ext3 > /dev/null && fs="$fs ext3" 23.568 + type mkfs.ext4 > /dev/null && fs="$fs ext4" 23.569 + type mkfs.jfs > /dev/null && fs="$fs jfs" 23.570 + type mkfs.minix > /dev/null && fs="$fs minix" 23.571 type mkfs.reiser4 > /dev/null && fs="$fs reiser4" 23.572 - type mkfs.xfs > /dev/null && fs="$fs xfs" 23.573 + type mkfs.xfs > /dev/null && fs="$fs xfs" 23.574 printf "%s" "$fs" | sed 's/^\s//' 23.575 } 23.576 23.577 @@ -1124,7 +1124,7 @@ 23.578 printf "%05.0f %s \n",rand()*99999, $0; 23.579 }' | sort -n | sed 's/^[0-9]* //' )" 23.580 else 23.581 - log "$(gettext "No mirror list found, run tazpkg recharge.")" 23.582 + log "$(_ 'No mirror list found, run %s.' 'tazpkg recharge')" 23.583 list_mirrors="http://mirror.slitaz.org/" 23.584 fi 23.585 MIRRORS="$list_mirrors" 23.586 @@ -1136,16 +1136,16 @@ 23.587 local file="$1" mirror transfer=0 oldfile 23.588 mkdir -p /tmp/tazinst 23.589 for mirror in $MIRRORS; do 23.590 - log "$(gettext "Downloading:") $mirror$file" 23.591 + log "$(_ 'Downloading: %s' "$mirror$file")" 23.592 oldfile="$(printf "%s" $file | \ 23.593 /bin/busybox awk 'BEGIN{RS="/"}{text=$1}END{print text}')" 23.594 [ -e "/tmp/tazinst/$oldfile" ] && rm -f "/tmp/tazinst/$oldfile" 23.595 /bin/busybox wget $mirror$file -P /tmp/tazinst && transfer=1 && break 23.596 done 23.597 if [ "$transfer" -gt "0" ];then 23.598 - log "$(gettext "Download completed.")" 23.599 + log "$(_ 'Download completed.')" 23.600 else 23.601 - error 5 "$file: $(gettext "Download failed.")" 23.602 + error 5 "(_ '%s: Download failed.' "$file")" 23.603 fi 23.604 } 23.605 23.606 @@ -1154,9 +1154,9 @@ 23.607 { 23.608 local pkg="$1" 23.609 if [ ! -d /var/lib/tazpkg/installed/$pkg ]; then 23.610 - log "$(gettext "Installing package to the current system:") $pkg" 23.611 + log "$(_ 'Installing package %s to the current system.' "$pkg")" 23.612 [ -z "$RECHARGE" ] && RECHARGE=true && /usr/bin/tazpkg recharge 23.613 - /usr/bin/tazpkg get-install "$pkg" || error 5 "Cannot install $pkg" 23.614 + /usr/bin/tazpkg get-install "$pkg" || error 5 "$(_ 'Cannot install %s.' "$pkg")" 23.615 fi 23.616 } 23.617 23.618 @@ -1164,7 +1164,7 @@ 23.619 add_pkg() 23.620 { 23.621 local pkg="$1" 23.622 - log "$(gettext "Adding package to the target system:") $pkg..." 23.623 + log "$(_ 'Adding package %s to the target system...' "$pkg")" 23.624 [ -z "$RECHARGE" ] && RECHARGE=true && /usr/bin/tazpkg recharge 23.625 /usr/bin/tazpkg get "$pkg" >> "$LOG" 2>> "$LOG" 23.626 yes "" | /usr/bin/tazpkg install $pkg.tazpkg \ 23.627 @@ -1179,7 +1179,7 @@ 23.628 # start log 23.629 log_open() 23.630 { 23.631 - printf "%s\n" "=== Tazinst: started on $(date "+%x %X") ===" > "$LOG" 23.632 + _ '=== Tazinst: started on %s ===' "$(date "+%x %X")" > "$LOG" 23.633 LOGGING="true" 23.634 } 23.635 23.636 @@ -1205,15 +1205,15 @@ 23.637 # print an error msg & exit 23.638 error() 23.639 { 23.640 - local error="$1" msg="$2" cancel="$(gettext "Process not completed")" 23.641 - printf "%s: %s\n%s\n" "$(gettext "Error")" "$msg" "$cancel" 1>&2 23.642 + local error="$1" msg="$2" cancel="$(_ 'Process not completed')" 23.643 + _ 'Error: %s' "$msg" >&2; echo "$cancel" >&2 23.644 if [ -n "$LOGGING" ]; then 23.645 # 1st pattern 23.646 echo "-x-x- " >> "$LOG" 23.647 - printf "%s: %s\n%s\n" "$(gettext "Error")" "$msg" "$cancel" >> "$LOG" 23.648 + _ 'Error: %s' "$msg" >> "$LOG"; echo "$cancel" >> "$LOG" 23.649 # 2nd pattern 23.650 echo "x-x-x " >> "$LOG" 23.651 - printf "=== Tazinst error on $(date "+%x %X") ===\n" >> "$LOG" 23.652 + _ '=== Tazinst error on %s ===' "$(date "+%x %X")" >> "$LOG" 23.653 fi 23.654 unset LOGGING 23.655 umount_devices 23.656 @@ -1222,12 +1222,12 @@ 23.657 23.658 error8() 23.659 { 23.660 - error 8 "$(gettext "Internal error")" 23.661 + error 8 "$(_ 'Internal error')" 23.662 } 23.663 23.664 error9() 23.665 { 23.666 - error 9 "$(gettext "Cancelled by user")" 23.667 + error 9 "$(_ 'Cancelled by user')" 23.668 } 23.669 23.670 #------------------ 23.671 @@ -1248,9 +1248,9 @@ 23.672 local cdrom=/dev/$drive 23.673 # mount cdrom 23.674 if mount -t iso9660 "$cdrom" "$SOURCE_ROOT" 2>>"$LOG"; then 23.675 - log "$(gettext "Using files from") $cdrom." 23.676 + log "$(_ 'Using files from %s.' "$cdrom")" 23.677 else 23.678 - error 3 "$cdrom: $(gettext "Mount failed")." 23.679 + error 3 "$(_ '%s: Mount failed.' "$cdrom")" 23.680 fi 23.681 } 23.682 23.683 @@ -1259,14 +1259,14 @@ 23.684 { 23.685 # /home is on LiveUSB 23.686 if [ -d /home/boot ]; then 23.687 - log "$(gettext "Using files from USB device")..." 23.688 + log "$(_ 'Using files from USB device...')" 23.689 ln -s /home/boot $SOURCE_ROOT/boot 23.690 else 23.691 # mount LiveUSB 23.692 if mount "$SOURCE" "$SOURCE_ROOT" 2>>"$LOG"; then 23.693 - log "$(gettext "Using files from USB device") $SOURCE." 23.694 + log "$(_ 'Using files from USB device %s.' "$SOURCE")" 23.695 else 23.696 - error 3 "$SOURCE: $(gettext "Failed to mount USB device")." 23.697 + error 3 "$(_ '%s: Failed to mount USB device.' "$SOURCE")" 23.698 fi 23.699 fi 23.700 } 23.701 @@ -1281,17 +1281,17 @@ 23.702 local md5calc="$(md5sum $SOURCE | cut -d' ' -f1)" 23.703 if [ ! "$md5calc" = "$md5ref" ]; then 23.704 log "md5sum iso=$md5ref md5sum tazinst=$md5calc" 23.705 - error 3 "$(gettext "md5sum error, file corrupted.")" 23.706 + error 3 "$(_ 'md5sum error, file corrupted.')" 23.707 fi 23.708 else 23.709 - log "$SOURCE: $(gettext "md5 file not found, cannot check integrity.")" 23.710 + log "$(_ '%s: md5 file not found, cannot check integrity.' "$SOURCE")" 23.711 fi 23.712 # mount ISO 23.713 if mount -o loop -t iso9660 "$SOURCE" \ 23.714 "$SOURCE_ROOT" 2>>"$LOG"; then 23.715 - log "$(gettext "Using files from ISO") $SOURCE." 23.716 + log "$(_ 'Using files from ISO %s.' "$SOURCE")" 23.717 else 23.718 - error 3 "$SOURCE: $(gettext "Failed to mount ISO.")" 23.719 + error 3 "$(_ '%s: Failed to mount ISO.' "$SOURCE")" 23.720 fi 23.721 } 23.722 23.723 @@ -1313,7 +1313,7 @@ 23.724 # set up source and check SliTaz' content 23.725 mount_source() 23.726 { 23.727 - log "$(gettext "Creating mount point:") $SOURCE_ROOT..." 23.728 + log "$(_ 'Creating mount point: %s...' "$SOURCE_ROOT")" 23.729 mkdir -p "$SOURCE_ROOT" 23.730 case "$MEDIA" in 23.731 cdrom) 23.732 @@ -1329,12 +1329,12 @@ 23.733 esac 23.734 23.735 # exit if no rootfs.gz found. 23.736 - log "$(gettext "Checking installation media...")" 23.737 + log "$(_ 'Checking installation media...')" 23.738 if [ ! -f $SOURCE_ROOT/boot/rootfs.gz -a \ 23.739 ! -f $SOURCE_ROOT/boot/rootfs1.gz ]; then 23.740 - error 3 $(gettext "Invalid source") 23.741 + error 3 "$(_ 'Invalid source')" 23.742 else 23.743 - log "$(gettext "Installation media checked ok")" 23.744 + log "$(_ 'Installation media checked ok')" 23.745 fi 23.746 } 23.747 23.748 @@ -1346,12 +1346,12 @@ 23.749 format() 23.750 { 23.751 local uuid="$1" fmt="$2" dest="$3" dev format 23.752 - log "$(gettext "Format") $uuid ($fmt)" 23.753 + log "$(_ 'Format %s (%s)' "$uuid" "$fmt")" 23.754 format="mkfs.$fmt" 23.755 if (printf "%s" "$uuid" | grep -q "UUID="); then 23.756 # case UUID= 23.757 dev="$(uuid2dev $uuid)" 23.758 - "$format" "$dev" >>"$LOG" 2>>"$LOG" || error 4 "Formatting has failed" 23.759 + "$format" "$dev" >>"$LOG" 2>>"$LOG" || error 4 "$(_ 'Formatting has failed')" 23.760 # uuid has changed 23.761 case "$dest" in 23.762 root_uuid) 23.763 @@ -1363,22 +1363,22 @@ 23.764 esac 23.765 else 23.766 # case /dev/xxxx 23.767 - "$format" $uuid >>"$LOG" 2>>"$LOG" || error 4 "Formatting has failed" 23.768 + "$format" $uuid >>"$LOG" 2>>"$LOG" || error 4 "$(_ 'Formatting has failed')" 23.769 fi 23.770 } 23.771 23.772 # prepare partitions 23.773 prepare_uuid() 23.774 { 23.775 - log "$(gettext "Preparing target partition...")" 23.776 + log "$(_ 'Preparing target partition...')" 23.777 local uuid 23.778 # target may be in use 23.779 if mount | grep -q "$ROOT_UUID" ;then 23.780 - log "$(gettext "Partition is already mounted, unmounting.")" 23.781 + log "$(_ 'Partition is already mounted, unmounting.')" 23.782 umount "$ROOT_UUID" 23.783 fi 23.784 mount | grep -q "$ROOT_UUID" && \ 23.785 - error 4 "$ROOT_UUID: $(gettext "Partition is already in use.")" 23.786 + error 4 "$ROOT_UUID: $(_ 'Partition is already in use.')" 23.787 # Mount point can be already used. 23.788 mount | grep -q "$TARGET_ROOT" && \ 23.789 umount "$TARGET_ROOT" 2>>"$LOG" 23.790 @@ -1386,7 +1386,7 @@ 23.791 # Formatting root partition 23.792 case "$ROOT_FORMAT" in 23.793 "") 23.794 - log "$ROOT_UUID: $(gettext "The partition will be cleaned...")" ;; 23.795 + log "$(_ '%s: The partition will be cleaned...' "$ROOT_UUID")" ;; 23.796 *) 23.797 format "$ROOT_UUID" "$ROOT_FORMAT" root_uuid 23.798 esac 23.799 @@ -1395,13 +1395,13 @@ 23.800 if [ -n "$HOME_UUID" ]; then 23.801 case "$HOME_FORMAT" in 23.802 "") 23.803 - log "$HOME_UUID $(gettext "The partition will be kept...")" ;; 23.804 + log "$(_ '%s: The partition will be kept...' "$HOME_UUID")" ;; 23.805 *) 23.806 format "$HOME_UUID" "$HOME_FORMAT" home_uuid 23.807 esac 23.808 fi 23.809 23.810 - log "$(gettext "Creating mount point:") $TARGET_ROOT" 23.811 + log "$(_ 'Creating mount point: %s...' "$TARGET_ROOT")" 23.812 mkdir -p "$TARGET_ROOT" >> "$LOG" || error8 23.813 # Mount target. 23.814 local mount_fs="$ROOT_FORMAT" 23.815 @@ -1410,7 +1410,7 @@ 23.816 "$TARGET_ROOT" >>"$LOG" 2>>"$LOG" 23.817 if [ $(mount | \ 23.818 grep -c "mnt/target") == "0" ]; then 23.819 - error 4 "$ROOT_UUID: $(gettext "Unable to mount partition")" 23.820 + error 4 "$(_ '%s: Unable to mount partition' "$ROOT_UUID")" 23.821 fi 23.822 } 23.823 23.824 @@ -1424,23 +1424,23 @@ 23.825 { 23.826 # umount target 23.827 if mount | grep -q "$TARGET_ROOT"; then 23.828 - log "$(gettext "Unmounting target partition:") $ROOT_UUID" 23.829 + log "$(_ 'Unmounting target partition: %s' "$ROOT_UUID")" 23.830 umount -l "$TARGET_ROOT" 2>>$LOG 23.831 fi 23.832 23.833 # umount source 23.834 if mount | grep -q "$SOURCE_ROOT"; then 23.835 - log "$(gettext "Unmounting:") $SOURCE_ROOT" 23.836 + log "$(_ 'Unmounting: %s' "$SOURCE_ROOT")" 23.837 umount -l "$SOURCE_ROOT" 23.838 fi 23.839 if [ -h $SOURCE_ROOT/boot ]; then 23.840 - log "$(gettext "Unlinking:") $SOURCE_ROOT" 23.841 + log "$(_ 'Unlinking: %s' "$SOURCE_ROOT")" 23.842 rm -f $SOURCE_ROOT/boot 23.843 fi 23.844 23.845 # eject cd 23.846 if [ "$SOURCE" == "cdrom" ]; then 23.847 - gettext "Ejecting cdrom..." 23.848 + _ 'Ejecting CD-ROM...' 23.849 eject 23.850 fi 23.851 # remove lock file 23.852 @@ -1449,12 +1449,12 @@ 23.853 23.854 end_of_install() 23.855 { 23.856 - log "$(gettext "Process completed. You can now restart (reboot)")" 23.857 - log "$(gettext "from your SliTaz GNU/Linux system.")" 23.858 - printf "%s\n" "=== Tazinst ended on $(date "+%x %X") ===" >> "$LOG" 23.859 + log "$(_ 'Process completed. You can now restart (reboot) from your SliTaz GNU/Linux system.' |\ 23.860 + fold -s)" 23.861 + _ '=== Tazinst ended on %s ===' "$(date "+%x %X")" >> "$LOG" 23.862 unset LOGGING 23.863 # saving log 23.864 - log "$(gettext "Copying log to /var/log/tazinst.log")" 23.865 + log "$(_ 'Copying log to %s' '/var/log/tazinst.log')" 23.866 cp -a "$LOG" $TARGET_ROOT/var/log 23.867 umount_devices 23.868 } 23.869 @@ -1490,7 +1490,7 @@ 23.870 syslinux_install ;; 23.871 *) 23.872 syslinux_config 23.873 - log "$(gettext "No bootloader to install.")" ;; 23.874 + log "$(_ 'No bootloader to install.')" ;; 23.875 esac 23.876 } 23.877 23.878 @@ -1558,7 +1558,7 @@ 23.879 $TARGET_ROOT/boot/grub/menu.bak 23.880 # create the target GRUB configuration. 23.881 mkdir -p $TARGET_ROOT/boot/grub || error8 23.882 - cat > $TARGET_ROOT/boot/grub/menu.lst << _EOF_ 23.883 + cat > $TARGET_ROOT/boot/grub/menu.lst <<_EOF_ 23.884 # /boot/grub/menu.lst: GRUB boot loader configuration. 23.885 # 23.886 23.887 @@ -1584,8 +1584,8 @@ 23.888 23.889 local winpart="$(winboot_uuid)" 23.890 if [ -n "$winpart" ]; then 23.891 - log "$(gettext "Enabling Windows dual-boot")" 23.892 - cat >> $TARGET_ROOT/boot/grub/menu.lst << _EOF_ 23.893 + log "$(_ 'Enabling Windows dual-boot')" 23.894 + cat >> $TARGET_ROOT/boot/grub/menu.lst <<_EOF_ 23.895 # For booting Windows : 23.896 # 23.897 title Microsoft Windows 23.898 @@ -1607,17 +1607,17 @@ 23.899 { 23.900 # install grub 23.901 local target_disk="$(uuid2disk $ROOT_UUID)" 23.902 - log "$(gettext "Installing grub on:") $target_disk" 23.903 - /usr/sbin/grub-install --version >> "$LOG" || error 5 "grub not found" 23.904 + log "$(_ 'Installing GRUB on: %s' "$target_disk")" 23.905 + /usr/sbin/grub-install --version >> "$LOG" || error 5 "$(_ 'GRUB not found')" 23.906 /usr/sbin/grub-install --no-floppy \ 23.907 --root-directory=$TARGET_ROOT $target_disk >>"$LOG" 2>>"$LOG" 23.908 # set boot flag 23.909 - log "$(gettext "Setting the boot flag")" 23.910 + log "$(_ 'Setting the boot flag')" 23.911 /usr/sbin/parted "$(uuid2disk $ROOT_UUID)" \ 23.912 set "$(($(partnum $ROOT_UUID)+1))" boot on 2>> "$LOG" 23.913 # splash image 23.914 if [ -f "$SOURCE_ROOT/boot/grub/splash.xpm.gz" ]; then 23.915 - log "$(gettext "Copying splash image")" 23.916 + log "$(_ 'Copying splash image')" 23.917 mkdir -p $TARGET_ROOT/boot/grub 23.918 cp $SOURCE_ROOT/boot/grub/splash.xpm.gz \ 23.919 $TARGET_ROOT/boot/grub 23.920 @@ -1640,7 +1640,7 @@ 23.921 $TARGET_ROOT/boot/syslinux/syslinux.bak 23.922 # create the target syslinux configuration. 23.923 mkdir -p $TARGET_ROOT/boot/syslinux || error8 23.924 - cat > $TARGET_ROOT/boot/syslinux/syslinux.cfg << EOF 23.925 + cat > $TARGET_ROOT/boot/syslinux/syslinux.cfg <<EOF 23.926 # use a boot menu 23.927 UI vesamenu.c32 23.928 23.929 @@ -1666,10 +1666,10 @@ 23.930 23.931 # Menu colors 23.932 MENU COLOR border * #00000000 #00000000 none 23.933 -MENU COLOR title * #ffffffff #00000000 * 23.934 +MENU COLOR title * #ffffffff #00000000 * 23.935 MENU COLOR sel 0 #ffffffff #00000000 none 23.936 MENU COLOR unsel 0 #50ffffff #00000000 none 23.937 -MENU COLOR help * #ffffffff #00000000 * 23.938 +MENU COLOR help * #ffffffff #00000000 * 23.939 MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std 23.940 MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std 23.941 MENU COLOR msg07 37;40 #90ffffff #a0000000 std 23.942 @@ -1688,8 +1688,8 @@ 23.943 EOF 23.944 local winpart="$(winboot_uuid)" 23.945 if [ -n "$winpart" ]; then 23.946 - log "$(gettext "Enabling Windows dual-boot")" 23.947 - cat >> $TARGET_ROOT/boot/syslinux/syslinux.cfg << EOF 23.948 + log "$(_ 'Enabling Windows dual-boot')" 23.949 + cat >> $TARGET_ROOT/boot/syslinux/syslinux.cfg <<EOF 23.950 LABEL windows 23.951 MENU LABEL Windows 23.952 COM32 chain.c32 23.953 @@ -1707,7 +1707,7 @@ 23.954 # install syslinux 23.955 syslinux_install() 23.956 { 23.957 - log "$(gettext "Installing syslinux")" 23.958 + log "$(_ 'Installing Syslinux')" 23.959 # needed tools 23.960 local dir disk="$(uuid2disk $ROOT_UUID)" 23.961 for dir in /home/boot/extlinux /home/boot/syslinux /boot/syslinux; do 23.962 @@ -1717,19 +1717,19 @@ 23.963 /usr/bin/lzma d /usr/share/boot/chain.c32.lzma \ 23.964 $TARGET_ROOT/boot/syslinux/chain.c32 2>> "$LOG" 23.965 # install syslinux 23.966 - /bin/syslinux -version >> "$LOG" || error 5 "syslinux not found" 23.967 + /bin/syslinux -version >> "$LOG" || error 5 "$(_ 'Syslinux not found')" 23.968 /bin/extlinux --install $TARGET_ROOT/boot/syslinux >> "$LOG" 2>> "$LOG" 23.969 case "$(p_table $ROOT_UUID)" in 23.970 msdos) 23.971 - log "$(gettext "Setting the boot flag on")" 23.972 + log "$(_ 'Setting the boot flag on')" 23.973 /usr/sbin/parted "$disk" \ 23.974 set "$(($(partnum $ROOT_UUID)+1))" boot on 2>> "$LOG" 23.975 - [ -r /usr/share/boot/mbr.bin ] || error 5 "mbr.bin not found" 23.976 - log "$(gettext "Installing mbr")" 23.977 + [ -r /usr/share/boot/mbr.bin ] || error 5 "$(_ 'mbr.bin not found')" 23.978 + log "$(_ 'Installing MBR')" 23.979 dd bs=440 count=1 conv=notrunc \ 23.980 if=/usr/share/boot/mbr.bin of=$disk >> "$LOG" ;; 23.981 gpt) 23.982 - log "$(gettext "Setting the legacy_boot flag on")" 23.983 + log "$(_ 'Setting the legacy_boot flag on')" 23.984 # remove old boot flag 23.985 local oldboot="$(parted $disk print \ 23.986 | grep boot | /bin/busybox awk '{print $1}')" 23.987 @@ -1738,14 +1738,14 @@ 23.988 # set boot flag 23.989 /usr/sbin/parted "$disk" \ 23.990 set "$(($(partnum $ROOT_UUID)+1))" legacy_boot on 2>> "$LOG" 23.991 - log "$(gettext "Installing gptmbr")" 23.992 - [ -r /usr/share/boot/gptmbr.bin ] || error 5 "gptmbr.bin not found" 23.993 + log "$(_ 'Installing GPTMBR')" 23.994 + [ -r /usr/share/boot/gptmbr.bin ] || error 5 "$(_ 'gptmbr.bin not found')" 23.995 dd bs=440 conv=notrunc count=1 \ 23.996 if=/usr/share/boot/gptmbr.bin of=$disk >> "$LOG" ;; 23.997 esac 23.998 # splash image 23.999 if [ -f "$SOURCE_ROOT/boot/isolinux/splash.jpg" ]; then 23.1000 - log "$(gettext "Copying splash image")" 23.1001 + log "$(_ 'Copying splash image')" 23.1002 cp -a $SOURCE_ROOT/boot/isolinux/splash.jpg \ 23.1003 $TARGET_ROOT/boot/syslinux 23.1004 fi 23.1005 @@ -1778,7 +1778,7 @@ 23.1006 { 23.1007 if [ -z "$ROOT_FORMAT" ]; then 23.1008 # partition was not formatted 23.1009 - log "$(gettext "Cleaning the root partition") ($ROOT_UUID)..." 23.1010 + log "$(_ 'Cleaning the root partition (%s)...' "$ROOT_UUID")" 23.1011 # keep /home in case of reinstall. 23.1012 local path="$(pwd)" 23.1013 cd "$TARGET_ROOT" || error8 23.1014 @@ -1787,12 +1787,12 @@ 23.1015 do 23.1016 case "$dir" in 23.1017 home) 23.1018 - log "$(gettext "keeping /home found on:") $ROOT_UUID" 23.1019 + log "$(_ 'keeping /home found on: %s' "$ROOT_UUID")" 23.1020 mv home home.bak ;; 23.1021 lost+found) 23.1022 continue ;; 23.1023 *) 23.1024 - log "$(gettext "removing target:") $dir" 23.1025 + log "$(_ 'removing target: %s' "$dir")" 23.1026 rm -rf "$dir" 2>>"$LOG" ;; 23.1027 esac 23.1028 done 23.1029 @@ -1810,13 +1810,13 @@ 23.1030 KERNEL="vmlinuz-$(ls /$TARGET_ROOT/lib/modules | tail -1)" 23.1031 else 23.1032 KERNEL="vmlinuz-$(uname -r)" 23.1033 - log "$(gettext "Kernel name not found, falling back to:") $(uname -r)" 23.1034 + log "$(_ 'Kernel name not found, falling back to: %s' "$(uname -r)")" 23.1035 fi 23.1036 mkdir -p $TARGET_ROOT/boot || error8 23.1037 for i in $SOURCE_ROOT/boot/bzImage* ; do 23.1038 cp $i $TARGET_ROOT/boot/${KERNEL%slitaz*}slitaz${i#*bzImage} 23.1039 done 23.1040 - log "$(gettext "install_kernel:") $KERNEL" 23.1041 + log "$(_ 'install_kernel: %s' "$KERNEL")" 23.1042 } 23.1043 23.1044 # extract packed rootfs: squashfs or cromfs 23.1045 @@ -1902,16 +1902,16 @@ 23.1046 # restore backup of existing /home if exists. 23.1047 # (created by prepare_target_dev) 23.1048 if [ -d home.bak ]; then 23.1049 - log "$(gettext "Restoring directory: /home...")" 23.1050 + log "$(_ 'Restoring directory: /home...')" 23.1051 rm -rf home 23.1052 mv home.bak home 23.1053 fi 23.1054 # add root device to CHECK_FS in rcS.conf to check filesystem 23.1055 # on each boot. 23.1056 - log "$(gettext "Adding / partition and CHECK_FS to file /etc/rcS.conf...")" 23.1057 + log "$(_ 'Adding / partition and CHECK_FS to file %s...' '/etc/rcS.conf')" 23.1058 sed -i s#'CHECK_FS=\"\"'#"CHECK_FS=\"$(dev2uuid $ROOT_UUID)\""# etc/rcS.conf 23.1059 # set hostname. 23.1060 - log "$(gettext "Configuring host name:") $HOSTNAME" 23.1061 + log "$(_ 'Configuring host name: %s' "$HOSTNAME")" 23.1062 printf "%s\n" "$HOSTNAME" > etc/hostname 23.1063 printf "%s\n" "127.0.0.1 localhost $HOSTNAME tazpanel" > etc/hosts 23.1064 cd "$path" || error8 23.1065 @@ -1974,7 +1974,7 @@ 23.1066 local home_fs="$HOME_FORMAT" 23.1067 [ -z "$home_fs" ] && home_fs="$(filesys $HOME_UUID)" 23.1068 # manage /home 23.1069 - log "$(gettext "Configuring partition to be used as /home:") $HOME_UUID" 23.1070 + log "$(_ 'Configuring partition to be used as /home: %s' "$HOME_UUID")" 23.1071 mv home/$USER_LOGIN tmp 23.1072 mount -t "$home_fs" "$HOME_UUID" home >> "$LOG" 2>> "$LOG" 23.1073 if [ -d $TARGET_ROOT/home/$USER_LOGIN ]; then 23.1074 @@ -1993,39 +1993,39 @@ 23.1075 install() 23.1076 { 23.1077 log_open 23.1078 - log "1 $(gettext "Installing SliTaz on:") $(get root_uuid)" 23.1079 - log "5 $(gettext "Checking settings")..." 23.1080 + log "1 $(_ 'Installing SliTaz on: %s' "$(get root_uuid)")" 23.1081 + log "5 $(_ 'Checking settings...')" 23.1082 check all >> "$LOG" 2>> "$LOG" 23.1083 load_settings 23.1084 23.1085 - log "10 $(gettext "Preparing source media")..." 23.1086 + log "10 $(_ 'Preparing source media...')" 23.1087 mount_source 23.1088 23.1089 - log "20 $(gettext "Preparing target disk")..." 23.1090 + log "20 $(_ 'Preparing target disk...')" 23.1091 prepare_uuid 23.1092 23.1093 - log "30 $(gettext "Cleaning the root partition if necessary")..." 23.1094 + log "30 $(_ 'Cleaning the root partition if necessary...')" 23.1095 clean_target 23.1096 23.1097 - log "40 $(gettext "Extracting the root system")..." 23.1098 + log "40 $(_ 'Extracting the root system...')" 23.1099 extract_rootfs $SOURCE_ROOT/boot 23.1100 23.1101 - log "50 $(gettext "Installing the kernel")..." 23.1102 + log "50 $(_ 'Installing the Kernel...')" 23.1103 install_kernel 23.1104 23.1105 - log "60 $(gettext "Preconfiguring the system")..." 23.1106 + log "60 $(_ 'Preconfiguring the system...')" 23.1107 pre_config_system 23.1108 23.1109 - log "70 $(gettext "Configuring root and default user account")..." 23.1110 + log "70 $(_ 'Configuring root and default user account...')" 23.1111 users_settings 23.1112 23.1113 - log "80 $(gettext "Configuring /home")..." 23.1114 + log "80 $(_ 'Configuring /home...')" 23.1115 home_config 23.1116 23.1117 - log "90 $(gettext "Checking bootloader installation...")" 23.1118 + log "90 $(_ 'Checking bootloader installation...')" 23.1119 bootloader 23.1120 23.1121 - log "100 $(gettext "Files installation completed")" 23.1122 + log "100 $(_ 'Files installation completed')" 23.1123 end_of_install 23.1124 } 23.1125 23.1126 @@ -2039,10 +2039,10 @@ 23.1127 { 23.1128 if [ -f $TARGET_ROOT/etc/slitaz-release ]; then 23.1129 local release="$(cat $TARGET_ROOT/etc/slitaz-release)" 23.1130 - log "$(gettext "Preparing upgrade of SliTaz release:") $release" 23.1131 + log "$(_ 'Preparing upgrade of SliTaz release: %s' "$release")" 23.1132 else 23.1133 - error 6 "$ROOT_UUID: $(gettext "This partition doesn't appear to \ 23.1134 -contain a valid SliTaz system, the file: /etc/slitaz-release doesn't exist.")" 23.1135 + error 6 "$(_ "%s: This partition doesn't appear to contain a valid \ 23.1136 +SliTaz system, the file: %s doesn't exist." "$ROOT_UUID" '/etc/slitaz-release')" 23.1137 fi 23.1138 } 23.1139 23.1140 @@ -2060,21 +2060,21 @@ 23.1141 rm -rf boot/vmlinuz-* ;; 23.1142 home) 23.1143 mv home home.bak 23.1144 - log "$(gettext "keeping /home found on:") $ROOT_UUID" ;; 23.1145 + log "$(_ 'keeping /home found on: %s' "$ROOT_UUID")" ;; 23.1146 etc) 23.1147 /bin/busybox tar czf etc.tar.gz etc 23.1148 mv etc etc.bak 23.1149 - log "$(gettext "keeping /etc found on:") $ROOT_UUID" ;; 23.1150 + log "$(_ 'keeping /etc found on: %s' "$ROOT_UUID")" ;; 23.1151 var) 23.1152 if [ -d var/www ]; then 23.1153 mv var/www www.bak 23.1154 - log "$(gettext "keeping /var/www found on:") $ROOT_UUID" 23.1155 + log "$(_ 'keeping /var/www found on: %s' "$ROOT_UUID")" 23.1156 fi 23.1157 rm -rf var 2>>"$LOG" ;; 23.1158 lost+found) 23.1159 continue ;; 23.1160 *) 23.1161 - log "$(gettext "removing target: $dir")" 23.1162 + log "$(_ 'removing target: %s' "$dir")" 23.1163 rm -rf "$dir" 2>>"$LOG" ;; 23.1164 esac 23.1165 done 23.1166 @@ -2095,21 +2095,21 @@ 23.1167 rm -rf $TARGET_ROOT/var/www 23.1168 mv $TARGET_ROOT/www.bak $TARGET_ROOT/var/www 23.1169 fi 23.1170 - log "$(gettext "backups restored:") $(date)" 23.1171 + log "$(_ 'backups restored: %s' "$(date)")" 23.1172 23.1173 # /var/lib/slitaz-installer 23.1174 mkdir -p $TARGET_ROOT/var/lib/tazinst && \ 23.1175 mv $TARGET_ROOT/etc.tar.gz $TARGET_ROOT/var/lib/tazinst && \ 23.1176 mv $TARGET_ROOT/home/packages-selection.list \ 23.1177 $TARGET_ROOT/var/lib/tazinst \ 23.1178 - && log "$(gettext "backups saved in /var/lib/tazinst")" 23.1179 + && log "$(_ 'backups saved in %s' '/var/lib/tazinst')" 23.1180 } 23.1181 23.1182 # upgrade added pkgs 23.1183 install_pkgs() 23.1184 { 23.1185 # check if the pkg is on the mirror. 23.1186 - log "$(gettext "Checking the availability of packages...")" 23.1187 + log "$(_ 'Checking the availability of packages...')" 23.1188 touch packages-to-install.list 23.1189 packages=0 23.1190 diff="$(cat packages-selection.diff | sort)" 23.1191 @@ -2122,14 +2122,14 @@ 23.1192 done 23.1193 23.1194 # install packages. 23.1195 - log "$(gettext "Installing packages...")" 23.1196 + log "$(_ 'Installing packages...')" 23.1197 if [ "$packages" == "0" ]; then 23.1198 - log "$(gettext "packages to install: 0")" 23.1199 + log "$(_ 'packages to install: 0')" 23.1200 else 23.1201 # get-install all missing pkgs. 23.1202 for pkg in $(cat packages-to-install.list) 23.1203 do 23.1204 - log "$(gettext "Installing:") $pkg..." 23.1205 + log "$(_ 'Installing: %s...' "$pkg")" 23.1206 # get install package and answer yes in case of dependencies. 23.1207 pkgname="$(grep ^$pkg /var/lib/tazpkg/packages.list)" 23.1208 /usr/bin/tazpkg get "$pkg" >/dev/null 2>/dev/null 23.1209 @@ -2138,7 +2138,7 @@ 23.1210 rm -f $pkgname.tazpkg 23.1211 done 23.1212 fi 23.1213 - log "$(gettext "Installation of packages complete...")" 23.1214 + log "$(_ 'Installation of packages complete...')" 23.1215 } 23.1216 23.1217 # search for added pkgs 23.1218 @@ -2147,23 +2147,23 @@ 23.1219 local path="$(pwd)" 23.1220 cd $TARGET_ROOT/var/lib/tazinst || error8 23.1221 # LiveCD packages list. 23.1222 - log "$(gettext "Creating package lists...")" 23.1223 + log "$(_ 'Creating package lists...')" 23.1224 ls -1 $TARGET_ROOT/var/lib/tazpkg/installed > packages-source.list || error8 23.1225 - log "$(gettext "packages-source.list: done")" 23.1226 + log "$(_ '%s: done' 'packages-source.list')" 23.1227 # diff 23.1228 /bin/busybox diff packages-source.list packages-selection.list | \ 23.1229 grep ^+[a-z] | sed s/^+// > packages-selection.diff 23.1230 - log "$(gettext "packages-selection.diff: done")" 23.1231 + log "$(_ '%s: done' 'packages-selection.diff')" 23.1232 # get mirror list. 23.1233 /usr/bin/tazpkg recharge >>$LOG 2>>$LOG 23.1234 if [ -f /var/lib/tazpkg/packages.list ]; then 23.1235 install_pkgs 23.1236 else 23.1237 touch packages-to-install.list 23.1238 - printf "%s\n" "$(gettext "The list of available packages on the mirror \ 23.1239 -could not be downloaded. No missing packages will be reinstalled now, but you \ 23.1240 -can do so later by looking at the following list: 23.1241 -/var/lib/tazinst/packages-selection.diff")" 23.1242 + longline "$(_ "The list of available packages on the mirror could not \ 23.1243 +be downloaded. No missing packages will be reinstalled now, but you can do so \ 23.1244 +later by looking at the following list:")" 23.1245 + echo '/var/lib/tazinst/packages-selection.diff' 23.1246 fi 23.1247 cd "$path" || error8 23.1248 } 23.1249 @@ -2172,39 +2172,39 @@ 23.1250 upgrade() 23.1251 { 23.1252 log_open 23.1253 - log "1 $(gettext "Upgrading SliTaz on:") $(get root_uuid)" 23.1254 - log "5 $(gettext "Checking settings")..." 23.1255 + log "1 $(_ 'Upgrading SliTaz on: %s' "$(get root_uuid)")" 23.1256 + log "5 $(_ 'Checking settings...')" 23.1257 check all >> "$LOG" 23.1258 load_settings 23.1259 23.1260 - log "10 $(gettext "Preparing source media")..." 23.1261 + log "10 $(_ 'Preparing source media...')" 23.1262 mount_source 23.1263 23.1264 - log "20 $(gettext "Preparing target disk")..." 23.1265 + log "20 $(_ 'Preparing target disk...')" 23.1266 prepare_uuid 23.1267 23.1268 - log "30 $(gettext "Searching for /etc/slitaz-release")..." 23.1269 + log "30 $(_ 'Searching for %s...' '/etc/slitaz-release')" 23.1270 check_release 23.1271 23.1272 - log "40 $(gettext "Backup /etc, /home and the packages list")..." 23.1273 + log "40 $(_ 'Backup /etc, /home and the packages list...')" 23.1274 backup_files 23.1275 23.1276 - log "50 $(gettext "Extracting the root system")..." 23.1277 + log "50 $(_ 'Extracting the root system...')" 23.1278 extract_rootfs $SOURCE_ROOT/boot 23.1279 23.1280 - log "60 $(gettext "Restoring configuration files")..." 23.1281 + log "60 $(_ 'Restoring configuration files...')" 23.1282 restore_files 23.1283 23.1284 - log "70 $(gettext "Installing the kernel")..." 23.1285 + log "70 $(_ 'Installing the Kernel...')" 23.1286 install_kernel 23.1287 23.1288 - log "80 $(gettext "Upgrading added packages")..." 23.1289 + log "80 $(_ 'Upgrading added packages...')" 23.1290 update_pkgs 23.1291 23.1292 - log "90 $(gettext "Bootloader")..." 23.1293 + log "90 $(_ 'Bootloader...')" 23.1294 bootloader 23.1295 23.1296 - log "100 $(gettext "Files installation completed")" 23.1297 + log "100 $(_ 'Files installation completed')" 23.1298 end_of_install 23.1299 } 23.1300