--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 20:49:22	2467
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/08 08:52:28	2472
@@ -7,8 +7,10 @@
 # Niels Rogalla <niro@magellan-linux.de>
 #
 
-# ignore the environment
-LC_ALL=C
+# setup locales
+TEXTDOMAIN=installer
+LC_MESSAGES=C
+
 # include dir
 INSTALLER_LIBDIR="%LIBDIR%"
 
@@ -113,7 +115,7 @@
 	local SHDD="${HDD//\/dev\/}"
 
 	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."
+		$"Please create 1 partition.\n\n[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace.\nPlease mark ${SHDD}1 \Z3bootable\Zn."
 }
 
 dialog_setup_hdd_info_auto()
@@ -180,7 +182,7 @@
 		zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
 		rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
 		maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
-		*) message+=$"\n \\ZnCommon device detected.\Zn" ;;
+		*) message+=$"\n\ZnCommon device detected.\Zn" ;;
 	esac
 	if [[ ${FORMFACTOR} = laptop ]]
 	then
@@ -253,7 +255,7 @@
 
 	while [[ ${method} -le 2 ]]
 	do
-		method=$(menubox $"Configuration:" \
+		method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \
 			$"1:Install system" \
 			$"2:Show detected harddrives" \
 			$"3:Exit and reboot" \