diff --git a/src/app/pluginmanager/qgspluginmanager.cpp b/src/app/pluginmanager/qgspluginmanager.cpp index b1dd91933b34..765134de459c 100644 --- a/src/app/pluginmanager/qgspluginmanager.cpp +++ b/src/app/pluginmanager/qgspluginmanager.cpp @@ -900,7 +900,7 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item ) if ( ! metadata->value( QStringLiteral( "changelog" ) ).isEmpty() ) { html += QLatin1String( "
" ); - QString changelog = tr( "Changelog:
%1
" ).arg( metadata->value( QStringLiteral( "changelog" ) ) ); + QString changelog = QStringLiteral( "%1:
%2
" ).arg( tr( "Changelog" ), metadata->value( QStringLiteral( "changelog" ) ) ); html += changelog.replace( '\n', QLatin1String( "
" ) ); } diff --git a/src/core/processing/qgsnativealgorithms.cpp b/src/core/processing/qgsnativealgorithms.cpp index 715988f11629..29296780f628 100644 --- a/src/core/processing/qgsnativealgorithms.cpp +++ b/src/core/processing/qgsnativealgorithms.cpp @@ -1176,7 +1176,9 @@ QVariantMap QgsRemoveNullGeometryAlgorithm::processAlgorithm( const QVariantMap QString QgsBoundingBoxAlgorithm::shortHelpString() const { - return QObject::tr( "This algorithm calculates the bounding box (envelope) for each feature in an input layer.\n\nSee the 'Minimum bounding geometry' algorithm for a bounding box calculation which covers the whole layer or grouped subsets of features." ); + return QObject::tr( "This algorithm calculates the bounding box (envelope) for each feature in an input layer." ) + + QStringLiteral( "\n\n" ) + + QObject::tr( "See the 'Minimum bounding geometry' algorithm for a bounding box calculation which covers the whole layer or grouped subsets of features." ); } QgsBoundingBoxAlgorithm *QgsBoundingBoxAlgorithm::createInstance() const @@ -1214,7 +1216,9 @@ QgsFeature QgsBoundingBoxAlgorithm::processFeature( const QgsFeature &feature, Q QString QgsOrientedMinimumBoundingBoxAlgorithm::shortHelpString() const { - return QObject::tr( "This algorithm calculates the minimum area rotated rectangle which covers each feature in an input layer.\n\nSee the 'Minimum bounding geometry' algorithm for a oriented bounding box calculation which covers the whole layer or grouped subsets of features." ); + return QObject::tr( "This algorithm calculates the minimum area rotated rectangle which covers each feature in an input layer." ) + + QStringLiteral( "\n\n" ) + + QObject::tr( "See the 'Minimum bounding geometry' algorithm for a oriented bounding box calculation which covers the whole layer or grouped subsets of features." ); } QgsOrientedMinimumBoundingBoxAlgorithm *QgsOrientedMinimumBoundingBoxAlgorithm::createInstance() const @@ -1264,7 +1268,9 @@ void QgsMinimumEnclosingCircleAlgorithm::initParameters( const QVariantMap & ) QString QgsMinimumEnclosingCircleAlgorithm::shortHelpString() const { - return QObject::tr( "This algorithm calculates the minimum enclosing circle which covers each feature in an input layer.\n\nSee the 'Minimum bounding geometry' algorithm for a minimal enclosing circle calculation which covers the whole layer or grouped subsets of features." ); + return QObject::tr( "This algorithm calculates the minimum enclosing circle which covers each feature in an input layer." ) + + QStringLiteral( "\n\n" ) + + QObject::tr( "See the 'Minimum bounding geometry' algorithm for a minimal enclosing circle calculation which covers the whole layer or grouped subsets of features." ); } QgsMinimumEnclosingCircleAlgorithm *QgsMinimumEnclosingCircleAlgorithm::createInstance() const @@ -1305,7 +1311,9 @@ QgsFeature QgsMinimumEnclosingCircleAlgorithm::processFeature( const QgsFeature QString QgsConvexHullAlgorithm::shortHelpString() const { - return QObject::tr( "This algorithm calculates the convex hull for each feature in an input layer.\n\nSee the 'Minimum bounding geometry' algorithm for a convex hull calculation which covers the whole layer or grouped subsets of features." ); + return QObject::tr( "This algorithm calculates the convex hull for each feature in an input layer." ) + + QStringLiteral( "\n\n" ) + + QObject::tr( "See the 'Minimum bounding geometry' algorithm for a convex hull calculation which covers the whole layer or grouped subsets of features." ); } QgsConvexHullAlgorithm *QgsConvexHullAlgorithm::createInstance() const @@ -1345,10 +1353,12 @@ QgsFeature QgsConvexHullAlgorithm::processFeature( const QgsFeature &feature, Qg QString QgsPromoteToMultipartAlgorithm::shortHelpString() const { return QObject::tr( "This algorithm takes a vector layer with singlepart geometries and generates a new one in which all geometries are " - "multipart. Input features which are already multipart features will remain unchanged.\n\n" - "This algorithm can be used to force geometries to multipart types in order to be compatibility with data providers " - "with strict singlepart/multipart compatibility checks.\n\n" - "See the 'Collect geometries' or 'Aggregate' algorithms for alternative options." ); + "multipart. Input features which are already multipart features will remain unchanged." ) + + QStringLiteral( "\n\n" ) + + QObject::tr( "This algorithm can be used to force geometries to multipart types in order to be compatibility with data providers " + "with strict singlepart/multipart compatibility checks." ) + + QStringLiteral( "\n\n" ) + + QObject::tr( "See the 'Collect geometries' or 'Aggregate' algorithms for alternative options." ); } QgsPromoteToMultipartAlgorithm *QgsPromoteToMultipartAlgorithm::createInstance() const @@ -1387,10 +1397,12 @@ QString QgsCollectAlgorithm::shortHelpString() const { return QObject::tr( "This algorithm takes a vector layer and collects its geometries into new multipart geometries. One or more attributes can " "be specified to collect only geometries belonging to the same class (having the same value for the specified attributes), alternatively " - "all geometries can be collected.\n\n" - "All output geometries will be converted to multi geometries, even those with just a single part. " - "This algorithm does not dissolve overlapping geometries - they will be collected together without modifying the shape of each geometry part.\n\n" - "See the 'Promote to multipart' or 'Aggregate' algorithms for alternative options." ); + "all geometries can be collected." ) + + QStringLiteral( "\n\n" ) + + QObject::tr( "All output geometries will be converted to multi geometries, even those with just a single part. " + "This algorithm does not dissolve overlapping geometries - they will be collected together without modifying the shape of each geometry part." ) + + QStringLiteral( "\n\n" ) + + QObject::tr( "See the 'Promote to multipart' or 'Aggregate' algorithms for alternative options." ); } QgsCollectAlgorithm *QgsCollectAlgorithm::createInstance() const diff --git a/src/providers/geonode/qgsgeonodenewconnection.cpp b/src/providers/geonode/qgsgeonodenewconnection.cpp index bcbd2fdcce38..fe73a659c0d2 100644 --- a/src/providers/geonode/qgsgeonodenewconnection.cpp +++ b/src/providers/geonode/qgsgeonodenewconnection.cpp @@ -43,13 +43,13 @@ void QgsGeoNodeNewConnection::testConnection() { QMessageBox::information( this, tr( "Test connection" ), - tr( "\nConnection to %1 was successful, \n\n%1 is a valid geonode instance.\n\n" ).arg( url() ) ); + tr( "\nConnection to %1 was successful, \n\n%1 is a valid GeoNode instance.\n\n" ).arg( url() ) ); } else { QMessageBox::information( this, tr( "Test connection" ), - tr( "\nConnection failed, \n\nplease check whether %1 is a valid geonode instance.\n\n" ).arg( url() ) ); + tr( "\nConnection failed, \n\nplease check whether %1 is a valid GeoNode instance.\n\n" ).arg( url() ) ); } } diff --git a/src/ui/qgsgeonodesourceselectbase.ui b/src/ui/qgsgeonodesourceselectbase.ui index 4e773a2ea9a5..35cb7b62ff80 100644 --- a/src/ui/qgsgeonodesourceselectbase.ui +++ b/src/ui/qgsgeonodesourceselectbase.ui @@ -11,13 +11,13 @@ - Add Geonode Layer + Add GeoNode Layer - Geonode connections + GeoNode connections