ya_i18n.diff
| src/providers/grass/qgsgrass.cpp (working copy) | ||
|---|---|---|
| 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 | 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 |
| ... | ... | |
| 421 | 421 | |
| 422 | 422 |
// TODO WIN32 (lock.exe does not work properly?) |
| 423 | 423 |
#ifndef WIN32 |
| 424 |
if ( status > 0 ) return "Mapset is already in use.";
|
|
| 424 |
if ( status > 0 ) return QObject::tr("Mapset is already in use.");
|
|
| 425 | 425 |
#endif |
| 426 | 426 | |
| 427 | 427 |
// Create temporary directory |
| ... | ... | |
| 436 | 436 |
if ( !dirInfo.isWritable() ) |
| 437 | 437 |
{
|
| 438 | 438 |
lockFile.remove(); |
| 439 |
return "Temporary directory " + mTmp + " exist but is not writable";
|
|
| 439 |
return QObject::tr("Temporary directory ") + mTmp + QObject::tr(" exist but is not writable");
|
|
| 440 | 440 |
} |
| 441 | 441 |
} |
| 442 | 442 |
else if ( !dir.mkdir( mTmp ) ) |
| 443 | 443 |
{
|
| 444 | 444 |
lockFile.remove(); |
| 445 |
return "Cannot create temporary directory " + mTmp;
|
|
| 445 |
return QObject::tr("Cannot create temporary directory ") + mTmp;
|
|
| 446 | 446 |
} |
| 447 | 447 |
|
| 448 | 448 |
// Create GISRC file |
| ... | ... | |
| 458 | 458 |
if ( !out.open( QIODevice::WriteOnly ) ) |
| 459 | 459 |
{
|
| 460 | 460 |
lockFile.remove(); |
| 461 |
return "Cannot create " + mGisrc;
|
|
| 461 |
return QObject::tr("Cannot create ") + mGisrc;
|
|
| 462 | 462 |
} |
| 463 | 463 |
QTextStream stream ( &out ); |
| 464 | 464 | |
| ... | ... | |
| 531 | 531 |
QFile file ( mMapsetLock ); |
| 532 | 532 |
if ( !file.remove() ) |
| 533 | 533 |
{
|
| 534 |
return "Cannot remove mapset lock: " + mMapsetLock;
|
|
| 534 |
return QObject::tr("Cannot remove mapset lock: ") + mMapsetLock;
|
|
| 535 | 535 |
} |
| 536 | 536 |
mMapsetLock = ""; |
| 537 | 537 | |
| ... | ... | |
| 918 | 918 |
if ( G_get_cellhd ( map.toLocal8Bit().data(), |
| 919 | 919 |
mapset.toLocal8Bit().data(), window) < 0 ) |
| 920 | 920 |
{
|
| 921 |
QMessageBox::warning( 0, "Warning",
|
|
| 922 |
"Cannot read raster map region" );
|
|
| 921 |
QMessageBox::warning( 0, QObject::tr("Warning"),
|
|
| 922 |
QObject::tr("Cannot read raster map region" ));
|
|
| 923 | 923 |
return false; |
| 924 | 924 |
} |
| 925 | 925 |
} |
| ... | ... | |
| 935 | 935 | |
| 936 | 936 |
if ( level < 2 ) |
| 937 | 937 |
{
|
| 938 |
QMessageBox::warning( 0, "Warning",
|
|
| 939 |
"Cannot read vector map region" );
|
|
| 938 |
QMessageBox::warning( 0, QObject::tr("Warning"),
|
|
| 939 |
QObject::tr("Cannot read vector map region" ) );
|
|
| 940 | 940 |
return false; |
| 941 | 941 |
} |
| 942 | 942 | |
| ... | ... | |
| 971 | 971 |
map.toLocal8Bit().data(), |
| 972 | 972 |
mapset.toLocal8Bit().data() ) != NULL ) |
| 973 | 973 |
{
|
| 974 |
QMessageBox::warning( 0, "Warning",
|
|
| 975 |
"Cannot read region" );
|
|
| 974 |
QMessageBox::warning( 0, QObject::tr("Warning"),
|
|
| 975 |
QObject::tr("Cannot read region" ));
|
|
| 976 | 976 |
return false; |
| 977 | 977 |
} |
| 978 | 978 |
} |
| src/core/qgshttptransaction.cpp (working copy) | ||
|---|---|---|
| 263 | 263 |
|
| 264 | 264 |
if (total) |
| 265 | 265 |
{
|
| 266 |
status = QString("Received %1 of %2 bytes")
|
|
| 266 |
status = QString( QObject::tr("Received %1 of %2 bytes") )
|
|
| 267 | 267 |
.arg( done ) |
| 268 | 268 |
.arg( total ); |
| 269 | 269 |
} |
| 270 | 270 |
else |
| 271 | 271 |
{
|
| 272 |
status = QString("Received %1 bytes (total unknown)")
|
|
| 272 |
status = QString( QObject::tr("Received %1 bytes (total unknown)") )
|
|
| 273 | 273 |
.arg( done ); |
| 274 | 274 |
} |
| 275 | 275 | |
| ... | ... | |
| 380 | 380 |
{
|
| 381 | 381 |
case QHttp::Unconnected: |
| 382 | 382 |
QgsDebugMsg("There is no connection to the host.");
|
| 383 |
emit setStatus( QString("Not connected") );
|
|
| 383 |
emit setStatus( QString(QObject::tr("Not connected") ) );
|
|
| 384 | 384 |
break; |
| 385 | 385 | |
| 386 | 386 |
case QHttp::HostLookup: |
| 387 | 387 |
QgsDebugMsg("A host name lookup is in progress.");
|
| 388 | 388 | |
| 389 |
emit setStatus( QString("Looking up '%1'")
|
|
| 389 |
emit setStatus( QString( QObject::tr("Looking up '%1'") )
|
|
| 390 | 390 |
.arg(httphost) ); |
| 391 | 391 |
break; |
| 392 | 392 | |
| 393 | 393 |
case QHttp::Connecting: |
| 394 | 394 |
QgsDebugMsg("An attempt to connect to the host is in progress.");
|
| 395 | 395 | |
| 396 |
emit setStatus( QString("Connecting to '%1'")
|
|
| 396 |
emit setStatus( QString( QObject::tr("Connecting to '%1'") )
|
|
| 397 | 397 |
.arg(httphost) ); |
| 398 | 398 |
break; |
| 399 | 399 | |
| 400 | 400 |
case QHttp::Sending: |
| 401 | 401 |
QgsDebugMsg("The client is sending its request to the server.");
|
| 402 | 402 | |
| 403 |
emit setStatus( QString("Sending request '%1'")
|
|
| 403 |
emit setStatus( QString( QObject::tr("Sending request '%1'") )
|
|
| 404 | 404 |
.arg(httpurl) ); |
| 405 | 405 |
break; |
| 406 | 406 | |
| 407 | 407 |
case QHttp::Reading: |
| 408 | 408 |
QgsDebugMsg("The client's request has been sent and the client is reading the server's response.");
|
| 409 | 409 | |
| 410 |
emit setStatus( QString("Receiving reply") );
|
|
| 410 |
emit setStatus( QString( QObject::tr("Receiving reply") ) );
|
|
| 411 | 411 |
break; |
| 412 | 412 | |
| 413 | 413 |
case QHttp::Connected: |
| 414 | 414 |
QgsDebugMsg("The connection to the host is open, but the client is neither sending a request, nor waiting for a response.");
|
| 415 | 415 | |
| 416 |
emit setStatus( QString("Response is complete") );
|
|
| 416 |
emit setStatus( QString( QObject::tr("Response is complete") ) );
|
|
| 417 | 417 |
break; |
| 418 | 418 | |
| 419 | 419 |
case QHttp::Closing: |
| 420 | 420 |
QgsDebugMsg("The connection is closing down, but is not yet closed. (The state will be Unconnected when the connection is closed.)");
|
| 421 | 421 | |
| 422 |
emit setStatus( QString("Closing down connection") );
|
|
| 422 |
emit setStatus( QString( QObject::tr("Closing down connection") ) );
|
|
| 423 | 423 |
break; |
| 424 | 424 |
} |
| 425 | 425 | |