qgis · Mar 9, 2011
diff --git a/‎i18n/qgis_de.ts
Lines changed: 1218 additions & 1246 deletions b/‎i18n/qgis_de.ts
Lines changed: 1218 additions & 1246 deletions
diff --git a/‎src/providers/gdal/qgsgdalprovider.cpp
Lines changed: 4 additions & 8 deletions b/‎src/providers/gdal/qgsgdalprovider.cpp
Lines changed: 4 additions & 8 deletions
@@ -134,8 +134,7 @@ QgsGdalProvider::QgsGdalProvider( QString const & uri )
   if ( mGdalBaseDataset == NULL )
   {
     QMessageBox::warning( 0, QObject::tr( "Warning" ),
-                          QObject::tr( "Cannot open GDAL dataset " ) + uri + " : "
-                          + QString::fromUtf8( CPLGetLastErrorMsg() ) );
+                          QObject::tr( "Cannot open GDAL dataset %1: %2" ).arg( uri ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );
     return;
   }
 
@@ -179,8 +178,7 @@ QgsGdalProvider::QgsGdalProvider( QString const & uri )
   if ( myGDALBand == NULL )
   {
     QMessageBox::warning( 0, QObject::tr( "Warning" ),
-                          QObject::tr( "Cannot get GDAL raster band : " )
-                          + QString::fromUtf8( CPLGetLastErrorMsg() ) ) ;
+                          QObject::tr( "Cannot get GDAL raster band: %1" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );
 
     GDALDereferenceDataset( mGdalBaseDataset );
     mGdalBaseDataset = NULL;
@@ -546,8 +544,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle  const & theExtent,
   if ( !myGdalMemDataset )
   {
     QMessageBox::warning( 0, QObject::tr( "Warning" ),
-                          QObject::tr( "Cannot open GDAL MEM dataset " ) + myMemDsn + " : "
-                          + QString::fromUtf8( CPLGetLastErrorMsg() ) );
+                          QObject::tr( "Cannot open GDAL MEM dataset %1: %2" ).arg( myMemDsn ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );
     return;
   }
 
@@ -626,8 +623,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle  const & theExtent,
   if ( myErr != CPLE_None )
   {
     QMessageBox::warning( 0, QObject::tr( "Warning" ),
-                          QObject::tr( "Cannot ChunkAndWarpImage : " )
-                          + QString::fromUtf8( CPLGetLastErrorMsg() ) );
+                          QObject::tr( "Cannot ChunkAndWarpImage: %1" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );
     return;
   }
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,7 @@ QgsGdalProvider::QgsGdalProvider( QString const & uri )`
`134`	`134`	`if ( mGdalBaseDataset == NULL )`
`135`	`135`	`{`
`136`	`136`	`QMessageBox::warning( 0, QObject::tr( "Warning" ),`
`137`		`- QObject::tr( "Cannot open GDAL dataset " ) + uri + " : "`
`138`		`- + QString::fromUtf8( CPLGetLastErrorMsg() ) );`
	`137`	`+ QObject::tr( "Cannot open GDAL dataset %1: %2" ).arg( uri ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );`
`139`	`138`	`return;`
`140`	`139`	`}`
`141`	`140`
`@@ -179,8 +178,7 @@ QgsGdalProvider::QgsGdalProvider( QString const & uri )`
`179`	`178`	`if ( myGDALBand == NULL )`
`180`	`179`	`{`
`181`	`180`	`QMessageBox::warning( 0, QObject::tr( "Warning" ),`
`182`		`- QObject::tr( "Cannot get GDAL raster band : " )`
`183`		`- + QString::fromUtf8( CPLGetLastErrorMsg() ) ) ;`
	`181`	`+ QObject::tr( "Cannot get GDAL raster band: %1" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );`
`184`	`182`
`185`	`183`	`GDALDereferenceDataset( mGdalBaseDataset );`
`186`	`184`	`mGdalBaseDataset = NULL;`
`@@ -546,8 +544,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle const & theExtent,`
`546`	`544`	`if ( !myGdalMemDataset )`
`547`	`545`	`{`
`548`	`546`	`QMessageBox::warning( 0, QObject::tr( "Warning" ),`
`549`		`- QObject::tr( "Cannot open GDAL MEM dataset " ) + myMemDsn + " : "`
`550`		`- + QString::fromUtf8( CPLGetLastErrorMsg() ) );`
	`547`	`+ QObject::tr( "Cannot open GDAL MEM dataset %1: %2" ).arg( myMemDsn ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );`
`551`	`548`	`return;`
`552`	`549`	`}`
`553`	`550`
`@@ -626,8 +623,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle const & theExtent,`
`626`	`623`	`if ( myErr != CPLE_None )`
`627`	`624`	`{`
`628`	`625`	`QMessageBox::warning( 0, QObject::tr( "Warning" ),`
`629`		`- QObject::tr( "Cannot ChunkAndWarpImage : " )`
`630`		`- + QString::fromUtf8( CPLGetLastErrorMsg() ) );`
	`626`	`+ QObject::tr( "Cannot ChunkAndWarpImage: %1" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );`
`631`	`627`	`return;`
`632`	`628`	`}`
`633`	`629`