Fix some wording and spelling

DelazJ · DelazJ · commit ac88f2afe96e · 2018-01-21T12:38:31.000+01:00
diff --git 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
@@ -95,7 +95,7 @@
   </widget>
   <widget class="QToolBar" name="toolBar">
    <property name="windowTitle">
-    <string>toolBar</string>
+    <string>Toolbar</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -735,8 +735,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
   QString scalePaths = mSettings->value( 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
@@ -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
@@ -209,7 +209,7 @@
 &lt;body&gt;
 &lt;p&gt;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.&lt;/p&gt;
 &lt;p&gt;By activating this option the following fast table metadata operations are done:&lt;/p&gt;
-&lt;p&gt;1) Row count is determined from table statistics obtained from running the PostgreSQL table analyze function.&lt;/p&gt;
+&lt;p&gt;1) Row count is determined from results of running the PostgreSQL Analyze function on the table.&lt;/p&gt;
 &lt;p&gt;2) Table extents are always determined with the estimated_extent PostGIS function even if a layer filter is applied.&lt;/p&gt;
 &lt;p&gt;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.&lt;/p&gt;
 &lt;/body&gt;

Original file line number	Diff line number	Diff line change
`@@ -735,8 +735,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti`
`735`	`735`	`QString scalePaths = mSettings->value( QStringLiteral( "Map/scales" ), PROJECT_SCALES ).toString();`
`736`	`736`	`if ( !scalePaths.isEmpty() )`
`737`	`737`	`{`
`738`		`- const QStringList ScalesList = scalePaths.split( ',' );`
`739`		`- for ( const QString &scale : ScalesList )`
	`738`	`+ const QStringList scalesList = scalePaths.split( ',' );`
	`739`	`+ for ( const QString &scale : scalesList )`
`740`	`740`	`{`
`741`	`741`	`addScaleToScaleList( scale );`
`742`	`742`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ QString QgsFieldComboBoxPlugin::toolTip() const`
`76`	`76`
`77`	`77`	`QString QgsFieldComboBoxPlugin::whatsThis() const`
`78`	`78`	`{`
`79`		`- return tr( "A combo box to list the field of a layer." );`
	`79`	`+ return tr( "A combo box to list the fields of a layer." );`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`QString QgsFieldComboBoxPlugin::domXml() const`