Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Replace prioritise by prioritize
  • Loading branch information
DelazJ committed Dec 29, 2016
1 parent 69af2fa commit 8dca115
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion python/core/qgspallabeling.sip
Expand Up @@ -408,7 +408,7 @@ class QgsPalLayerSettings
bool centroidInside; // whether centroid-point calculated must be inside polygon

/** Ordered list of predefined label positions for points. Positions earlier
* in the list will be prioritised over later positions. Only used when the placement
* in the list will be prioritized over later positions. Only used when the placement
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
* @note not available in Python bindings
*/
Expand Down
2 changes: 2 additions & 0 deletions scripts/spelling.dat
Expand Up @@ -357,6 +357,8 @@ prepaired:prepared
primative:primitive
princliple:principle
priorty:priority
prioritise:prioritize
prioritising:prioritizing
proccesors:processors
proces:process
processessing:processing
Expand Down
2 changes: 1 addition & 1 deletion src/core/pal/feature.h
Expand Up @@ -143,7 +143,7 @@ namespace pal
*/
int createCandidatesOverPoint( double x, double y, QList<LabelPosition *> &lPos, double angle );

/** Generates candidates following a prioritised list of predefined positions around a point.
/** Generates candidates following a prioritized list of predefined positions around a point.
* @param x x coordinate of the point
* @param y y coordinate of the point
* @param lPos pointer to an array of candidates, will be filled by generated candidate
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgspallabeling.h
Expand Up @@ -427,7 +427,7 @@ class CORE_EXPORT QgsPalLayerSettings
bool centroidInside; // whether centroid-point calculated must be inside polygon

/** Ordered list of predefined label positions for points. Positions earlier
* in the list will be prioritised over later positions. Only used when the placement
* in the list will be prioritized over later positions. Only used when the placement
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
* @note not available in Python bindings
*/
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgstextformatwidgetbase.ui
Expand Up @@ -3868,7 +3868,7 @@ font-style: italic;</string>
<item row="0" column="0">
<widget class="QRadioButton" name="radPredefinedOrder">
<property name="toolTip">
<string>Uses cartographically 'ideal' placements, prioritising label placement with best visual relationship with the point feature</string>
<string>Uses 'ideal' cartographic placements, prioritizing label placement with best visual relationship with the point feature</string>
</property>
<property name="text">
<string>Cartographic</string>
Expand Down

0 comments on commit 8dca115

Please sign in to comment.