diff -r a33a2bdd8299 -r e44baadd4958 mainwindow.cpp
--- a/mainwindow.cpp Tue Aug 30 14:09:19 2005 +0000
+++ b/mainwindow.cpp Thu Sep 01 15:35:18 2005 +0000
@@ -794,11 +794,11 @@
QAction *a;
- a = new QAction( tr( "Set application to open pdf files"), QPixmap(), tr( "Set application to open pdf files")+QString("...") , 0, this, "setPDF" );
+ a = new QAction( tr( "Set application to open pdf files"), QPixmap(), tr( "Set application to open pdf files ...") , 0, this, "setPDF" );
connect( a, SIGNAL( activated() ), this, SLOT( settingsPDF() ) );
a->addTo( menu );
- a = new QAction( tr( "Set application to open external links"), QPixmap(), tr( "Set application to open external links")+QString("..."), 0, this, "setURL" );
+ a = new QAction( tr( "Set application to open external links"), QPixmap(), tr( "Set application to open external links..."), 0, this, "setURL" );
connect( a, SIGNAL( activated() ), this, SLOT( settingsURL() ) );
a->addTo( menu );
@@ -1057,8 +1057,7 @@
if (!eList.isEmpty())
{
QMessageBox mb( "VYM",
- tr("The directory ") + dir +
- tr(" is not empty. Do you risk to overwrite its contents?"),
+ tr("The directory %1 is not empty.\nDo you risk to overwrite its contents?").arg(dir),
QMessageBox::Warning,
QMessageBox::Yes ,
QMessageBox::Cancel | QMessageBox::Default,
@@ -1163,10 +1162,10 @@
{
// Already there, ask for confirmation
QMessageBox mb( "VYM",
- tr("The map ") + fn + tr ("\n is already opened."
+ tr("The map %1\nis already opened."
"Opening the same map in multiple editors may lead \n"
"to confusion when finishing working with vym."
- "Do you want to"),
+ "Do you want to").arg(fn),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::Cancel | QMessageBox::Escape,
@@ -1211,7 +1210,7 @@
if (!QFile(fn).exists() )
{
QMessageBox mb( "VYM",
- tr("This map does not exist:\n ")+fn+tr("\nDo you want to create a new one?"),
+ tr("This map does not exist:\n %1\nDo you want to create a new one?").arg(fn),
QMessageBox::Question,
QMessageBox::Yes ,
QMessageBox::Cancel | QMessageBox::Default,
@@ -1446,11 +1445,10 @@
if (!saveZipped)
{
QMessageBox mb( "VYM",
- tr("The map ") + fn +
- tr ("\ndid not use the compressed "
+ tr("The map %1\ndid not use the compressed "
"vym file format.\nWriting it uncompressed will also write images \n"
"and flags and thus may overwrite files in the "
- "given directory\n\nDo you want to write the map"),
+ "given directory\n\nDo you want to write the map").arg(fn),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No ,
@@ -1551,13 +1549,13 @@
if (err==success)
{
statusBar()->message(
- tr("Saved")+" " + me->getFilePath(),
+ tr("Saved %1").arg(me->getFilePath()),
statusbarTime );
lastMaps.prepend(me->getFilePath() );
setupLastMapsMenu();
} else
statusBar()->message(
- tr("Couldn't save")+" " + me->getFilePath(),
+ tr("Couldn't save ").arg(me->getFilePath()),
statusbarTime );
}
@@ -1583,7 +1581,7 @@
if (QFile (fn).exists())
{
QMessageBox mb( "VYM",
- tr("The file ") + fn + tr ("\nexists already. Do you want to"),
+ tr("The file %1\nexists already. Do you want to").arg(fn),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::Cancel | QMessageBox::Escape,
@@ -1712,7 +1710,7 @@
{
currentMapEditor()->exportImage(fn,item);
} else {
- statusBar()->message( tr("Couldn't save") + fn, statusbarTime );
+ statusBar()->message( tr("Couldn't save %1").arg(fn), statusbarTime );
}
}
}
@@ -1730,8 +1728,7 @@
if (currentMapEditor()->hasChanged())
{
QMessageBox mb( "VYM",
- tr("The map ") + currentMapEditor()->getFileName() +
- tr(" has been modified but not saved yet. Do you want to"),
+ tr("The map %1 has been modified but not saved yet. Do you want to").arg(currentMapEditor()->getFileName()),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No,
@@ -1864,8 +1861,7 @@
} else
{
QMessageBox::information( findWindow, tr( "VYM -Information:" ),
- tr("No matches found for ")+
- ""+s+"");
+ tr("No matches found for %1").arg(s));
}
}
@@ -1923,7 +1919,7 @@
{
if (!QFile(currentVymLink).exists() )
QMessageBox::critical( 0, tr( "Critical Error" ),
- tr("Couldn't open map " +currentVymLink)+".");
+ tr("Couldn't open map %1").arg(currentVymLink));
else
{
fileLoad (currentVymLink, NewMap);