Fix misc typos and untranslatable strings

qgis · Jul 19, 2013 · 1faadbc · 1faadbc
1 parent ddef9a9
commit 1faadbc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp b/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
@@ -60,9 +60,9 @@ QgsStyleV2ExportImportDialog::QgsStyleV2ExportImportDialog( QgsStyleV2* style, Q
   {
     setWindowTitle( tr( "Import style(s)" ) );
     // populate the import types
-    importTypeCombo->addItem( "file specified below", QVariant( "file" ) );
+    importTypeCombo->addItem( tr( "file specified below" ), QVariant( "file" ) );
     // importTypeCombo->addItem( "official QGIS repo online", QVariant( "official" ) );
-    importTypeCombo->addItem( "URL specified below", QVariant( "url" ) );
+    importTypeCombo->addItem( tr( "URL specified below" ), QVariant( "url" ) );
     connect( importTypeCombo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( importTypeChanged( int ) ) );
 
     QStringList groups = mQgisStyle->groupNames();

diff --git a/src/plugins/topology/dockModel.cpp b/src/plugins/topology/dockModel.cpp
@@ -21,7 +21,7 @@
 DockModel::DockModel( ErrorList& theErrorList, QObject *parent = 0 ) : mErrorlist( theErrorList )
 {
   Q_UNUSED( parent );
-  mHeader << "Error" << "Layer" << "Feature ID";
+  mHeader << QObject::tr( "Error" ) << QObject::tr( "Layer" ) << QObject::tr( "Feature ID" );
 
 }
 

diff --git a/src/plugins/topology/topolTest.cpp b/src/plugins/topology/topolTest.cpp
@@ -273,13 +273,13 @@ ErrorList topolTest::checkDanglingLines( double tolerance, QgsVectorLayer* layer
 
     if ( !g1 )
     {
-      QgsMessageLog::logMessage( tr( "First geometry invalid in line test." ), tr( "Topology plugin" ) );
+      QgsMessageLog::logMessage( tr( "First geometry invalid in dangling line test." ), tr( "Topology plugin" ) );
       continue;
     }
 
     if ( !g1->asGeos() )
     {
-      QgsMessageLog::logMessage( tr( "Failed to import first geometry into GEOS in line test." ), tr( "Topology plugin" ) );
+      QgsMessageLog::logMessage( tr( "Failed to import first geometry into GEOS in dangling line test." ), tr( "Topology plugin" ) );
       continue;
     }
 
@@ -405,13 +405,13 @@ ErrorList topolTest::checkDuplicates( double tolerance, QgsVectorLayer *layer1,
       QgsGeometry* g2 = mFeatureMap2[*cit].feature.geometry();
       if ( !g2 )
       {
-        QgsMessageLog::logMessage( tr( "Invalid second geometry in dangling line test." ), tr( "Topology plugin" ) );
+        QgsMessageLog::logMessage( tr( "Invalid second geometry in duplicate geometry test." ), tr( "Topology plugin" ) );
         continue;
       }
 
       if ( !g2->asGeos() )
       {
-        QgsMessageLog::logMessage( tr( "Failed to import second geometry into GEOS in dangling line test." ), tr( "Topology plugin" ) );
+        QgsMessageLog::logMessage( tr( "Failed to import second geometry into GEOS in duplicate geometry test." ), tr( "Topology plugin" ) );
         continue;
       }
 
@@ -528,19 +528,19 @@ ErrorList topolTest::checkOverlaps( double tolerance, QgsVectorLayer *layer1, Qg
       QgsGeometry* g2 = mFeatureMap2[*cit].feature.geometry();
       if ( !g2 )
       {
-        QgsMessageLog::logMessage( tr( "Invalid second geometry in dangling line test." ), tr( "Topology plugin" ) );
+        QgsMessageLog::logMessage( tr( "Invalid second geometry in overlaps test." ), tr( "Topology plugin" ) );
         continue;
       }
 
       if ( !g2->asGeos() )
       {
-        QgsMessageLog::logMessage( tr( "Failed to import second geometry into GEOS in dangling line test." ), tr( "Topology plugin" ) );
+        QgsMessageLog::logMessage( tr( "Failed to import second geometry into GEOS in overlaps test." ), tr( "Topology plugin" ) );
         continue;
       }
 
       if ( g2->isGeosValid() == false )
       {
-        QgsMessageLog::logMessage( tr( "Skipping invalid second geometry of feature %1 in dangling line test." ).arg( it->feature.id() ), tr( "Topology plugin" ) );
+        QgsMessageLog::logMessage( tr( "Skipping invalid second geometry of feature %1 in overlaps test." ).arg( it->feature.id() ), tr( "Topology plugin" ) );
         continue;
       }
 
@@ -1259,7 +1259,7 @@ ErrorList topolTest::checkPointCoveredByLineEnds( double tolerance, QgsVectorLay
       QgsGeometry* g2 = f.geometry();
       if ( !g2 || !g2->asGeos() )
       {
-        QgsMessageLog::logMessage( tr( "No second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
+        QgsMessageLog::logMessage( tr( "Second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
         continue;
       }
       QgsGeometry* startPoint = QgsGeometry::fromPoint( g2->asPolyline().first() );
@@ -1344,7 +1344,7 @@ ErrorList topolTest::checkyLineEndsCoveredByPoints( double tolerance, QgsVectorL
       QgsGeometry* g2 = f.geometry();
       if ( !g2 || !g2->asGeos() )
       {
-        QgsMessageLog::logMessage( tr( "No second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
+        QgsMessageLog::logMessage( tr( "Second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
         continue;
       }
 
@@ -1435,7 +1435,7 @@ ErrorList topolTest::checkPointInPolygon( double tolerance, QgsVectorLayer *laye
       QgsGeometry* g2 = f.geometry();
       if ( !g2 || !g2->asGeos() )
       {
-        QgsMessageLog::logMessage( tr( "No second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
+        QgsMessageLog::logMessage( tr( "Second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
         continue;
       }
       if ( g2->contains( g1 ) )
@@ -1509,7 +1509,7 @@ ErrorList topolTest::checkPolygonContainsPoint( double tolerance, QgsVectorLayer
       QgsGeometry* g2 = f.geometry();
       if ( !g2 || !g2->asGeos() )
       {
-        QgsMessageLog::logMessage( tr( "No second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
+        QgsMessageLog::logMessage( tr( "Second geometry missing or GEOS import failed." ), tr( "Topology plugin" ) );
         continue;
       }
       if ( g1->contains( g2 ) )