diff --git a/archinstall/chrootinstall.sh b/archinstall/chrootinstall.sh index 16eaaf5..c0188c9 100755 --- a/archinstall/chrootinstall.sh +++ b/archinstall/chrootinstall.sh @@ -55,13 +55,13 @@ for addr in $(echo $langs | tr " " "\n") do varx+=" $addr $addr" done -varf="dialog --stdout --nocancel --menu \"$(T "Select language for keyboard and texts")\" 0 0 5 $varx" +varf="dialog --stdout --nocancel --menu \"$(T "Select language for JKArch")\" 0 0 5 $varx" opclang=`bash -c "$varf"` varx="" #Empty varx langabr=$(echo $opclang | cut -f1 -d"_") langinst=$(cat /etc/locale.gen | grep -m1 '^#'$opclang | cut -c2-40) -opt=`dialog --stdout --nocancel --menu "$(T "Your language:") $opclang" 0 0 4 1 "Es correcto" 2 "No, editar"` +opt=`dialog --stdout --nocancel --menu "$(T "Your language:") $opclang" 0 0 4 1 "$(T "It's right")" 2 "$(T "No,edit")"` case $opt in 2) opclang="";; esac @@ -78,7 +78,7 @@ clear echo "$(T "Now select your timezone for adjusting the clock")" while [[ $NEW_TIMEZONE == "" ]];do NEW_TIMEZONE=$(tzselect) -opt=`dialog --stdout --nocancel --menu "$(T "Your timezone:") $NEW_TIMEZONE" 0 0 4 1 "Es correcto" 2 "No, editar"` +opt=`dialog --stdout --nocancel --menu "$(T "Your timezone:") $NEW_TIMEZONE" 0 0 4 1 "$(T "It's right")" 2 "$(T "No,edit")"` case $opt in 2) NEW_TIMEZONE="";; esac @@ -249,14 +249,14 @@ case $opt9 in esac pacman -S $packages --noconfirm --needed if [[ $inswine = 1 ]];then - echo "$(T "Configuring wine for better experience (32 bit winearch)")" + echo "$(T "Configuring wine for better experience") (32 bit winearch)" su $nameuser -c "WINEARCH=win32 wineboot -u" fi packages="" } function baseconX { -tput setaf 2 ;echo "Instalando programas X y gráficos básicos, junto al entorno escogido. Esto puede tardar un rato, espere pacientemente" ; tput setaf 9 +tput setaf 2 ;echo "$(T "Installing desktop and basic programs, please wait")" ; tput setaf 9 sleep 2 pacman -S xorg-server xorg-xinit xorg-server-common xf86-input-libinput lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb udisks networkmanager network-manager-applet gnome-keyring xdialog --noconfirm pacman -S lxterminal ttf-inconsolata file-roller --noconfirm diff --git a/archinstall/translations.sh b/archinstall/translations.sh index 2de0f3c..a59d01b 100755 --- a/archinstall/translations.sh +++ b/archinstall/translations.sh @@ -199,7 +199,7 @@ case "$1" in esac;; "Setup finished, press enter to reboot.") case $sclang in - "es") echo "Instalación finalizada, al pulsar aceptar, se reiniciará el sistema";; + "es") echo "Instalación finalizada, al pulsar aceptar, se reiniciara el sistema";; *) echo "$1";; esac;; "Network connection error, please check it") @@ -207,9 +207,9 @@ case "$1" in "es") echo "Error de conexion con internet, compruebe la red";; *) echo "$1";; esac;; - "Select language from general to particular") + "Select language for JKArch") case $sclang in - "es") echo "Escoja su idioma. Se irá desde la abreviatura general, a la particular";; + "es") echo "Escoja su idioma para JKArch";; *) echo "$1";; esac;; "Wait") @@ -254,7 +254,7 @@ case "$1" in esac;; "Now select your timezone for adjusting the clock") case $sclang in - "es") echo "Ahora seleccione su ubicación/país para ajustar el reloj";; + "es") echo "Ahora seleccione su ubicacion/país para ajustar el reloj";; *) echo "$1";; esac;; "Enter how much memory you want to use for swap (MB)") @@ -274,7 +274,7 @@ case "$1" in esac;; "No new bootloader installed") case $sclang in - "es") echo "No se ha instalado ningún gestor de arranque en el sistema";; + "es") echo "No se ha instalado ningun gestor de arranque en el sistema";; *) echo "$1";; esac;; "Other configs") @@ -289,12 +289,12 @@ case "$1" in esac;; "Repeat password") case $sclang in - "es") echo "Repita la contraseña";; + "es") echo "Repita la contrasena";; *) echo "$1";; esac;; "Password for ") case $sclang in - "es") echo "Contraseña para ";; + "es") echo "Contrasena para ";; *) echo "$1";; esac;; "Installing packages") @@ -302,6 +302,31 @@ case "$1" in "es") echo "Instalando paquetes";; *) echo "$1";; esac;; + "Configuring wine for better experience") + case $sclang in + "es") echo "Configurando wine para una mejor experiencia";; + *) echo "$1";; + esac;; + "Installing desktop and basic programs, please wait") + case $sclang in + "es") echo "Instalando el entorno de escritorio y programas basicos, por favor espere";; + *) echo "$1";; + esac;; + "Your timezone:") + case $sclang in + "es") echo "Tu franja horaria:";; + *) echo "$1";; + esac;; + "No,edit") + case $sclang in + "es") echo "No, editar";; + *) echo "$1";; + esac;; + "Es correcto") + case $sclang in + "es") echo "It's right";; + *) echo "$1";; + esac;; *) echo "$1";; esac } \ No newline at end of file