Added patch #685 from lubaby (+ some more) to trunk.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6838 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 27, 2007 · b07319d · b07319d
1 parent e5acdf4
commit b07319d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
@@ -391,19 +391,19 @@ void QgsGrassEdit::init()
 
   // Set symbology names
   mSymbName.resize(SYMB_COUNT);
-  mSymbName[SYMB_BACKGROUND]    = "Background";
-  mSymbName[SYMB_HIGHLIGHT]     = "Highlight";
-  mSymbName[SYMB_DYNAMIC]       = "Dynamic";
-  mSymbName[SYMB_POINT]         = "Point";
-  mSymbName[SYMB_LINE]          = "Line";
-  mSymbName[SYMB_BOUNDARY_0]    = "Boundary (no area)";
-  mSymbName[SYMB_BOUNDARY_1]    = "Boundary (1 area)";
-  mSymbName[SYMB_BOUNDARY_2]    = "Boundary (2 areas)";
-  mSymbName[SYMB_CENTROID_IN]   = "Centroid (in area)";
-  mSymbName[SYMB_CENTROID_OUT]  = "Centroid (outside area)";
-  mSymbName[SYMB_CENTROID_DUPL] = "Centroid (duplicate in area)";
-  mSymbName[SYMB_NODE_1]        = "Node (1 line)";
-  mSymbName[SYMB_NODE_2]        = "Node (2 lines)";
+  mSymbName[SYMB_BACKGROUND]    = tr("Background");
+  mSymbName[SYMB_HIGHLIGHT]     = tr("Highlight");
+  mSymbName[SYMB_DYNAMIC]       = tr("Dynamic");
+  mSymbName[SYMB_POINT]         = tr("Point");
+  mSymbName[SYMB_LINE]          = tr("Line");
+  mSymbName[SYMB_BOUNDARY_0]    = tr("Boundary (no area)");
+  mSymbName[SYMB_BOUNDARY_1]    = tr("Boundary (1 area)");
+  mSymbName[SYMB_BOUNDARY_2]    = tr("Boundary (2 areas)");
+  mSymbName[SYMB_CENTROID_IN]   = tr("Centroid (in area)");
+  mSymbName[SYMB_CENTROID_OUT]  = tr("Centroid (outside area)");
+  mSymbName[SYMB_CENTROID_DUPL] = tr("Centroid (duplicate in area)");
+  mSymbName[SYMB_NODE_1]        = tr("Node (1 line)");
+  mSymbName[SYMB_NODE_2]        = tr("Node (2 lines)");
 
   // Restore symbology
   QString spath = "/GRASS/edit/symb/";
@@ -436,13 +436,13 @@ void QgsGrassEdit::init()
   }
 
   // Set Symbology in dialog
-  symbologyList->setColumnText(0,"Disp");
+  symbologyList->setColumnText(0,tr("Disp","Column title") );
   symbologyList->setColumnWidth(0,20);
-  symbologyList->addColumn("Color");
+  symbologyList->addColumn( tr("Color","Column title") );
   symbologyList->setColumnWidth(0,50);
-  symbologyList->addColumn("Type");
+  symbologyList->addColumn( tr("Type","Column title") );
   symbologyList->setColumnWidthMode(2,Q3ListView::Maximum);
-  symbologyList->addColumn("Index", 0);
+  symbologyList->addColumn(tr("Index","Column title") , 0);
   symbologyList->clear();
   symbologyList->setSorting(-1);
 
@@ -472,9 +472,9 @@ void QgsGrassEdit::init()
 
   // Init table tab
   mAttributeTable->setLeftMargin(0); // hide row labels
-  mAttributeTable->horizontalHeader()->setLabel( 0, "Column" );
-  mAttributeTable->horizontalHeader()->setLabel( 1, "Type" );
-  mAttributeTable->horizontalHeader()->setLabel( 2, "Length" );
+  mAttributeTable->horizontalHeader()->setLabel( 0, tr("Column") );
+  mAttributeTable->horizontalHeader()->setLabel( 1, tr("Type") );
+  mAttributeTable->horizontalHeader()->setLabel( 2, tr("Length") );
 
   int ndblinks = mProvider->numDbLinks();
 
@@ -529,9 +529,9 @@ void QgsGrassEdit::init()
   mRubberBandIcon->setZValue(20);
 
   // Init GUI values
-  mCatModeBox->insertItem( "Next not used", CAT_MODE_NEXT );
-  mCatModeBox->insertItem( "Manual entry", CAT_MODE_MANUAL );
-  mCatModeBox->insertItem( "No category", CAT_MODE_NOCAT );
+  mCatModeBox->insertItem( tr("Next not used"), CAT_MODE_NEXT );
+  mCatModeBox->insertItem( tr("Manual entry"), CAT_MODE_MANUAL );
+  mCatModeBox->insertItem( tr("No category"), CAT_MODE_NOCAT );
   catModeChanged ( );
 
   // TODO: how to get keyboard events from canvas (shortcuts)
@@ -1813,7 +1813,7 @@ void QgsGrassEdit::setCanvasPropmt( QString left, QString mid, QString rigth)
   mCanvasPrompt = "";
   if ( left.length() > 0 ) mCanvasPrompt.append ( tr("Left: ") + left + "   " );
   if ( mid.length() > 0 ) mCanvasPrompt.append ( tr("Middle: ") + mid + "   " );
-  if ( rigth.length() > 0 ) mCanvasPrompt.append ( tr("Rigth: ") + rigth );
+  if ( rigth.length() > 0 ) mCanvasPrompt.append ( tr("Right: ") + rigth );
 }
 
 void QgsGrassEdit::attributesClosed()

diff --git a/src/plugins/grid_maker/plugingui.cpp b/src/plugins/grid_maker/plugingui.cpp
@@ -49,7 +49,7 @@ void QgsGridMakerPluginGui::on_buttonBox_accepted()
   if (leOutputShapeFile->text().isEmpty())
   {
     QMessageBox::warning( 0, tr("QGIS - Grid Maker"),
-            QString(tr("Please enter the file name before pressing OK!.") ));
+            QString(tr("Please enter the file name before pressing OK!") ));
     return;
   }
 

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1887,13 +1887,13 @@ bool QgsPostgresProvider::changeAttributeValues(const QgsChangedAttributesMap &
       if (result==0)
       {
         showMessageBox(tr("PostGIS error"),
-                       tr("An error occured contacting the PostgreSQL databse"));
+                       tr("An error occured contacting the PostgreSQL database"));
         return false;
       }
       ExecStatusType message=PQresultStatus(result);
       if(message==PGRES_FATAL_ERROR)
       {
-        showMessageBox(tr("PostGIS error"),tr("The PostgreSQL databse returned: ")
+        showMessageBox(tr("PostGIS error"),tr("The PostgreSQL database returned: ")
                         + QString(PQresultErrorMessage(result))
                         + "\n" + tr("When trying: ") + sql);
         return false;
@@ -2006,13 +2006,13 @@ bool QgsPostgresProvider::changeGeometryValues(QgsGeometryMap & geometry_map)
       PGresult* result=PQexec(connection, (const char *)(sql.utf8()));
       if (result==0)
       {
-        showMessageBox(tr("PostGIS error"), tr("An error occured contacting the PostgreSQL databse"));
+        showMessageBox(tr("PostGIS error"), tr("An error occured contacting the PostgreSQL database"));
         return false;
       }
       ExecStatusType message=PQresultStatus(result);
       if(message==PGRES_FATAL_ERROR)
       {
-        showMessageBox(tr("PostGIS error"), tr("The PostgreSQL databse returned: ")
+        showMessageBox(tr("PostGIS error"), tr("The PostgreSQL database returned: ")
                                    + QString(PQresultErrorMessage(result))
                                    + "\n" + tr("When trying: ") + sql);
         return false;