diff --git a/archinstall/archinstall.sh b/archinstall/archinstall.sh index 4273940..0874b3c 100755 --- a/archinstall/archinstall.sh +++ b/archinstall/archinstall.sh @@ -21,7 +21,7 @@ dialog --title "$titled" --msgbox "$msgd" 15 60 function fatalerror { razon=$1 -mostrardialog "Error fatal" "Ha occurrido un error fatal, la instalacion se va a detener \n Razon: $razon" +mostrardialog "Error" "$(T "An error has ocurred, setup will be stopped") $razon" exit } @@ -37,7 +37,7 @@ optpa=`dialog --stdout --nocancel --menu "$(T "¿Do you want to edit partitions? case $optpa in 1) #Abrir gparted grafico - mostrardialog "Gparted" "Se abrira Gparted. Con el puedes editar, borrar,añadir y poner a tu gusto graficamente las particiones. \n Recuerda que al menos debe haber una particion ext4 primaria para el sistema. \n (Nota: No monte ninguna particion)" + mostrardialog "Gparted" "$(T "Gparted will be opened. Help text")" startx;; 2) #Terminal @@ -207,7 +207,7 @@ fatalerror "$(T "Network connection error, please check it")" fi tput setaf 2 ; echo "$(T "Optimizing download")" ; tput setaf 9 reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist -tput setaf 2 ; echo "Descargando..." ; tput setaf 9 +tput setaf 2 ; echo "$(T "Downloading")" ; tput setaf 9 pacstrap -C /tmp/pacman.conf /mnt/ base btrfs-progs mkdir -p /mnt/root/inst/ wget https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/chrootinstall.sh -O /mnt/root/inst/chrootinstall.sh diff --git a/archinstall/chrootinstall.sh b/archinstall/chrootinstall.sh index fc11922..c8f121e 100755 --- a/archinstall/chrootinstall.sh +++ b/archinstall/chrootinstall.sh @@ -24,7 +24,7 @@ dialog --title "$titled" --msgbox "$msgd" 15 60 function fatalerror { razon=$1 -mostrardialog "Error fatal" "Ha occurrido un error fatal, la instalacion se va a detener \n Razon: $razon" +mostrardialog "Error" "$(T "An error has ocurred, setup will be stopped") $razon" exit } diff --git a/archinstall/translations.sh b/archinstall/translations.sh index 133078e..7cc12d9 100755 --- a/archinstall/translations.sh +++ b/archinstall/translations.sh @@ -52,6 +52,11 @@ case "$1" in "es") echo "ERROR: No tienes discos duros, no se puede continuar. Por favor enchufe/inserte un disco duro y reinicie. \n Al pulsar aceptar se reiniciara el sistema";; *) echo "ERROR: You dont have any HDD/SSD, setup can't continue. Plug-in some HDD/SSD and start again. When you press enter, computer will poweroff.";; esac;; + "An error has ocurred, setup will be stopped") + case $sclang in + "es") echo "A ocurrido un error, la instalacion se va a detener. Razon: ";; + *) echo "An error has ocurred, setup will be stopped.\nReason: ";; + esac;; "System configuration") case $sclang in "es") echo "Configuración de su sistema";; @@ -177,11 +182,22 @@ case "$1" in "es") echo "Optimizando la descarga...";; *) echo "${1}...";; esac;; + "Downloading") + case $sclang in + "es") echo "Descargando";; + *) echo "$1";; + esac;; "Installing system, this can take about 10 minutes, wait") case $sclang in - "es") echo "Espere...";; - *) echo "Instalando el sistema, esto puede tardar unos 10 minutos, espere hasta el siguiente aviso";; + "es") echo "Instalando el sistema, esto puede tardar unos 10 minutos, espere hasta el siguiente aviso";; + *) echo "$1";; esac;; + "Gparted will be opened. Help text") + case $sclang in + "es") echo "Se abrira Gparted. Con el puedes editar, borrar,añadir y poner a tu gusto graficamente las particiones. \n Recuerda que al menos debe haber una particion ext4 primaria para el sistema. \n (Nota: No monte ninguna particion)";; + *) echo "Gparted will be opened. With it, you can edit, erase, add, and modify partitions. \n Remember that,at least you have to have a root ext4 partition for JKArch.\n(Note: Do not mount any partition)";; + esac;; + *) echo "$1";; esac } \ No newline at end of file