[QGIS Commit] r10021 - trunk/qgis/src/app/composer

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-01-26 04:20:53 -0500 (Mon, 26 Jan 2009)
New Revision: 10021

Modified:
   trunk/qgis/src/app/composer/qgscomposer.cpp
Log:
reapply translation string changes lost with r10006

Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp	2009-01-26 09:11:22 UTC (rev 10020)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp	2009-01-26 09:20:53 UTC (rev 10021)
@@ -509,10 +509,8 @@
   if ( memuse > 200 )   // cca 4500 x 4500
   {
     int answer = QMessageBox::warning( 0, tr( "Big image" ),
-                                       tr( "To create image " ) + QString::number( width ) + " x "
-                                       + QString::number( height )
-                                       + tr( " requires circa " )
-                                       + QString::number( memuse ) + tr( " MB of memory" ),
+                                       tr( "To create image %1 x %2 requires circa %3 MB of memory" )
+                                       .arg( width ).arg( height ).arg( memuse ),
                                        QMessageBox::Ok,  QMessageBox::Abort );
 
     raise();
@@ -539,7 +537,8 @@
   for ( ; myCounterInt < QImageWriter::supportedImageFormats().count(); myCounterInt++ )
   {
     QString myFormat = QString( QImageWriter::supportedImageFormats().at( myCounterInt ) );
-    QString myFilter = myFormat + " " + tr( "format" ) + " (*." + myFormat.toLower() + " *." + myFormat.toUpper() + ")";
+    QString myFilter = tr( "%1 format (*.%2 *.%3)" )
+                       .arg( myFormat ).arg( myFormat.toLower() ).arg( myFormat.toUpper() );
 
     if ( myCounterInt > 0 ) myFilters += ";;";
     myFilters += myFilter;
@@ -638,22 +637,22 @@
     m->setCheckBoxVisible( true );
     m->setCheckBoxQSettingsLabel( myQSettingsLabel );
     m->setMessageAsHtml( tr( "<p>The SVG export function in Qgis has several "
-                             "problems due to bugs and deficiencies in the "
+                             "problems due to bugs and deficiencies in the " )
 #if QT_VERSION < 0x040300
-                             "Qt4 svg code. Of note, text does not "
-                             "appear in the SVG file and there are problems "
-                             "with the map bounding box clipping other items "
-                             "such as the legend or scale bar.</p>"
+                         + tr( "Qt4 svg code. Of note, text does not "
+                               "appear in the SVG file and there are problems "
+                               "with the map bounding box clipping other items "
+                               "such as the legend or scale bar.</p>" )
 #else
-                             "Qt4 svg code. In particular, there are problems "
-                             "with layers not being clipped to the map "
-                             "bounding box.</p>"
+                         + tr( "Qt4 svg code. In particular, there are problems "
+                               "with layers not being clipped to the map "
+                               "bounding box.</p>" )
 #endif
-                             "If you require a vector-based output file from "
-                             "Qgis it is suggested that you try printing "
-                             "to PostScript if the SVG output is not "
-                             "satisfactory."
-                             "</p>" ) );
+                         + tr( "If you require a vector-based output file from "
+                               "Qgis it is suggested that you try printing "
+                               "to PostScript if the SVG output is not "
+                               "satisfactory."
+                               "</p>" ) );
     m->exec();
   }
   QString myLastUsedFile = myQSettings.value( "/UI/lastSaveAsSvgFile", "qgis.svg" ).toString();