Skip to content
Permalink
Browse files
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 8d848c926f571d0c78294fe921c0882fbb8c6d51
Showing with 5 additions and 6 deletions.
  1. +1 −1 src/app/qgsattributetabledisplay.cpp
  2. +1 −2 src/app/qgsmaptoolidentify.cpp
  3. +1 −1 src/app/qgssearchquerybuilder.cpp
  4. +1 −1 src/app/qgsserversourceselect.cpp
  5. +1 −1 src/core/qgshttptransaction.cpp
@@ -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);
@@ -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();
@@ -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);
@@ -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() )
);

@@ -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");

0 comments on commit 8d848c9

Please sign in to comment.