Index: app/dist/common/utt_make_config.pl
===================================================================
--- app/dist/common/utt_make_config.pl	(revision d593c5e768abb663835cfc216a133cf5ce86c8c6)
+++ app/dist/common/utt_make_config.pl	(revision 389de9abcbd0bbec63c04912b2d253b58dc5145c)
@@ -12,4 +12,6 @@
 
 prepareUttUsrHome($usr_home);
+conf_utt(catfile($usr_home, 'utt.conf'), $sys_home);
+
 conf_cor(catfile($usr_home, 'cor.conf'), $sys_home);
 conf_grp(catfile($usr_home, 'grp.conf'), $sys_home);
@@ -17,5 +19,4 @@
 conf_lem(catfile($usr_home, 'lem.conf'), $sys_home);
 conf_ser(catfile($usr_home, 'ser.conf'), $sys_home);
-conf_utt(catfile($usr_home, 'utt.conf'), $sys_home);
 
 print "UTT user configuration created in $usr_home\n";
@@ -27,15 +28,17 @@
     my $dir = shift;
 
-	if(-d $dir) {
-		print "Old configuration will be deleted!\n";
-		my $cnt = unlink <$dir/*>;
-		print "$cnt files deleted.\n";
+    print "Preparing user configuration.\n";
+
+    if(-d $dir) {
+	print "Old configuration detected. ";
+	my $cnt = unlink <$dir/*>;
+	print "($cnt files deleted)\n";
+    }
+    else {
+	print "Creating directory $dir\n";
+	if(1 != mkdir $dir) {
+	    die "Unable to create UTT user configuration!\n";
 	}
-	else {
-		print "Creating directory $dir\n";
-		if(1 != mkdir $dir) {
-		  die "Unable to create UTT user configuration!\n";
-		}
-	}
+    }
 }
 
@@ -114,11 +117,38 @@
 	my $utt_file = shift;
 	my $utthome = shift;
+
+	my $lang = getUserLanguage(abs_path(catdir($utthome, "share/utt")));
+
   open(FILE, ">$utt_file");
 
   print FILE makeConfigHeader();
-  print FILE "# user locale\n";
-  print FILE "language=", findLocale(), "\n";
+  print FILE "# user locale (dictionary)\n";
+  print FILE "language=", $lang, "\n";
 
   close FILE;
+}
+
+sub getUserLanguage() {
+    my $dict_dir = shift;
+
+    print "Setup dictionaries.\n";
+    
+    opendir(DIR, $dict_dir) || die "Install dictionary first!\n";
+    @files = grep(/[^\.{1,2}]/ && -d "$dict_dir/$_", readdir(DIR));
+    closedir DIR;
+    my $cnt = scalar @files;
+    print "$cnt dictionary(ies) found.\n";
+    if(0 == $cnt) {
+	die("Install dictionary first!\n");
+    }
+
+    foreach my $file (@files) {
+	print "Do you select dictionary $file [yes/no]? ";
+	my $ans = <STDIN>;
+	if($ans =~ /y(es)?/i) {
+	    return $file;
+	}
+    }
+    die "No dictionary selected - setup failed!\n";
 }