--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:27:16	2409
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:36:09	2414
@@ -108,36 +108,26 @@
 
 dialog_setup_hdd_info()
 {
-	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
+	local SHDD="${HDD//\/dev\/}"
 
-	dialog \
-	--colors \
-	--title "[ Festplatten Partitionierung ]" \
-	--backtitle "${TITLE}" \
-	--ok-label "Weiter" \
-	--msgbox "\nBitte legen Sie 1 Partition an.\n\n\
-		[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit dem gesamten Speicher\n\
-		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
+	messagebox -h $"[ Harddrive partitioning ]" \
+		$"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."
 }
 
 dialog_setup_hdd_info_auto()
 {
-	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
+	local SHDD="${HDD//\/dev\/}"
 
-	dialog \
-	--colors \
-	--title "[ Festplatten Partitionierung ]" \
-	--backtitle "${TITLE}" \
-	--ok-label "Weiter" \
-	--msgbox "\nAchtung!\n\
-		Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
+	messagebox -h $"[ Harddrive partitioning ]" \
+		$"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"
 }
 
 dialog_setup_system_menu()
 {
-	local i
+	local mode
+	local retval
 
-	i=$(dialog \
+	mode=$(dialog \
 	--backtitle "${TITLE}" \
 	--title "[ Festplatten Partitionierung ]" \
 	--cancel-label "Abbrechen" \
@@ -149,11 +139,11 @@
 	"" "" \
 	"" "\Z1Experten Modi:\Zn" \
 	"2" "Normale IDE-Disk (Manuell)" \
-	RES=$?
-	[[ ${RES} -eq 1 ]] && return 1
-	if [[ ${RES} -eq 0 ]]
+	retval=$?
+	[[ ${retval} -eq 1 ]] && return 1
+	if [[ ${retval} -eq 0 ]]
 	then
-		case "${i}" in
+		case "${menu}" in
 			"1") run_install_auto ;;
 			"2") run_install_normal ;;
 			"") dialog_setup_system_menu;;
@@ -225,7 +215,7 @@
 	fi
 }
 
-dialog_setup_hdd_partitions_manuell()
+dialog_setup_hdd_partitions_manual()
 {
 	local i
 
@@ -258,7 +248,7 @@
 		if [[ ${RES} -eq 0 ]]
 		then
 			dialog_setup_hdd_info
-			setup_hdd_partitions_manuell
+			setup_hdd_partitions_manual
 		fi
 	fi
 }
@@ -554,11 +544,11 @@
 	fi
 }
 
-setup_hdd_partitions_manuell()
+setup_hdd_partitions_manual()
 {
 	ROOTHDD="${HDD}1"
 
-	## hdds partitionieren manuell
+	## hdds partitionieren manual
 	cfdisk ${HDD} || dialog_die
 }
 
@@ -835,7 +825,7 @@
 {
 	dialog_hardware_detection
 
-	dialog_setup_hdd_partitions_manuell
+	dialog_setup_hdd_partitions_manual
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs