diff -r a33a2bdd8299 -r e44baadd4958 mapeditor.cpp
--- a/mapeditor.cpp	Tue Aug 30 14:09:19 2005 +0000
+++ b/mapeditor.cpp	Thu Sep 01 15:35:18 2005 +0000
@@ -1200,8 +1200,7 @@
 		if (QFile (fd->selectedFile()).exists() )
 		{
 			QMessageBox mb( "VYM",
-				tr("The file ") + fd->selectedFile() + 
-				tr(" exists already. Do you want to overwrite it?"),
+				tr("The file %1 exists already.\nDo you want to overwrite it?").arg(fd->selectedFile()), 
 			QMessageBox::Warning,
 			QMessageBox::Yes | QMessageBox::Default,
 			QMessageBox::Cancel | QMessageBox::Escape,
@@ -1240,7 +1239,7 @@
 	if ( !file.open( IO_WriteOnly ) )
 	{
 		// This should neverever happen
-		QMessageBox::critical (0,tr("Critical Export Error"),tr("MapEditor::exportXML couldn't open ")+file.name());
+		QMessageBox::critical (0,tr("Critical Export Error"),tr("MapEditor::exportXML couldn't open %1").arg(file.name()));
 		return;
 	}	
 
@@ -1387,11 +1386,10 @@
 	} else	
 	{
 		QMessageBox::critical( 0, tr( "Critical Error" ),
-			"Temporary directory " +bakMapDir + 
-			tr (" used for undo is gone. \n"
+			tr("Temporary directory %1 used for undo is gone. \n"
 			"I will create a new one, but at the moment no undo is available.\n"
 			"Maybe you want to reload your original data.\n\n"
-			"Sorry for any inconveniences.") );
+			"Sorry for any inconveniences.").arg(bakMapDir) );
 		makeTmpDirs();	
 	}							
 }
@@ -2821,7 +2819,7 @@
 		fd->addFilter ("GIF (*.gif)");
 		fd->addFilter ("PNM (*.pnm)");
 		fd->addFilter (QString (tr("Images") + " (*.png *.bmp *.xbm *.jpg *.png *.xpm *.gif *.pnm)"));
-		fd->setCaption(tr("vym - Save image as ") + fmt);
+		fd->setCaption(tr("vym - Save image as %1").arg(fmt));
 		fd->setMode( QFileDialog::AnyFile );
 		fd->setSelection (fio->getOriginalFilename());
 		fd->show();
@@ -2832,9 +2830,8 @@
 			if (QFile (fd->selectedFile()).exists() )
 			{
 				QMessageBox mb( "VYM",
-					tr("The file ") + fd->selectedFile() + 
-					tr(" exists already. "
-					"Do you want to overwrite it?"),
+					tr("The file %1 exists already.\n"
+					"Do you want to overwrite it?").arg(fd->selectedFile()),
 				QMessageBox::Warning,
 				QMessageBox::Yes | QMessageBox::Default,
 				QMessageBox::Cancel | QMessageBox::Escape,
@@ -2905,7 +2902,7 @@
 				bo->setColor (QColor("blue"),false);
 				bo->toggleScroll();
 				if ( !d.cd(fi->fileName()) ) 
-					QMessageBox::critical (0,tr("Critical Import Error"),tr("Cannot find the directory"));
+					QMessageBox::critical (0,tr("Critical Import Error"),tr("Cannot find the directory %1").arg(fi->fileName()));
 				else 
 				{
 					// Recursively add subdirs