@@ -383,12 +383,12 @@ QString QgsGrass::openMapset ( QString gisdbase, QString location, QString mapse
383
383
384
384
// Check if the mapset is in use
385
385
QString gisBase = getenv (" GISBASE" );
386
- if ( gisBase.isNull () ) return " GISBASE is not set." ;
386
+ if ( gisBase.isNull () ) return QObject::tr ( " GISBASE is not set." ) ;
387
387
388
388
QFileInfo fi ( mapsetPath+ " /WIND" );
389
389
if ( !fi.exists () )
390
390
{
391
- return mapsetPath + " is not a GRASS mapset." ;
391
+ return mapsetPath + QObject::tr ( " is not a GRASS mapset." ) ;
392
392
}
393
393
394
394
QString lock = mapsetPath + " /.gislock" ;
@@ -406,7 +406,7 @@ QString QgsGrass::openMapset ( QString gisdbase, QString location, QString mapse
406
406
407
407
if ( !process->start () )
408
408
{
409
- return " Cannot start " + gisBase + " /etc/lock" ;
409
+ return QObject::tr ( " Cannot start " ) + gisBase + " /etc/lock" ;
410
410
}
411
411
412
412
// TODO better wait
@@ -423,7 +423,7 @@ QString QgsGrass::openMapset ( QString gisdbase, QString location, QString mapse
423
423
424
424
// TODO WIN32 (lock.exe does not work properly?)
425
425
#ifndef WIN32
426
- if ( status > 0 ) return " Mapset is already in use." ;
426
+ if ( status > 0 ) return QObject::tr ( " Mapset is already in use." ) ;
427
427
#endif
428
428
429
429
// Create temporary directory
@@ -438,13 +438,13 @@ QString QgsGrass::openMapset ( QString gisdbase, QString location, QString mapse
438
438
if ( !dirInfo.isWritable () )
439
439
{
440
440
lockFile.remove ();
441
- return " Temporary directory " + mTmp + " exist but is not writable" ;
441
+ return QObject::tr ( " Temporary directory " ) + mTmp + QObject::tr ( " exist but is not writable" ) ;
442
442
}
443
443
}
444
444
else if ( !dir.mkdir ( mTmp ) )
445
445
{
446
446
lockFile.remove ();
447
- return " Cannot create temporary directory " + mTmp ;
447
+ return QObject::tr ( " Cannot create temporary directory " ) + mTmp ;
448
448
}
449
449
450
450
// Create GISRC file
@@ -460,7 +460,7 @@ QString QgsGrass::openMapset ( QString gisdbase, QString location, QString mapse
460
460
if ( !out.open ( QIODevice::WriteOnly ) )
461
461
{
462
462
lockFile.remove ();
463
- return " Cannot create " + mGisrc ;
463
+ return QObject::tr ( " Cannot create " ) + mGisrc ;
464
464
}
465
465
QTextStream stream ( &out );
466
466
@@ -533,7 +533,7 @@ QString QgsGrass::closeMapset ( )
533
533
QFile file ( mMapsetLock );
534
534
if ( !file.remove () )
535
535
{
536
- return " Cannot remove mapset lock: " + mMapsetLock ;
536
+ return QObject::tr ( " Cannot remove mapset lock: " ) + mMapsetLock ;
537
537
}
538
538
mMapsetLock = " " ;
539
539
@@ -920,8 +920,8 @@ bool QgsGrass::mapRegion( int type, QString gisbase,
920
920
if ( G_get_cellhd ( map.toLocal8Bit ().data (),
921
921
mapset.toLocal8Bit ().data (), window) < 0 )
922
922
{
923
- QMessageBox::warning ( 0 , " Warning" ,
924
- " Cannot read raster map region" );
923
+ QMessageBox::warning ( 0 , QObject::tr ( " Warning" ) ,
924
+ QObject::tr ( " Cannot read raster map region" ) );
925
925
return false ;
926
926
}
927
927
}
@@ -937,8 +937,8 @@ bool QgsGrass::mapRegion( int type, QString gisbase,
937
937
938
938
if ( level < 2 )
939
939
{
940
- QMessageBox::warning ( 0 , " Warning" ,
941
- " Cannot read vector map region" );
940
+ QMessageBox::warning ( 0 , QObject::tr ( " Warning" ) ,
941
+ QObject::tr ( " Cannot read vector map region" ) );
942
942
return false ;
943
943
}
944
944
@@ -973,8 +973,8 @@ bool QgsGrass::mapRegion( int type, QString gisbase,
973
973
map.toLocal8Bit ().data (),
974
974
mapset.toLocal8Bit ().data () ) != NULL )
975
975
{
976
- QMessageBox::warning ( 0 , " Warning" ,
977
- " Cannot read region" );
976
+ QMessageBox::warning ( 0 , QObject::tr ( " Warning" ) ,
977
+ QObject::tr ( " Cannot read region" ) );
978
978
return false ;
979
979
}
980
980
}
0 commit comments