tazinst diff slitaz-installer @ 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 | f9a876208b66 |
| children | e6d15a13acca |
line diff
1.1 --- a/slitaz-installer Wed Mar 30 01:45:52 2016 +0300 1.2 +++ b/slitaz-installer Sat Apr 09 17:22:22 2016 +0300 1.3 @@ -17,107 +17,107 @@ 1.4 #-------------- 1.5 # msgs section 1.6 #-------------- 1.7 - 1.8 +. /lib/libtaz.sh 1.9 # info msgs 1.10 1.11 -MODE_MSG="\n$(gettext "Welcome to the slitaz-installer").\n 1.12 -\Z2$(gettext "Which type of installation do you want to start?")\Zn\n" 1.13 +MODE_MSG="\n$(_ 'Welcome to the slitaz-installer.')\n 1.14 +\Z2$(_ 'Which type of installation do you want to start?')\Zn\n" 1.15 1.16 -MEDIA_MSG="\n$(gettext "SliTaz can be installed from different media.")\n\n\ 1.17 -\Z2$(gettext "Select a media from the following list:")\Zn\n" 1.18 +MEDIA_MSG="\n$(_ 'SliTaz can be installed from different media.')\n 1.19 +\Z2$(_ 'Select a media from the following list:')\Zn\n" 1.20 1.21 -SOURCE_USB_MSG="\n$(gettext "You have selected the option to install SliTaz \ 1.22 -from an USB Key")\n\n\ 1.23 -\Z2$(gettext "Enter the partition where SliTaz Live is located:"):\Zn\n" 1.24 +SOURCE_USB_MSG="\n$(_ 'You have selected the option to install SliTaz from an USB Key.')\n 1.25 +\Z2$(_ 'Enter the partition where SliTaz Live is located:')\Zn\n" 1.26 1.27 -SOURCE_ISO_MSG="\n$(gettext "You have selected the option to install SliTaz \ 1.28 -from an ISO file located on a local disk.")\n\n\ 1.29 -\Z2$(gettext "Please, select a file below:")\Zn\n" 1.30 +SOURCE_ISO_MSG="\n$(_ "You have selected the option to install SliTaz \ 1.31 +from an ISO file located on a local disk.")\n 1.32 +\Z2$(_ 'Please, select a file below:')\Zn\n" 1.33 1.34 -SOURCE_WEB_MSG="\n$(gettext "You have selected the option to install SliTaz \ 1.35 -from the web")\n\n\\Z2$(gettext "Please, select a version:")\Zn\n" 1.36 +SOURCE_WEB_MSG="\n$(_ 'You have selected the option to install SliTaz from the web.')\n 1.37 +\\Z2$(_ 'Please, select a version:')\Zn\n" 1.38 1.39 -SOURCE_DEF_MSG="\n$(gettext "Select the source"):\n" 1.40 +SOURCE_DEF_MSG="\n$(_ 'Select the source:')\n" 1.41 1.42 -ROOT_UUID_DEFAULT_MSG="$(gettext "\nDrive selection")\n\n\Z2$(gettext "Please specify the partition where to install SliTaz:")\Zn\n" 1.43 +ROOT_UUID_DEFAULT_MSG="\n$(_ 'Drive selection')\n 1.44 +\Z2$(_ 'Please specify the partition where to install SliTaz:')\Zn\n" 1.45 1.46 -ROOT_UUID_UPGRADE_MSG="$(gettext "The installer will upgrade the existing \ 1.47 +ROOT_UUID_UPGRADE_MSG="$(_ "The installer will upgrade the existing \ 1.48 SliTaz system by saving all configuration files and the list of installed \ 1.49 packages. Then, it will clean the partition and install the new version \ 1.50 of SliTaz, restore the configuration files and reinstall any packages which \ 1.51 -are not present on the cdrom. 1.52 -You will need an active internet connection before upgrading.")\n \ 1.53 -\Z2$(gettext "Partition containing the system to upgrade:")\Zn\n" 1.54 +are not present on the CD-ROM.") 1.55 +$(_ 'You will need an active internet connection before upgrading.') 1.56 +\Z2$(_ 'Partition containing the system to upgrade:')\Zn\n" 1.57 1.58 -ROOT_FORMAT_MSG="\n$(gettext "Only the filesystems actually installed on your \ 1.59 +ROOT_FORMAT_MSG="\n$(_ "Only the filesystems actually installed on your \ 1.60 system are listed. If you intend to use another filesystem, you have to \ 1.61 -install it before. \ 1.62 -Unless you know what you are doing, it is safe to use ext2, ext3 or ext4.\n\n\ 1.63 -\Z2To format this partition, please select a filesystem below:")\Zn\n" 1.64 +install it before. Unless you know what you are doing, it is safe to use ext2, \ 1.65 +ext3 or ext4.")\n 1.66 +\Z2$(_ 'To format this partition, please select a filesystem below:')\Zn\n" 1.67 1.68 -HOME_UUID_MSG="\n$(gettext "Separate /home partition")\n\n\ 1.69 -\Z2$(gettext "Please, select the partition to use:")\Zn\n" 1.70 +HOME_UUID_MSG="\n$(_ 'Separate /home partition')\n 1.71 +\Z2$(_ 'Please, select the partition to use:')\Zn\n" 1.72 1.73 -HOSTNAME_MSG="\n$(gettext "Hostname configuration allows you to specify the \ 1.74 +HOSTNAME_MSG="\n$(_ "Hostname configuration allows you to specify the \ 1.75 machine name. The hostname is used internally to identify the host on the \ 1.76 -network. This value can be changed after the system is installed.\n\n\ 1.77 -\Z2Enter a hostname:\Zn\n")" 1.78 +network. This value can be changed after the system is installed.")\n 1.79 +\Z2$(_ 'Enter a hostname:')\Zn\n)" 1.80 1.81 -ROOT_PWD_MSG="\n$(gettext "The root administrator privilege lets you manage \ 1.82 +ROOT_PWD_MSG="\n$(_ "The root administrator privilege lets you manage \ 1.83 and configure the full system. A root user can damage your system so you \ 1.84 -should always setup a strong password with special characters and/or numbers.\ 1.85 -")\n\n\ 1.86 -\Z2$(gettext "Enter the password for root:")\Zn\n" 1.87 +should always setup a strong password with special characters and/or numbers.")\n 1.88 +\Z2$(_ 'Enter the password for root:')\Zn\n" 1.89 1.90 -USER_LOGIN_MSG="\n$(gettext "The default user for the system will have their \ 1.91 +USER_LOGIN_MSG="\n$(_ "The default user for the system will have their \ 1.92 personal files stored in /home/*user* (and will be automatically added to the \ 1.93 -audio group)")\n\n\Z2$(gettext "Enter the name of the first user:")\Zn\n" 1.94 +audio group)")\n 1.95 +\Z2$(_ 'Enter the name of the first user:')\Zn\n" 1.96 1.97 -USER_PWD_MSG="\n$(gettext "The password for default user"). 1.98 -$(gettext "It may be a security risk if too weak and should always be strong \ 1.99 +USER_PWD_MSG="\n$(_ 'The password for default user.') 1.100 +$(_ "It may be a security risk if too weak and should always be strong \ 1.101 if you use a SSH connection through the web.")\n 1.102 -\Z2$(gettext "Enter the password for the default user:")\Zn\n" 1.103 +\Z2$(_ 'Enter the password for the default user:')\Zn\n" 1.104 1.105 -END_OF_INSTALL_MSG="\n$(gettext "Installation is now finished, you can exit \ 1.106 -the installer or reboot on your new SliTaz GNU/Linux operating system")." 1.107 +END_OF_INSTALL_MSG="\n$(_ "Installation is now finished, you can exit \ 1.108 +the installer or reboot on your new SliTaz GNU/Linux operating system.")" 1.109 1.110 1.111 # questions msgs 1.112 1.113 -ASK_ROOT_FORMAT="\n$(gettext "The next step lets you format the target \ 1.114 +ASK_ROOT_FORMAT="\n$(_ "The next step lets you format the target \ 1.115 partition. Choose between robust, stable and/or journaled filesystem. If the \ 1.116 -partition is already formated you can skip this stage, if not just accept.\n 1.117 -Warning! formating a partition will destroy all current data.\n 1.118 -\Z2Do you wish to format the partition ?\Zn")" 1.119 +partition is already formated you can skip this stage, if not just accept.")\n 1.120 +$(_ 'Warning! formating a partition will destroy all current data.')\n 1.121 +\Z2$(_ 'Do you wish to format the partition?')\Zn)" 1.122 1.123 -ASK_HOME_UUID="\n$(gettext "On most GNU/Linux systems users personal \ 1.124 +ASK_HOME_UUID="\n$(_ "On most GNU/Linux systems users personal \ 1.125 files are stored in the directory /home. Home can be on a separate partition \ 1.126 -or another hard disk.\n 1.127 -\Z2DO you want to use a separate Home partition ?\Zn")" 1.128 +or another hard disk.")\n 1.129 +\Z2$(_ 'Do you want to use a separate Home partition?')\Zn)" 1.130 1.131 -ASK_HOME_FORMAT="\n$(gettext "/home will be installed on a separate partition. \ 1.132 +ASK_HOME_FORMAT="\n$(_ "/home will be installed on a separate partition. \ 1.133 The next step lets you format the /home partition. If the partition \ 1.134 -is already formated you can skip this stage, if not just accept. Warning \ 1.135 -formating a partition will destroy all current data.\n 1.136 -\Z2Do you wish to format the /home partition ?\Zn")" 1.137 +is already formated you can skip this stage, if not just accept.") 1.138 +$(_ 'Warning! formating a partition will destroy all current data.')\n 1.139 +\Z2$(_ 'Do you wish to format the /home partition?')\Zn)" 1.140 1.141 -ASK_BOOTLOADER="\n$(gettext "You have now the option to install a \ 1.142 -bootloader which is capable of booting almost any kind of operating system.\n\n\ 1.143 -If you want to use an existing bootloader installation, skip this step \ 1.144 +ASK_BOOTLOADER="\n$(_ "You have now the option to install a \ 1.145 +bootloader which is capable of booting almost any kind of operating system.")\n 1.146 +$(_ "If you want to use an existing bootloader installation, skip this step \ 1.147 and configure your bootloader to boot SliTaz (refer to your bootloader \ 1.148 -documentation on how to do this)").\n\n\ 1.149 -\Z2$(gettext "Install a bootloader?")\Zn\n" 1.150 +documentation on how to do this).")\n 1.151 +\Z2$(_ 'Install a bootloader?')\Zn\n" 1.152 1.153 -ASK_WINBOOT="\n$(gettext "Do you want to implement a dual-boot with \ 1.154 +ASK_WINBOOT="\n$(_ "Do you want to implement a dual-boot with \ 1.155 Windows? At start-up, you will be asked whether you want to boot into \ 1.156 -Windows or SliTaz GNU/Linux.\n 1.157 -\Z2Install a dual-boot with Windows ?")\n" 1.158 +Windows or SliTaz GNU/Linux.")\n 1.159 +\Z2$(_ 'Install a dual-boot with Windows?')\n" 1.160 1.161 -ASK_SUMMARY="$(gettext "Installation settings summary and last chance to \ 1.162 +ASK_SUMMARY="$(_ "Installation settings summary and last chance to \ 1.163 cancel or restart all installation steps.")\n 1.164 -\Z2Go and install SliTaz?\Zn\n\n" 1.165 +\Z2$(_ 'Go and install SliTaz?')\Zn\n\n" 1.166 1.167 -EMPTY_MENU_MSG="\n$(gettext "Sorry, no device, nor file found or available.")" 1.168 +EMPTY_MENU_MSG="\n$(_ 'Sorry, no device, nor file found or available.')" 1.169 1.170 #---------------" 1.171 # check section 1.172 @@ -128,20 +128,20 @@ 1.173 local version 1.174 # search for tazinst 1.175 if ! [ -x /usr/sbin/tazinst ] ; then 1.176 - printf "$(gettext "Error 2: ") 1.177 -$(gettext "The lightweight SliTaz HDD installer 'tazinst' is missing. 1.178 -Check permissions, or reinstall the slitaz-tools package.")\n" 1.179 - exit 2 1.180 + _ 'Error 2:' 1.181 + _ "The lightweight SliTaz HDD installer '%s' is missing." 'tazinst' 1.182 + _ 'Check permissions, or reinstall the %s package.' 'slitaz-installer' 1.183 + newline; exit 2 1.184 fi 1.185 # check version 1.186 version=$(tazinst version | tr -d '[:alpha:]') 1.187 if ! (echo "$version" | awk -v req="$TAZINST_REQUIRED_VERSION" ' 1.188 {ver=$0+0}{ if (ver < req) exit 1}') ; then 1.189 - printf "$(gettext "Error 2: ") 1.190 -$(gettext "The lightweight SliTaz HDD installer tazinst ($version) is not 1.191 -at the required version ($TAZINST_REQUIRED_VERSION), use tazinst in an xterm or 1.192 -reinstall the slitaz-tools package.")\n" 1.193 - exit 2 1.194 + _ 'Error 2:' 1.195 + _ 'The lightweight SliTaz HDD installer tazinst (%s) is not at the required version (%s).' \ 1.196 + "$version" "$TAZINST_REQUIRED_VERSION" 1.197 + _ 'Use %s in an xterm or reinstall the %s package.' 'tazinst' 'slitaz-installer' 1.198 + newline; exit 2 1.199 fi 1.200 } 1.201 1.202 @@ -157,7 +157,7 @@ 1.203 mode) 1.204 printf "$MODE_MSG" ;; 1.205 media) 1.206 - printf "$MEDIA_MSG" ;; 1.207 + printf "$MEDIA_MSG" ;; 1.208 source) 1.209 local media="$(tazinst get media)" 1.210 case "$media" in 1.211 @@ -172,8 +172,8 @@ 1.212 esac ;; 1.213 root_uuid) 1.214 local mode="$(tazinst get mode)" 1.215 - [ "$mode" = "upgrade" ] && printf "$ROOT_UUID_UPGRADE_MSG" \ 1.216 - || printf "$ROOT_UUID_DEFAULT_MSG" ;; 1.217 + if [ "$mode" == 'upgrade' ]; then printf "$ROOT_UUID_UPGRADE_MSG"; 1.218 + else printf "$ROOT_UUID_DEFAULT_MSG"; fi ;; 1.219 root_format|home_format) 1.220 printf "$ROOT_FORMAT_MSG" ;; 1.221 home_uuid) 1.222 @@ -265,44 +265,44 @@ 1.223 case "$option" in 1.224 mode) 1.225 local mode="$(tazinst get mode)" 1.226 - printf "\n\n$(gettext "Mode"): " 1.227 - printf "$(tazinst help mode | grep "$mode")" ;; 1.228 + printf "\n\n$(_ 'Mode: %s')" \ 1.229 + "$(tazinst help mode | grep "$mode")" ;; 1.230 media) 1.231 - printf "\n$(gettext "From media"): $(tazinst get media)" ;; 1.232 + printf "\n$(_ 'From media: %s')" "$(tazinst get media)" ;; 1.233 source) 1.234 local source="$(tazinst get source)" 1.235 [ -n "$source" ] && printf " ($source)" ;; 1.236 root_uuid) 1.237 - printf "\n$(gettext "To the disk"): $(tazinst get root_uuid)" ;; 1.238 + printf "\n$(_ 'To the disk: %s')" "$(tazinst get root_uuid)" ;; 1.239 root_format) 1.240 local root_format="$(tazinst get root_format)" 1.241 - [ -n "$root_format" ] \ 1.242 - && printf " $(gettext "(Formatting as"): $root_format)" \ 1.243 - || printf " $(gettext "(No formatting)")" ;; 1.244 + if [ -n "$root_format" ]; 1.245 + then printf " $(_ '(Formatting as %s)' "$root_format")"; 1.246 + else printf " $(_ '(No formatting)')"; fi ;; 1.247 home_uuid) 1.248 local home_uuid="$(tazinst get home_uuid)" 1.249 - [ -n "$home_uuid" ] \ 1.250 - && printf "\n$(gettext "Separate /home is"): $home_uuid" \ 1.251 - || printf "\n$(gettext "No separate /home partition")" ;; 1.252 + if [ -n "$home_uuid" ]; 1.253 + then printf "\n$(_ 'Separate /home is: %s' "$home_uuid")"; 1.254 + else printf "\n$(_ 'No separate /home partition')"; fi ;; 1.255 home_format) 1.256 local home_format="$(tazinst get home_format)" 1.257 - [ -n "$home_uuid" ] && ([ -n "$home_format" ] \ 1.258 - && printf " $(gettext "(Formatting as"): $home_format)" \ 1.259 - || printf " $(gettext "(No /home formatting)")";) ;; 1.260 + if [ -n "$home_uuid" ]; then if [ -n "$home_format" ]; 1.261 + then printf " $(_ '(Formatting as %s)' "$home_format")"; 1.262 + else printf " $(_ '(No /home formatting)')"; fi; fi ;; 1.263 hostname) 1.264 - printf "\nHostname: $(tazinst get hostname)" ;; 1.265 + printf "\n$(_ 'Hostname: %s' "$(tazinst get hostname)")" ;; 1.266 user_login) 1.267 - printf "\n$(gettext "User login"): $(tazinst get user_login)" ;; 1.268 + printf "\n$(_ 'User login: %s' "$(tazinst get user_login)")" ;; 1.269 bootloader) 1.270 local bootloader="$(tazinst get bootloader)" 1.271 - [ -n "$bootloader" ] \ 1.272 - && printf "\n$(gettext "Bootloader: installed")" \ 1.273 - || printf "\n$(gettext "No bootloader installed")" ;; 1.274 + if [ -n "$bootloader" ]; 1.275 + then printf "\n$(_ 'Bootloader: installed')"; 1.276 + else printf "\n$(_ 'No bootloader installed')"; fi ;; 1.277 winboot) 1.278 local winboot="$(tazinst get winboot)" 1.279 - [ -n "$winboot" ] \ 1.280 - && printf "$(gettext ", with Windows dual-boot")" \ 1.281 - || printf "$(gettext ", no dual-boot")" ;; 1.282 + if [ -n "$winboot" ]; 1.283 + then printf "$(_ ", with Windows dual-boot")"; 1.284 + else printf "$(_ ", no dual-boot")"; fi ;; 1.285 esac 1.286 done 1.287 } 1.288 @@ -319,11 +319,11 @@ 1.289 trap "rm -f $tempfile ; exit 1" $sighup $sigint $sigquit 1.290 "$DIALOG" \ 1.291 --clear --colors \ 1.292 - --title " Select $option " \ 1.293 + --title " $(_ 'Select %s' "$option") " \ 1.294 --backtitle "$BACKLIST" \ 1.295 --default-item "$(tazinst get "$option")" \ 1.296 - --ok-label "$(gettext "Next")" \ 1.297 - --cancel-label "$(gettext "Back")" \ 1.298 + --ok-label "$(_ 'Next')" \ 1.299 + --cancel-label "$(_ 'Back')" \ 1.300 --menu "$(msg $option)" 18 70 6 $items 2> "$tempfile" 1.301 retval="$?" 1.302 choice=$(cat "$tempfile") 1.303 @@ -333,7 +333,7 @@ 1.304 # a '$choice' was selected 1.305 tazinst set "$option" "$choice" && move up || \ 1.306 "$DIALOG" \ 1.307 - --title " Select $option " --clear \ 1.308 + --title " $(_ 'Select %s' "$option") " --clear \ 1.309 --msgbox "\n$(tazinst check "$option" 2>&1)" 10 41 ;; 1.310 1|255) 1.311 # voluntary exit or ESC pressed 1.312 @@ -347,11 +347,11 @@ 1.313 local option="$1" 1.314 "$DIALOG" \ 1.315 --clear --colors \ 1.316 - --title " Select $option " \ 1.317 + --title " $(_ 'Select %s' "$option") " \ 1.318 --backtitle "$BACKLIST" \ 1.319 - --ok-label "$(gettext "Yes")" \ 1.320 - --cancel-label "$(gettext "Back")" \ 1.321 - --extra-button --extra-label "$(gettext "No")" \ 1.322 + --ok-label "$(_ 'Yes')" \ 1.323 + --cancel-label "$(_ 'Back')" \ 1.324 + --extra-button --extra-label "$(_ 'No')" \ 1.325 --yesno "$(ask $option)" 18 70 1.326 retval="$?" 1.327 case "$retval" in 1.328 @@ -375,9 +375,9 @@ 1.329 trap "rm -f $tempfile; exit 1" $sighup $sigint $sigquit 1.330 $DIALOG \ 1.331 --clear --colors \ 1.332 - --title " Select $option " \ 1.333 - --ok-label "$(gettext "Next")" \ 1.334 - --cancel-label "$(gettext "Back")" \ 1.335 + --title " $(_ 'Select %s' "$option") " \ 1.336 + --ok-label "$(_ 'Next')" \ 1.337 + --cancel-label "$(_ 'Back')" \ 1.338 --inputbox "$(msg $option)" 16 51 "$value" 2> "$tempfile" 1.339 retval="$?" 1.340 choice="$(cat $tempfile)" 1.341 @@ -388,7 +388,7 @@ 1.342 retcode=$? 1.343 [ "$retcode" -gt "0" ] && \ 1.344 "$DIALOG" \ 1.345 - --title " Select $option " --clear \ 1.346 + --title " $(_ 'Select %s' "$option") " --clear \ 1.347 --msgbox "\n$(tazinst check "$option" 2>&1)" 10 41 1.348 # continue if no error (0) or only warning (>127) 1.349 [ "$retcode" -le "0" ] && move up 1.350 @@ -406,17 +406,17 @@ 1.351 { 1.352 "$DIALOG" \ 1.353 --clear --colors \ 1.354 - --title " Summary " \ 1.355 + --title " $(_ 'Summary') " \ 1.356 --backtitle "$BACKLIST" \ 1.357 - --yes-label "$(gettext "Yes")" \ 1.358 - --no-label "$(gettext "No")" \ 1.359 + --yes-label "$(_ 'Yes')" \ 1.360 + --no-label "$(_ 'No')" \ 1.361 --yesno "$(ask summary)$(summary_list)" 18 70 1.362 retval="$?" 1.363 case "$retval" in 1.364 0) # yes 1.365 move up ;; 1.366 1) # Cancel 1.367 - gettext "SliTaz install cancelled."; echo 1.368 + _ 'SliTaz install cancelled.'; echo 1.369 exit 1 ;; 1.370 3) # no 1.371 return 3 ;; 1.372 @@ -564,16 +564,16 @@ 1.373 } 1.374 END{ 1.375 print "XXX" 1.376 - }' | $DIALOG --title "SliTaz-Installer" --gauge "Installing.." 20 70 0 1.377 + }' | $DIALOG --title " $(_ 'SliTaz Installer') " --gauge "$(_ 'Installing...')" 20 70 0 1.378 1.379 1.380 # end_of_install 1.381 if tazinst log | grep -q "x-x-" ; then 1.382 tazinst clean 1.383 - $DIALOG --title " Installation complete " \ 1.384 + $DIALOG --title " $(_ 'Installation complete') " \ 1.385 --backtitle "$BACKLIST" \ 1.386 - --yes-label "Exit" \ 1.387 - --no-label "Reboot" \ 1.388 + --yes-label "$(_ 'Exit')" \ 1.389 + --no-label "$(_ 'Reboot')" \ 1.390 --clear --colors --yesno "$END_OF_INSTALL_MSG" 18 70 1.391 retval=$? 1.392 case $retval in 1.393 @@ -582,10 +582,10 @@ 1.394 1) 1.395 reboot || reboot -f ;; 1.396 255) 1.397 - echo -e "ESC pressed.\n" && exit 0 ;; 1.398 + _ 'ESC pressed.'; newline; exit 0 ;; 1.399 esac 1.400 else 1.401 - $DIALOG --title " Process not completed " \ 1.402 + $DIALOG --title " $(_ 'Process not completed') " \ 1.403 --backtitle "$BACKLIST" \ 1.404 --clear --msgbox \ 1.405 "$(tazinst log | awk '$1 == "-x-x-",$1 == "x-x-x"')" 18 70 1.406 @@ -594,6 +594,6 @@ 1.407 0) 1.408 exit 0 ;; 1.409 255) 1.410 - echo -e "ESC pressed.\n" && exit 0 ;; 1.411 + _ 'ESC pressed.'; newline; exit 0 ;; 1.412 esac 1.413 fi