diff --git a/levels/gen_levels_xml.sh b/levels/gen_levels_xml.sh
index 87029431..e0c89a55 100755
--- a/levels/gen_levels_xml.sh
+++ b/levels/gen_levels_xml.sh
@@ -32,8 +32,8 @@ for lang in $lang_short; do
 	for key in Title Resume ScriptName; do
 		for subkey in text resume; do
 			subval=$(grep "^$key.$lang.*$subkey" $levelfileorig | sed -e "s/^.*$subkey=\"\([^\"]*\)\".*$/\1/")
-			echo "<${key}_$subkey>$subval</${key}_$subkey>" >> $destfile
-			echo "<p type=\"$key $subkey\"><!-- $key ($subkey) -->$subval</p>" >> $allsfile
+			echo "<${key}_$subkey>$levelfile:$subval</${key}_$subkey>" >> $destfile
+			echo "<p type=\"$key $subkey\">$levelfile:$subval</p>" >> $allsfile
 		done
 	done
 	echo "</$levelfile>" >> $destfile
@@ -77,13 +77,14 @@ echo -n "* Generate translation files: "
 for lang in $lang_long; do
 	if [ $lang = "en" ]; then continue; fi;
 	echo -n "$lang"
-	echo "</body></html>" >> $allsfile_c.fr.$allsfile_e
+	echo "</body></html>" >> $allsfile_c.$lang.$allsfile_e
 	pofile=po/$lang.po
 	if [ ! -f $pofile ]; then
-		po4a-gettextize -M UTF-8 -L UTF-8 -f xhtml -m levels.xhtml -l levels.$lang.xhtml > $pofile 2>/dev/null
+		po4a-gettextize -M UTF-8 -L UTF-8 -f xhtml -m levels.xhtml -l levels.$lang.xhtml > $pofile
 		sed -e 's/, fuzzy//g' -i $pofile
+	else
+		po4a-updatepo -M UTF-8 -f xhtml -m levels.xhtml -p $pofile 2>/dev/null
 	fi
-	po4a-updatepo -M UTF-8 -f xhtml -m levels.xhtml -p $pofile 2>/dev/null
 done
 echo " done"
 
@@ -106,7 +107,7 @@ for levelfile in $(ls *.txt); do
 			for key in Title Resume ScriptName; do
 				lineend=""
 				for subkey in text resume; do
-					keyval=$(grep "^<${key}_${subkey}>" $xmlfile | sed -e "s|^<${key}\_${subkey}>\(.*\)<\/${key}\_${subkey}>$|\1|g")
+					keyval=$(grep "^<${key}_${subkey}>" $xmlfile | sed -e "s|^<${key}\_${subkey}>${rootfilename}:\(.*\)<\/${key}\_${subkey}>$|\1|g")
 					if [ -n "$keyval" ]; then
 						lineend="$lineend $subkey=\"$keyval\""
 					fi