added_tr.diff

Redmine Admin, 2006-09-29 01:23 PM

Download (30.7 KB)

View differences:

src/plugins/grass/qgsgrassattributes.cpp (working copy)
310 310
      QString *error = mProvider->updateAttributes ( tb->text(0,1).toInt(), tb->text(1,1).toInt(), sql );
311 311

  
312 312
      if ( !error->isEmpty() ) {
313
	  QMessageBox::warning( 0, "Warning", *error );
313
	  QMessageBox::warning( 0, tr("Warning"), *error );
314 314
	  resultLabel->setText ( "ERROR" );
315 315
      } else {
316 316
	  resultLabel->setText ( "OK" );
src/plugins/grass/qgsgrassbrowser.cpp (working copy)
285 285
        {
286 286
            QString output ( process.readAllStandardOutput () );
287 287
            QString error ( process.readAllStandardError () );
288
            QMessageBox::warning( 0, "Warning", "Cannot copy map "
288
            QMessageBox::warning( 0, tr("Warning"), tr("Cannot copy map ")
289 289
                       + map + "@" + mapset 
290
                       + "<br>command: " + module + " " + args.join(" ")
290
                       + tr("<br>command: ") + module + " " + args.join(" ")
291 291
                       + "<br>" + formatMessage(output)
292 292
                       + "<br>" + formatMessage(error) ); 
293 293
        }
......
351 351
        {
352 352
            QString output ( process.readAllStandardOutput () );
353 353
            QString error ( process.readAllStandardError () );
354
            QMessageBox::warning( 0, "Warning", "Cannot rename map "
354
            QMessageBox::warning( 0, tr("Warning"), tr("Cannot rename map ")
355 355
                       + map  
356
                       + "<br>command: " + module + " " + args.join(" ")
356
                       + tr("<br>command: ") + module + " " + args.join(" ")
357 357
                       + "<br>" + formatMessage(output)
358 358
                       + "<br>" + formatMessage(error) ); 
359 359
        }
......
389 389
            continue; // should not happen
390 390
        }
391 391
         
392
        int ret = QMessageBox::question ( 0, "Warning",
393
              "Delete map <b>" + map + "</b>",
392
        int ret = QMessageBox::question ( 0, tr("Warning"),
393
              tr("Delete map <b>") + map + "</b>",
394 394
              QMessageBox::Yes,  QMessageBox::No );
395 395

  
396 396
        if ( ret == QMessageBox::No ) continue;
......
406 406
        {
407 407
            QString output ( process.readAllStandardOutput () );
408 408
            QString error ( process.readAllStandardError () );
409
            QMessageBox::warning( 0, "Warning", "Cannot delete map "
409
            QMessageBox::warning( 0, tr("Warning"), tr("Cannot delete map ")
410 410
                       + map  
411
                       + "<br>command: " + module + " " + args.join(" ")
411
                       + tr("<br>command: ") + module + " " + args.join(" ")
412 412
                       + "<br>" + formatMessage(output)
413 413
                       + "<br>" + formatMessage(error) ); 
414 414
        }
......
450 450

  
451 451
    if ( G_put_window ( window ) == -1 )
452 452
    { 
453
	QMessageBox::warning( 0, "Warning", 
454
		 "Cannot write new region" ); 
453
	QMessageBox::warning( 0, tr("Warning"), 
454
		 tr("Cannot write new region") ); 
455 455
        return;
456 456
    }
457 457
    emit regionChanged();
src/plugins/grass/qgsgrassedit.cpp (working copy)
223 223
void QgsGrassEdit::init()
224 224
{
225 225
  if ( !(mProvider->isGrassEditable()) ) {
226
    QMessageBox::warning( 0, "Warning", "You are not owner of the mapset, "
227
        "cannot open the vector for editing." );
226
    QMessageBox::warning( 0, tr("Warning"), tr("You are not owner of the mapset, "
227
        "cannot open the vector for editing.") );
228 228
    return;
229 229
  }
230 230

  
231 231
  if ( !(mProvider->startEdit()) ) {
232
    QMessageBox::warning( 0, "Warning", "Cannot open vector for update." );
232
    QMessageBox::warning( 0, tr("Warning"), tr("Cannot open vector for update." ));
233 233
    return;
234 234
  }
235 235

  
......
691 691
    QString *error = mProvider->createTable ( field, mAttributeTable->item(0,0)->text(), sql );  
692 692

  
693 693
    if ( !error->isEmpty() ) {
694
      QMessageBox::warning( 0, "Warning", *error );
694
      QMessageBox::warning( 0, tr("Warning"), *error );
695 695
    } else {
696
      QMessageBox::information( 0, "Info", "The table was created" );
696
      QMessageBox::information( 0, tr("Info"), tr("The table was created") );
697 697
      QString str;
698 698
      str.sprintf ( "%d", field );
699 699
      mFieldBox->insertItem( str );
......
716 716
      QString *error = mProvider->addColumn ( field, sql );  
717 717

  
718 718
      if ( !error->isEmpty() ) {
719
        QMessageBox::warning( 0, "Warning", *error );
719
        QMessageBox::warning( 0, tr("Warning"), *error );
720 720
      }
721 721
      delete error;
722 722
    }
......
1084 1084
        QString *error = mProvider->insertAttributes ( field, cat );
1085 1085

  
1086 1086
        if ( !error->isEmpty() ) {
1087
          QMessageBox::warning( 0, "Warning", *error );
1087
          QMessageBox::warning( 0, tr("Warning"), *error );
1088 1088
        }
1089 1089
        delete error;
1090 1090
      }
......
1323 1323
      
1324 1324
    case EDIT_CATS:
1325 1325
      mTool = NONE;
1326
      QMessageBox::warning( 0, "Warning", "Tool not yet implemented." );
1326
      QMessageBox::warning( 0, tr("Warning"), tr("Tool not yet implemented.") );
1327 1327
      break;
1328 1328

  
1329 1329
    default:
......
1350 1350
  QString *error = mProvider->isOrphan ( field, cat, &orphan );
1351 1351

  
1352 1352
  if ( !error->isEmpty() ) {
1353
      QMessageBox::warning( 0, "Warning", "Cannot check orphan record: "
1353
      QMessageBox::warning( 0, tr("Warning"), tr("Cannot check orphan record: ")
1354 1354
                + *error );
1355 1355
      return;
1356 1356
  }
1357 1357
  if ( !orphan ) return;
1358 1358

  
1359
  int ret = QMessageBox::question ( 0, "Warning", 
1360
	      "Orphan record was left in attribute table. "
1361
	      "<br>Delete the record?",  
1359
  int ret = QMessageBox::question ( 0, tr("Warning"), 
1360
	     tr("Orphan record was left in attribute table. "
1361
	      "<br>Delete the record?"),  
1362 1362
	      QMessageBox::Yes,  QMessageBox::No );
1363 1363

  
1364 1364
  if ( ret == QMessageBox::No ) return;
......
1366 1366
  // Delete record
1367 1367
  error = mProvider->deleteAttributes ( field, cat );
1368 1368
  if ( !error->isEmpty() ) {
1369
      QMessageBox::warning( 0, "Warning", "Cannot delete orphan record: "
1369
      QMessageBox::warning( 0, tr("Warning"), tr("Cannot delete orphan record: ")
1370 1370
                + *error );
1371 1371
      return;
1372 1372
  }
......
1395 1395
    if ( cols->size() == 0 ) {
1396 1396
      QString str;
1397 1397
      str.setNum( field );
1398
      QMessageBox::warning( 0, "Warning", "Cannot describe table for field " + str );
1398
      QMessageBox::warning( 0, tr("Warning"), tr("Cannot describe table for field ") + str );
1399 1399
    } else {
1400 1400
      std::vector<QgsFeatureAttribute> *atts = 
1401 1401
        mProvider->attributes ( field, cat );
......
1452 1452
      QString *error = mProvider->insertAttributes ( field, cat );
1453 1453

  
1454 1454
      if ( !error->isEmpty() ) {
1455
        QMessageBox::warning( 0, "Warning", *error );
1455
        QMessageBox::warning( 0, tr("Warning"), *error );
1456 1456
      }
1457 1457
      delete error;
1458 1458
    }
src/plugins/grass/qgsgrassmapcalc.cpp (working copy)
173 173
    int t = QgsGrassMapcalcFunction::Operator;
174 174
    //mFunctions.push_back(QgsGrassMapcalcFunction("-",2, "Odcitani", "in1,in2" ));
175 175
    // Arithmetical
176
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "+", 2, "Addition" ));
177
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "-", 2, "Subtraction"));
178
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "*", 2, "Multiplication" ));
179
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "/", 2, "Division" ));
180
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "%", 2, "Modulus" ));
181
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "^", 2, "Exponentiation" ));
176
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "+", 2, tr("Addition" )));
177
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "-", 2, tr("Subtraction")));
178
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "*", 2, tr("Multiplication" )));
179
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "/", 2, tr("Division" )));
180
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "%", 2, tr("Modulus" )));
181
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "^", 2, tr("Exponentiation" )));
182 182

  
183 183
    // Logical
184
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "==", 2, "Equal" ));
185
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "!=", 2, "Not equal" ));
186
    mFunctions.push_back(QgsGrassMapcalcFunction( t, ">",  2, "Greater than" ));
187
    mFunctions.push_back(QgsGrassMapcalcFunction( t, ">=", 2, "Greater than or equal" ));
188
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "<",  2, "Less than" ));
189
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "<=", 2, "Less than or equal" ));
190
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "&&", 2, "And" ));
191
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "||", 2, "Or" ));
184
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "==", 2, tr("Equal" )));
185
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "!=", 2, tr("Not equal" )));
186
    mFunctions.push_back(QgsGrassMapcalcFunction( t, ">",  2, tr("Greater than" )));
187
    mFunctions.push_back(QgsGrassMapcalcFunction( t, ">=", 2, tr("Greater than or equal" )));
188
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "<",  2, tr("Less than" )));
189
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "<=", 2, tr("Less than or equal" )));
190
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "&&", 2, tr("And" )));
191
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "||", 2, tr("Or" )));
192 192

  
193 193
    t = QgsGrassMapcalcFunction::Function;
194
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "abs",  1, "Absolute value of x", "abs(x)" ));
195
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "atan", 1, "Inverse tangent of x (result is in degrees)", "atan(x)" ));
196
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "atan", 2, "Inverse tangent of y/x (result is in degrees)", "atan(x,y)" ));
197
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "col", 0, "Current column of moving window (starts with 1)" ));
198
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "cos",  1, "Cosine of x (x is in degrees)", "cos(x)" ));
199
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "double", 1, "Convert x to double-precision floating point", "double(x)" ));
200
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "ewres", 0, "Current east-west resolution" ));
201
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "exp", 1, "Exponential function of x", "exp(x)" ));
202
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "exp", 2, "x to the power y", "exp(x,y)" ));
203
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "float", 2, "Convert x to single-precision floating point", "float(x)" ));
204
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "if", 1, "Decision: 1 if x not zero, 0 otherwise", "if(x)" ));
205
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "if", 2, "Decision: a if x not zero, 0 otherwise", "if(x,a)" ));
206
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "if", 3, "Decision: a if x not zero, b otherwise", "if(x,a,b)", "if,then,else", false ));
207
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "if", 4, "Decision: a if x > 0, b if x is zero, c if x < 0", "if(x,a,b,c)" ));
208
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "int", 1, "Convert x to integer [ truncates ]", "int(x)" ));
209
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "isnull", 1, "Check if x = NULL", "isnull(x)" ));
210
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "log", 1, "Natural log of x", "log(x)" ));
211
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "log", 2, "Log of x base b", "log(x,b)" ));
212
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "max", 2, "Largest value", "max(a,b)" ));
213
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "max", 3, "Largest value", "max(a,b,c)" ));
214
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "median", 2, "Median value", "median(a,b)" ));
215
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "median", 3, "Median value", "median(a,b,c)" ));
216
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "min", 2, "Smallest value", "min(a,b)" ));
217
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "min", 3, "Smallest value", "min(a,b,c)" ));
218
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "mode", 2, "Mode value", "mode(a,b)" ));
219
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "mode", 3, "Mode value", "mode(a,b,c)" ));
220
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "not", 1, "1 if x is zero, 0 otherwise", "not(x)" ));
221
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "nsres", 0, "Current north-south resolution" ));
222
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "null", 0, "NULL value" ));
223
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "rand", 2, "Random value between a and b", "rand(a,b)" ));
224
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "round", 1, "Round x to nearest integer", "round(x)" ));
225
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "row", 0, "Current row of moving window (Starts with 1)" ));
226
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "sin", 1, "Sine of x (x is in degrees)", "sin(x)" ));
227
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "sqrt", 1, "Square root of x", "sqrt(x)" ));
228
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "tan", 1, "Tangent of x (x is in degrees)", "tan(x)" ));
229
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "x", 0, "Current x-coordinate of moving window" ));
230
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "y", 0, "Current y-coordinate of moving window" ));
194
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "abs",  1, tr("Absolute value of x"), "abs(x)" ));
195
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "atan", 1, tr("Inverse tangent of x (result is in degrees)"), "atan(x)" ));
196
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "atan", 2, tr("Inverse tangent of y/x (result is in degrees)"), "atan(x,y)" ));
197
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "col", 0, tr("Current column of moving window (starts with 1)") ));
198
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "cos",  1, tr("Cosine of x (x is in degrees)"), "cos(x)" ));
199
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "double", 1, tr("Convert x to double-precision floating point"), "double(x)" ));
200
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "ewres", 0, tr("Current east-west resolution" )));
201
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "exp", 1, tr("Exponential function of x"), "exp(x)" ));
202
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "exp", 2, tr("x to the power y"), "exp(x,y)" ));
203
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "float", 2, tr("Convert x to single-precision floating point"), "float(x)" ));
204
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "if", 1, tr("Decision: 1 if x not zero, 0 otherwise"), "if(x)" ));
205
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "if", 2, tr("Decision: a if x not zero, 0 otherwise"), "if(x,a)" ));
206
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "if", 3, tr("Decision: a if x not zero, b otherwise"), "if(x,a,b)", "if,then,else", false ));
207
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "if", 4, tr("Decision: a if x > 0, b if x is zero, c if x < 0"), "if(x,a,b,c)" ));
208
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "int", 1, tr("Convert x to integer [ truncates ]"), "int(x)" ));
209
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "isnull", 1, tr("Check if x = NULL"), "isnull(x)" ));
210
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "log", 1, tr("Natural log of x"), "log(x)" ));
211
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "log", 2, tr("Log of x base b"), "log(x,b)" ));
212
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "max", 2, tr("Largest value"), "max(a,b)" ));
213
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "max", 3, tr("Largest value"), "max(a,b,c)" ));
214
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "median", 2, tr("Median value"), "median(a,b)" ));
215
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "median", 3, tr("Median value"), "median(a,b,c)" ));
216
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "min", 2, tr("Smallest value"), "min(a,b)" ));
217
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "min", 3, tr("Smallest value"), "min(a,b,c)" ));
218
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "mode", 2, tr("Mode value"), "mode(a,b)" ));
219
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "mode", 3, tr("Mode value"), "mode(a,b,c)" ));
220
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "not", 1, tr("1 if x is zero, 0 otherwise"), "not(x)" ));
221
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "nsres", 0, tr("Current north-south resolution" )));
222
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "null", 0, tr("NULL value" )));
223
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "rand", 2, tr("Random value between a and b"), "rand(a,b)" ));
224
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "round", 1, tr("Round x to nearest integer"), "round(x)" ));
225
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "row", 0, tr("Current row of moving window (Starts with 1)" )));
226
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "sin", 1, tr("Sine of x (x is in degrees)", "sin(x)" )));
227
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "sqrt", 1, tr("Square root of x", "sqrt(x)" )));
228
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "tan", 1, tr("Tangent of x (x is in degrees)", "tan(x)" )));
229
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "x", 0, tr("Current x-coordinate of moving window" )));
230
    mFunctions.push_back(QgsGrassMapcalcFunction( t, "y", 0, tr("Current y-coordinate of moving window" )));
231 231
    
232 232
    for ( int i =0; i < mFunctions.size(); i++ )
233 233
    {
......
526 526
                    QgsGrass::getDefaultLocation(),
527 527
                    QgsGrass::getDefaultMapset(), &currentWindow ) )
528 528
    {
529
        QMessageBox::warning( 0, "Warning", "Cannot get current region" );
529
        QMessageBox::warning( 0, tr("Warning"), tr("Cannot get current region" ));
530 530
        return list;
531 531
    }
532 532

  
......
555 555
                QgsGrass::getDefaultLocation(), mapset, map,
556 556
                &window ) )
557 557
        {
558
            QMessageBox::warning( 0, "Warning", "Cannot check region "
559
                                  "of map " + obj->value() );
558
            QMessageBox::warning( 0, tr("Warning"), tr("Cannot check region "
559
                                  "of map ") + obj->value() );
560 560
            continue;
561 561
        }
562 562

  
......
579 579
                    QgsGrass::getDefaultLocation(),
580 580
                    QgsGrass::getDefaultMapset(), window ) )
581 581
    {
582
        QMessageBox::warning( 0, "Warning", "Cannot get current region" );
582
        QMessageBox::warning( 0, tr("Warning"), tr("Cannot get current region" ));
583 583
        return false;
584 584
    }
585 585

  
......
611 611
                QgsGrass::getDefaultLocation(), mapset, map,
612 612
                &mapWindow ) )
613 613
        {
614
            QMessageBox::warning( 0, "Warning", "Cannot get region "
615
                                  "of map " + obj->value() );
614
            QMessageBox::warning( 0, tr("Warning"), tr("Cannot get region "
615
                                  "of map ") + obj->value() );
616 616
            return false;
617 617
        }
618 618
       
......
806 806
    updateMaps();
807 807
    if ( mMaps.size() == 0 )
808 808
    {
809
         QMessageBox::warning( 0, "Warning", "No GRASS raster maps"
810
		 " currently in QGIS" );
809
         QMessageBox::warning( 0, tr("Warning"), tr("No GRASS raster maps"
810
		 " currently in QGIS" ));
811 811

  
812 812
	 setTool ( AddConstant);
813 813
	 return;
......
1096 1096

  
1097 1097
	if ( !d.mkdir("mapcalc" ) )
1098 1098
	{
1099
             QMessageBox::warning( 0, "Warning", "Cannot create 'mapcalc' "
1100
		     "directory in current mapset." );
1099
             QMessageBox::warning( 0, tr("Warning"), tr("Cannot create 'mapcalc' "
1100
		     "directory in current mapset." ));
1101 1101
             return;
1102 1102
	}
1103 1103
    }
......
1107 1107
    while ( 1 ) 
1108 1108
    {
1109 1109
	bool ok;
1110
	name = QInputDialog::getText( "New mapcalc", 
1111
		 "Enter new mapcalc name:", QLineEdit::Normal, mFileName, &ok);
1110
	name = QInputDialog::getText( tr("New mapcalc"), 
1111
		 tr("Enter new mapcalc name:"), QLineEdit::Normal, mFileName, &ok);
1112 1112
	if ( !ok ) return;
1113 1113
	name = name.stripWhiteSpace();
1114 1114

  
1115 1115
	if ( name.isEmpty() ) {
1116
	     QMessageBox::warning( 0, "Warning", "Enter vector name" );
1116
	     QMessageBox::warning( 0, tr("Warning"), tr("Enter vector name" ));
1117 1117
	     continue;
1118 1118
	}
1119 1119

  
1120 1120
	// check if exists
1121 1121
	if ( QFile::exists( mc+ "/" + name ) )
1122 1122
	{
1123
	    int ret = QMessageBox::question ( 0, "Warning", 
1124
		        "The file already exists. Overwrite? ",  
1123
	    int ret = QMessageBox::question ( 0, tr("Warning"), 
1124
		        tr("The file already exists. Overwrite? "),  
1125 1125
			QMessageBox::Yes,  QMessageBox::No );
1126 1126

  
1127 1127
            if ( ret == QMessageBox::No ) continue;   
......
1141 1141
#endif
1142 1142
    if ( mFileName.isEmpty() ) // Should not happen
1143 1143
    {
1144
	QMessageBox::warning (this, "Save mapcalc", "File name empty" );
1144
	QMessageBox::warning (this, tr("Save mapcalc"), tr("File name empty") );
1145 1145
        return;
1146 1146
    }
1147 1147
    // TODO!!!: 'escape' < > & ...
......
1159 1159
    QFile out ( path );
1160 1160
    if ( !out.open( QIODevice::WriteOnly ) )
1161 1161
    {
1162
        QMessageBox::warning (this, "Save mapcalc", 
1163
		              "Cannot open mapcalc file" );
1162
        QMessageBox::warning (this, tr("Save mapcalc"), 
1163
		              tr("Cannot open mapcalc file") );
1164 1164
        return;
1165 1165
    }
1166 1166
    
......
1289 1289
    
1290 1290
    if ( !file.exists() ) // should not happen
1291 1291
    {
1292
	QMessageBox::warning( 0, "Warning", "The mapcalc schema (" 
1293
				+ path + ") not found." );
1292
	QMessageBox::warning( 0, tr("Warning"), tr("The mapcalc schema (") 
1293
				+ path + tr(") not found." ));
1294 1294
	return;
1295 1295
    }
1296 1296

  
1297 1297
    if ( ! file.open( QIODevice::ReadOnly ) ) 
1298 1298
    {
1299
        QMessageBox::warning( 0, "Warning", "Cannot open mapcalc schema ("
1299
        QMessageBox::warning( 0, tr("Warning"), tr("Cannot open mapcalc schema (")
1300 1300
		                 + path + ")" );
1301 1301
		        
1302 1302
	return;
......
1308 1308
    int parsed = doc.setContent( &file,  &err, &line, &column );
1309 1309
    file.close();
1310 1310
    if ( !parsed ) {
1311
        QString errmsg = "Cannot read mapcalc schema (" + path + "):\n" + err 
1312
	        	+ "\nat line " + QString::number(line) 
1313
			+ " column " + QString::number(column);
1311
        QString errmsg = tr("Cannot read mapcalc schema (") + path + "):\n" + err 
1312
	        	+ tr("\nat line ") + QString::number(line) 
1313
			+ tr(" column ") + QString::number(column);
1314 1314
				        
1315
	QMessageBox::warning( 0, "Warning", errmsg );
1315
	QMessageBox::warning( 0, tr("Warning"), errmsg );
1316 1316
        return;
1317 1317
    }
1318 1318

  
src/core/qgslabelattributes.cpp (working copy)
55 55
{
56 56

  
57 57
    if ( def ) { // set defaults
58
	setText ( "Label" );
58
	setText ("Label");
59 59

  
60 60
	mFont = QApplication::font();
61 61
	mFamilyIsSet = true;
src/helpviewer/qgshelpviewer.cpp (working copy)
86 86
      }
87 87
      else
88 88
      {
89
        QMessageBox::critical(this, "Error", 
89
        QMessageBox::critical(this, tr("Error"), 
90 90
            tr("Failed to get the help text from the database") + QString(":\n   ")
91 91
            + sqlite3_errmsg(db));  
92 92
      }
src/providers/delimitedtext/qgsdelimitedtextprovider.cpp (working copy)
745 745
    QSettings settings;
746 746
    QString enc;
747 747
    QString shapefileName;
748
    QString filter =  QString("Shapefiles (*.shp)");
748
    QString filter =  QString(tr("Shapefiles (*.shp)"));
749 749
    QString dirName = settings.readEntry("/Plugin-DelimitedText/text_path", "./");
750 750

  
751 751
    QgsEncodingFileDialog* openFileDialog = new QgsEncodingFileDialog(0,
......
821 821
              name().toLocal8Bit().data() << " width length " << lengths[i] << std::endl;
822 822
            if (poLayer->CreateField(&fld) != OGRERR_NONE)
823 823
            {
824
              QMessageBox::warning(0, "Error",
825
                                   "Error creating field " + attrField.name());
824
              QMessageBox::warning(0, tr("Error"),
825
                                   tr("Error creating field ") + attrField.name());
826 826
            }
827 827
          }
828 828
          // read the delimited text file and create the features
......
895 895
        }
896 896
        else
897 897
        {
898
          QMessageBox::warning(0, "Error", "Layer creation failed");
898
          QMessageBox::warning(0, tr("Error"), tr("Layer creation failed"));
899 899
        }
900 900

  
901 901
      }
902 902
      else
903 903
      {
904
        QMessageBox::warning(0, "Error creating shapefile",
905
                             "The shapefile could not be created (" +
904
        QMessageBox::warning(0, tr("Error creating shapefile"),
905
                             tr("The shapefile could not be created (") +
906 906
                             shapefileName + ")");
907 907
      }
908 908

  
......
911 911
  }
912 912
  else
913 913
  {
914
    QMessageBox::warning(0, "Driver not found",
915
                         driverName + " driver is not available");
914
    QMessageBox::warning(0, tr("Driver not found"),
915
                         driverName + tr(" driver is not available"));
916 916
    returnValue = false;
917 917
  }
918 918
  return returnValue;
src/providers/mysql/qgsmysqlprovider.cpp (working copy)
887 887
              name().toLocal8Bit().data() << " width length " << lengths[i] << std::endl;
888 888
            if (poLayer->CreateField(&fld) != OGRERR_NONE)
889 889
            {
890
              QMessageBox::warning(0, "Error",
891
                                   "Error creating field " + attrField.name());
890
              QMessageBox::warning(0, tr("Error"),
891
                                   tr("Error creating field ") + attrField.name());
892 892
            }
893 893
          }
894 894
          // read the MySQL file and create the features
......
967 967
        }
968 968
        else
969 969
        {
970
          QMessageBox::warning(0, "Error", "Layer creation failed");
970
          QMessageBox::warning(0, tr("Error"), tr("Layer creation failed"));
971 971
        }
972 972

  
973 973
      }
974 974
      else
975 975
      {
976
        QMessageBox::warning(0, "Error creating shapefile",
977
                             "The shapefile could not be created (" +
976
        QMessageBox::warning(0, tr("Error creating shapefile"),
977
                             tr("The shapefile could not be created (") +
978 978
                             shapefileName + ")");
979 979
      }
980 980

  
......
983 983
  }
984 984
  else
985 985
  {
986
    QMessageBox::warning(0, "Driver not found",
987
                         driverName + " driver is not available");
986
    QMessageBox::warning(0, tr("Driver not found"),
987
                         driverName + tr(" driver is not available"));
988 988
    returnValue = false;
989 989
  }
990 990
  return returnValue;
src/providers/wms/qgshttptransaction.cpp (working copy)
1
/***************************************************************************
1
	/***************************************************************************
2 2
  qgshttptransaction.cpp  -  Tracks a HTTP request with its response,
3 3
                             with particular attention to tracking 
4 4
                             HTTP redirect responses
......
263 263
  
264 264
  if (total)
265 265
  {
266
    status = QString("Received %1 of %2 bytes")
266
    status = QString(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(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(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(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(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(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(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(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(tr("Closing down connection")) );
423 423
      break;
424 424
  }
425 425

  
src/providers/ogr/qgsogrfactory.cpp (working copy)
61 61
    valid = true;
62 62
  } else
63 63
  {
64
    QMessageBox::warning(NULL, "Wrong Path/URI", "The provided path for the dataset is not valid.",QMessageBox::Ok, Qt::NoButton, Qt::NoButton);
64
    QMessageBox::warning(NULL, tr("Wrong Path/URI"), tr("The provided path for the dataset is not valid."),QMessageBox::Ok, Qt::NoButton, Qt::NoButton);
65 65
    valid = false;
66 66
  }
67 67
}