tazinst diff installer.cgi @ rev 6
Remove unwanted line breaks from code and translations. Tiny code reformatting. Start Russian translation.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Feb 16 17:16:10 2013 +0000 (2013-02-16) |
| parents | b0ed6cbb9de0 |
| children | ee47159f98fb |
line diff
1.1 --- a/installer.cgi Thu Feb 14 13:12:12 2013 +0100 1.2 +++ b/installer.cgi Sat Feb 16 17:16:10 2013 +0000 1.3 @@ -49,11 +49,11 @@ 1.4 { 1.5 comment "welcome message" 1.6 open_div_id "wrapper" 1.7 - h4 "$(gettext 'Welcome to the Slitaz Installer!')" 1.8 - p "$(gettext 'The SliTaz Installer installs or upgrades SliTaz to a 1.9 -hard disk drive from a device like a Live-CD or LiveUSB key, from a SliTaz 1.10 -ISO file, or from the web by downloading an ISO file.')" 1.11 - h5 "$(gettext "Which type of installation do you want to start?")" 1.12 + h4 $(gettext "Welcome to the Slitaz Installer!") 1.13 + p $(gettext "The SliTaz Installer installs or upgrades SliTaz to a \ 1.14 +hard disk drive from a device like a Live-CD or LiveUSB key, from a SliTaz \ 1.15 +ISO file, or from the web by downloading an ISO file.") 1.16 + h5 $(gettext "Which type of installation do you want to start?") 1.17 close_div 1.18 } 1.19 1.20 @@ -61,31 +61,33 @@ 1.21 { 1.22 comment "install message" 1.23 open_div_class "box" 1.24 - h4 "$(gettext 'Install')" 1.25 - p "$(gettext 'Install SliTaz on a partition of your hard disk drive. If you 1.26 -decide to format your partition, all data will be lost. If you do not 1.27 -format, all data except for any existing /home directory will be removed, 1.28 -the home directory will be kept as is.')" 1.29 - p "$(gettext 'Before installation, you may need to create or resize 1.30 -partitions on your hard disk drive in order to make space for SliTaz 1.31 -GNU/Linux. You can graphically manage your partitions with Gparted')" 1.32 + h4 $(gettext "Install") 1.33 + p $(gettext "Install SliTaz on a partition of your hard disk drive. If you \ 1.34 +decide to format your partition, all data will be lost. If you do not \ 1.35 +format, all data except for any existing /home directory will be removed, \ 1.36 +the home directory will be kept as is.") 1.37 + p $(gettext "Before installation, you may need to create or resize \ 1.38 +partitions on your hard disk drive in order to make space for SliTaz \ 1.39 +GNU/Linux. You can graphically manage your partitions with Gparted") 1.40 close_div 1.41 - button "install" "$(gettext "Install SliTaz")" \ 1.42 - "$(gettext "Proceed to a new SliTaz installation")" 1.43 + button "install" \ 1.44 + "$(gettext 'Install SliTaz')" \ 1.45 + "$(gettext 'Proceed to a new SliTaz installation')" 1.46 } 1.47 1.48 select_upgrade() 1.49 { 1.50 comment "upgrade message" 1.51 open_div_class "box" 1.52 - h4 "$(gettext 'Upgrade')" 1.53 - p "$(gettext 'Upgrade an already installed SliTaz system on your hard disk 1.54 -drive. Your /home /etc /var/www directories will be kept, all other 1.55 -directories will be removed. Any additional packages added to your old 1.56 -Slitaz system will be updated as long you have an active internet connection.')" 1.57 + h4 $(gettext "Upgrade") 1.58 + p $(gettext "Upgrade an already installed SliTaz system on your hard disk \ 1.59 +drive. Your /home /etc /var/www directories will be kept, all other \ 1.60 +directories will be removed. Any additional packages added to your old \ 1.61 +Slitaz system will be updated as long you have an active internet connection.") 1.62 close_div 1.63 - button "upgrade" "$(gettext 'Upgrade SliTaz')" \ 1.64 - "$(gettext "Upgrade an existing SliTaz system")" 1.65 + button "upgrade" \ 1.66 + "$(gettext 'Upgrade SliTaz')" \ 1.67 + "$(gettext 'Upgrade an existing SliTaz system')" 1.68 } 1.69 1.70 #-------------------- 1.71 @@ -101,38 +103,39 @@ 1.72 select_gparted() 1.73 { 1.74 comment "gparted message" 1.75 - h5 "$(gettext 'Partitioning')" 1.76 + h5 $(gettext "Partitioning") 1.77 open_div_class "box" 1.78 - p "$(gettext "On most used systems, the hard drive is already dedicated to 1.79 -partitions for Windows<sup>™</sup>, or Linux, or another operating 1.80 -system. You'll need to resize these partitions in order to make space for 1.81 -SliTaz GNU/Linux. SliTaz will co-exist with other operating systems already 1.82 -installed on your hard drive.")" 1.83 - p "$(gettext "The amount of space needed depends on how much software you 1.84 -plan to install and how much space you require for users. It's conceivable 1.85 -that you could run a minimal SliTaz system in 300 megs or less, but 2 gigs 1.86 -is indeed more comfy.")" 1.87 - p "$(gettext 'A separate home partition, and a partition that will be used 1.88 -as Linux swap space may be created if needed. Slitaz detects and uses swap 1.89 -partitions automatically.')" 1.90 + p $(gettext "On most used systems, the hard drive is already dedicated to \ 1.91 +partitions for Windows<sup>™</sup>, or Linux, or another operating \ 1.92 +system. You'll need to resize these partitions in order to make space for \ 1.93 +SliTaz GNU/Linux. SliTaz will co-exist with other operating systems already \ 1.94 +installed on your hard drive.") 1.95 + p $(gettext "The amount of space needed depends on how much software you \ 1.96 +plan to install and how much space you require for users. It's conceivable \ 1.97 +that you could run a minimal SliTaz system in 300 megs or less, but 2 gigs \ 1.98 +is indeed more comfy.") 1.99 + p $(gettext "A separate home partition, and a partition that will be used \ 1.100 +as Linux swap space may be created if needed. Slitaz detects and uses swap \ 1.101 +partitions automatically.") 1.102 close_div 1.103 open_div_class "box" 1.104 - p "$(gettext 'You can graphically manage your partitions with GParted. 1.105 -GParted is a partition editor for graphically managing your disk partitions. 1.106 -GParted allows you to create, destroy, resize and copy partitions without 1.107 -data loss.')" 1.108 - p "$(gettext 'GParted supports ext2, ext3, ext4, linux swap, ntfs and fat32 1.109 -filesystems right out of the box. Support for xjs, jfs, hfs and other 1.110 -filesystems is available as well but you first need to add drivers for these 1.111 -filesystems by installing the related packages xfsprogs, jfsutils, linux-hfs 1.112 -and so on.')" 1.113 + p $(gettext "You can graphically manage your partitions with GParted. \ 1.114 +GParted is a partition editor for graphically managing your disk partitions. \ 1.115 +GParted allows you to create, destroy, resize and copy partitions without \ 1.116 +data loss.") 1.117 + p $(gettext "GParted supports ext2, ext3, ext4, linux swap, ntfs and fat32 \ 1.118 +filesystems right out of the box. Support for xjs, jfs, hfs and other \ 1.119 +filesystems is available as well but you first need to add drivers for these \ 1.120 +filesystems by installing the related packages xfsprogs, jfsutils, linux-hfs \ 1.121 +and so on.") 1.122 close_div 1.123 comment "launch GParted" 1.124 - button "gparted" "$(gettext 'Execute GParted')" \ 1.125 - "$(gettext "Launch GParted, the partition editor tool")" 1.126 - h5 "$(gettext 'Continue installation')" 1.127 - p "$(gettext "Once you've made room for SliTaz on your drive, you should be 1.128 -able to continue installation.")" 1.129 + button "gparted" \ 1.130 + "$(gettext 'Execute GParted')" \ 1.131 + "$(gettext 'Launch GParted, the partition editor tool')" 1.132 + h5 $(gettext "Continue installation") 1.133 + p $(gettext "Once you've made room for SliTaz on your drive, you should be \ 1.134 +able to continue installation.") 1.135 } 1.136 1.137 #------------ 1.138 @@ -152,56 +155,85 @@ 1.139 comment "source selection" 1.140 # cdrom 1.141 if printf "$list_media" | grep -q "cdrom"; then 1.142 - input_media "cdrom" "$media" 1.143 - label_media "cdrom" "$(gettext 'LiveCD')" "$media" \ 1.144 - "$(gettext "Use the SliTaz LiveCD")" 1.145 + input_media "cdrom" \ 1.146 + "$media" 1.147 + label_media "cdrom" \ 1.148 + "$(gettext 'LiveCD')" \ 1.149 + "$media" \ 1.150 + "$(gettext 'Use the SliTaz LiveCD')" 1.151 br 1.152 fi 1.153 # usb 1.154 if printf "$list_media" | grep -q "usb"; then 1.155 - input_media "usb" "$media" 1.156 - label_media "usb" "$(gettext 'LiveUSB:')" "$media" \ 1.157 - "$(gettext "Enter the partition where SliTaz Live is located on your \ 1.158 -USB Key")" 1.159 + input_media "usb" \ 1.160 + "$media" 1.161 + label_media "usb" \ 1.162 + "$(gettext 'LiveUSB:')" \ 1.163 + "$media" \ 1.164 + "$(gettext 'Enter the partition where SliTaz Live is located on your USB Key')" 1.165 error="$?" 1.166 - select "$(/usr/sbin/tazinst list usb "$INSTFILE")" "$source" "SRC_USB" 1.167 - error_msg "$error" "source" 2 1.168 + select "$(/usr/sbin/tazinst list usb "$INSTFILE")" \ 1.169 + "$source" \ 1.170 + "SRC_USB" 1.171 + error_msg "$error" \ 1.172 + "source" \ 1.173 + 2 1.174 br 1.175 fi 1.176 # iso 1.177 - input_media "iso" "$media" 1.178 - label_media "iso" "$(gettext 'ISO file:')" "$media" \ 1.179 - "$(gettext "Select a SliTaz ISO file located on a local disk")" 1.180 + input_media "iso" \ 1.181 + "$media" 1.182 + label_media "iso" \ 1.183 + "$(gettext 'ISO file:')" \ 1.184 + "$media" \ 1.185 + "$(gettext 'Select a SliTaz ISO file located on a local disk')" 1.186 error="$?" 1.187 if [ "$media" == "iso" ]; then 1.188 - input "text" "src_iso" "$source" "" \ 1.189 - "$(gettext 'Select an ISO or enter the full path to the ISO file')" \ 1.190 + input "text" \ 1.191 + "src_iso" \ 1.192 + "$source" "" \ 1.193 + "$(gettext 'Select an ISO or enter the full path to the ISO file')" \ 1.194 "iso" 1.195 else 1.196 - input "text" "src_iso" "" "none" \ 1.197 - "$(gettext 'Select an ISO or enter the full path to the ISO file')" \ 1.198 + input "text" \ 1.199 + "src_iso" \ 1.200 + "" \ 1.201 + "none" \ 1.202 + "$(gettext 'Select an ISO or enter the full path to the ISO file')" \ 1.203 "iso" 1.204 fi 1.205 - datalist "$(/usr/sbin/tazinst list iso "$INSTFILE")" "src_iso" 1.206 - error_msg "$error" "source" 1.207 + datalist "$(/usr/sbin/tazinst list iso "$INSTFILE")" \ 1.208 + "src_iso" 1.209 + error_msg "$error" \ 1.210 + "source" 1.211 br 1.212 # web 1.213 - input_media "web" "$media" 1.214 - label_media "web" "$(gettext 'Web:')" "$media" \ 1.215 - "$(gettext "Select a SliTaz version on the Web")" 1.216 + input_media "web" \ 1.217 + "$media" 1.218 + label_media "web" \ 1.219 + "$(gettext 'Web:')" \ 1.220 + "$media" \ 1.221 + "$(gettext 'Select a SliTaz version on the Web')" 1.222 error="$?" 1.223 1.224 if [ "$media" == "web" ]; then 1.225 - input "text" "src_web" "$source" "" \ 1.226 - "$(gettext 'Select a version or enter the full url to an ISO file')" \ 1.227 + input "text" \ 1.228 + "src_web" \ 1.229 + "$source" "" \ 1.230 + "$(gettext 'Select a version or enter the full url to an ISO file')" \ 1.231 "web" 1.232 else 1.233 - input "text" "src_web" "" "none" \ 1.234 - "$(gettext 'Select a version or enter the full url to an ISO file')" \ 1.235 + input "text" \ 1.236 + "src_web" \ 1.237 + "" \ 1.238 + "none" \ 1.239 + "$(gettext 'Select a version or enter the full url to an ISO file')" \ 1.240 "web" 1.241 fi 1.242 - datalist "$(/usr/sbin/tazinst help web "$INSTFILE")" "src_web" 1.243 - error_msg "$error" "source" 1.244 + datalist "$(/usr/sbin/tazinst help web "$INSTFILE")" \ 1.245 + "src_web" 1.246 + error_msg "$error" \ 1.247 + "source" 1.248 } 1.249 1.250 select_root_uuid() 1.251 @@ -210,17 +242,23 @@ 1.252 local mode="$(/usr/sbin/tazinst get mode "$INSTFILE")" 1.253 comment "root_uuid selection" 1.254 if [ "$mode" == "upgrade" ]; then 1.255 - label "root_uuid" "$(gettext 'Existing SliTaz partition to upgrade:')" \ 1.256 - "$(gettext "Specify the partition containing the system to upgrade")" 1.257 + label "root_uuid" \ 1.258 + "$(gettext 'Existing SliTaz partition to upgrade:')" \ 1.259 + "$(gettext 'Specify the partition containing the system to upgrade')" 1.260 error="$?" 1.261 else 1.262 - label "root_uuid" "$(gettext 'Install Slitaz to partition:')" \ 1.263 - "$(gettext "Specify the partition where to install SliTaz")" 1.264 + label "root_uuid" \ 1.265 + "$(gettext 'Install Slitaz to partition:')" \ 1.266 + "$(gettext 'Specify the partition where to install SliTaz')" 1.267 error="$?" 1.268 fi 1.269 - select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" "$root_uuid" \ 1.270 - "ROOT_UUID" 2 1.271 - error_msg "$error" "root_uuid" 2 1.272 + select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \ 1.273 + "$root_uuid" \ 1.274 + "ROOT_UUID" \ 1.275 + 2 1.276 + error_msg "$error" \ 1.277 + "root_uuid" \ 1.278 + 2 1.279 br 1.280 } 1.281 1.282 @@ -228,8 +266,9 @@ 1.283 { 1.284 local root_format="$(/usr/sbin/tazinst get root_format "$INSTFILE")" 1.285 comment "root_format selection" 1.286 - format "$(/usr/sbin/tazinst list format "$INSTFILE")" "$root_format" \ 1.287 -"ROOT_FORMAT" 1.288 + format "$(/usr/sbin/tazinst list format "$INSTFILE")" \ 1.289 + "$root_format" \ 1.290 + "ROOT_FORMAT" 1.291 } 1.292 1.293 select_options() 1.294 @@ -241,11 +280,14 @@ 1.295 { 1.296 local home_uuid="$(/usr/sbin/tazinst get home_uuid "$INSTFILE")" 1.297 comment "home_uuid selection" 1.298 - h5 "$(gettext 'home partition')" 1.299 - label "home_uuid" "$(gettext 'Separate partition for /home:')" \ 1.300 - "$(gettext "Specify the partition containing /home")" 1.301 - select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" "$home_uuid" \ 1.302 - "HOME_UUID" 2 1.303 + h5 $(gettext "home partition") 1.304 + label "home_uuid" \ 1.305 + "$(gettext 'Separate partition for /home:')" \ 1.306 + "$(gettext 'Specify the partition containing /home')" 1.307 + select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \ 1.308 + "$home_uuid" \ 1.309 + "HOME_UUID" \ 1.310 + 2 1.311 br 1.312 } 1.313 1.314 @@ -253,70 +295,100 @@ 1.315 { 1.316 local home_format="$(/usr/sbin/tazinst get home_format "$INSTFILE")" 1.317 comment "home_format selection" 1.318 - format "$(/usr/sbin/tazinst list format "$INSTFILE")" "$home_format" \ 1.319 -"HOME_FORMAT" 1.320 + format "$(/usr/sbin/tazinst list format "$INSTFILE")" \ 1.321 + "$home_format" \ 1.322 + "HOME_FORMAT" 1.323 } 1.324 1.325 select_hostname() 1.326 { 1.327 local hostname="$(/usr/sbin/tazinst get hostname "$INSTFILE")" error 1.328 comment "hostname selection" 1.329 - h5 "$(gettext 'Hostname')" 1.330 - label "hostname" "$(gettext 'Set Hostname to:')" \ 1.331 - "$(gettext "Hostname configuration allows you to specify the machine name")" 1.332 + h5 $(gettext "Hostname") 1.333 + label "hostname" \ 1.334 + "$(gettext 'Set Hostname to:')" \ 1.335 + "$(gettext 'Hostname configuration allows you to specify the machine name')" 1.336 error=$? 1.337 - input "text" "HOSTNAME" "$hostname" "" "$(gettext 'Name of your system')" 1.338 - error_msg "$error" "hostname" 2 1.339 + input "text" \ 1.340 + "HOSTNAME" \ 1.341 + "$hostname" \ 1.342 + "" \ 1.343 + "$(gettext 'Name of your system')" 1.344 + error_msg "$error" \ 1.345 + "hostname" \ 1.346 + 2 1.347 } 1.348 1.349 select_root_pwd() 1.350 { 1.351 local root_pwd="$(/usr/sbin/tazinst get root_pwd "$INSTFILE")" error 1.352 comment "root_pwd selection" 1.353 - h5 "$(gettext 'Root superuser')" 1.354 - label "root_pwd" "$(gettext 'Root passwd:')" \ 1.355 - "$(gettext "Enter the password for root")" 1.356 + h5 $(gettext "Root superuser") 1.357 + label "root_pwd" \ 1.358 + "$(gettext 'Root passwd:')" \ 1.359 + "$(gettext 'Enter the password for root')" 1.360 error="$?" 1.361 - input "text" "ROOT_PWD" "$root_pwd" "" "$(gettext 'Password of root')" 1.362 - error_msg "$error" "root_pwd" 1.363 + input "text" \ 1.364 + "ROOT_PWD" \ 1.365 + "$root_pwd" \ 1.366 + "" \ 1.367 + "$(gettext 'Password of root')" 1.368 + error_msg "$error" \ 1.369 + "root_pwd" 1.370 } 1.371 1.372 select_user_login() 1.373 { 1.374 local user_login="$(/usr/sbin/tazinst get user_login "$INSTFILE")" error 1.375 comment "user_login selection" 1.376 - h5 "$(gettext 'User')" 1.377 - label "user_login" "$(gettext 'User login:')" \ 1.378 - "$(gettext "Enter the name of the first user")" 1.379 + h5 $(gettext "User") 1.380 + label "user_login" \ 1.381 + "$(gettext 'User login:')" \ 1.382 + "$(gettext 'Enter the name of the first user')" 1.383 error="$?" 1.384 - input "text" "USER_LOGIN" "$user_login" "" \ 1.385 + input "text" \ 1.386 + "USER_LOGIN" \ 1.387 + "$user_login" \ 1.388 + "" \ 1.389 "$(gettext 'Name of the first user')" 1.390 - error_msg "$error" "user_login" 2 1.391 + error_msg "$error" \ 1.392 + "user_login" \ 1.393 + 2 1.394 br 1.395 } 1.396 1.397 select_user_pwd() 1.398 { 1.399 local user_pwd="$(/usr/sbin/tazinst get user_pwd "$INSTFILE")" error 1.400 - label "user_pwd" "$(gettext 'User passwd:')" \ 1.401 - "$(gettext "The password for default user")" 1.402 + label "user_pwd" \ 1.403 + "$(gettext 'User passwd:')" \ 1.404 + "$(gettext 'The password for default user')" 1.405 error="$?" 1.406 - input "text" "USER_PWD" "$user_pwd" "" \ 1.407 + input "text" \ 1.408 + "USER_PWD" \ 1.409 + "$user_pwd" \ 1.410 + "" \ 1.411 "$(gettext 'Password of the first user')" 1.412 - error_msg "$error" "user_pwd" 1.413 + error_msg "$error" \ 1.414 + "user_pwd" 1.415 } 1.416 1.417 select_bootloader() 1.418 { 1.419 local bootloader="$(/usr/sbin/tazinst get bootloader "$INSTFILE")" error 1.420 comment "bootloader selection" 1.421 - h5 "$(gettext 'Bootloader')" 1.422 - input "checkbox" "bootloader" "auto" "$bootloader" 1.423 - label "bootloader" "$(gettext "Install a bootloader.")" \ 1.424 - "$(gettext "Usually you should answer yes, unless you want to install a \ 1.425 + h5 $(gettext "Bootloader") 1.426 + input "checkbox" \ 1.427 + "bootloader" \ 1.428 + "auto" \ 1.429 + "$bootloader" 1.430 + label "bootloader" \ 1.431 + "$(gettext 'Install a bootloader.')" \ 1.432 + "$(gettext "Usually you should answer yes, unless you want to install a \ 1.433 bootloader by hand yourself.")" 1.434 error="$?" 1.435 - error_msg "$error" "bootloader" 1.436 + error_msg "$error" \ 1.437 + "bootloader" 1.438 br 1.439 } 1.440 1.441 @@ -324,19 +396,24 @@ 1.442 { 1.443 local winboot="$(/usr/sbin/tazinst get winboot "$INSTFILE")" error 1.444 comment "winboot selection" 1.445 - input "checkbox" "winboot" "auto" "$winboot" 1.446 - label "winboot" "$(gettext 'Enable Windows Dual-Boot.')" \ 1.447 - "$(gettext "At start-up, you will be asked whether you want to boot into \ 1.448 + input "checkbox" \ 1.449 + "winboot" \ 1.450 + "auto" \ 1.451 + "$winboot" 1.452 + label "winboot" \ 1.453 + "$(gettext 'Enable Windows Dual-Boot.')" \ 1.454 + "$(gettext "At start-up, you will be asked whether you want to boot into \ 1.455 Windows™ or SliTaz GNU/Linux.")" 1.456 error="$?" 1.457 - error_msg "$error" "winboot" 1.458 + error_msg "$error" \ 1.459 + "winboot" 1.460 } 1.461 1.462 errors_msg() 1.463 { 1.464 if [ "$CHECK" ]; then 1.465 echo "<span class=\"alert\">" 1.466 - p "$(gettext "Errors found. Please check your settings.")" 1.467 + p $(gettext "Errors found. Please check your settings.") 1.468 echo "</span>" 1.469 fi 1.470 } 1.471 @@ -346,13 +423,13 @@ 1.472 local settings="$(/usr/sbin/tazinst get settings "$INSTFILE")" 1.473 CHECK=$(GET CHECK) 1.474 errors_msg 1.475 - h4 "$(gettext 'Select source media:')" 1.476 + h4 $(gettext "Select source media:") 1.477 open_div_class "box" 1.478 open_div_class "media" 1.479 select_source 1.480 close_div 1.481 close_div 1.482 - h4 "$(gettext 'Select destination')" 1.483 + h4 $(gettext "Select destination") 1.484 open_div_class "box" 1.485 select_root_uuid 1.486 printf "$settings" | grep -q "root_format" \ 1.487 @@ -381,7 +458,7 @@ 1.488 1.489 save_settings() 1.490 { 1.491 - h5 "$(gettext "Checking settings...")" 1.492 + h5 $(gettext "Checking settings...") 1.493 # install type 1.494 /usr/sbin/tazinst set media "$(GET MEDIA)" "$INSTFILE" 1.495 # source File 1.496 @@ -453,7 +530,7 @@ 1.497 echo "<script type=\"text/javascript\">" 1.498 printf "document.write(\047<div id=\"progress\">" 1.499 printf "<img src=\"/styles/default/images/stop.png\" />" 1.500 - printf "$(gettext "Errors encountered.")" 1.501 + printf "$(gettext 'Errors encountered.')" 1.502 printf "</div>\047)\n" 1.503 echo "</script>" 1.504 br 1.505 @@ -466,14 +543,14 @@ 1.506 echo "<script type=\"text/javascript\">" 1.507 printf "document.write(\047<div id=\"progress\">" 1.508 printf "<img src=\"/styles/default/images/tux.png\" />" 1.509 - printf "$(gettext "Process completed!")" 1.510 + printf "$(gettext 'Process completed!')" 1.511 printf "</div>\047)\n" 1.512 echo "</script>" 1.513 br 1.514 br 1.515 br 1.516 - p "$(gettext "Installation is now finished, you can exit the installer 1.517 -or reboot on your new SliTaz GNU/Linux operating system")." 1.518 + p $(gettext "Installation is now finished, you can exit the installer \ 1.519 +or reboot on your new SliTaz GNU/Linux operating system.") 1.520 fi 1.521 return "$error" 1.522 1.523 @@ -481,7 +558,7 @@ 1.524 1.525 tazinst_log() 1.526 { 1.527 - h4 "$(gettext "Tazinst log")" 1.528 + h4 $(gettext "Tazinst log") 1.529 printf "<pre>$(/usr/sbin/tazinst log | sed 's/\%/ percent/g')</pre>" 1.530 } 1.531 1.532 @@ -496,21 +573,21 @@ 1.533 case $mode in 1.534 install) 1.535 open_div_id "wrapper" 1.536 - h4 "$(gettext 'Install SliTaz')" 1.537 - p "$(gettext "You're going to install SliTaz on a partition of your 1.538 -hard disk drive. If you decide to format your HDD, all data will be 1.539 -lost. If you do not format, all data except for any existing /home 1.540 -directory will be removed, the home directory will be kept as is.")" 1.541 + h4 $(gettext "Install SliTaz") 1.542 + p $(gettext "You're going to install SliTaz on a partition of your \ 1.543 +hard disk drive. If you decide to format your HDD, all data will be \ 1.544 +lost. If you do not format, all data except for any existing /home \ 1.545 +directory will be removed, the home directory will be kept as is.") 1.546 close_div 1.547 ;; 1.548 upgrade) 1.549 open_div_id "wrapper" 1.550 - h4 "$(gettext 'Upgrade SliTaz')" 1.551 - p "$(gettext "You're going to upgrade an already installed SliTaz 1.552 -system on your hard disk drive. Your /home /etc /var/www directories 1.553 -will be kept, all other directories will be removed. Any additional 1.554 -packages added to your old Slitaz system will be updated as long you 1.555 -have an active internet connection.")" 1.556 + h4 $(gettext "Upgrade SliTaz") 1.557 + p $(gettext "You're going to upgrade an already installed SliTaz \ 1.558 +system on your hard disk drive. Your /home /etc /var/www directories \ 1.559 +will be kept, all other directories will be removed. Any additional \ 1.560 +packages added to your old Slitaz system will be updated as long you \ 1.561 +have an active internet connection.") 1.562 close_div 1.563 ;; 1.564 esac 1.565 @@ -540,15 +617,22 @@ 1.566 next_msg=$(gettext 'Back to Installer Start Page') ;; 1.567 esac 1.568 hr 1.569 - input_hidden "page" "$next" 1.570 - a "$back" "$SCRIPT_NAME?page=$back" "$back_msg" 1.571 - input "submit" "" "$next_msg" 1.572 + input_hidden "page" \ 1.573 + "$next" 1.574 + a "$back" \ 1.575 + "$SCRIPT_NAME?page=$back" \ 1.576 + "$back_msg" 1.577 + input "submit" \ 1.578 + "" \ 1.579 + "$next_msg" 1.580 } 1.581 1.582 moveto_home() 1.583 { 1.584 local msg=$(gettext 'Back to Installer Start Page') 1.585 - a "home" "$SCRIPT_NAME?page=home" "$msg" 1.586 + a "home" \ 1.587 + "$SCRIPT_NAME?page=home" \ 1.588 + "$msg" 1.589 } 1.590 1.591 page_redirection() 1.592 @@ -582,11 +666,11 @@ 1.593 local errorcode=0 1.594 comment "check_ressources" 1.595 if ! [ -x /usr/sbin/tazinst ] ; then 1.596 - h4 "$(gettext 'Tazinst Error')" 1.597 - p "$(gettext "<strong>tazinst</strong>, the backend to slitaz-installer 1.598 -is missing. Any installation can not be done without tazinst.")" 1.599 - p "$(gettext "Check tazinst permissions, or reinstall the 1.600 -slitaz-installer package.")" 1.601 + h4 $(gettext "Tazinst Error") 1.602 + p $(gettext "<strong>tazinst</strong>, the backend to slitaz-installer \ 1.603 +is missing. Any installation can not be done without tazinst.") 1.604 + p $(gettext "Check tazinst permissions, or reinstall the \ 1.605 +slitaz-installer package.") 1.606 errorcode=1 1.607 else 1.608 # check tazinst minimum version 1.609 @@ -594,12 +678,12 @@ 1.610 r=$TAZINST_MINIMUM_VERSION 1.611 if ! (echo "$v" | /bin/busybox awk -v r=$r \ 1.612 '{v=$v+0}{ if (v < r) exit 1}') ; then 1.613 - h4 "$(gettext 'Tazinst Error')" 1.614 - p "$(gettext "<strong>tazinst</strong>, the slitaz-installer 1.615 -backend, is not at the minimum required version. Any installation 1.616 -cannot be done without tazinst.")" 1.617 - p "$(gettext "Reinstall the slitaz-installer package, or use 1.618 -tazinst in cli mode.")" 1.619 + h4 $(gettext "Tazinst Error") 1.620 + p $(gettext "<strong>tazinst</strong>, the slitaz-installer \ 1.621 +backend, is not at the minimum required version. Any installation \ 1.622 +cannot be done without tazinst.") 1.623 + p $(gettext "Reinstall the slitaz-installer package, or use \ 1.624 +tazinst in CLI mode.") 1.625 errorcode=1 1.626 fi 1.627 # check tazinst maximum version 1.628 @@ -607,12 +691,12 @@ 1.629 r=$TAZINST_MAXIMUM_VERSION 1.630 if ! (echo "$v" | /bin/busybox awk -v r=$r \ 1.631 '{v=$v+0}{ if (v > r) exit 1}') ; then 1.632 - h4 "$(gettext 'Tazinst Error')" 1.633 - p "$(gettext "<strong>tazinst</strong>, the slitaz-installer 1.634 -backend, is at a higher version than the maximum authorized 1.635 -by the slitaz-installer. Any installation cannot be done.")" 1.636 - p "$(gettext "Reinstall the slitaz-installer package, or use 1.637 -tazinst in cli mode.")" 1.638 + h4 $(gettext "Tazinst Error") 1.639 + p $(gettext "<strong>tazinst</strong>, the slitaz-installer \ 1.640 +backend, is at a higher version than the maximum authorized \ 1.641 +by the slitaz-installer. Any installation cannot be done.") 1.642 + p $(gettext "Reinstall the slitaz-installer package, or use \ 1.643 +tazinst in CLI mode.") 1.644 errorcode=1 1.645 fi 1.646 fi 1.647 @@ -636,13 +720,12 @@ 1.648 1.649 comment() 1.650 { 1.651 - echo "<!-- $1 -->" 1.652 + echo "<!-- $@ -->" 1.653 } 1.654 1.655 a() 1.656 { 1.657 - local value="$1" href="$2" msg="$3" 1.658 - echo "<a class=\"button\" value=\"$value\" href=\"$href\">$msg</a>" 1.659 + echo "<a class=\"button\" value=\"$1\" href=\"$2\">$3</a>" 1.660 } 1.661 1.662 open_div() 1.663 @@ -667,17 +750,17 @@ 1.664 1.665 p() 1.666 { 1.667 - echo "<p>$1</p>" 1.668 + echo "<p>$@</p>" 1.669 } 1.670 1.671 h4() 1.672 { 1.673 - echo "<h4>$1</h4>" 1.674 + echo "<h4>$@</h4>" 1.675 } 1.676 1.677 h5() 1.678 { 1.679 - echo "<h5>$1</h5>" 1.680 + echo "<h5>$@</h5>" 1.681 } 1.682 1.683 label() 1.684 @@ -706,7 +789,10 @@ 1.685 { 1.686 local id="$1" label="$2" media="$3" title="$4" retcode=0 1.687 if [ "$media" == "$id" ]; then 1.688 - label "source" "$label" "$title" "$media" 1.689 + label "source" \ 1.690 + "$label" \ 1.691 + "$title" \ 1.692 + "$media" 1.693 retcode="$?" 1.694 else 1.695 printf "<label for=\"$id\"" 1.696 @@ -736,7 +822,7 @@ 1.697 1.698 select() 1.699 { 1.700 - local list="$1" selected="$2" name="$3" type="$4" none="$(gettext "None")" 1.701 + local list="$1" selected="$2" name="$3" type="$4" none="$(gettext 'None')" 1.702 printf "$list" | /bin/busybox awk -v SELECTED="$selected" -v NONE="$none" \ 1.703 -v NAME="$name" -v TYPE="$type" 'BEGIN{ 1.704 TYPE=TYPE+0 1.705 @@ -774,18 +860,17 @@ 1.706 { 1.707 local id="$1" media="$2" 1.708 echo -n "<input type=\"radio\" name=\"MEDIA\" value=\"$id\" id=\"$id\" " 1.709 - echo "$([ "$media" == "$id" ] && echo "checked") />" 1.710 + echo "$([ "$media" == "$id" ] && echo 'checked') />" 1.711 } 1.712 1.713 input_hidden() 1.714 { 1.715 - local name="$1" value="$2" 1.716 - echo "<input type=\"hidden\" name=\"$name\" value=\"$value\" />" 1.717 + echo "<input type=\"hidden\" name=\"$1\" value=\"$2\" />" 1.718 } 1.719 1.720 datalist() 1.721 { 1.722 - local list="$1" name="$2" none="$(gettext "None")" 1.723 + local list="$1" name="$2" none="$(gettext 'None')" 1.724 echo "<datalist id=\"list_$name\">" 1.725 # workaround for browsers that don’t support the datalist element.. 1.726 echo "<select class=\"workaround\" id=\"sel_$name\" \ 1.727 @@ -811,10 +896,12 @@ 1.728 1.729 format() 1.730 { 1.731 - list_fs="$1" selected="$2" name="$3" none="$(gettext "Do not format")" 1.732 - printf "<label for=\"$name\" title=\"$(gettext "To format this partition, \ 1.733 -select a filesystem, usually it's safe to use ext4")\">" 1.734 - echo "$(gettext "Formatting option:")</label>" 1.735 + list_fs="$1" selected="$2" name="$3" none="$(gettext 'Do not format')" 1.736 + cat << EOT 1.737 +<label for="$name" title="$(gettext "To format this partition, \ 1.738 +select a filesystem, usually it's safe to use ext4")"> 1.739 +$(gettext "Formatting option:")</label> 1.740 +EOT 1.741 printf "$list_fs" | /bin/busybox awk -v SELECTED=$selected -v NONE="$none" \ 1.742 -v NAME="$name" 'BEGIN{ 1.743 RS=" " 1.744 @@ -949,10 +1036,10 @@ 1.745 </div> 1.746 1.747 <div id="footer"> 1.748 - $(gettext 'Copyright') © 2012-2013 1.749 + $(gettext "Copyright") © 2012–2013 1.750 <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a> 1.751 - - <a href="/index.cgi?file=/usr/share/licenses/bsd.txt"> 1.752 - $(gettext 'BSD License')</a> 1.753 + — <a href="/index.cgi?file=/usr/share/licenses/bsd.txt"> 1.754 + $(gettext "BSD License")</a> 1.755 </div> 1.756 1.757 </body>