1,645 changes: 839 additions & 806 deletions i18n/qgis_de.ts
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/app/qgsmeasuredialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void QgsMeasureDialog::updateUi()

if (( mCanvasUnits == QGis::Meters && mDisplayUnits == QGis::Feet ) || ( mCanvasUnits == QGis::Feet && mDisplayUnits == QGis::Meters ) )
{
toolTip += "<br> * " + tr( "Finally, the value is converted from %2 to %3." ).arg( QGis::tr( mCanvasUnits ) ).arg( QGis::tr( mDisplayUnits ) );
toolTip += "<br> * " + tr( "Finally, the value is converted from %1 to %2." ).arg( QGis::tr( mCanvasUnits ) ).arg( QGis::tr( mDisplayUnits ) );
}

editTotal->setToolTip( toolTip );
Expand Down
3 changes: 1 addition & 2 deletions src/core/qgsowsconnection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ QgsOWSConnection::QgsOWSConnection( const QString & theService, const QString &
// check for a password, if none prompt to get it
if ( password.isEmpty() )
{
//password = QInputDialog::getText( this, tr( "WMS Password for %1" ).arg( theConnName ), "Password", QLineEdit::Password );
password = QInputDialog::getText( 0, tr( "WMS Password for %1" ).arg( mConnName ), "Password", QLineEdit::Password );
password = QInputDialog::getText( 0, tr( "WMS Password for %1" ).arg( mConnName ), tr( "Password" ), QLineEdit::Password );
}
mConnectionInfo = "username=" + username + ",password=" + password + ",url=" + mConnectionInfo;
mUri.setParam( "username", username );
Expand Down
4 changes: 2 additions & 2 deletions src/providers/sqlanywhere/qgssqlanywherefeatureiterator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ QgsSqlAnywhereFeatureIterator::prepareStatement( QString whereClause )
|| !mStmt->describe_bind_param( 2, xmaxParam )
|| !mStmt->describe_bind_param( 3, ymaxParam ) )
{
P->reportError( P->tr( "Error describing bind parameters" ), mStmt );
P->reportError( QObject::tr( "Error describing bind parameters" ), mStmt );
return false;
}

Expand All @@ -329,7 +329,7 @@ QgsSqlAnywhereFeatureIterator::prepareStatement( QString whereClause )
|| !mStmt->bind_param( 2, xmaxParam )
|| !mStmt->bind_param( 3, ymaxParam ) )
{
P->reportError( P->tr( "Error binding parameters" ), mStmt );
P->reportError( QObject::tr( "Error binding parameters" ), mStmt );
return false;
}
}
Expand Down