Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merged r6781 to trunk
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6783 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
homann committed Mar 10, 2007
1 parent 32eb419 commit 8d848c9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/app/qgsattributetabledisplay.cpp
Expand Up @@ -351,7 +351,7 @@ void QgsAttributeTableDisplay::doSearch(const QString& searchString)

QString str;
if (mSearchIds.size())
str.sprintf(tr("Found %d matching features."), mSearchIds.size());
str.sprintf(tr("Found %d matching features.","", mSearchIds.size()), mSearchIds.size());
else
str = tr("No matching features found.");
QMessageBox::information(this, tr("Search results"), str);
Expand Down
3 changes: 1 addition & 2 deletions src/app/qgsmaptoolidentify.cpp
Expand Up @@ -302,8 +302,7 @@ void QgsMapToolIdentify::identifyVectorLayer(QgsVectorLayer* layer, const QgsPoi
else
{
QString title = layer->name();
title += QString(" - %1").arg(featureCount);
title += QObject::tr(" features found");
title += QString( tr("- %1 features found","Identify results window title",featureCount) ).arg(featureCount);
mResults->setTitle(title);
}
QApplication::restoreOverrideCursor();
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgssearchquerybuilder.cpp
Expand Up @@ -126,7 +126,7 @@ void QgsSearchQueryBuilder::on_btnTest_clicked()

QString str;
if (count)
str.sprintf(tr("Found %d matching features."), count);
str.sprintf(tr("Found %d matching features.","",count), count);
else
str = tr("No matching features found.");
QMessageBox::information(this, tr("Search results"), str);
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsserversourceselect.cpp
Expand Up @@ -573,7 +573,7 @@ void QgsServerSourceSelect::on_lstLayers_selectionChanged()
QSet<QString> crsFilter = mWmsProvider->supportedCrsForLayers(newSelectedLayers);

gbCRS->setTitle(
QString( tr("Coordinate Reference System (%1 available)") )
QString( tr("Coordinate Reference System (%1 available)", "", crsFilter.count() ) )
.arg( crsFilter.count() )
);

Expand Down
2 changes: 1 addition & 1 deletion src/core/qgshttptransaction.cpp
Expand Up @@ -431,7 +431,7 @@ void QgsHttpTransaction::networkTimedOut()
QgsDebugMsg("QgsHttpTransaction::networkTimedOut: entering.");

mError = QString(tr("Network timed out after %1 seconds of inactivity.\n"
"This may be a problem in your network connection or at the WMS server.")
"This may be a problem in your network connection or at the WMS server.","", NETWORK_TIMEOUT_MSEC/1000)
).arg(NETWORK_TIMEOUT_MSEC/1000);

QgsDebugMsg("QgsHttpTransaction::getSynchronously: Setting httpactive = FALSE");
Expand Down

0 comments on commit 8d848c9

Please sign in to comment.