tazinst diff installer.cgi @ 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 | d19538a7017c |
| children | fb5d8424fa9b |
line diff
1.1 --- a/installer.cgi Tue Apr 05 19:04:43 2016 +0100 1.2 +++ b/installer.cgi Sat Apr 09 17:22:22 2016 +0300 1.3 @@ -17,7 +17,7 @@ 1.4 . lib/libtazpanel 1.5 get_config 1.6 1.7 -TITLE=$(gettext 'TazPanel - Installer') 1.8 +TITLE=$(_ 'TazPanel - Installer') 1.9 1.10 # export package name for gettext. 1.11 TEXTDOMAIN='installer' 1.12 @@ -39,16 +39,16 @@ 1.13 menu) 1.14 cat <<EOT 1.15 <li tabindex="0"> 1.16 - <span>$(gettext 'Installation')</span> 1.17 + <span>$(_ 'Installation')</span> 1.18 <menu> 1.19 <li><a data-icon="install" 1.20 - href="installer.cgi" data-root>$(gettext 'Installation')</a></li> 1.21 + href="installer.cgi" data-root>$(_ 'Installation')</a></li> 1.22 <li><a data-icon="slitaz" 1.23 - href="installer.cgi?page=install" data-root>$(gettext 'Install SliTaz')</a></li> 1.24 + href="installer.cgi?page=install" data-root>$(_ 'Install SliTaz')</a></li> 1.25 <li><a data-icon="upgrade" 1.26 - href="installer.cgi?page=upgrade" data-root>$(gettext 'Upgrade system')</a></li> 1.27 + href="installer.cgi?page=upgrade" data-root>$(_ 'Upgrade system')</a></li> 1.28 <li><a data-icon="slitaz" 1.29 - href="installer.cgi?page=evaluate" data-root>$(gettext 'Evaluate SliTaz')</a></li> 1.30 + href="installer.cgi?page=evaluate" data-root>$(_ 'Evaluate SliTaz')</a></li> 1.31 </menu> 1.32 </li> 1.33 EOT 1.34 @@ -64,16 +64,16 @@ 1.35 cat <<EOT 1.36 <!-- Welcome message --> 1.37 1.38 -<h2>$(gettext "Welcome to the SliTaz Installer!")</h2> 1.39 +<h2>$(_ 'Welcome to the SliTaz Installer!')</h2> 1.40 1.41 -<p>$(gettext "The SliTaz Installer installs or upgrades SliTaz to a \ 1.42 +<p>$(_ "The SliTaz Installer installs or upgrades SliTaz to a \ 1.43 hard disk drive from a device like a Live-CD or LiveUSB key, from a SliTaz \ 1.44 ISO file, or from the web by downloading an ISO file.")</p> 1.45 1.46 -<p>$(gettext "Windows™ users can evaluate SliTaz in the directory \ 1.47 +<p>$(_ "Windows™ users can evaluate SliTaz in the directory \ 1.48 \\slitaz on their hard disk.")</p> 1.49 1.50 -<p>$(gettext "Which type of installation do you want to start?")</p> 1.51 +<p>$(_ "Which type of installation do you want to start?")</p> 1.52 EOT 1.53 } 1.54 1.55 @@ -83,14 +83,14 @@ 1.56 <!-- Install message --> 1.57 1.58 <section> 1.59 - <header>$(gettext 'Install')</header> 1.60 + <header>$(_ 'Install')</header> 1.61 1.62 <div> 1.63 - <p>$(gettext "Install SliTaz on a partition of your hard disk drive. If \ 1.64 + <p>$(_ "Install SliTaz on a partition of your hard disk drive. If \ 1.65 you decide to format your partition, all data will be lost. If you do not \ 1.66 format, all data except for any existing /home directory will be removed \ 1.67 (the home directory will be kept as is).")</p> 1.68 - <p>$(gettext "Before installation, you may need to create or resize \ 1.69 + <p>$(_ "Before installation, you may need to create or resize \ 1.70 partitions on your hard disk drive in order to make space for SliTaz \ 1.71 GNU/Linux. You can graphically manage your partitions with Gparted")</p> 1.72 </div> 1.73 @@ -98,8 +98,8 @@ 1.74 <footer> 1.75 <form> 1.76 <button name="page" value="install" data-icon="slitaz" 1.77 - title="$(gettext 'Proceed to a new SliTaz installation')" 1.78 - >$(gettext 'Install SliTaz')</button> 1.79 + title="$(_ 'Proceed to a new SliTaz installation')" 1.80 + >$(_ 'Install SliTaz')</button> 1.81 </form> 1.82 </footer> 1.83 </section> 1.84 @@ -112,10 +112,10 @@ 1.85 <!-- Upgrade message --> 1.86 1.87 <section> 1.88 - <header>$(gettext 'Upgrade')</header> 1.89 + <header>$(_ 'Upgrade')</header> 1.90 1.91 <div> 1.92 - <p>$(gettext "Upgrade an already installed SliTaz system on your hard disk \ 1.93 + <p>$(_ "Upgrade an already installed SliTaz system on your hard disk \ 1.94 drive. Your /home /etc /var/www directories will be kept, all other \ 1.95 directories will be removed. Any additional packages added to your old \ 1.96 SliTaz system will be updated as long you have an active internet connection.")</p> 1.97 @@ -124,8 +124,8 @@ 1.98 <footer> 1.99 <form> 1.100 <button name="page" value="upgrade" data-icon="upgrade" 1.101 - title="$(gettext 'Upgrade an existing SliTaz system')" 1.102 - >$(gettext 'Upgrade SliTaz')</button> 1.103 + title="$(_ 'Upgrade an existing SliTaz system')" 1.104 + >$(_ 'Upgrade SliTaz')</button> 1.105 </form> 1.106 </footer> 1.107 </section> 1.108 @@ -138,12 +138,12 @@ 1.109 <!-- Evaluate message --> 1.110 1.111 <section> 1.112 - <header>$(gettext "Evaluate:") $(gettext "Without Partitioning / Formating")</header> 1.113 + <header>$(_ 'Evaluate: Without Partitioning / Formating')</header> 1.114 1.115 <div> 1.116 - <p>$(gettext "SliTaz and Windows™ can coexist in the same partition.")</p> 1.117 - <p>$(gettext "SliTaz will be in the \slitaz directory like UMSDOS did \ 1.118 -in the previous century...")</p> 1.119 + <p>$(_ 'SliTaz and Windows™ can coexist in the same partition.')</p> 1.120 + <p>$(_ "SliTaz will be in the %s directory like UMSDOS did \ 1.121 +in the previous century..." '\slitaz')</p> 1.122 </div> 1.123 1.124 <footer> 1.125 @@ -151,13 +151,13 @@ 1.126 <input type="hidden" name="iso"/> 1.127 <input type="hidden" name="action" value="install"/> 1.128 <table> 1.129 - <tr><td>$(gettext 'ISO image file full path') 1.130 - <span data-img="info" title="$(gettext 'set /dev/cdrom for a physical CD-ROM')"></span> 1.131 + <tr><td>$(_ 'ISO image file full path') 1.132 + <span data-img="info" title="$(_ 'set %s for a physical CD-ROM' '/dev/cdrom')"></span> 1.133 </td> 1.134 <td>$(file_chooser "iso" "")</td></tr> 1.135 - <tr><td>$(gettext 'Target partition')</td> 1.136 + <tr><td>$(_ 'Target partition')</td> 1.137 <td><select name="instdev"> 1.138 - <option value="/dev/null">$(gettext 'Choose a partition')</option> 1.139 + <option value="/dev/null">$(_ 'Choose a partition')</option> 1.140 EOT 1.141 blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \ 1.142 sed -e 's|[A-Z]*ID="[^"]*"||g;s| SEC[^ ]*||;s|LABEL=||;s|:||' \ 1.143 @@ -169,7 +169,7 @@ 1.144 cat <<EOT 1.145 </select></td></tr> 1.146 </table> 1.147 - <button data-icon="install">$(gettext 'Install')</button> 1.148 + <button data-icon="install">$(_ 'Install')</button> 1.149 </form> 1.150 </footer> 1.151 </section> 1.152 @@ -192,27 +192,27 @@ 1.153 <!-- GParted message --> 1.154 1.155 <section> 1.156 - <header>$(gettext "Partitioning")</header> 1.157 + <header>$(_ 'Partitioning')</header> 1.158 1.159 <div> 1.160 - <p>$(gettext "On most used systems, the hard drive is already dedicated to \ 1.161 + <p>$(_ "On most used systems, the hard drive is already dedicated to \ 1.162 partitions for Windows™, or Linux, or another operating \ 1.163 system. You'll need to resize these partitions in order to make space for \ 1.164 SliTaz GNU/Linux. SliTaz will co-exist with other operating systems already \ 1.165 installed on your hard drive.")</p> 1.166 - <p>$(gettext "The amount of space needed depends on how much software you \ 1.167 + <p>$(_ "The amount of space needed depends on how much software you \ 1.168 plan to install and how much space you require for users. It's conceivable \ 1.169 that you could run a minimal SliTaz system in 300 megs or less, but 2 gigs \ 1.170 is indeed more comfy.")</p> 1.171 - <p>$(gettext "A separate home partition and a partition that will be used \ 1.172 + <p>$(_ "A separate home partition and a partition that will be used \ 1.173 as Linux swap space may be created if needed. SliTaz detects and uses swap \ 1.174 partitions automatically.")</p> 1.175 <hr/> 1.176 - <p>$(gettext "You can graphically manage your partitions with GParted. \ 1.177 + <p>$(_ "You can graphically manage your partitions with GParted. \ 1.178 GParted is a partition editor for graphically managing your disk partitions. \ 1.179 GParted allows you to create, destroy, resize and copy partitions without \ 1.180 data loss.")</p> 1.181 - <p>$(gettext "GParted supports ext2, ext3, ext4, linux swap, ntfs and \ 1.182 + <p>$(_ "GParted supports ext2, ext3, ext4, linux swap, ntfs and \ 1.183 fat32 filesystems right out of the box. Support for xjs, jfs, hfs and other \ 1.184 filesystems is available as well but you first need to add drivers for these \ 1.185 filesystems by installing the related packages xfsprogs, jfsutils, linux-hfs \ 1.186 @@ -223,15 +223,15 @@ 1.187 <!-- Launch GParted --> 1.188 <form> 1.189 <button name="page" value="gparted" data-icon="hdd" 1.190 - title="$(gettext 'Launch GParted, the partition editor tool')" 1.191 - >$(gettext 'Execute GParted')</button> 1.192 + title="$(_ 'Launch GParted, the partition editor tool')" 1.193 + >$(_ 'Execute GParted')</button> 1.194 </form> 1.195 </footer> 1.196 </section> 1.197 1.198 -<h5>$(gettext "Continue installation")</h5> 1.199 +<h5>$(_ 'Continue installation')</h5> 1.200 1.201 -<p>$(gettext "Once you've made room for SliTaz on your drive, you should \ 1.202 +<p>$(_ "Once you've made room for SliTaz on your drive, you should \ 1.203 be able to continue installation.")</p> 1.204 EOT 1.205 } 1.206 @@ -256,9 +256,9 @@ 1.207 input_media "cdrom" \ 1.208 "$media" 1.209 label_media "cdrom" \ 1.210 - "$(gettext 'LiveCD')" \ 1.211 + "$(_ 'LiveCD')" \ 1.212 "$media" \ 1.213 - "$(gettext 'Use the SliTaz LiveCD')" 1.214 + "$(_ 'Use the SliTaz LiveCD')" 1.215 br 1.216 fi 1.217 # usb 1.218 @@ -266,10 +266,10 @@ 1.219 input_media "usb" \ 1.220 "$media" 1.221 label_media "usb" \ 1.222 - "$(gettext 'LiveUSB:')" \ 1.223 + "$(_ 'LiveUSB:')" \ 1.224 "$media" \ 1.225 - "$(gettext 'Enter the partition where SliTaz Live is located on 1.226 - your USB Key')" 1.227 + "$(_ 'Enter the partition where SliTaz Live is located on your USB Key')" 1.228 + 1.229 error="$?" 1.230 select "$(/usr/sbin/tazinst list usb "$INSTFILE" | cut -d' ' -f2)" \ 1.231 "$source" \ 1.232 @@ -283,22 +283,22 @@ 1.233 input_media "iso" \ 1.234 "$media" 1.235 label_media "iso" \ 1.236 - "$(gettext 'ISO file:')" \ 1.237 + "$(_ 'ISO file:')" \ 1.238 "$media" \ 1.239 - "$(gettext 'Select a SliTaz ISO file located on a local disk')" 1.240 + "$(_ 'Select a SliTaz ISO file located on a local disk')" 1.241 error="$?" 1.242 if [ "$media" == "iso" ]; then 1.243 input "text" \ 1.244 "src_iso" \ 1.245 "$source" "" \ 1.246 - "$(gettext 'Select an ISO or enter the full path to the ISO file')"\ 1.247 + "$(_ 'Select an ISO or enter the full path to the ISO file')"\ 1.248 "iso" 1.249 else 1.250 input "text" \ 1.251 "src_iso" \ 1.252 "" \ 1.253 "none" \ 1.254 - "$(gettext 'Select an ISO or enter the full path to the ISO file')"\ 1.255 + "$(_ 'Select an ISO or enter the full path to the ISO file')"\ 1.256 "iso" 1.257 fi 1.258 datalist "$(/usr/sbin/tazinst list iso "$INSTFILE")" \ 1.259 @@ -310,23 +310,23 @@ 1.260 input_media "web" \ 1.261 "$media" 1.262 label_media "web" \ 1.263 - "$(gettext 'Web:')" \ 1.264 + "$(_ 'Web:')" \ 1.265 "$media" \ 1.266 - "$(gettext 'Select a SliTaz version on the Web')" 1.267 + "$(_ 'Select a SliTaz version on the Web')" 1.268 error="$?" 1.269 1.270 if [ "$media" == "web" ]; then 1.271 input "text" \ 1.272 "src_web" \ 1.273 "$source" "" \ 1.274 - "$(gettext 'Select a version or enter the full url to an ISO file')"\ 1.275 + "$(_ 'Select a version or enter the full URL to an ISO file')"\ 1.276 "web" 1.277 else 1.278 input "text" \ 1.279 "src_web" \ 1.280 "" \ 1.281 "none" \ 1.282 - "$(gettext 'Select a version or enter the full url to an ISO file')"\ 1.283 + "$(_ 'Select a version or enter the full URL to an ISO file')"\ 1.284 "web" 1.285 fi 1.286 datalist "$(/usr/sbin/tazinst help web "$INSTFILE")" \ 1.287 @@ -342,13 +342,13 @@ 1.288 comment "root_uuid selection" 1.289 if [ "$mode" == "upgrade" ]; then 1.290 label "root_uuid" \ 1.291 - "$(gettext 'Existing SliTaz partition to upgrade:')" \ 1.292 - "$(gettext 'Specify the partition containing the system to upgrade')" 1.293 + "$(_ 'Existing SliTaz partition to upgrade:')" \ 1.294 + "$(_ 'Specify the partition containing the system to upgrade')" 1.295 error="$?" 1.296 else 1.297 label "root_uuid" \ 1.298 - "$(gettext 'Install SliTaz to partition:')" \ 1.299 - "$(gettext 'Specify the partition where to install SliTaz')" 1.300 + "$(_ 'Install SliTaz to partition:')" \ 1.301 + "$(_ 'Specify the partition where to install SliTaz')" 1.302 error="$?" 1.303 fi 1.304 select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \ 1.305 @@ -377,12 +377,12 @@ 1.306 <!-- home_uuid selection --> 1.307 1.308 <fieldset> 1.309 - <legend>$(gettext "home partition")</legend> 1.310 + <legend>$(_ 'home partition')</legend> 1.311 1.312 $( 1.313 label "home_uuid" \ 1.314 - "$(gettext 'Separate partition for /home:')" \ 1.315 - "$(gettext 'Specify the partition containing /home')" 1.316 + "$(_ 'Separate partition for %s:' '/home')" \ 1.317 + "$(_ 'Specify the partition containing %s' '/home')" 1.318 select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \ 1.319 "$home_uuid" \ 1.320 "HOME_UUID" \ 1.321 @@ -413,17 +413,17 @@ 1.322 <!-- hostname selection --> 1.323 1.324 <fieldset> 1.325 - <legend>$(gettext "Hostname")</legend> 1.326 + <legend>$(_ 'Hostname')</legend> 1.327 $( 1.328 label "hostname" \ 1.329 - "$(gettext 'Set Hostname to:')" \ 1.330 - "$(gettext 'Hostname configuration allows you to specify the machine name')" 1.331 + "$(_ 'Set Hostname to:')" \ 1.332 + "$(_ 'Hostname configuration allows you to specify the machine name')" 1.333 error=$? 1.334 input "text" \ 1.335 "HOSTNAME" \ 1.336 "$hostname" \ 1.337 "" \ 1.338 - "$(gettext 'Name of your system')" 1.339 + "$(_ 'Name of your system')" 1.340 error_msg "$error" \ 1.341 "hostname" \ 1.342 2 1.343 @@ -440,17 +440,17 @@ 1.344 <!-- root_pwd selection --> 1.345 1.346 <fieldset> 1.347 - <legend>$(gettext "Root superuser")</legend> 1.348 + <legend>$(_ 'Root superuser')</legend> 1.349 $( 1.350 label "root_pwd" \ 1.351 - "$(gettext 'Root passwd:')" \ 1.352 - "$(gettext 'Enter the password for root')" 1.353 + "$(_ 'Root password:')" \ 1.354 + "$(_ 'Enter the password for root')" 1.355 error="$?" 1.356 input "text" \ 1.357 "ROOT_PWD" \ 1.358 "$root_pwd" \ 1.359 "" \ 1.360 - "$(gettext 'Password of root')" 1.361 + "$(_ 'Password of root')" 1.362 error_msg "$error" \ 1.363 "root_pwd" 1.364 ) 1.365 @@ -466,17 +466,17 @@ 1.366 <!-- user_login selection --> 1.367 1.368 <fieldset> 1.369 - <legend>$(gettext "User")</legend> 1.370 + <legend>$(_ 'User')</legend> 1.371 $( 1.372 label "user_login" \ 1.373 - "$(gettext 'User login:')" \ 1.374 - "$(gettext 'Enter the name of the first user')" 1.375 + "$(_ 'User login:')" \ 1.376 + "$(_ 'Enter the name of the first user')" 1.377 error="$?" 1.378 input "text" \ 1.379 "USER_LOGIN" \ 1.380 "$user_login" \ 1.381 "" \ 1.382 - "$(gettext 'Name of the first user')" 1.383 + "$(_ 'Name of the first user')" 1.384 error_msg "$error" \ 1.385 "user_login" \ 1.386 2 1.387 @@ -491,14 +491,14 @@ 1.388 local user_pwd="$(/usr/sbin/tazinst get user_pwd "$INSTFILE")" error 1.389 1.390 label "user_pwd" \ 1.391 - "$(gettext 'User passwd:')" \ 1.392 - "$(gettext 'The password for default user')" 1.393 + "$(_ 'User password:')" \ 1.394 + "$(_ 'The password for default user')" 1.395 error="$?" 1.396 input "text" \ 1.397 "USER_PWD" \ 1.398 "$user_pwd" \ 1.399 "" \ 1.400 - "$(gettext 'Password of the first user')" 1.401 + "$(_ 'Password of the first user')" 1.402 error_msg "$error" \ 1.403 "user_pwd" 1.404 cat <<EOT 1.405 @@ -515,7 +515,7 @@ 1.406 <!-- bootloader selection --> 1.407 1.408 <fieldset> 1.409 - <legend>$(gettext "Bootloader")</legend> 1.410 + <legend>$(_ 'Bootloader')</legend> 1.411 1.412 $( 1.413 input "checkbox" \ 1.414 @@ -523,8 +523,8 @@ 1.415 "auto" \ 1.416 "$bootloader" 1.417 label "bootloader" \ 1.418 - "$(gettext 'Install a bootloader.')" \ 1.419 - "$(gettext "Usually you should answer yes, unless you want to install \ 1.420 + "$(_ 'Install a bootloader.')" \ 1.421 + "$(_ "Usually you should answer yes, unless you want to install \ 1.422 a bootloader by hand yourself.")" 1.423 error="$?" 1.424 error_msg "$error" \ 1.425 @@ -545,8 +545,8 @@ 1.426 "auto" \ 1.427 "$winboot" 1.428 label "winboot" \ 1.429 - "$(gettext 'Enable Windows Dual-Boot.')" \ 1.430 - "$(gettext "At start-up, you will be asked whether you want to boot \ 1.431 + "$(_ 'Enable Windows Dual-Boot.')" \ 1.432 + "$(_ "At start-up, you will be asked whether you want to boot \ 1.433 into Windows™ or SliTaz GNU/Linux.")" 1.434 error="$?" 1.435 error_msg "$error" \ 1.436 @@ -561,7 +561,7 @@ 1.437 { 1.438 if [ "$CHECK" ]; then 1.439 echo '<span class="alert">' 1.440 - p "$(gettext "Errors found. Please check your settings.")" 1.441 + p "$(_ "Errors found. Please check your settings.")" 1.442 echo '</span>' 1.443 fi 1.444 } 1.445 @@ -574,14 +574,14 @@ 1.446 1.447 cat<<EOT 1.448 <fieldset> 1.449 - <legend>$(gettext "Select source media:")</legend> 1.450 + <legend>$(_ 'Select source media:')</legend> 1.451 1.452 <div class="media">$(select_source)</div> 1.453 </fieldset> 1.454 1.455 1.456 <fieldset> 1.457 - <legend>$(gettext "Select destination")</legend> 1.458 + <legend>$(_ 'Select destination')</legend> 1.459 1.460 <div>$( 1.461 select_root_uuid 1.462 @@ -591,7 +591,7 @@ 1.463 1.464 1.465 <fieldset id="options"> 1.466 - <legend>$(gettext 'Options')</legend> 1.467 + <legend>$(_ 'Options')</legend> 1.468 1.469 <div class="options">$( 1.470 printf '%s' "$settings" | grep -q "home_uuid" && select_home_uuid 1.471 @@ -619,7 +619,7 @@ 1.472 1.473 save_settings() 1.474 { 1.475 - h5 "$(gettext "Checking settings...")" 1.476 + h5 "$(_ 'Checking settings...')" 1.477 1.478 # install type 1.479 /usr/sbin/tazinst set media "$(GET MEDIA)" "$INSTFILE" 1.480 @@ -686,7 +686,7 @@ 1.481 tazinst_run() 1.482 { 1.483 local mode="$(/usr/sbin/tazinst get mode "$INSTFILE")" error 1.484 - h4 "$(gettext 'Proceeding to:') $(gettext "$mode")" 1.485 + h4 "$(_ 'Proceeding to: %s' "$(gettext "$mode")")" 1.486 /usr/sbin/tazinst execute "$INSTFILE" | /bin/busybox awk '{ 1.487 num=$1+0 1.488 if (num>0 && num<=100){ 1.489 @@ -704,7 +704,7 @@ 1.490 echo "<script type=\"text/javascript\">" 1.491 printf "document.write(\047<div id=\"progress\">" 1.492 printf "<img src=\"/styles/default/images/stop.png\" />" 1.493 - printf "$(gettext 'Errors encountered.')" 1.494 + _n 'Errors encountered.' 1.495 printf "</div>\047)\n" 1.496 echo "</script>" 1.497 br 1.498 @@ -717,13 +717,13 @@ 1.499 echo "<script type=\"text/javascript\">" 1.500 printf "document.write(\047<div id=\"progress\">" 1.501 printf "<img src=\"/styles/default/images/tux.png\" />" 1.502 - printf "$(gettext 'Process completed!')" 1.503 + _n 'Process completed!' 1.504 printf "</div>\047)\n" 1.505 echo "</script>" 1.506 br 1.507 br 1.508 br 1.509 - p $(gettext "Installation is now finished, you can exit the installer \ 1.510 + p $(_ "Installation is now finished, you can exit the installer \ 1.511 or reboot on your new SliTaz GNU/Linux operating system.") 1.512 fi 1.513 return "$error" 1.514 @@ -733,7 +733,7 @@ 1.515 1.516 tazinst_log() 1.517 { 1.518 - h4 "$(gettext "Tazinst log")" 1.519 + h4 "$(_ "Tazinst log")" 1.520 printf '<pre>%s</pre>' "$(/usr/sbin/tazinst log | sed 's/\%/ percent/g')" 1.521 } 1.522 1.523 @@ -747,9 +747,9 @@ 1.524 case $mode in 1.525 install) 1.526 cat <<EOT 1.527 -<h2>$(gettext "Install SliTaz")</h2> 1.528 +<h2>$(_ 'Install SliTaz')</h2> 1.529 1.530 -<p>$(gettext "You're going to install SliTaz on a partition of \ 1.531 +<p>$(_ "You're going to install SliTaz on a partition of \ 1.532 your hard disk drive. If you decide to format your HDD, all data will be \ 1.533 lost. If you do not format, all data except for any existing /home \ 1.534 directory will be removed (the home directory will be kept as is).")</p> 1.535 @@ -757,9 +757,9 @@ 1.536 ;; 1.537 upgrade) 1.538 cat <<EOT 1.539 -<h2>$(gettext "Upgrade SliTaz")</h2> 1.540 +<h2>$(_ 'Upgrade SliTaz')</h2> 1.541 1.542 -<p>$(gettext "You're going to upgrade an already installed SliTaz \ 1.543 +<p>$(_ "You're going to upgrade an already installed SliTaz \ 1.544 system on your hard disk drive. Your /home /etc /var/www directories \ 1.545 will be kept, all other directories will be removed. Any additional \ 1.546 packages added to your old SliTaz system will be updated as long you \ 1.547 @@ -776,24 +776,24 @@ 1.548 1.549 case "$back_page" in 1.550 partitioning) 1.551 - back_msg=$(gettext 'Back to partitioning') ;; 1.552 + back_msg=$(_ 'Back to partitioning') ;; 1.553 input) 1.554 - back_msg=$(gettext 'Back to entering settings') ;; 1.555 + back_msg=$(_ 'Back to entering settings') ;; 1.556 *) 1.557 - back_msg=$(gettext 'Back to Installer Start Page') ;; 1.558 + back_msg=$(_ 'Back to Installer Start Page') ;; 1.559 esac 1.560 1.561 case "$next_page" in 1.562 execute|run) 1.563 - next_msg=$(gettext 'Proceed to SliTaz installation') ;; 1.564 + next_msg=$(_ 'Proceed to SliTaz installation') ;; 1.565 reboot) 1.566 - next_msg=$(gettext 'Installation complete. You can now restart') ;; 1.567 + next_msg=$(_ 'Installation complete. You can now restart') ;; 1.568 failed) 1.569 - next_msg=$(gettext 'Installation failed. See log') ;; 1.570 + next_msg=$(_ 'Installation failed. See log') ;; 1.571 input) 1.572 - next_msg=$(gettext 'Continue installation.') ;; 1.573 + next_msg=$(_ 'Continue installation.') ;; 1.574 *) 1.575 - next_msg=$(gettext 'Back to Installer Start Page') ;; 1.576 + next_msg=$(_ 'Back to Installer Start Page') ;; 1.577 esac 1.578 1.579 cat <<EOT 1.580 @@ -810,7 +810,7 @@ 1.581 cat <<EOT 1.582 <form> 1.583 <button name="page" value="home" data-icon="back" 1.584 - >$(gettext 'Back to Installer Start Page')</button> 1.585 + >$(_ 'Back to Installer Start Page')</button> 1.586 </form> 1.587 EOT 1.588 } 1.589 @@ -823,15 +823,15 @@ 1.590 <html> 1.591 <head> 1.592 <meta charset="UTF-8"> 1.593 -<title>$(gettext "A web page that points a browser to a different page after \ 1.594 +<title>$(_ "A web page that points a browser to a different page after \ 1.595 2 seconds")</title> 1.596 <meta http-equiv="refresh" content="0; URL=$SCRIPT_NAME?page=$1"> 1.597 <meta name="keywords" content="automatic redirection"> 1.598 </head> 1.599 <body> 1.600 -<p>$(gettext "If your browser doesn't automatically redirect within a few \ 1.601 -seconds, you may want to go there manually") 1.602 -<a href="$SCRIPT_NAME?page=$page">$(gettext "here")</a></p> 1.603 +<p>$(_ "If your browser doesn't automatically redirect within a few \ 1.604 +seconds, you may want to go there manually [here]" | \ 1.605 +sed "s|\[|<a href=\"?page=$page\">|; s|\]|</a>|")</p> 1.606 </body> 1.607 </html> 1.608 EOT 1.609 @@ -846,11 +846,11 @@ 1.610 local errorcode=0 1.611 comment "check_ressources" 1.612 if ! [ -x /usr/sbin/tazinst ] ; then 1.613 - h4 $(gettext "Tazinst Error") 1.614 - p $(gettext "<strong>tazinst</strong>, the backend to slitaz-installer \ 1.615 -is missing. Any installation can not be done without tazinst.") 1.616 - p $(gettext "Check tazinst permissions, or reinstall the \ 1.617 -slitaz-installer package.") 1.618 + h4 $(_ 'Tazinst Error') 1.619 + p $(_ '%s, the backend to %s is missing.' '<strong>tazinst</strong>' 'slitaz-installer'; 1.620 + _ 'Any installation can not be done without %s.' 'tazinst') 1.621 + p $(_ "Check %s permissions, or reinstall the %s package." \ 1.622 + 'tazinst' 'slitaz-installer') 1.623 errorcode=1 1.624 else 1.625 # check tazinst minimum version 1.626 @@ -858,12 +858,12 @@ 1.627 r=$TAZINST_MINIMUM_VERSION 1.628 if ! (printf '%s' "$v" | /bin/busybox awk -v r=$r \ 1.629 '{v=$v+0}{ if (v < r) exit 1}') ; then 1.630 - h4 $(gettext "Tazinst Error") 1.631 - p $(gettext "<strong>tazinst</strong>, the slitaz-installer \ 1.632 -backend, is not at the minimum required version. Any installation \ 1.633 -cannot be done without tazinst.") 1.634 - p $(gettext "Reinstall the slitaz-installer package, or use \ 1.635 -tazinst in CLI mode.") 1.636 + h4 $(_ 'Tazinst Error') 1.637 + p $(_ '%s, the %s backend, is not at the minimum required version.' \ 1.638 + '<strong>tazinst</strong>' 'slitaz-installer'; 1.639 + _ 'Any installation can not be done without %s.' 'tazinst') 1.640 + p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \ 1.641 + 'slitaz-installer' 'tazinst') 1.642 errorcode=1 1.643 fi 1.644 # check tazinst maximum version 1.645 @@ -871,12 +871,12 @@ 1.646 r=$TAZINST_MAXIMUM_VERSION 1.647 if ! (printf '%s' "$v" | /bin/busybox awk -v r=$r \ 1.648 '{v=$v+0}{ if (v > r) exit 1}') ; then 1.649 - h4 $(gettext "Tazinst Error") 1.650 - p $(gettext "<strong>tazinst</strong>, the slitaz-installer \ 1.651 -backend, is at a higher version than the maximum authorized \ 1.652 -by the slitaz-installer. Any installation cannot be done.") 1.653 - p $(gettext "Reinstall the slitaz-installer package, or use \ 1.654 -tazinst in CLI mode.") 1.655 + h4 $(_ 'Tazinst Error') 1.656 + p $(_ "%s, the %s backend, is at a higher version than the maximum authorized \ 1.657 +by the %s." '<strong>tazinst</strong>' 'slitaz-installer' 'slitaz-installer'; 1.658 + _ 'Any installation cannot be done.') 1.659 + p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \ 1.660 + 'slitaz-installer' 'tazinst') 1.661 errorcode=1 1.662 fi 1.663 fi 1.664 @@ -902,8 +902,8 @@ 1.665 1.666 a() { 1.667 local page="$1" text="$2" 1.668 - printf '<a class="button" value="%s" href="%s?page=%s">%s</a>\n' \ 1.669 - "$page" "$SCRIPT_NAME" "$page" "$text" 1.670 + printf '<a class="button" value="%s" href="?page=%s">%s</a>\n' \ 1.671 + "$page" "$page" "$text" 1.672 } 1.673 1.674 button() { 1.675 @@ -992,11 +992,11 @@ 1.676 select() { 1.677 local list="$1" selected="$2" name="$3" type="$4" 1.678 printf '%s' "$list" | \ 1.679 - /bin/busybox awk -v SELECTED="$selected" -v NONE="$(gettext "None")" \ 1.680 + /bin/busybox awk -v SELECTED="$selected" -v NONE="$(_ 'None')" \ 1.681 -v NAME="$name" -v TYPE="$type" 'BEGIN{ 1.682 TYPE=TYPE+0 1.683 print "<select name=\"" NAME "\">" 1.684 - print "<option value=>< " NONE " ></option>" 1.685 + print "<option value=>< " NONE " ></option>" 1.686 } 1.687 { 1.688 printf "<option value=\"" $1 "\"" 1.689 @@ -1049,7 +1049,7 @@ 1.690 1.691 # workaround ..end 1.692 printf '%s' "$list" | \ 1.693 - /bin/busybox awk -v NONE="$(gettext "None")" 'BEGIN{ 1.694 + /bin/busybox awk -v NONE="$(_ 'None')" 'BEGIN{ 1.695 line=0 1.696 } 1.697 { 1.698 @@ -1060,7 +1060,7 @@ 1.699 } 1.700 END{ 1.701 if (line < 1) 1.702 - printf "<option value=>< %s ></option>\n", NONE 1.703 + printf "<option value=>< %s ></option>\n", NONE 1.704 }' 1.705 echo "</select>" 1.706 echo "</datalist>" 1.707 @@ -1068,11 +1068,11 @@ 1.708 1.709 format() 1.710 { 1.711 - list_fs="$1" selected="$2" name="$3" none="$(gettext 'Do not format')" 1.712 + list_fs="$1" selected="$2" name="$3" none="$(_ 'Do not format')" 1.713 printf '<label for="%s" ' "$name" 1.714 - printf 'title="%s">' "$(gettext "To format this partition, select a \ 1.715 + printf 'title="%s">' "$(_ "To format this partition, select a \ 1.716 filesystem, usually it's safe to use ext4")" 1.717 - printf '%s</label>\n' "$(gettext "Formatting option:")" 1.718 + printf '%s</label>\n' "$(_ 'Formatting option:')" 1.719 printf '%s' "$list_fs" | \ 1.720 /bin/busybox awk -v SELECTED=$selected -v NONE="$none" -v NAME="$name" ' 1.721 BEGIN{