[spelling] labelling -> labeling

qgis · Dec 19, 2016 · 9c4be41 · 9c4be41
1 parent 1bbc132
commit 9c4be41
Show file tree

Hide file tree

Showing 19 changed files with 110 additions and 70 deletions.
diff --git a/NEWS b/NEWS
@@ -67,7 +67,7 @@ This release has following new features:
 - Symbology: Control outline join style for simple, ellipse, and font markers
 - Symbology: New map tool for interactively setting point symbol offset
 - Symbology: Style Dock
-- Labelling: Labeling map tools now work with rule-based labeling
+- Labeling: Labeling map tools now work with rule-based labeling
 - Diagrams: Legend entries for diagram size
 - Diagrams: Unit selection for outline width
 - Diagrams: Diagrams behave like labels and can be managed from toolbar
@@ -175,10 +175,10 @@ This release has following new features:
 - General : New expression functions in 2.14
 - General : Better control over placement of map elements
 - General : Paid bugfixing programme
-- Labelling : Actual rendered symbol is now considered as an obstacle for point feature labels
-- Labelling : "Cartographic" placement mode for point labels
-- Labelling : Applying label distance from symbol bounds
-- Labelling : Control over label rendering order
+- Labeling : Actual rendered symbol is now considered as an obstacle for point feature labels
+- Labeling : "Cartographic" placement mode for point labels
+- Labeling : Applying label distance from symbol bounds
+- Labeling : Control over label rendering order
 - Layer Legend : applying the same style to selected layers or to legend group
 - Layer Legend : New options for filtering legend elements
 - Layer Legend : Filter legend by expression
@@ -239,13 +239,13 @@ This release has following new features:
 - General : User Interface Theme support
 - General : New expression functions in 2.12
 - General : Variables in expressions
-- Labelling : Data defined quadrant when in "around point" mode
-- Labelling : Draw only labels which fit inside polygons
-- Labelling : Control priority of labeling obstacles
-- Labelling : New options to control how polygon layers act as obstacles
-- Labelling : Data defined control over label priority
-- Labelling : Option for obstacle-only layers
-- Labelling : Rule-based labeling
+- Labeling : Data defined quadrant when in "around point" mode
+- Labeling : Draw only labels which fit inside polygons
+- Labeling : Control priority of labeling obstacles
+- Labeling : New options to control how polygon layers act as obstacles
+- Labeling : Data defined control over label priority
+- Labeling : Option for obstacle-only layers
+- Labeling : Rule-based labeling
 - Map Composer : Atlas navigation improvements
 - Map Composer : Custom format for grid annotations
 - Map Composer : Multiline text handling and automatic text wrapping in composer attribute tables
@@ -512,7 +512,7 @@ key new features.
 - HTML support has been added map composer label item to give you even
       more control over your final maps. HTML labels support full css styles
       sheets, html, and even javascript if you are that way inclined.
-- The labelling system has been totally overhauled - it now includes many
+- The labeling system has been totally overhauled - it now includes many
       new features such as drop shadows, 'highway shields', many more data bound
       options, and various performance enhancements. We are slowly doing away
       with the 'old labels' system, although you will still find that
@@ -567,7 +567,7 @@ key new features.
 - Customization - allows setting up simplified QGIS interface by hiding various components of main window and widgets in dialogs.
 - New symbol layer types - Line Pattern Fill, Point Pattern fill
 - Composers - have multiple lines on legend items using a specified character
-- Expression based labelling
+- Expression based labeling
 - Heatmap tool - a new core plugin has been added for generating raster heatmaps from point data. You may need to activate this plugin using the plugin manager.
 - GPS Tracking - The GPS live tracking user interface was overhauled and many fixes and improvements were added to it.
 - Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
@@ -907,7 +907,7 @@ as' option, you can now specify OGR creation options.
 - In the table of contents, it is now possible to select and remove several layers at once.
 
 
-  15.3. Labelling (New generation only)
+  15.3. Labeling (New generation only)
   =====================================
 
 - Data defined label position in labeling-ng.
@@ -993,7 +993,7 @@ colors
 information to display groups in the composer legend.
 - Show selected feature count in status bar 
 - Query option added to layer menu to subset vector layers
-- Option to label only selected features (on the 'old' labelling tool)
+- Option to label only selected features (on the 'old' labeling tool)
 - Load/save queries created in the query builder.
 - Manual adding of categories in symbology-ng.
 - Georeferencer: possibility to configure if residuals should be showed in
@@ -1831,7 +1831,7 @@ Added display/label field handling. Field is now set when the layer is
    added by examining the fields and attempting to make a "smart" choice. The
    user can later change this field from the layer properties dialog. This field
    is used as the item name in the identify box (top of the tree for each feature
-   and its attributes) and will eventually be used in labelling features.
+   and its attributes) and will eventually be used in labeling features.
 Cleanup of postgres add layer dialog 
 Removed excessive debug output from qgsfeature 
 

diff --git a/doc/news.html b/doc/news.html
@@ -147,7 +147,7 @@ <H1>1. What's new in Version 2.16 'Nødebo'?</H1>
 <LI>Symbology: Control outline join style for simple, ellipse, and font markers
 <LI>Symbology: New map tool for interactively setting point symbol offset
 <LI>Symbology: Style Dock
-<LI>Labelling: Labeling map tools now work with rule-based labeling
+<LI>Labeling: Labeling map tools now work with rule-based labeling
 <LI>Diagrams: Legend entries for diagram size
 <LI>Diagrams: Unit selection for outline width
 <LI>Diagrams: Diagrams behave like labels and can be managed from toolbar
@@ -258,10 +258,10 @@ <H1>2. What's new in Version 2.14 'Essen'?</H1>
 <LI>General : New expression functions in 2.14
 <LI>General : Better control over placement of map elements
 <LI>General : Paid bugfixing programme
-<LI>Labelling : Actual rendered symbol is now considered as an obstacle for point feature labels
-<LI>Labelling : "Cartographic" placement mode for point labels
-<LI>Labelling : Applying label distance from symbol bounds
-<LI>Labelling : Control over label rendering order
+<LI>Labeling : Actual rendered symbol is now considered as an obstacle for point feature labels
+<LI>Labeling : "Cartographic" placement mode for point labels
+<LI>Labeling : Applying label distance from symbol bounds
+<LI>Labeling : Control over label rendering order
 <LI>Layer Legend : applying the same style to selected layers or to legend group
 <LI>Layer Legend : New options for filtering legend elements
 <LI>Layer Legend : Filter legend by expression
@@ -325,13 +325,13 @@ <H1>3. What's new in Version 2.12 'Lyon'?</H1>
 <LI>General : User Interface Theme support
 <LI>General : New expression functions in 2.12
 <LI>General : Variables in expressions
-<LI>Labelling : Data defined quadrant when in "around point" mode
-<LI>Labelling : Draw only labels which fit inside polygons
-<LI>Labelling : Control priority of labeling obstacles
-<LI>Labelling : New options to control how polygon layers act as obstacles
-<LI>Labelling : Data defined control over label priority
-<LI>Labelling : Option for obstacle-only layers
-<LI>Labelling : Rule-based labeling
+<LI>Labeling : Data defined quadrant when in "around point" mode
+<LI>Labeling : Draw only labels which fit inside polygons
+<LI>Labeling : Control priority of labeling obstacles
+<LI>Labeling : New options to control how polygon layers act as obstacles
+<LI>Labeling : Data defined control over label priority
+<LI>Labeling : Option for obstacle-only layers
+<LI>Labeling : Rule-based labeling
 <LI>Map Composer : Atlas navigation improvements
 <LI>Map Composer : Custom format for grid annotations
 <LI>Map Composer : Multiline text handling and automatic text wrapping in composer attribute tables
@@ -617,7 +617,7 @@ <H1>10. Whats new in Version 2.0.0 'Dufour'?</H1>
 <LI>HTML support has been added map composer label item to give you even
       more control over your final maps. HTML labels support full css styles
       sheets, html, and even javascript if you are that way inclined.
-<LI>The labelling system has been totally overhauled - it now includes many
+<LI>The labeling system has been totally overhauled - it now includes many
       new features such as drop shadows, 'highway shields', many more data bound
       options, and various performance enhancements. We are slowly doing away
       with the 'old labels' system, although you will still find that
@@ -675,7 +675,7 @@ <H1>11. Whats new in Version 1.8.0 'Lisboa'?</H1>
 <LI>Customization - allows setting up simplified QGIS interface by hiding various components of main window and widgets in dialogs.
 <LI>New symbol layer types - Line Pattern Fill, Point Pattern fill
 <LI>Composers - have multiple lines on legend items using a specified character
-<LI>Expression based labelling
+<LI>Expression based labeling
 <LI>Heatmap tool - a new core plugin has been added for generating raster heatmaps from point data. You may need to activate this plugin using the plugin manager.
 <LI>GPS Tracking - The GPS live tracking user interface was overhauled and many fixes and improvements were added to it.
 <LI>Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
@@ -1031,7 +1031,7 @@ <H2>15.2. Table of contents (TOC) improvements</H2>
 <LI>In the table of contents, it is now possible to select and remove several layers at once.
 </UL>
 
-<H2>15.3. Labelling (New generation only)</H2>
+<H2>15.3. Labeling (New generation only)</H2>
 
 <UL>
 <LI>Data defined label position in labeling-ng.
@@ -1119,7 +1119,7 @@ <H2>16.1. Main GUI</H2>
 information to display groups in the composer legend.
 <LI>Show selected feature count in status bar 
 <LI>Query option added to layer menu to subset vector layers
-<LI>Option to label only selected features (on the 'old' labelling tool)
+<LI>Option to label only selected features (on the 'old' labeling tool)
 <LI>Load/save queries created in the query builder.
 <LI>Manual adding of categories in symbology-ng.
 <LI>Georeferencer: possibility to configure if residuals should be showed in
@@ -2004,7 +2004,7 @@ <H1>28. 0.5</H1>
    added by examining the fields and attempting to make a "smart" choice. The
    user can later change this field from the layer properties dialog. This field
    is used as the item name in the identify box (top of the tree for each feature
-   and its attributes) and will eventually be used in labelling features.
+   and its attributes) and will eventually be used in labeling features.
 Cleanup of postgres add layer dialog 
 Removed excessive debug output from qgsfeature 
  <P></P>

diff --git a/doc/news.t2t b/doc/news.t2t
@@ -61,7 +61,7 @@ This release has following new features:
 - Symbology: Control outline join style for simple, ellipse, and font markers
 - Symbology: New map tool for interactively setting point symbol offset
 - Symbology: Style Dock
-- Labelling: Labeling map tools now work with rule-based labeling
+- Labeling: Labeling map tools now work with rule-based labeling
 - Diagrams: Legend entries for diagram size
 - Diagrams: Unit selection for outline width
 - Diagrams: Diagrams behave like labels and can be managed from toolbar
@@ -169,10 +169,10 @@ This release has following new features:
 - General : New expression functions in 2.14
 - General : Better control over placement of map elements
 - General : Paid bugfixing programme
-- Labelling : Actual rendered symbol is now considered as an obstacle for point feature labels
-- Labelling : "Cartographic" placement mode for point labels
-- Labelling : Applying label distance from symbol bounds
-- Labelling : Control over label rendering order
+- Labeling : Actual rendered symbol is now considered as an obstacle for point feature labels
+- Labeling : "Cartographic" placement mode for point labels
+- Labeling : Applying label distance from symbol bounds
+- Labeling : Control over label rendering order
 - Layer Legend : applying the same style to selected layers or to legend group
 - Layer Legend : New options for filtering legend elements
 - Layer Legend : Filter legend by expression
@@ -233,13 +233,13 @@ This release has following new features:
 - General : User Interface Theme support
 - General : New expression functions in 2.12
 - General : Variables in expressions
-- Labelling : Data defined quadrant when in "around point" mode
-- Labelling : Draw only labels which fit inside polygons
-- Labelling : Control priority of labeling obstacles
-- Labelling : New options to control how polygon layers act as obstacles
-- Labelling : Data defined control over label priority
-- Labelling : Option for obstacle-only layers
-- Labelling : Rule-based labeling
+- Labeling : Data defined quadrant when in "around point" mode
+- Labeling : Draw only labels which fit inside polygons
+- Labeling : Control priority of labeling obstacles
+- Labeling : New options to control how polygon layers act as obstacles
+- Labeling : Data defined control over label priority
+- Labeling : Option for obstacle-only layers
+- Labeling : Rule-based labeling
 - Map Composer : Atlas navigation improvements
 - Map Composer : Custom format for grid annotations
 - Map Composer : Multiline text handling and automatic text wrapping in composer attribute tables
@@ -499,7 +499,7 @@ key new features.
 - HTML support has been added map composer label item to give you even
       more control over your final maps. HTML labels support full css styles
       sheets, html, and even javascript if you are that way inclined.
-- The labelling system has been totally overhauled - it now includes many
+- The labeling system has been totally overhauled - it now includes many
       new features such as drop shadows, 'highway shields', many more data bound
       options, and various performance enhancements. We are slowly doing away
       with the 'old labels' system, although you will still find that
@@ -553,7 +553,7 @@ key new features.
 - Customization - allows setting up simplified QGIS interface by hiding various components of main window and widgets in dialogs.
 - New symbol layer types - Line Pattern Fill, Point Pattern fill
 - Composers - have multiple lines on legend items using a specified character
-- Expression based labelling
+- Expression based labeling
 - Heatmap tool - a new core plugin has been added for generating raster heatmaps from point data. You may need to activate this plugin using the plugin manager.
 - GPS Tracking - The GPS live tracking user interface was overhauled and many fixes and improvements were added to it.
 - Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
@@ -880,7 +880,7 @@ as' option, you can now specify OGR creation options.
 - In the table of contents, it is now possible to select and remove several layers at once.
 - 
 
-==Labelling (New generation only)==
+==Labeling (New generation only)==
 
 - Data defined label position in labeling-ng.
 - Line wrapping, data defined font and buffer settings for labeling-ng.
@@ -962,7 +962,7 @@ colors
 information to display groups in the composer legend.
 - Show selected feature count in status bar 
 - Query option added to layer menu to subset vector layers
-- Option to label only selected features (on the 'old' labelling tool)
+- Option to label only selected features (on the 'old' labeling tool)
 - Load/save queries created in the query builder.
 - Manual adding of categories in symbology-ng.
 - Georeferencer: possibility to configure if residuals should be showed in
@@ -1782,7 +1782,7 @@ Added display/label field handling. Field is now set when the layer is
    added by examining the fields and attempting to make a "smart" choice. The
    user can later change this field from the layer properties dialog. This field
    is used as the item name in the identify box (top of the tree for each feature
-   and its attributes) and will eventually be used in labelling features.
+   and its attributes) and will eventually be used in labeling features.
 Cleanup of postgres add layer dialog 
 Removed excessive debug output from qgsfeature 
 

diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -480,7 +480,7 @@ class QgsPalLayerSettings
     // called from register feature hook
     void calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY, QgsFeature* f = 0, QgsRenderContext* context = 0 );
 
-    /** Register a feature for labelling.
+    /** Register a feature for labeling.
      * @param f feature to label
      * @param context render context. The QgsExpressionContext contained within the render context
      * must have already had the feature and fields sets prior to calling this method.

diff --git a/resources/customization.xml b/resources/customization.xml
@@ -950,7 +950,7 @@
       <widget objectName="mLabelFieldComboBox" class="QComboBox" label=""/>
       <widget objectName="mLabelFontButton" class="QPushButton" label="Label font..."/>
       <widget objectName="mLabelColorLabel" class="QLabel" label="Label color:"/>
-      <widget objectName="mScaleDependentLabelsCheckBox" class="QCheckBox" label="Use scale dependent labelling"/>
+      <widget objectName="mScaleDependentLabelsCheckBox" class="QCheckBox" label="Use scale dependent labeling"/>
       <widget objectName="mMaxScaleLabel" class="QLabel" label="max scale denominator:"/>
       <widget objectName="mMaxScaleDenominatorEdit" class="QLineEdit" label=""/>
     </widget>

diff --git a/scripts/.agignore b/scripts/.agignore
@@ -23,6 +23,7 @@ src/plugins/grass/qtermwidget/
 
 #Specific files
 ChangeLog
+doc/contributors.json
 Exception_to_GPL_for_Qt.txt
 images/themes/default/svgbase/hammer.svg
 images/themes/default/propertyicons/general.svg

diff --git a/scripts/chkspelling_ag.sh b/scripts/chkspelling_ag.sh
@@ -39,7 +39,7 @@ if [[ !  -z  $OUTPUT  ]]; then
   echo "****"
   # < ---------- get files + error ---------------------------------------------------------------------->
   ag --smart-case --only-matching --nogroup --nonumbers --all-text --word-regexp -p $AGIGNORE "$RE" $FILES | \
-  #                                     <-- generate sed command .... <------------------------------ get correction word ----------------------------->     <------------------------------- match case -------------------------------------------> <-----replace : by / and add word boundary------> ...finalize sed command>
+  #                                     <-- generate sed command .... <------------------------------ get correction word ---------------------------------->    <------------------------------- match case ------------------------------------------->   <-----replace : by / and add word boundary------> ...finalize sed command>
   sed -e 's/\(\S*\):\([[:alnum:]]*\)$/  echo "sed -i \x27s\/"$( echo "\2:$(ag --nonumbers --ignore-case --word-regexp \2 scripts\/spelling.dat | cut -d: -f2)" | sed -r \x27s\/([A-Z]+):(.*)\/\\1:\\U\\2\/; s\/([A-Z][a-z]+):([a-z])\/\\1:\\U\\2\\L\/\x27  | sed -r \x27s\/(\\S\*):\/\\\\b\\1\\\\b\\\/\/\x27)"\/g\x27 \1" /e' | \
   # remove duplicate line
   sort -u