Skip to content

Commit fea112e

Browse files
author
homann
committedMar 27, 2007
Added patch #685 from lubaby (+ some more) to 0.8
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6837 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7091eb5 commit fea112e

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed
 

‎src/gui/qgsvectorlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,7 @@ bool QgsVectorLayer::deleteSelectedFeatures()
18331833
if(!isEditable())
18341834
{
18351835
QMessageBox::information(0, tr("Layer not editable"),
1836-
tr("The current layer is not editable. Choose 'Allow editing' in the legend item right click menu"));
1836+
tr("The current layer is not editable. Choose 'Allow editing' in the legend item right click menu."));
18371837
return false;
18381838
}
18391839

‎src/plugins/grass/qgsgrassedit.cpp

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

387387
// Set symbology names
388388
mSymbName.resize(SYMB_COUNT);
389-
mSymbName[SYMB_BACKGROUND] = "Background";
390-
mSymbName[SYMB_HIGHLIGHT] = "Highlight";
391-
mSymbName[SYMB_DYNAMIC] = "Dynamic";
392-
mSymbName[SYMB_POINT] = "Point";
393-
mSymbName[SYMB_LINE] = "Line";
394-
mSymbName[SYMB_BOUNDARY_0] = "Boundary (no area)";
395-
mSymbName[SYMB_BOUNDARY_1] = "Boundary (1 area)";
396-
mSymbName[SYMB_BOUNDARY_2] = "Boundary (2 areas)";
397-
mSymbName[SYMB_CENTROID_IN] = "Centroid (in area)";
398-
mSymbName[SYMB_CENTROID_OUT] = "Centroid (outside area)";
399-
mSymbName[SYMB_CENTROID_DUPL] = "Centroid (duplicate in area)";
400-
mSymbName[SYMB_NODE_1] = "Node (1 line)";
401-
mSymbName[SYMB_NODE_2] = "Node (2 lines)";
389+
mSymbName[SYMB_BACKGROUND] = tr("Background");
390+
mSymbName[SYMB_HIGHLIGHT] = tr("Highlight");
391+
mSymbName[SYMB_DYNAMIC] = tr("Dynamic");
392+
mSymbName[SYMB_POINT] = tr("Point");
393+
mSymbName[SYMB_LINE] = tr("Line");
394+
mSymbName[SYMB_BOUNDARY_0] = tr("Boundary (no area)");
395+
mSymbName[SYMB_BOUNDARY_1] = tr("Boundary (1 area)");
396+
mSymbName[SYMB_BOUNDARY_2] = tr("Boundary (2 areas)");
397+
mSymbName[SYMB_CENTROID_IN] = tr("Centroid (in area)");
398+
mSymbName[SYMB_CENTROID_OUT] = tr("Centroid (outside area)");
399+
mSymbName[SYMB_CENTROID_DUPL] = tr("Centroid (duplicate in area)");
400+
mSymbName[SYMB_NODE_1] = tr("Node (1 line)");
401+
mSymbName[SYMB_NODE_2] = tr("Node (2 lines)");
402402

403403
// Restore symbology
404404
QString spath = "/GRASS/edit/symb/";
@@ -431,13 +431,13 @@ void QgsGrassEdit::init()
431431
}
432432

433433
// Set Symbology in dialog
434-
symbologyList->setColumnText(0,"Disp");
434+
symbologyList->setColumnText(0,tr("Disp","Column title") );
435435
symbologyList->setColumnWidth(0,20);
436-
symbologyList->addColumn("Color");
436+
symbologyList->addColumn( tr("Color","Column title") );
437437
symbologyList->setColumnWidth(0,50);
438-
symbologyList->addColumn("Type");
438+
symbologyList->addColumn( tr("Type","Column title") );
439439
symbologyList->setColumnWidthMode(2,Q3ListView::Maximum);
440-
symbologyList->addColumn("Index", 0);
440+
symbologyList->addColumn(tr("Index","Column title") , 0);
441441
symbologyList->clear();
442442
symbologyList->setSorting(-1);
443443

@@ -467,9 +467,9 @@ void QgsGrassEdit::init()
467467

468468
// Init table tab
469469
mAttributeTable->setLeftMargin(0); // hide row labels
470-
mAttributeTable->horizontalHeader()->setLabel( 0, "Column" );
471-
mAttributeTable->horizontalHeader()->setLabel( 1, "Type" );
472-
mAttributeTable->horizontalHeader()->setLabel( 2, "Length" );
470+
mAttributeTable->horizontalHeader()->setLabel( 0, tr("Column") );
471+
mAttributeTable->horizontalHeader()->setLabel( 1, tr("Type") );
472+
mAttributeTable->horizontalHeader()->setLabel( 2, tr("Length") );
473473

474474
int ndblinks = mProvider->numDbLinks();
475475

@@ -527,9 +527,9 @@ void QgsGrassEdit::init()
527527
mRubberBandIcon->show();
528528

529529
// Init GUI values
530-
mCatModeBox->insertItem( "Next not used", CAT_MODE_NEXT );
531-
mCatModeBox->insertItem( "Manual entry", CAT_MODE_MANUAL );
532-
mCatModeBox->insertItem( "No category", CAT_MODE_NOCAT );
530+
mCatModeBox->insertItem( tr("Next not used"), CAT_MODE_NEXT );
531+
mCatModeBox->insertItem( tr("Manual entry"), CAT_MODE_MANUAL );
532+
mCatModeBox->insertItem( tr("No category"), CAT_MODE_NOCAT );
533533
catModeChanged ( );
534534

535535
// TODO: how to get keyboard events from canvas (shortcuts)
@@ -1829,7 +1829,7 @@ void QgsGrassEdit::setCanvasPropmt( QString left, QString mid, QString rigth)
18291829
mCanvasPrompt = "";
18301830
if ( left.length() > 0 ) mCanvasPrompt.append ( tr("Left: ") + left + " " );
18311831
if ( mid.length() > 0 ) mCanvasPrompt.append ( tr("Middle: ") + mid + " " );
1832-
if ( rigth.length() > 0 ) mCanvasPrompt.append ( tr("Rigth: ") + rigth );
1832+
if ( rigth.length() > 0 ) mCanvasPrompt.append ( tr("Right: ") + rigth );
18331833
}
18341834

18351835
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_pbnOK_clicked()
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
@@ -2069,7 +2069,7 @@ bool QgsPostgresProvider::changeAttributeValues(std::map<int,std::map<QString,QS
20692069
if (result==0)
20702070
{
20712071
QMessageBox::critical(0, tr("PostGIS error"),
2072-
tr("An error occured contacting the PostgreSQL databse"),
2072+
tr("An error occured contacting the PostgreSQL database"),
20732073
QMessageBox::Ok,
20742074
Qt::NoButton);
20752075
return false;
@@ -2078,7 +2078,7 @@ bool QgsPostgresProvider::changeAttributeValues(std::map<int,std::map<QString,QS
20782078
if(message==PGRES_FATAL_ERROR)
20792079
{
20802080
QMessageBox::information(0, tr("PostGIS error"),
2081-
tr("The PostgreSQL databse returned: ")
2081+
tr("The PostgreSQL database returned: ")
20822082
+ QString(PQresultErrorMessage(result))
20832083
+ "\n"
20842084
+ tr("When trying: ")
@@ -2195,7 +2195,7 @@ bool QgsPostgresProvider::changeGeometryValues(std::map<int, QgsGeometry> & geom
21952195
if (result==0)
21962196
{
21972197
QMessageBox::critical(0, tr("PostGIS error"),
2198-
tr("An error occured contacting the PostgreSQL databse"),
2198+
tr("An error occured contacting the PostgreSQL database"),
21992199
QMessageBox::Ok,
22002200
Qt::NoButton);
22012201
return false;
@@ -2204,7 +2204,7 @@ bool QgsPostgresProvider::changeGeometryValues(std::map<int, QgsGeometry> & geom
22042204
if(message==PGRES_FATAL_ERROR)
22052205
{
22062206
QMessageBox::information(0, tr("PostGIS error"),
2207-
tr("The PostgreSQL databse returned: ")
2207+
tr("The PostgreSQL database returned: ")
22082208
+ QString(PQresultErrorMessage(result))
22092209
+ "\n"
22102210
+ tr("When trying: ")

0 commit comments

Comments
 (0)
Please sign in to comment.