diff --git a/checkout b/checkout
index 6a5f068..c4767e3 100755
--- a/checkout
+++ b/checkout
@@ -17,104 +17,97 @@
 source `dirname $0`/ths-variables
 
 if [ ! -f $THS ]; then
-	echo "Please enter your language code (Default: lt):"
-	read lcode
-	if [ ! "$lcode" ]; then
-		lcode="lt"
-	fi
-	echo lcode="$lcode" >> $THS
+    echo "Please enter your language code (Default: lt):"
+    read lcode
+    if [ ! "$lcode" ]; then
+	lcode="lt"
+    fi
+    echo lcode="$lcode" >> $THS
 
-	echo "Enter path for stable templates (Default: `pwd`/pot-stable/):"
-	read potstable
-	if [ ! "$potstable" ]; then
-		potstable="pot-stable/"
-	fi
-	echo potstable="$potstable" >> $THS
+    echo "Enter path for stable templates (Default: `pwd`/pot-stable/):"
+    read potstable
+    if [ ! "$potstable" ]; then
+	potstable="pot-stable/"
+    fi
+    echo potstable="$potstable" >> $THS
 
-	echo "Enter path for trunk templates (Default: `pwd`/pot-trunk/):"
-	read pottrunk
-	if [ ! "$pottrunk" ]; then
-		pottrunk="pot-trunk/"
-	fi
-	echo pottrunk="$pottrunk" >> $THS
+    echo "Enter path for trunk templates (Default: `pwd`/pot-trunk/):"
+    read pottrunk
+    if [ ! "$pottrunk" ]; then
+	pottrunk="pot-trunk/"
+    fi
+    echo pottrunk="$pottrunk" >> $THS
 
-	echo "Enter path for stable messages (Default: `pwd`/stable/):"
-	read postable
-	if [ ! "$postable" ]; then
-		postable="stable/"
-	fi
-	echo postable="$postable" >> $THS
+    echo "Enter path for stable messages (Default: `pwd`/stable/):"
+    read postable
+    if [ ! "$postable" ]; then
+	postable="stable/"
+    fi
+    echo postable="$postable" >> $THS
 
-	echo "Enter path for trunk messages (Default: `pwd`/pot-trunk/):"
-	read potrunk
-	if [ ! "$potrunk" ]; then
-		potrunk="trunk/"
-	fi
-	echo potrunk="$potrunk" >> $THS
+    echo "Enter path for trunk messages (Default: `pwd`/pot-trunk/):"
+    read potrunk
+    if [ ! "$potrunk" ]; then
+	potrunk="trunk/"
+    fi
+    echo potrunk="$potrunk" >> $THS
 
-	while [ ! "$documentation" = "n" ] && [ ! "$documentation" = "y" ]; do
-		echo "Do you want to checkout documentation messages and templates? [y/N]"
-		read documentation
-		documentation=`echo $documentation | tr YN yn`
-		if [ ! $documentation ]; then
-			documentation="n"
-		fi
+    while [ ! "$documentation" = "n" ] && [ ! "$documentation" = "y" ]; do
+	echo "Do you want to checkout documentation messages and templates? [y/N]"
+	read documentation
+	documentation=`echo $documentation | tr YN yn`
+	if [ ! $documentation ]; then
+	    documentation="n"
+	fi
 	done
 	echo documentation="$documentation" >> $THS
 
 	if [ "$documentation" = "y" ]; then
-		echo "Enter path for documentation stable templates (Default: `pwd`/doc-pot-stable/):"
-		read docpotstable
+	    echo "Enter path for documentation stable templates (Default: `pwd`/doc-pot-stable/):"
+	    read docpotstable
 		if [ ! "$docpotstable" ]; then
-			docpotstable="doc-pot-stable/"
+		    docpotstable="doc-pot-stable/"
 		fi
 		echo docpotstable="$docpotstable" >> $THS
 
 		echo "Enter path for documentation trunk templates (Default: `pwd`/doc-pot-trunk/):"
 		read docpottrunk
 		if [ ! "$docpottrunk" ]; then
-			docpottrunk="doc-pot-trunk/"
+		    docpottrunk="doc-pot-trunk/"
 		fi
 		echo docpottrunk="$docpottrunk" >> $THS
 
 		echo "Enter path for documentation stable messages (Default: `pwd`/doc-stable/):"
 		read docstable
 		if [ ! "$docstable" ]; then
-			docstable="doc-stable/"
+		    docstable="doc-stable/"
 		fi
 		echo docstable="$docstable" >> $THS
 
 		echo "Enter path for documentation trunk messages (Default: `pwd`/doc-trunk/):"
 		read doctrunk
 		if [ ! "$doctrunk" ]; then
-			doctrunk="doc-trunk/"
+		    doctrunk="doc-trunk/"
 		fi
 		echo doctrunk="$doctrunk" >> $THS
 	fi
 
-	echo "Enter enter workspace prefix (Default: workspace):"
-	read workspace
-	if [ ! "$workspace" ]; then
-		workspace="workspace"
-	fi
-	echo workspace="$workspace" >> $THS
-
 	while [ ! "$svnwrite" = "n" ] && [ ! "$svnwrite" = "y" ]; do
-		echo "Do you have write access to KDE svn repository? [y/N]"
-		read svnwrite
-		svnwrite=`echo $svnwrite | tr YN yn`
-		if [ ! $svnwrite ]; then
-			svnwrite="n"
-		fi
+	    echo "Do you have write access to KDE svn repository? [y/N]"
+	    read svnwrite
+	    svnwrite=`echo $svnwrite | tr YN yn`
+	    if [ ! $svnwrite ]; then
+		svnwrite="n"
+	    fi
 	done
 	echo svnwrite="$svnwrite" >> $THS
 
 	if [ "$svnwrite" = "y" ]; then
-	    while [ "$username" ]; do
+	    while [ ! "$username" ]; do
 		echo "Please enter your username for KDE svn repository:"
 		read username
 	    done
-		echo username="$username" >> $THS
+	    echo username="$username" >> $THS
 	fi
 
 	# Checkout repositories.