Skip to content

Commit b07319d

Browse files
author
homann
committedMar 27, 2007
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
·
final-1_7_1Preview-0.9.0-1
1 parent e5acdf4 commit b07319d

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed
 

‎src/plugins/grass/qgsgrassedit.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -391,19 +391,19 @@ void QgsGrassEdit::init()
391391

392392
// Set symbology names
393393
mSymbName.resize(SYMB_COUNT);
394-
mSymbName[SYMB_BACKGROUND] = "Background";
395-
mSymbName[SYMB_HIGHLIGHT] = "Highlight";
396-
mSymbName[SYMB_DYNAMIC] = "Dynamic";
397-
mSymbName[SYMB_POINT] = "Point";
398-
mSymbName[SYMB_LINE] = "Line";
399-
mSymbName[SYMB_BOUNDARY_0] = "Boundary (no area)";
400-
mSymbName[SYMB_BOUNDARY_1] = "Boundary (1 area)";
401-
mSymbName[SYMB_BOUNDARY_2] = "Boundary (2 areas)";
402-
mSymbName[SYMB_CENTROID_IN] = "Centroid (in area)";
403-
mSymbName[SYMB_CENTROID_OUT] = "Centroid (outside area)";
404-
mSymbName[SYMB_CENTROID_DUPL] = "Centroid (duplicate in area)";
405-
mSymbName[SYMB_NODE_1] = "Node (1 line)";
406-
mSymbName[SYMB_NODE_2] = "Node (2 lines)";
394+
mSymbName[SYMB_BACKGROUND] = tr("Background");
395+
mSymbName[SYMB_HIGHLIGHT] = tr("Highlight");
396+
mSymbName[SYMB_DYNAMIC] = tr("Dynamic");
397+
mSymbName[SYMB_POINT] = tr("Point");
398+
mSymbName[SYMB_LINE] = tr("Line");
399+
mSymbName[SYMB_BOUNDARY_0] = tr("Boundary (no area)");
400+
mSymbName[SYMB_BOUNDARY_1] = tr("Boundary (1 area)");
401+
mSymbName[SYMB_BOUNDARY_2] = tr("Boundary (2 areas)");
402+
mSymbName[SYMB_CENTROID_IN] = tr("Centroid (in area)");
403+
mSymbName[SYMB_CENTROID_OUT] = tr("Centroid (outside area)");
404+
mSymbName[SYMB_CENTROID_DUPL] = tr("Centroid (duplicate in area)");
405+
mSymbName[SYMB_NODE_1] = tr("Node (1 line)");
406+
mSymbName[SYMB_NODE_2] = tr("Node (2 lines)");
407407

408408
// Restore symbology
409409
QString spath = "/GRASS/edit/symb/";
@@ -436,13 +436,13 @@ void QgsGrassEdit::init()
436436
}
437437

438438
// Set Symbology in dialog
439-
symbologyList->setColumnText(0,"Disp");
439+
symbologyList->setColumnText(0,tr("Disp","Column title") );
440440
symbologyList->setColumnWidth(0,20);
441-
symbologyList->addColumn("Color");
441+
symbologyList->addColumn( tr("Color","Column title") );
442442
symbologyList->setColumnWidth(0,50);
443-
symbologyList->addColumn("Type");
443+
symbologyList->addColumn( tr("Type","Column title") );
444444
symbologyList->setColumnWidthMode(2,Q3ListView::Maximum);
445-
symbologyList->addColumn("Index", 0);
445+
symbologyList->addColumn(tr("Index","Column title") , 0);
446446
symbologyList->clear();
447447
symbologyList->setSorting(-1);
448448

@@ -472,9 +472,9 @@ void QgsGrassEdit::init()
472472

473473
// Init table tab
474474
mAttributeTable->setLeftMargin(0); // hide row labels
475-
mAttributeTable->horizontalHeader()->setLabel( 0, "Column" );
476-
mAttributeTable->horizontalHeader()->setLabel( 1, "Type" );
477-
mAttributeTable->horizontalHeader()->setLabel( 2, "Length" );
475+
mAttributeTable->horizontalHeader()->setLabel( 0, tr("Column") );
476+
mAttributeTable->horizontalHeader()->setLabel( 1, tr("Type") );
477+
mAttributeTable->horizontalHeader()->setLabel( 2, tr("Length") );
478478

479479
int ndblinks = mProvider->numDbLinks();
480480

@@ -529,9 +529,9 @@ void QgsGrassEdit::init()
529529
mRubberBandIcon->setZValue(20);
530530

531531
// Init GUI values
532-
mCatModeBox->insertItem( "Next not used", CAT_MODE_NEXT );
533-
mCatModeBox->insertItem( "Manual entry", CAT_MODE_MANUAL );
534-
mCatModeBox->insertItem( "No category", CAT_MODE_NOCAT );
532+
mCatModeBox->insertItem( tr("Next not used"), CAT_MODE_NEXT );
533+
mCatModeBox->insertItem( tr("Manual entry"), CAT_MODE_MANUAL );
534+
mCatModeBox->insertItem( tr("No category"), CAT_MODE_NOCAT );
535535
catModeChanged ( );
536536

537537
// TODO: how to get keyboard events from canvas (shortcuts)
@@ -1813,7 +1813,7 @@ void QgsGrassEdit::setCanvasPropmt( QString left, QString mid, QString rigth)
18131813
mCanvasPrompt = "";
18141814
if ( left.length() > 0 ) mCanvasPrompt.append ( tr("Left: ") + left + " " );
18151815
if ( mid.length() > 0 ) mCanvasPrompt.append ( tr("Middle: ") + mid + " " );
1816-
if ( rigth.length() > 0 ) mCanvasPrompt.append ( tr("Rigth: ") + rigth );
1816+
if ( rigth.length() > 0 ) mCanvasPrompt.append ( tr("Right: ") + rigth );
18171817
}
18181818

18191819
void QgsGrassEdit::attributesClosed()

‎src/plugins/grid_maker/plugingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void QgsGridMakerPluginGui::on_buttonBox_accepted()
4949
if (leOutputShapeFile->text().isEmpty())
5050
{
5151
QMessageBox::warning( 0, tr("QGIS - Grid Maker"),
52-
QString(tr("Please enter the file name before pressing OK!.") ));
52+
QString(tr("Please enter the file name before pressing OK!") ));
5353
return;
5454
}
5555

‎src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,13 +1887,13 @@ bool QgsPostgresProvider::changeAttributeValues(const QgsChangedAttributesMap &
18871887
if (result==0)
18881888
{
18891889
showMessageBox(tr("PostGIS error"),
1890-
tr("An error occured contacting the PostgreSQL databse"));
1890+
tr("An error occured contacting the PostgreSQL database"));
18911891
return false;
18921892
}
18931893
ExecStatusType message=PQresultStatus(result);
18941894
if(message==PGRES_FATAL_ERROR)
18951895
{
1896-
showMessageBox(tr("PostGIS error"),tr("The PostgreSQL databse returned: ")
1896+
showMessageBox(tr("PostGIS error"),tr("The PostgreSQL database returned: ")
18971897
+ QString(PQresultErrorMessage(result))
18981898
+ "\n" + tr("When trying: ") + sql);
18991899
return false;
@@ -2006,13 +2006,13 @@ bool QgsPostgresProvider::changeGeometryValues(QgsGeometryMap & geometry_map)
20062006
PGresult* result=PQexec(connection, (const char *)(sql.utf8()));
20072007
if (result==0)
20082008
{
2009-
showMessageBox(tr("PostGIS error"), tr("An error occured contacting the PostgreSQL databse"));
2009+
showMessageBox(tr("PostGIS error"), tr("An error occured contacting the PostgreSQL database"));
20102010
return false;
20112011
}
20122012
ExecStatusType message=PQresultStatus(result);
20132013
if(message==PGRES_FATAL_ERROR)
20142014
{
2015-
showMessageBox(tr("PostGIS error"), tr("The PostgreSQL databse returned: ")
2015+
showMessageBox(tr("PostGIS error"), tr("The PostgreSQL database returned: ")
20162016
+ QString(PQresultErrorMessage(result))
20172017
+ "\n" + tr("When trying: ") + sql);
20182018
return false;

0 commit comments

Comments
 (0)
Please sign in to comment.