1.1 --- a/mainwindow.cpp Tue Aug 30 14:09:19 2005 +0000
1.2 +++ b/mainwindow.cpp Thu Sep 01 15:35:18 2005 +0000
1.3 @@ -794,11 +794,11 @@
1.4 QAction *a;
1.5
1.6
1.7 - a = new QAction( tr( "Set application to open pdf files"), QPixmap(), tr( "Set application to open pdf files")+QString("...") , 0, this, "setPDF" );
1.8 + a = new QAction( tr( "Set application to open pdf files"), QPixmap(), tr( "Set application to open pdf files ...") , 0, this, "setPDF" );
1.9 connect( a, SIGNAL( activated() ), this, SLOT( settingsPDF() ) );
1.10 a->addTo( menu );
1.11
1.12 - a = new QAction( tr( "Set application to open external links"), QPixmap(), tr( "Set application to open external links")+QString("..."), 0, this, "setURL" );
1.13 + a = new QAction( tr( "Set application to open external links"), QPixmap(), tr( "Set application to open external links..."), 0, this, "setURL" );
1.14 connect( a, SIGNAL( activated() ), this, SLOT( settingsURL() ) );
1.15 a->addTo( menu );
1.16
1.17 @@ -1057,8 +1057,7 @@
1.18 if (!eList.isEmpty())
1.19 {
1.20 QMessageBox mb( "VYM",
1.21 - tr("The directory ") + dir +
1.22 - tr(" is not empty. Do you risk to overwrite its contents?"),
1.23 + tr("The directory %1 is not empty.\nDo you risk to overwrite its contents?").arg(dir),
1.24 QMessageBox::Warning,
1.25 QMessageBox::Yes ,
1.26 QMessageBox::Cancel | QMessageBox::Default,
1.27 @@ -1163,10 +1162,10 @@
1.28 {
1.29 // Already there, ask for confirmation
1.30 QMessageBox mb( "VYM",
1.31 - tr("The map ") + fn + tr ("\n is already opened."
1.32 + tr("The map %1\nis already opened."
1.33 "Opening the same map in multiple editors may lead \n"
1.34 "to confusion when finishing working with vym."
1.35 - "Do you want to"),
1.36 + "Do you want to").arg(fn),
1.37 QMessageBox::Warning,
1.38 QMessageBox::Yes | QMessageBox::Default,
1.39 QMessageBox::Cancel | QMessageBox::Escape,
1.40 @@ -1211,7 +1210,7 @@
1.41 if (!QFile(fn).exists() )
1.42 {
1.43 QMessageBox mb( "VYM",
1.44 - tr("This map does not exist:\n ")+fn+tr("\nDo you want to create a new one?"),
1.45 + tr("This map does not exist:\n %1\nDo you want to create a new one?").arg(fn),
1.46 QMessageBox::Question,
1.47 QMessageBox::Yes ,
1.48 QMessageBox::Cancel | QMessageBox::Default,
1.49 @@ -1446,11 +1445,10 @@
1.50 if (!saveZipped)
1.51 {
1.52 QMessageBox mb( "VYM",
1.53 - tr("The map ") + fn +
1.54 - tr ("\ndid not use the compressed "
1.55 + tr("The map %1\ndid not use the compressed "
1.56 "vym file format.\nWriting it uncompressed will also write images \n"
1.57 "and flags and thus may overwrite files in the "
1.58 - "given directory\n\nDo you want to write the map"),
1.59 + "given directory\n\nDo you want to write the map").arg(fn),
1.60 QMessageBox::Warning,
1.61 QMessageBox::Yes | QMessageBox::Default,
1.62 QMessageBox::No ,
1.63 @@ -1551,13 +1549,13 @@
1.64 if (err==success)
1.65 {
1.66 statusBar()->message(
1.67 - tr("Saved")+" " + me->getFilePath(),
1.68 + tr("Saved %1").arg(me->getFilePath()),
1.69 statusbarTime );
1.70 lastMaps.prepend(me->getFilePath() );
1.71 setupLastMapsMenu();
1.72 } else
1.73 statusBar()->message(
1.74 - tr("Couldn't save")+" " + me->getFilePath(),
1.75 + tr("Couldn't save ").arg(me->getFilePath()),
1.76 statusbarTime );
1.77 }
1.78
1.79 @@ -1583,7 +1581,7 @@
1.80 if (QFile (fn).exists())
1.81 {
1.82 QMessageBox mb( "VYM",
1.83 - tr("The file ") + fn + tr ("\nexists already. Do you want to"),
1.84 + tr("The file %1\nexists already. Do you want to").arg(fn),
1.85 QMessageBox::Warning,
1.86 QMessageBox::Yes | QMessageBox::Default,
1.87 QMessageBox::Cancel | QMessageBox::Escape,
1.88 @@ -1712,7 +1710,7 @@
1.89 {
1.90 currentMapEditor()->exportImage(fn,item);
1.91 } else {
1.92 - statusBar()->message( tr("Couldn't save") + fn, statusbarTime );
1.93 + statusBar()->message( tr("Couldn't save %1").arg(fn), statusbarTime );
1.94 }
1.95 }
1.96 }
1.97 @@ -1730,8 +1728,7 @@
1.98 if (currentMapEditor()->hasChanged())
1.99 {
1.100 QMessageBox mb( "VYM",
1.101 - tr("The map ") + currentMapEditor()->getFileName() +
1.102 - tr(" has been modified but not saved yet. Do you want to"),
1.103 + tr("The map %1 has been modified but not saved yet. Do you want to").arg(currentMapEditor()->getFileName()),
1.104 QMessageBox::Warning,
1.105 QMessageBox::Yes | QMessageBox::Default,
1.106 QMessageBox::No,
1.107 @@ -1864,8 +1861,7 @@
1.108 } else
1.109 {
1.110 QMessageBox::information( findWindow, tr( "VYM -Information:" ),
1.111 - tr("No matches found for ")+
1.112 - "<b>"+s+"</b>");
1.113 + tr("No matches found for <b>%1</b>").arg(s));
1.114 }
1.115 }
1.116
1.117 @@ -1923,7 +1919,7 @@
1.118 {
1.119 if (!QFile(currentVymLink).exists() )
1.120 QMessageBox::critical( 0, tr( "Critical Error" ),
1.121 - tr("Couldn't open map " +currentVymLink)+".");
1.122 + tr("Couldn't open map %1").arg(currentVymLink));
1.123 else
1.124 {
1.125 fileLoad (currentVymLink, NewMap);