Skip to content

Commit 782ed47

Browse files
committed
translation string improvements
1 parent 8b32d8d commit 782ed47

File tree

4 files changed

+29
-17
lines changed

4 files changed

+29
-17
lines changed

src/app/pluginmanager/qgspluginmanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
900900
if ( ! metadata->value( QStringLiteral( "changelog" ) ).isEmpty() )
901901
{
902902
html += QLatin1String( "<br/>" );
903-
QString changelog = tr( "Changelog:<br/>%1 <br/>" ).arg( metadata->value( QStringLiteral( "changelog" ) ) );
903+
QString changelog = QStringLiteral( "%1:<br/>%2 <br/>" ).arg( tr( "Changelog" ), metadata->value( QStringLiteral( "changelog" ) ) );
904904
html += changelog.replace( '\n', QLatin1String( "<br/>" ) );
905905
}
906906

src/core/processing/qgsnativealgorithms.cpp

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,9 @@ QVariantMap QgsRemoveNullGeometryAlgorithm::processAlgorithm( const QVariantMap
11761176

11771177
QString QgsBoundingBoxAlgorithm::shortHelpString() const
11781178
{
1179-
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." );
1179+
return QObject::tr( "This algorithm calculates the bounding box (envelope) for each feature in an input layer." ) +
1180+
QStringLiteral( "\n\n" ) +
1181+
QObject::tr( "See the 'Minimum bounding geometry' algorithm for a bounding box calculation which covers the whole layer or grouped subsets of features." );
11801182
}
11811183

11821184
QgsBoundingBoxAlgorithm *QgsBoundingBoxAlgorithm::createInstance() const
@@ -1214,7 +1216,9 @@ QgsFeature QgsBoundingBoxAlgorithm::processFeature( const QgsFeature &feature, Q
12141216

12151217
QString QgsOrientedMinimumBoundingBoxAlgorithm::shortHelpString() const
12161218
{
1217-
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." );
1219+
return QObject::tr( "This algorithm calculates the minimum area rotated rectangle which covers each feature in an input layer." ) +
1220+
QStringLiteral( "\n\n" ) +
1221+
QObject::tr( "See the 'Minimum bounding geometry' algorithm for a oriented bounding box calculation which covers the whole layer or grouped subsets of features." );
12181222
}
12191223

12201224
QgsOrientedMinimumBoundingBoxAlgorithm *QgsOrientedMinimumBoundingBoxAlgorithm::createInstance() const
@@ -1264,7 +1268,9 @@ void QgsMinimumEnclosingCircleAlgorithm::initParameters( const QVariantMap & )
12641268

12651269
QString QgsMinimumEnclosingCircleAlgorithm::shortHelpString() const
12661270
{
1267-
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." );
1271+
return QObject::tr( "This algorithm calculates the minimum enclosing circle which covers each feature in an input layer." ) +
1272+
QStringLiteral( "\n\n" ) +
1273+
QObject::tr( "See the 'Minimum bounding geometry' algorithm for a minimal enclosing circle calculation which covers the whole layer or grouped subsets of features." );
12681274
}
12691275

12701276
QgsMinimumEnclosingCircleAlgorithm *QgsMinimumEnclosingCircleAlgorithm::createInstance() const
@@ -1305,7 +1311,9 @@ QgsFeature QgsMinimumEnclosingCircleAlgorithm::processFeature( const QgsFeature
13051311

13061312
QString QgsConvexHullAlgorithm::shortHelpString() const
13071313
{
1308-
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." );
1314+
return QObject::tr( "This algorithm calculates the convex hull for each feature in an input layer." ) +
1315+
QStringLiteral( "\n\n" ) +
1316+
QObject::tr( "See the 'Minimum bounding geometry' algorithm for a convex hull calculation which covers the whole layer or grouped subsets of features." );
13091317
}
13101318

13111319
QgsConvexHullAlgorithm *QgsConvexHullAlgorithm::createInstance() const
@@ -1345,10 +1353,12 @@ QgsFeature QgsConvexHullAlgorithm::processFeature( const QgsFeature &feature, Qg
13451353
QString QgsPromoteToMultipartAlgorithm::shortHelpString() const
13461354
{
13471355
return QObject::tr( "This algorithm takes a vector layer with singlepart geometries and generates a new one in which all geometries are "
1348-
"multipart. Input features which are already multipart features will remain unchanged.\n\n"
1349-
"This algorithm can be used to force geometries to multipart types in order to be compatibility with data providers "
1350-
"with strict singlepart/multipart compatibility checks.\n\n"
1351-
"See the 'Collect geometries' or 'Aggregate' algorithms for alternative options." );
1356+
"multipart. Input features which are already multipart features will remain unchanged." ) +
1357+
QStringLiteral( "\n\n" ) +
1358+
QObject::tr( "This algorithm can be used to force geometries to multipart types in order to be compatibility with data providers "
1359+
"with strict singlepart/multipart compatibility checks." ) +
1360+
QStringLiteral( "\n\n" ) +
1361+
QObject::tr( "See the 'Collect geometries' or 'Aggregate' algorithms for alternative options." );
13521362
}
13531363

13541364
QgsPromoteToMultipartAlgorithm *QgsPromoteToMultipartAlgorithm::createInstance() const
@@ -1387,10 +1397,12 @@ QString QgsCollectAlgorithm::shortHelpString() const
13871397
{
13881398
return QObject::tr( "This algorithm takes a vector layer and collects its geometries into new multipart geometries. One or more attributes can "
13891399
"be specified to collect only geometries belonging to the same class (having the same value for the specified attributes), alternatively "
1390-
"all geometries can be collected.\n\n"
1391-
"All output geometries will be converted to multi geometries, even those with just a single part. "
1392-
"This algorithm does not dissolve overlapping geometries - they will be collected together without modifying the shape of each geometry part.\n\n"
1393-
"See the 'Promote to multipart' or 'Aggregate' algorithms for alternative options." );
1400+
"all geometries can be collected." ) +
1401+
QStringLiteral( "\n\n" ) +
1402+
QObject::tr( "All output geometries will be converted to multi geometries, even those with just a single part. "
1403+
"This algorithm does not dissolve overlapping geometries - they will be collected together without modifying the shape of each geometry part." ) +
1404+
QStringLiteral( "\n\n" ) +
1405+
QObject::tr( "See the 'Promote to multipart' or 'Aggregate' algorithms for alternative options." );
13941406
}
13951407

13961408
QgsCollectAlgorithm *QgsCollectAlgorithm::createInstance() const

src/providers/geonode/qgsgeonodenewconnection.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ void QgsGeoNodeNewConnection::testConnection()
4343
{
4444
QMessageBox::information( this,
4545
tr( "Test connection" ),
46-
tr( "\nConnection to %1 was successful, \n\n%1 is a valid geonode instance.\n\n" ).arg( url() ) );
46+
tr( "\nConnection to %1 was successful, \n\n%1 is a valid GeoNode instance.\n\n" ).arg( url() ) );
4747
}
4848
else
4949
{
5050
QMessageBox::information( this,
5151
tr( "Test connection" ),
52-
tr( "\nConnection failed, \n\nplease check whether %1 is a valid geonode instance.\n\n" ).arg( url() ) );
52+
tr( "\nConnection failed, \n\nplease check whether %1 is a valid GeoNode instance.\n\n" ).arg( url() ) );
5353
}
5454
}
5555

src/ui/qgsgeonodesourceselectbase.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Add Geonode Layer</string>
14+
<string>Add GeoNode Layer</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
1717
<item row="0" column="0">
1818
<widget class="QGroupBox" name="GroupBox1">
1919
<property name="title">
20-
<string>Geonode connections</string>
20+
<string>GeoNode connections</string>
2121
</property>
2222
<layout class="QGridLayout" name="gridLayout_2">
2323
<item row="0" column="0">

0 commit comments

Comments
 (0)