1.1 --- a/mapeditor.cpp	Tue Aug 30 14:09:19 2005 +0000
     1.2 +++ b/mapeditor.cpp	Thu Sep 01 15:35:18 2005 +0000
     1.3 @@ -1200,8 +1200,7 @@
     1.4  		if (QFile (fd->selectedFile()).exists() )
     1.5  		{
     1.6  			QMessageBox mb( "VYM",
     1.7 -				tr("The file ") + fd->selectedFile() + 
     1.8 -				tr(" exists already. Do you want to overwrite it?"),
     1.9 +				tr("The file %1 exists already.\nDo you want to overwrite it?").arg(fd->selectedFile()), 
    1.10  			QMessageBox::Warning,
    1.11  			QMessageBox::Yes | QMessageBox::Default,
    1.12  			QMessageBox::Cancel | QMessageBox::Escape,
    1.13 @@ -1240,7 +1239,7 @@
    1.14  	if ( !file.open( IO_WriteOnly ) )
    1.15  	{
    1.16  		// This should neverever happen
    1.17 -		QMessageBox::critical (0,tr("Critical Export Error"),tr("MapEditor::exportXML couldn't open ")+file.name());
    1.18 +		QMessageBox::critical (0,tr("Critical Export Error"),tr("MapEditor::exportXML couldn't open %1").arg(file.name()));
    1.19  		return;
    1.20  	}	
    1.21  
    1.22 @@ -1387,11 +1386,10 @@
    1.23  	} else	
    1.24  	{
    1.25  		QMessageBox::critical( 0, tr( "Critical Error" ),
    1.26 -			"Temporary directory " +bakMapDir + 
    1.27 -			tr (" used for undo is gone. \n"
    1.28 +			tr("Temporary directory %1 used for undo is gone. \n"
    1.29  			"I will create a new one, but at the moment no undo is available.\n"
    1.30  			"Maybe you want to reload your original data.\n\n"
    1.31 -			"Sorry for any inconveniences.") );
    1.32 +			"Sorry for any inconveniences.").arg(bakMapDir) );
    1.33  		makeTmpDirs();	
    1.34  	}							
    1.35  }
    1.36 @@ -2821,7 +2819,7 @@
    1.37  		fd->addFilter ("GIF (*.gif)");
    1.38  		fd->addFilter ("PNM (*.pnm)");
    1.39  		fd->addFilter (QString (tr("Images") + " (*.png *.bmp *.xbm *.jpg *.png *.xpm *.gif *.pnm)"));
    1.40 -		fd->setCaption(tr("vym - Save image as ") + fmt);
    1.41 +		fd->setCaption(tr("vym - Save image as %1").arg(fmt));
    1.42  		fd->setMode( QFileDialog::AnyFile );
    1.43  		fd->setSelection (fio->getOriginalFilename());
    1.44  		fd->show();
    1.45 @@ -2832,9 +2830,8 @@
    1.46  			if (QFile (fd->selectedFile()).exists() )
    1.47  			{
    1.48  				QMessageBox mb( "VYM",
    1.49 -					tr("The file ") + fd->selectedFile() + 
    1.50 -					tr(" exists already. "
    1.51 -					"Do you want to overwrite it?"),
    1.52 +					tr("The file %1 exists already.\n"
    1.53 +					"Do you want to overwrite it?").arg(fd->selectedFile()),
    1.54  				QMessageBox::Warning,
    1.55  				QMessageBox::Yes | QMessageBox::Default,
    1.56  				QMessageBox::Cancel | QMessageBox::Escape,
    1.57 @@ -2905,7 +2902,7 @@
    1.58  				bo->setColor (QColor("blue"),false);
    1.59  				bo->toggleScroll();
    1.60  				if ( !d.cd(fi->fileName()) ) 
    1.61 -					QMessageBox::critical (0,tr("Critical Import Error"),tr("Cannot find the directory"));
    1.62 +					QMessageBox::critical (0,tr("Critical Import Error"),tr("Cannot find the directory %1").arg(fi->fileName()));
    1.63  				else 
    1.64  				{
    1.65  					// Recursively add subdirs