diff --git a/archfi b/archfi
index 52e61fe..31eb053 100644
--- a/archfi
+++ b/archfi
@@ -12,7 +12,11 @@
 # referance : https://wiki.archlinux.org/index.php/Installation_guide
 
 
+<<<<<<< HEAD
 apptitle="Arch Linux Fast Install (archfi) - Version: 2016.03.30.21.44.09 (GPLv3)"
+=======
+apptitle="Arch Linux Fast Install (archfi) - Version: 2016.04.02.15.20.10 (GPLv3)"
+>>>>>>> src
 baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
 
 
@@ -940,7 +944,7 @@ archsetlocalechroot(){
 }
 
 archsettime(){
-  items=$(ls -l /mnt/usr/share/zoneinfo/ | grep '^d' | awk '{ print $9 }')
+  items=$(ls -l /mnt/usr/share/zoneinfo/ | grep '^d' | gawk -F':[0-9]* ' '/:/{print $2}')
   options=()
   for item in $items; do
     options+=("$item" "")
diff --git a/lng/Spanish b/lng/Spanish
index d3e6c09..d672ff7 100644
--- a/lng/Spanish
+++ b/lng/Spanish
@@ -7,7 +7,7 @@
 
 
 locale=es_ES.UTF-8
-#font=
+font=Lat2-Terminus16
 
 
 txtexit="Salir"
@@ -19,7 +19,7 @@ txtselectserver="Seleccione el servidor de fuentes"
 txtmainmenu="Menú Principal"
 txtlanguage="Lenguaje"
 txtsetkeymap="Disposición del teclado"
-#txteditor="Editor"
+txteditor="Editor"
 txtdiskpartmenu="Particionado de disco"
 txtselectpartsmenu="Seleccionar particiones e instalar"
 txthelp="Ayuda"