i18n.diff

Redmine Admin, 2007-03-18 03:15 AM

Download (18.5 KB)

View differences:

src/gui/qgsmaptoolvertexedit.cpp (working copy)
114 114
	//Find nearest segment of the selected line, move that node to the mouse location
115 115
	if (!snapSegmentWithContext(point))
116 116
	  {
117
	    QMessageBox::warning(0, "Error", 
117
	    QMessageBox::warning(0, QObject::tr("Error"), 
118 118
				 QObject::tr("Could not snap segment. Have you set the tolerance in Settings > Project Properties > General?"),
119 119
				 QMessageBox::Ok, Qt::NoButton);
120 120
	    return;
......
159 159
      {
160 160
	if(!snapVertexWithContext(snapPoint))
161 161
	  {
162
	    QMessageBox::warning(0, "Error", 
162
	    QMessageBox::warning(0, QObject::tr("Error"), 
163 163
				 QObject::tr("Could not snap segment. Have you set the tolerance in Settings > Project Properties > General?"),
164 164
				 QMessageBox::Ok, Qt::NoButton);
165 165
	    return;
......
169 169
      {
170 170
	if (!snapSegmentWithContext(snapPoint))
171 171
	  {
172
	    QMessageBox::warning(0, "Error", 
172
	    QMessageBox::warning(0, QObject::tr("Error"), 
173 173
				 QObject::tr("Could not snap segment. Have you set the tolerance in Settings > Project Properties > General?"),
174 174
				 QMessageBox::Ok, Qt::NoButton);
175 175
	    return;
......
178 178
	snapPoint = point;
179 179
	if (!snapVertexOfSnappedSegment(snapPoint))
180 180
	  {
181
	    QMessageBox::warning(0, "Error", 
181
	    QMessageBox::warning(0, QObject::tr("Error"), 
182 182
				 QObject::tr("Could not snap vertex. Have you set the tolerance in Settings > Project Properties > General?"),
183 183
				 QMessageBox::Ok, Qt::NoButton);
184 184
	    return;
......
227 227
    // TODO: Find nearest segment of the selected line, move that node to the mouse location
228 228
    if (!snapVertexWithContext(point))
229 229
      {
230
	QMessageBox::warning(0, "Error", 
230
	QMessageBox::warning(0, QObject::tr("Error"), 
231 231
          QObject::tr("Could not snap vertex. Have you set the tolerance in Settings > Project Properties > General?"),
232 232
          QMessageBox::Ok, Qt::NoButton);
233 233
	return;
......
395 395
  
396 396
  if (!vlayer)
397 397
  {
398
    QMessageBox::information(0,"Not a vector layer","The current layer is not a vector layer",QMessageBox::Ok);
398
    QMessageBox::information(0, QObject::tr("Not a vector layer"), QObject::tr("The current layer is not a vector layer"), QMessageBox::Ok);
399 399
    return;
400 400
  }
401 401
  
402 402
  if (!(vlayer->getDataProvider()->capabilities() & QgsVectorDataProvider::ChangeGeometries))
403 403
  {
404
    QMessageBox::information(0,"Change geometry",
405
                             "Data provider of the current layer doesn't allow changing geometries",
404
    QMessageBox::information(0, QObject::tr("Change geometry"),
405
                             QObject::tr("Data provider of the current layer doesn't allow changing geometries"),
406 406
                             QMessageBox::Ok);
407 407
    return;
408 408
  }
409 409
  
410 410
  if (!vlayer->isEditable())
411 411
  {
412
    QMessageBox::information(0,"Layer not editable",
413
                              "Cannot edit the vector layer. Use 'Start editing' in the legend item menu",
412
    QMessageBox::information(0, QObject::tr("Layer not editable"),
413
                              QObject::tr("Cannot edit the vector layer. Use 'Start editing' in the legend item menu"),
414 414
                              QMessageBox::Ok);
415 415
    return;
416 416
  }
src/gui/qgscustomprojectiondialog.cpp (working copy)
414 414
      //cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId));
415 415
      leParameters->setText(QString::fromUtf8((char *)sqlite3_column_text(myPreparedStatement,4)));
416 416
      mCurrentRecordLong=1; 
417
      lblRecordNo->setText(QString::number(mCurrentRecordLong) + " of " + QString::number(mRecordCountLong));
417
      lblRecordNo->setText(QString::number(mCurrentRecordLong) + tr(" of ") + QString::number(mRecordCountLong));
418 418
  }
419 419
  else
420 420
  {
......
490 490
      //cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId));
491 491
      leParameters->setText(QString::fromUtf8((char *)sqlite3_column_text(myPreparedStatement,4))),
492 492
      --mCurrentRecordLong;
493
      lblRecordNo->setText(QString::number(mCurrentRecordLong) + " of " + QString::number(mRecordCountLong));
493
      lblRecordNo->setText(QString::number(mCurrentRecordLong) + tr(" of ") + QString::number(mRecordCountLong));
494 494
  }
495 495
  else
496 496
  {
......
568 568
      //cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId));
569 569
      leParameters->setText(QString::fromUtf8((char *)sqlite3_column_text(myPreparedStatement,4)));
570 570
      ++mCurrentRecordLong;
571
      lblRecordNo->setText(QString::number(mCurrentRecordLong) + " of " + QString::number(mRecordCountLong));
571
      lblRecordNo->setText(QString::number(mCurrentRecordLong) + tr(" of ") + QString::number(mRecordCountLong));
572 572
  }
573 573
  else
574 574
  {
......
641 641
      //cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId));
642 642
      leParameters->setText(QString::fromUtf8((char *)sqlite3_column_text(myPreparedStatement,4)));
643 643
      mCurrentRecordLong =mRecordCountLong;
644
      lblRecordNo->setText(QString::number(mCurrentRecordLong) + " of " + QString::number(mRecordCountLong));
644
      lblRecordNo->setText(QString::number(mCurrentRecordLong) + tr(" of ") + QString::number(mRecordCountLong));
645 645
  }
646 646
  else
647 647
  {
......
710 710
    leParameters->setText("");
711 711
    //cboProjectionFamily->setCurrentItem(0);
712 712
    //cboEllipsoid->setCurrentItem(0);
713
    lblRecordNo->setText("* of " + QString::number(mRecordCountLong));
713
    lblRecordNo->setText( tr("* of ") + QString::number(mRecordCountLong));
714 714
    //remember the rec we are on in case the user aborts
715 715
    mLastRecordLong=mCurrentRecordLong;
716 716
    mCurrentRecordId="";
src/gui/qgsoptions.cpp (working copy)
239 239
#endif
240 240
  QString browser = QFileDialog::getOpenFileName(
241 241
          this,
242
          "Choose a browser",
242
          tr("Choose a browser"),
243 243
          "./",
244 244
          filter );
245 245
  if(browser.length() > 0)
src/gui/qgssearchquerybuilder.cpp (working copy)
31 31
{
32 32
  setupUi(this);
33 33
  
34
  setWindowTitle("Search query builder");
34
  setWindowTitle(tr("Search query builder"));
35 35
  
36 36
  // disable unsupported operators
37 37
  btnIn->setEnabled(false);
src/gui/qgsmarkerdialog.cpp (working copy)
68 68
void QgsMarkerDialog::changeDirectory()
69 69
{
70 70
    QString newdir = QFileDialog::getExistingDirectory(
71
        this, "Choose a directory", mCurrentDir);
71
        this, tr("Choose a directory"), mCurrentDir);
72 72
    if (!newdir.isEmpty())
73 73
    {
74 74
	mCurrentDir=newdir;
src/gui/qgsmaptoolcapture.cpp (working copy)
78 78
  
79 79
  if (!vlayer)
80 80
  {
81
    QMessageBox::information(0,"Not a vector layer","The current layer is not a vector layer",QMessageBox::Ok);
81
    QMessageBox::information(0, QObject::tr("Not a vector layer"), QObject::tr("The current layer is not a vector layer"),QMessageBox::Ok);
82 82
    return;
83 83
  }
84 84
  
85 85
  if (!vlayer->isEditable())
86 86
  {
87
    QMessageBox::information(0,"Layer not editable",
88
                             "Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'.",
87
    QMessageBox::information(0,QObject::tr("Layer not editable"),
88
                             QObject::tr("Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'."),
89 89
                             QMessageBox::Ok);
90 90
    return;
91 91
  }
......
98 98
    //check we only use this tool for point/multipoint layers
99 99
    if(vlayer->vectorType() != QGis::Point)
100 100
      {
101
	QMessageBox::information(0,"Wrong editing tool", "Cannot apply the 'capture point' tool on this vector layer",\
102
QMessageBox::Ok);
101
	QMessageBox::information(0, QObject::tr("Wrong editing tool"), QObject::tr("Cannot apply the 'capture point' tool on this vector layer"),
102
                                 QMessageBox::Ok);
103 103
	return;
104 104
      }
105 105
    QgsPoint idPoint = toMapCoords(e->pos());
......
182 182
    //check we only use the line tool for line/multiline layers
183 183
    if(mTool == CaptureLine && vlayer->vectorType() != QGis::Line)
184 184
      {
185
	QMessageBox::information(0,"Wrong editing tool", "Cannot apply the 'capture line' tool on this vector layer",\
185
	QMessageBox::information(0,QObject::tr("Wrong editing tool"), QObject::tr("Cannot apply the 'capture line' tool on this vector layer"),\
186 186
QMessageBox::Ok);
187 187
	return;
188 188
      }
......
190 190
    //check we only use the polygon tool for polygon/multipolygon layers
191 191
    if(mTool == CapturePolygon && vlayer->vectorType() != QGis::Polygon)
192 192
      {
193
	QMessageBox::information(0,"Wrong editing tool", "Cannot apply the 'capture polygon' tool on this vector layer",\
193
	QMessageBox::information(0,QObject::tr("Wrong editing tool"), QObject::tr("Cannot apply the 'capture polygon' tool on this vector layer"),\
194 194
QMessageBox::Ok);
195 195
	return;
196 196
      }
src/gui/qgsattributetabledisplay.cpp (working copy)
133 133
  {
134 134
    if(!table()->addAttribute(dialog.name(),dialog.type()))
135 135
    {
136
      QMessageBox::information(0,"Name conflict","The attribute could not be inserted. The name already exists in the table",QMessageBox::Ok);
136
      QMessageBox::information(0,tr("Name conflict"),tr("The attribute could not be inserted. The name already exists in the table"),QMessageBox::Ok);
137 137
    }
138 138
  }
139 139
}
......
182 182
  if(table()->edited())
183 183
  {
184 184
    //commit or roll back?
185
    int commit=QMessageBox::information(0,"Stop editing","Do you want to save the changes?",QMessageBox::Yes,QMessageBox::No);
185
    int commit=QMessageBox::information(0,tr("Stop editing"),tr("Do you want to save the changes?"),QMessageBox::Yes,QMessageBox::No);
186 186
    if(commit==QMessageBox::Yes)
187 187
    {
188 188
      if(!table()->commitChanges(mLayer))
189 189
      {
190
        QMessageBox::information(0,"Error","Could not commit changes",QMessageBox::Ok);
190
        QMessageBox::information(0,tr("Error"),tr("Could not commit changes"),QMessageBox::Ok);
191 191
      }
192 192
    }
193 193
    else
src/gui/qgspgquerybuilder.cpp (working copy)
212 212

  
213 213
  }else
214 214
  {
215
    QMessageBox::warning(this, tr("Database error"), tr("<p>Failed to get sample of field values using SQL:</p><p>") + sql + "</p><p>Error message was: "+ QString(PQerrorMessage(mPgConnection)) + "</p>");
215
    QMessageBox::warning(this, tr("Database error"), tr("<p>Failed to get sample of field values using SQL:</p><p>") + sql + tr("</p><p>Error message was: ")+ QString(PQerrorMessage(mPgConnection)) + "</p>");
216 216
  }
217 217
  // free the result set
218 218
  PQclear(result);
......
267 267
  // if there is no sql, issue a warning
268 268
  if(txtSQL->text().isEmpty())
269 269
  {
270
    QMessageBox::information(this, "No Query", "You must create a query before you can test it");
270
    QMessageBox::information(this, tr("No Query"), tr("You must create a query before you can test it"));
271 271
  }
272 272
  else
273 273
  { 
......
334 334
    if(numRecs == -1)
335 335
    {
336 336
      //error in query - show the problem
337
      QMessageBox::warning(this,"Error in Query", mPgErrorMessage);
337
      QMessageBox::warning(this,tr("Error in Query"), mPgErrorMessage);
338 338
    }
339 339
    else
340 340
    {
src/gui/qgsvectorlayerproperties.cpp (working copy)
503 503
    QgsDebug( cse.what() );
504 504

  
505 505
    myMetadataQString += "<tr><td bgcolor=\"white\">";
506
    myMetadataQString += tr("In project spatial reference system units : ");
507
    myMetadataQString += " (Invalid transformation of layer extents) ";
506
    myMetadataQString += tr("In project spatial reference system units: ");
507
    myMetadataQString += tr(" (Invalid transformation of layer extents) ");
508 508
    myMetadataQString += "</td></tr>";
509 509

  
510 510
  }
src/gui/qgsspatialrefsys.cpp (working copy)
1291 1291
    // XXX This will likely never happen since on open, sqlite creates the
1292 1292
    //     database if it does not exist.
1293 1293
    // ... unfortunately it happens on Windows
1294
    QMessageBox::warning(0,"Error","Could not open SRS database "
1295
                + path + "<br>Error(" + QString::number(myResult)
1294
    QMessageBox::warning(0, QObject::tr("Error"), QObject::tr("Could not open SRS database ")
1295
                + path + QObject::tr("<br>Error(") + QString::number(myResult)
1296 1296
                + "): " + QString(sqlite3_errmsg(*db)) ); 
1297 1297
    
1298 1298
  }
src/gui/qgsgraduatedsymboldialog.cpp (working copy)
62 62
	return;
63 63
    }
64 64

  
65
    modeComboBox->insertItem("Empty");
66
    modeComboBox->insertItem("Equal Interval");
65
    modeComboBox->insertItem( tr("Empty") );
66
    modeComboBox->insertItem( tr("Equal Interval") );
67 67
    
68 68
    //restore the correct settings
69 69
    const QgsGraduatedSymbolRenderer* renderer = dynamic_cast < const QgsGraduatedSymbolRenderer * >(layer->renderer());
......
253 253

  
254 254
    if (provider)
255 255
    {
256
	if (modeComboBox->currentText() == "Equal Interval")
256
	if (modeComboBox->currentText() == tr("Equal Interval") )
257 257
	{
258 258
	    minimum = provider->minValue(field).toDouble();
259 259
	    maximum = provider->maxValue(field).toDouble();
......
274 274
	QPen pen;
275 275
	QBrush brush;
276 276

  
277
	if (modeComboBox->currentText() == "Empty")
277
	if (modeComboBox->currentText() == tr("Empty") )
278 278
	{
279
	    listboxtext="Empty"+QString::number(i+1);
279
	    listboxtext= tr("Empty") + QString::number(i+1);
280 280
	    mClassBreakBox->insertItem(listboxtext);
281 281
	}
282
	else if(modeComboBox->currentText() == "Equal Interval")
282
	else if(modeComboBox->currentText() == tr("Equal Interval") )
283 283
	{
284 284
	    double lower=minimum + (maximum - minimum) / numberofclassesspinbox->value() * i;
285 285
	    double upper=minimum + (maximum - minimum) / numberofclassesspinbox->value() * (i+1);
src/gui/qgsmapserverexport.cpp (working copy)
70 70
  // Check for file and prompt for overwrite if it exists
71 71
  if (QFile::exists(txtMapFilePath->text()))
72 72
  {
73
    okToSave = QMessageBox::warning(0, "Overwrite File?", txtMapFilePath->text() +
74
        " exists. \nDo you want to overwrite it?", "Yes", "No");
73
    okToSave = QMessageBox::warning(0, tr("Overwrite File?"), txtMapFilePath->text() +
74
        tr(" exists. \nDo you want to overwrite it?"), tr("Yes"), tr("No"));
75 75
  }
76 76
  if (okToSave == 0)
77 77
  {
......
203 203
      mapFile << "  NAME " << name.toLocal8Bit().data() << std::endl;
204 204
      // feature type
205 205
#ifdef QGISDEBUG
206
      std::cout << "\tMapsrver Export checking feature type" << std::endl;
206
      std::cout << "\tMapserver Export checking feature type" << std::endl;
207 207
#endif
208 208
      mapFile << "  TYPE ";
209 209
      switch (lyr->featureType())
......
231 231
      mapFile << std::endl;
232 232

  
233 233
#ifdef QGISDEBUG
234
      std::cout << "\tMapsrver Export checking visibility" << std::endl;
234
      std::cout << "\tMapserver Export checking visibility" << std::endl;
235 235
#endif
236 236
      // set visibility (STATUS)
237 237
      mapFile << "  STATUS ";
......
247 247
      // data source (DATA)
248 248
      // Data source spec depends on layer type
249 249
#ifdef QGISDEBUG
250
      std::cout << "\tMapsrver Export checking layer type" << std::endl;
250
      std::cout << "\tMapserver Export checking layer type" << std::endl;
251 251
#endif
252 252
      switch (lyr->type())
253 253
      {
......
301 301
      //QListViewItem *li = map->getLegend()->currentItem();
302 302
      //    return li->text(0);
303 303
#ifdef QGISDEBUG
304
      std::cout << "\tMapsrver Export symbol name" << std::endl;
304
      std::cout << "\tMapserver Export symbol name" << std::endl;
305 305
#endif
306 306
      mapFile << "    NAME \"" << lyr->name().toLocal8Bit().data() << "\"" << std::endl;
307 307
      mapFile << "    # TEMPLATE" << std::endl;
308 308
      if (isPolygon)
309 309
      {
310 310
#ifdef QGISDEBUG
311
        std::cout << "\tMapsrver Export symbol fill color" << std::endl;
311
        std::cout << "\tMapserver Export symbol fill color" << std::endl;
312 312
#endif
313 313
        // use random fill colors
314 314
        // TODO Get fill color from the renderer
......
322 322
        mapFile << "    COLOR " << red << " " << green << " " << blue << std::endl;
323 323
      }
324 324
#ifdef QGISDEBUG
325
      std::cout << "\tMapsrver Export checking for line symbol " << std::endl;
325
      std::cout << "\tMapserver Export checking for line symbol " << std::endl;
326 326
#endif
327 327
      if (isPolygon || isLine)
328 328
      {
......
337 337
      mapFile << "  END" << std::endl;
338 338
      mapFile << "END" << std::endl;
339 339
#ifdef QGISDEBUG
340
      std::cout << "\tMapsrver Export layer definition done..." << std::endl;
340
      std::cout << "\tMapserver Export layer definition done..." << std::endl;
341 341
#endif
342 342
    }
343 343
    if (!chkExpLayersOnly->isChecked())
......
362 362
{
363 363
  QString s = QFileDialog::getSaveFileName(
364 364
                    this,
365
                    "Choose a filename for the exported map file",
365
                    tr("Choose a filename for the exported map file"),
366 366
                    "./",
367
                    "Mapserver files (*.map)" );
367
                    tr("Mapserver files (*.map)" ) );
368 368
  txtMapFilePath->setText(s);
369 369
}
370 370

  
......
373 373
  //QMessageBox::information(this, "Help","Help");
374 374
  QgsHelpViewer *hv = new QgsHelpViewer(this);
375 375
  // causes problems in qt3.1.x:  hv->setModal(false);
376
  hv->setCaption("QGIS Help - Mapserver Export");
376
  hv->setCaption( tr("QGIS Help - Mapserver Export") );
377 377
  hv->show();
378 378
}