From ac88f2afe96ed5495a942d93f4177591f5f6affb Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Wed, 23 Aug 2017 11:15:12 +0200 Subject: [PATCH] Fix some wording and spelling --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- python/plugins/processing/ui/DlgScriptEditor.ui | 2 +- src/app/qgsoptions.cpp | 4 ++-- src/customwidgets/qgsfieldcomboboxplugin.cpp | 2 +- src/ui/qgspgnewconnectionbase.ui | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9622d879649..10de886340a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,7 +8,7 @@ Include a few sentences describing the overall goals for this PR (pull request). - [ ] Commit messages are descriptive and explain the rationale for changes - [ ] Commits which fix bugs include `fixes #11111` in the commit message next to the description - [ ] Commits which add new features are tagged with `[FEATURE]` in the commit message -- [ ] Commits which change the UI or existing user workflows are tagged with `[needs-docs]` in the commit message and containt sufficient information in the commit message to be documented +- [ ] Commits which change the UI or existing user workflows are tagged with `[needs-docs]` in the commit message and contain sufficient information in the commit message to be documented - [ ] I have read the [QGIS Coding Standards](https://docs.qgis.org/testing/en/docs/developers_guide/codingstandards.html) and this PR complies with them - [ ] This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR) - [ ] New unit tests have been added for core changes diff --git a/python/plugins/processing/ui/DlgScriptEditor.ui b/python/plugins/processing/ui/DlgScriptEditor.ui index e3de69b7a8e..0ea970605be 100644 --- a/python/plugins/processing/ui/DlgScriptEditor.ui +++ b/python/plugins/processing/ui/DlgScriptEditor.ui @@ -95,7 +95,7 @@ - toolBar + Toolbar TopToolBarArea diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp index 4fcf8ba9eb6..ef706990d95 100644 --- a/src/app/qgsoptions.cpp +++ b/src/app/qgsoptions.cpp @@ -735,8 +735,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QListvalue( QStringLiteral( "Map/scales" ), PROJECT_SCALES ).toString(); if ( !scalePaths.isEmpty() ) { - const QStringList ScalesList = scalePaths.split( ',' ); - for ( const QString &scale : ScalesList ) + const QStringList scalesList = scalePaths.split( ',' ); + for ( const QString &scale : scalesList ) { addScaleToScaleList( scale ); } diff --git a/src/customwidgets/qgsfieldcomboboxplugin.cpp b/src/customwidgets/qgsfieldcomboboxplugin.cpp index dda45fb7085..b5c418e89e2 100644 --- a/src/customwidgets/qgsfieldcomboboxplugin.cpp +++ b/src/customwidgets/qgsfieldcomboboxplugin.cpp @@ -76,7 +76,7 @@ QString QgsFieldComboBoxPlugin::toolTip() const QString QgsFieldComboBoxPlugin::whatsThis() const { - return tr( "A combo box to list the field of a layer." ); + return tr( "A combo box to list the fields of a layer." ); } QString QgsFieldComboBoxPlugin::domXml() const diff --git a/src/ui/qgspgnewconnectionbase.ui b/src/ui/qgspgnewconnectionbase.ui index 63741411cd6..8c8fdf027b8 100644 --- a/src/ui/qgspgnewconnectionbase.ui +++ b/src/ui/qgspgnewconnectionbase.ui @@ -209,7 +209,7 @@ <body> <p>When the layer is setup various metadata is required for the PostGIS table. This includes information such as the table row count, geometry type and spatial extents of the data in the geometry column. If the table contains a large number of rows determining this metadata is time consuming.</p> <p>By activating this option the following fast table metadata operations are done:</p> -<p>1) Row count is determined from table statistics obtained from running the PostgreSQL table analyze function.</p> +<p>1) Row count is determined from results of running the PostgreSQL Analyze function on the table.</p> <p>2) Table extents are always determined with the estimated_extent PostGIS function even if a layer filter is applied.</p> <p>3) If the table geometry type is unknown and is not exclusively taken from the geometry_columns table, then it is determined from the first 100 non-null geometry rows in the table.</p> </body>