Skip to content

Commit c448360

Browse files
mach0mach0
committed
Merge pull request #750 from artfwo/master
Fix misc typos and untranslatable strings
2 parents ddef9a9 + 1faadbc commit c448360

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ QgsStyleV2ExportImportDialog::QgsStyleV2ExportImportDialog( QgsStyleV2* style, Q
6060
{
6161
setWindowTitle( tr( "Import style(s)" ) );
6262
// populate the import types
63-
importTypeCombo->addItem( "file specified below", QVariant( "file" ) );
63+
importTypeCombo->addItem( tr( "file specified below" ), QVariant( "file" ) );
6464
// importTypeCombo->addItem( "official QGIS repo online", QVariant( "official" ) );
65-
importTypeCombo->addItem( "URL specified below", QVariant( "url" ) );
65+
importTypeCombo->addItem( tr( "URL specified below" ), QVariant( "url" ) );
6666
connect( importTypeCombo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( importTypeChanged( int ) ) );
6767

6868
QStringList groups = mQgisStyle->groupNames();

‎src/plugins/topology/dockModel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
DockModel::DockModel( ErrorList& theErrorList, QObject *parent = 0 ) : mErrorlist( theErrorList )
2222
{
2323
Q_UNUSED( parent );
24-
mHeader << "Error" << "Layer" << "Feature ID";
24+
mHeader << QObject::tr( "Error" ) << QObject::tr( "Layer" ) << QObject::tr( "Feature ID" );
2525

2626
}
2727

‎src/plugins/topology/topolTest.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,13 @@ ErrorList topolTest::checkDanglingLines( double tolerance, QgsVectorLayer* layer
273273

274274
if ( !g1 )
275275
{
276-
QgsMessageLog::logMessage( tr( "First geometry invalid in line test." ), tr( "Topology plugin" ) );
276+
QgsMessageLog::logMessage( tr( "First geometry invalid in dangling line test." ), tr( "Topology plugin" ) );
277277
continue;
278278
}
279279

280280
if ( !g1->asGeos() )
281281
{
282-
QgsMessageLog::logMessage( tr( "Failed to import first geometry into GEOS in line test." ), tr( "Topology plugin" ) );
282+
QgsMessageLog::logMessage( tr( "Failed to import first geometry into GEOS in dangling line test." ), tr( "Topology plugin" ) );
283283
continue;
284284
}
285285

@@ -405,13 +405,13 @@ ErrorList topolTest::checkDuplicates( double tolerance, QgsVectorLayer *layer1,
405405
QgsGeometry* g2 = mFeatureMap2[*cit].feature.geometry();
406406
if ( !g2 )
407407
{
408-
QgsMessageLog::logMessage( tr( "Invalid second geometry in dangling line test." ), tr( "Topology plugin" ) );
408+
QgsMessageLog::logMessage( tr( "Invalid second geometry in duplicate geometry test." ), tr( "Topology plugin" ) );
409409
continue;
410410
}
411411

412412
if ( !g2->asGeos() )
413413
{
414-
QgsMessageLog::logMessage( tr( "Failed to import second geometry into GEOS in dangling line test." ), tr( "Topology plugin" ) );
414+
QgsMessageLog::logMessage( tr( "Failed to import second geometry into GEOS in duplicate geometry test." ), tr( "Topology plugin" ) );
415415
continue;
416416
}
417417

@@ -528,19 +528,19 @@ ErrorList topolTest::checkOverlaps( double tolerance, QgsVectorLayer *layer1, Qg
528528
QgsGeometry* g2 = mFeatureMap2[*cit].feature.geometry();
529529
if ( !g2 )
530530
{
531-
QgsMessageLog::logMessage( tr( "Invalid second geometry in dangling line test." ), tr( "Topology plugin" ) );
531+
QgsMessageLog::logMessage( tr( "Invalid second geometry in overlaps test." ), tr( "Topology plugin" ) );
532532
continue;
533533
}
534534

535535
if ( !g2->asGeos() )
536536
{
537-
QgsMessageLog::logMessage( tr( "Failed to import second geometry into GEOS in dangling line test." ), tr( "Topology plugin" ) );
537+
QgsMessageLog::logMessage( tr( "Failed to import second geometry into GEOS in overlaps test." ), tr( "Topology plugin" ) );
538538
continue;
539539
}
540540

541541
if ( g2->isGeosValid() == false )
542542
{
543-
QgsMessageLog::logMessage( tr( "Skipping invalid second geometry of feature %1 in dangling line test." ).arg( it->feature.id() ), tr( "Topology plugin" ) );
543+
QgsMessageLog::logMessage( tr( "Skipping invalid second geometry of feature %1 in overlaps test." ).arg( it->feature.id() ), tr( "Topology plugin" ) );
544544
continue;
545545
}
546546

@@ -1259,7 +1259,7 @@ ErrorList topolTest::checkPointCoveredByLineEnds( double tolerance, QgsVectorLay
12591259
QgsGeometry* g2 = f.geometry();
12601260
if ( !g2 || !g2->asGeos() )
12611261
{
1262-
QgsMessageLog::logMessage( tr( "No second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
1262+
QgsMessageLog::logMessage( tr( "Second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
12631263
continue;
12641264
}
12651265
QgsGeometry* startPoint = QgsGeometry::fromPoint( g2->asPolyline().first() );
@@ -1344,7 +1344,7 @@ ErrorList topolTest::checkyLineEndsCoveredByPoints( double tolerance, QgsVectorL
13441344
QgsGeometry* g2 = f.geometry();
13451345
if ( !g2 || !g2->asGeos() )
13461346
{
1347-
QgsMessageLog::logMessage( tr( "No second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
1347+
QgsMessageLog::logMessage( tr( "Second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
13481348
continue;
13491349
}
13501350

@@ -1435,7 +1435,7 @@ ErrorList topolTest::checkPointInPolygon( double tolerance, QgsVectorLayer *laye
14351435
QgsGeometry* g2 = f.geometry();
14361436
if ( !g2 || !g2->asGeos() )
14371437
{
1438-
QgsMessageLog::logMessage( tr( "No second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
1438+
QgsMessageLog::logMessage( tr( "Second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
14391439
continue;
14401440
}
14411441
if ( g2->contains( g1 ) )
@@ -1509,7 +1509,7 @@ ErrorList topolTest::checkPolygonContainsPoint( double tolerance, QgsVectorLayer
15091509
QgsGeometry* g2 = f.geometry();
15101510
if ( !g2 || !g2->asGeos() )
15111511
{
1512-
QgsMessageLog::logMessage( tr( "No second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
1512+
QgsMessageLog::logMessage( tr( "Second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
15131513
continue;
15141514
}
15151515
if ( g1->contains( g2 ) )

0 commit comments

Comments
 (0)