Merge of r6788 from head to 0.8 branch

g_j_m · g_j_m · commit a17130779927 · 2007-03-10T19:22:42.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6789 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsnewconnection.cpp b/src/gui/qgsnewconnection.cpp
@@ -115,7 +115,7 @@ void QgsNewConnection::testConnection()
   if (PQstatus(pd) == CONNECTION_OK)
     {
       // Database successfully opened; we can now issue SQL commands.
-      QMessageBox::information(this, tr("Test connection"), tr("Connection to %1 was successfull").arg(txtDatabase->text()));
+      QMessageBox::information(this, tr("Test connection"), tr("Connection to %1 was successful").arg(txtDatabase->text()));
   } else
     {
       QMessageBox::information(this, tr("Test connection"), tr("Connection failed - Check settings and try again.\n\nExtended error information:\n") + QString(PQerrorMessage(pd)) );

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void QgsNewConnection::testConnection()`
`115`	`115`	`if (PQstatus(pd) == CONNECTION_OK)`
`116`	`116`	`{`
`117`	`117`	`// Database successfully opened; we can now issue SQL commands.`
`118`		`- QMessageBox::information(this, tr("Test connection"), tr("Connection to %1 was successfull").arg(txtDatabase->text()));`
	`118`	`+ QMessageBox::information(this, tr("Test connection"), tr("Connection to %1 was successful").arg(txtDatabase->text()));`
`119`	`119`	`} else`
`120`	`120`	`{`
`121`	`121`	`QMessageBox::information(this, tr("Test connection"), tr("Connection failed - Check settings and try again.\n\nExtended error information:\n") + QString(PQerrorMessage(pd)) );`