Merge pull request #3920 from DelazJ/fixtypos

Fix more typos
qgis · Dec 30, 2016 · 4493461 · 4493461
2 parents 5e87155 + 2b93713
commit 4493461
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 37 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -202,6 +202,7 @@ Renamed Classes        {#qgis_api_break_3_0_renamed_classes}
 <tr><td>QgsApplication<td>userStyleV2Path<td>userStylePath
 <tr><td>QgsComposerShape<td>setUseSymbolV2<td>setUseSymbol
 <tr><td>QgsIFeatureSelectionManager<td>selectedFeaturesIds<td>selectedFeatureIds
+<tr><td>QgsMapLayer<td>capitaliseLayerName<td>capitalizeLayerName
 <tr><td>QgsSymbolLayerUtils<td>createSymbolLayerV2ListFromSld<td>createSymbolLayerListFromSld
 <tr><td>QgsVectorLayer<td>editorWidgetV2Config<td>editorWidgetConfig
 <tr><td>QgsVectorLayer<td>editorWidgetV2Text<td>editorWidgetText
@@ -309,7 +310,7 @@ Data Providers        {#qgis_api_break_3_0_DataProviders}
 Qgis        {#qgis_api_break_3_0_Qgis}
 ----
 
-- The QGis class was renamed to Qgis for capitalisation consistency with other class names
+- The QGis class was renamed to Qgis for capitalization consistency with other class names
 - permissiveToDouble() and permissiveToInt() where moved out of the QGis class and renamed to qgsPermissiveToDouble() and
 qgsPermissiveToInt()
 - The constants DEFAULT_IDENTIFY_RADIUS and MINIMUM_POINT_SIZE were removed
@@ -1130,6 +1131,7 @@ screenUpdateRequested() were removed. These members have had no effect for a num
 - drawLabels() method was removed. It used old deprecated labeling. Replaced by labeling based on PAL library, see QgsLabelingEngine.
 - readLayerXML() was renamed to readLayerXml()
 - writeLayerXML() was renamed to writeLayerXml()
+- capitaliseLayerName() was renamed to capitalizeLayerName()
 
 
 QgsMapLayerRegistry        {#qgis_api_break_3_0_QgsMapLayerRegistry}

diff --git a/python/core/effects/qgspainteffect.sip b/python/core/effects/qgspainteffect.sip
@@ -245,7 +245,7 @@ class QgsPaintEffect
  *
  * The draw source effect can be used to draw an unaltered copy of the original source
  * picture. Minor changes like lowering the opacity and applying a blend mode are
- * supported, however these changes will force the resultant output to be rasterised.
+ * supported, however these changes will force the resultant output to be rasterized.
  * If no alterations are performed then the original picture will be rendered as a vector.
  *
  * \note Added in version 2.9

diff --git a/python/core/qgsmaplayer.sip b/python/core/qgsmaplayer.sip
@@ -395,8 +395,8 @@ class QgsMapLayer : QObject
     /** Sets layer's spatial reference system */
     void setCrs( const QgsCoordinateReferenceSystem& srs, bool emitSignal = true );
 
-    /** A convenience function to (un)capitalise the layer name */
-    static QString capitaliseLayerName( const QString& name );
+    /** A convenience function to (un)capitalize the layer name */
+    static QString capitalizeLayerName( const QString& name );
 
     /** Retrieve the style URI for this layer
      * (either as a .qml file on disk or as a

diff --git a/scripts/spelling.dat b/scripts/spelling.dat
@@ -92,6 +92,7 @@ calender:calendar
 cancelation:cancellation
 capabilites:capabilities
 capatibilities:capabilities
+capitalise:capitalize
 cariage:carriage
 centimetre:centimeter
 centimetres:centimeters
@@ -248,6 +249,7 @@ integreated:integrated
 integrety:integrity
 integrey:integrity
 intendet:intended
+interactivly:interactively
 interchangable:interchangeable
 intermittant:intermittent
 intersecton:intersection
@@ -258,6 +260,7 @@ jave:java
 kilometre:kilometer
 kilometres:kilometers
 labelling:labeling
+labour:labor
 langage:language
 langauage:language
 langugage:language
@@ -288,6 +291,7 @@ microprocesspr:microprocessor
 millimetre:millimeter
 millimetres:millimeters
 milliseonds:milliseconds
+minimise:minimize
 miscelleneous:miscellaneous
 misformed:malformed
 mispelled:misspelled
@@ -384,6 +388,7 @@ protecion:protection
 protocoll:protocol
 psychadelic:psychedelic
 quering:querying
+rasterise:rasterize
 recieve:receive
 recieved:received
 reciever:receiver

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -878,7 +878,7 @@ void QgsComposer::changeEvent( QEvent* event )
 #endif
     case QEvent::WindowStateChange:
     {
-      /* Listen out for window un-minimisation and restore composer map states.
+      /* Listen out for window un-minimization and restore composer map states.
        * We can't use showEvent to detect this due to QT Bug 36675 (see #6085).
        */
       QWindowStateChangeEvent* changeEv = static_cast< QWindowStateChangeEvent* >( event );
@@ -3471,7 +3471,7 @@ void QgsComposer::writeXml( QDomNode& parentNode, QDomDocument& doc )
   QDomElement composerElem = doc.createElement( QStringLiteral( "Composer" ) );
   composerElem.setAttribute( QStringLiteral( "title" ), mTitle );
 
-  //change preview mode of minimised / hidden maps before saving XML (show contents only on demand)
+  //change preview mode of minimized / hidden maps before saving XML (show contents only on demand)
   QMap< QgsComposerMap*, int >::const_iterator mapIt = mMapsToRestore.constBegin();
   for ( ; mapIt != mMapsToRestore.constEnd(); ++mapIt )
   {

diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -703,7 +703,7 @@ void QgsGPSInformationWidget::displayGPSInformation( const QgsGPSInformation& in
       QgsRectangle myExtentLimit( mpCanvas->extent() );
       myExtentLimit.scale( mSpinMapExtentMultiplier->value() * 0.01 );
 
-      // only change the extents if the point is beyond the current extents to minimise repaints
+      // only change the extents if the point is beyond the current extents to minimize repaints
       if ( radRecenterMap->isChecked() ||
            ( radRecenterWhenNeeded->isChecked() && !myExtentLimit.contains( myPoint ) ) )
       {

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9118,7 +9118,7 @@ void QgisApp::showOptionsDialog( QWidget *parent, const QString& currentPage )
   QSettings mySettings;
   QString oldScales = mySettings.value( QStringLiteral( "Map/scales" ), PROJECT_SCALES ).toString();
 
-  bool oldCapitalise = mySettings.value( QStringLiteral( "/qgis/capitaliseLayerName" ), QVariant( false ) ).toBool();
+  bool oldCapitalize = mySettings.value( QStringLiteral( "/qgis/capitalizeLayerName" ), QVariant( false ) ).toBool();
 
   QgsOptions *optionsDialog = new QgsOptions( parent );
   if ( !currentPage.isEmpty() )
@@ -9143,7 +9143,7 @@ void QgisApp::showOptionsDialog( QWidget *parent, const QString& currentPage )
 
     mMapCanvas->setMapUpdateInterval( mySettings.value( QStringLiteral( "/qgis/map_update_interval" ), 250 ).toInt() );
 
-    if ( oldCapitalise != mySettings.value( QStringLiteral( "/qgis/capitaliseLayerName" ), QVariant( false ) ).toBool() )
+    if ( oldCapitalize != mySettings.value( QStringLiteral( "/qgis/capitalizeLayerName" ), QVariant( false ) ).toBool() )
     {
       // if the layer capitalization has changed, we need to update all layer names
       Q_FOREACH ( QgsMapLayer* layer, QgsProject::instance()->mapLayers() )

diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -693,7 +693,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
   pbnMeasureColor->setContext( QStringLiteral( "gui" ) );
   pbnMeasureColor->setDefaultColor( QColor( 222, 155, 67 ) );
 
-  capitaliseCheckBox->setChecked( mSettings->value( QStringLiteral( "/qgis/capitaliseLayerName" ), QVariant( false ) ).toBool() );
+  capitalizeCheckBox->setChecked( mSettings->value( QStringLiteral( "/qgis/capitalizeLayerName" ), QVariant( false ) ).toBool() );
 
   int projOpen = mSettings->value( QStringLiteral( "/qgis/projOpenAtLaunch" ), 0 ).toInt();
   mProjectOnLaunchCmbBx->setCurrentIndex( projOpen );
@@ -1185,8 +1185,8 @@ void QgsOptions::saveOptions()
 
   mSettings->setValue( QStringLiteral( "/qgis/map_update_interval" ), spinMapUpdateInterval->value() );
   mSettings->setValue( QStringLiteral( "/qgis/legendDoubleClickAction" ), cmbLegendDoubleClickAction->currentIndex() );
-  bool legendLayersCapitalise = mSettings->value( QStringLiteral( "/qgis/capitaliseLayerName" ), false ).toBool();
-  mSettings->setValue( QStringLiteral( "/qgis/capitaliseLayerName" ), capitaliseCheckBox->isChecked() );
+  bool legendLayersCapitalize = mSettings->value( QStringLiteral( "/qgis/capitalizeLayerName" ), false ).toBool();
+  mSettings->setValue( QStringLiteral( "/qgis/capitalizeLayerName" ), capitalizeCheckBox->isChecked() );
 
   // Default simplify drawing configuration
   QgsVectorSimplifyMethod::SimplifyHints simplifyHints = QgsVectorSimplifyMethod::NoSimplification;
@@ -1440,7 +1440,7 @@ void QgsOptions::saveOptions()
   // refresh legend if any legend item's state is to be changed
   if ( legendLayersBold != mLegendLayersBoldChkBx->isChecked()
        || legendGroupsBold != mLegendGroupsBoldChkBx->isChecked()
-       || legendLayersCapitalise != capitaliseCheckBox->isChecked() )
+       || legendLayersCapitalize != capitalizeCheckBox->isChecked() )
   {
     // TODO[MD] QgisApp::instance()->legend()->updateLegendItemStyles();
   }

diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -1007,7 +1007,7 @@ void QgsRasterLayerProperties::apply()
 
 void QgsRasterLayerProperties::on_mLayerOrigNameLineEd_textEdited( const QString& text )
 {
-  leDisplayName->setText( mRasterLayer->capitaliseLayerName( text ) );
+  leDisplayName->setText( mRasterLayer->capitalizeLayerName( text ) );
 }
 
 void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()

diff --git a/src/app/qgssponsors.cpp b/src/app/qgssponsors.cpp
@@ -32,7 +32,7 @@ QgsSponsors::QgsSponsors( QWidget *parent )
   init();
   QString intro = tr( "<p>We work really hard to make this nice software for you. "
                       "See all the cool features it has? Get a warm fuzzy feeling when you use it? "
-                      "QGIS is a labour of love by a dedicated team of developers. We want you to copy "
+                      "QGIS is a labor of love by a dedicated team of developers. We want you to copy "
                       "&amp; share it and put it in the hands of as many people as possible. If QGIS "
                       "is saving you money or you like our work and have the financial ability to "
                       "help, please consider sponsoring the development of QGIS. We use money from "

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -693,7 +693,7 @@ QString QgsVectorLayerProperties::metadata()
 
 void QgsVectorLayerProperties::on_mLayerOrigNameLineEdit_textEdited( const QString& text )
 {
-  txtDisplayName->setText( mLayer->capitaliseLayerName( text ) );
+  txtDisplayName->setText( mLayer->capitalizeLayerName( text ) );
 }
 
 void QgsVectorLayerProperties::on_mCrsSelector_crsChanged( const QgsCoordinateReferenceSystem& crs )

diff --git a/src/core/effects/qgscoloreffect.cpp b/src/core/effects/qgscoloreffect.cpp
@@ -53,7 +53,7 @@ void QgsColorEffect::draw( QgsRenderContext &context )
 
   QPainter* painter = context.painter();
 
-  //rasterise source and apply modifications
+  //rasterize source and apply modifications
   QImage image = sourceAsImage( context )->copy();
 
   QgsImageOperation::adjustBrightnessContrast( image, mBrightness, mContrast / 100.0 + 1 );

diff --git a/src/core/effects/qgspainteffect.cpp b/src/core/effects/qgspainteffect.cpp
@@ -281,7 +281,7 @@ void QgsDrawSourceEffect::draw( QgsRenderContext &context )
   }
   else
   {
-    //rasterise source and apply modifications
+    //rasterize source and apply modifications
     QImage image = sourceAsImage( context )->copy();
     QgsImageOperation::multiplyOpacity( image, 1.0 - mTransparency );
     painter->save();

diff --git a/src/core/effects/qgspainteffect.h b/src/core/effects/qgspainteffect.h
@@ -247,7 +247,7 @@ class CORE_EXPORT QgsPaintEffect
  *
  * The draw source effect can be used to draw an unaltered copy of the original source
  * picture. Minor changes like lowering the opacity and applying a blend mode are
- * supported, however these changes will force the resultant output to be rasterised.
+ * supported, however these changes will force the resultant output to be rasterized.
  * If no alterations are performed then the original picture will be rendered as a vector.
  *
  * \note Added in version 2.9

diff --git a/src/core/qgscolorramp.cpp b/src/core/qgscolorramp.cpp
@@ -393,7 +393,7 @@ QList<QColor> QgsLimitedRandomColorRamp::randomColors( int count,
   for ( int i = 0; i < count; ++i )
   {
     //increment hue by golden ratio (approx 137.507 degrees)
-    //as this minimises hue nearness as count increases
+    //as this minimizes hue nearness as count increases
     //see http://basecase.org/env/on-rainbows for more details
     currentHueAngle += 137.50776;
     //scale hue to between hueMax and hueMin

diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -63,7 +63,7 @@ QgsMapLayer::QgsMapLayer( QgsMapLayer::LayerType type,
     , mStyleManager( new QgsMapLayerStyleManager( this ) )
 {
   // Set the display name = internal name
-  mLayerName = capitaliseLayerName( mLayerOrigName );
+  mLayerName = capitalizeLayerName( mLayerOrigName );
 
   mShortName = QLatin1String( "" );
   //mShortName.replace( QRegExp( "[\\W]" ), "_" );
@@ -106,7 +106,7 @@ QString QgsMapLayer::id() const
 
 void QgsMapLayer::setName( const QString& name )
 {
-  QString newName = capitaliseLayerName( name );
+  QString newName = capitalizeLayerName( name );
   if ( name == mLayerOrigName && newName == mLayerName )
     return;
 
@@ -994,16 +994,16 @@ void QgsMapLayer::setCrs( const QgsCoordinateReferenceSystem& srs, bool emitSign
     emit crsChanged();
 }
 
-QString QgsMapLayer::capitaliseLayerName( const QString& name )
+QString QgsMapLayer::capitalizeLayerName( const QString& name )
 {
-  // Capitalise the first letter of the layer name if requested
+  // Capitalize the first letter of the layer name if requested
   QSettings settings;
-  bool capitaliseLayerName =
-    settings.value( QStringLiteral( "/qgis/capitaliseLayerName" ), QVariant( false ) ).toBool();
+  bool capitalizeLayerName =
+    settings.value( QStringLiteral( "/qgis/capitalizeLayerName" ), QVariant( false ) ).toBool();
 
   QString layerName( name );
 
-  if ( capitaliseLayerName && !layerName.isEmpty() )
+  if ( capitalizeLayerName && !layerName.isEmpty() )
     layerName = layerName.at( 0 ).toUpper() + layerName.mid( 1 );
 
   return layerName;

diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
@@ -419,8 +419,8 @@ class CORE_EXPORT QgsMapLayer : public QObject
     //! Sets layer's spatial reference system
     void setCrs( const QgsCoordinateReferenceSystem& srs, bool emitSignal = true );
 
-    //! A convenience function to (un)capitalise the layer name
-    static QString capitaliseLayerName( const QString& name );
+    //! A convenience function to (un)capitalize the layer name
+    static QString capitalizeLayerName( const QString& name );
 
     /** Retrieve the style URI for this layer
      * (either as a .qml file on disk or as a

diff --git a/src/core/qgsmaprenderercustompainterjob.cpp b/src/core/qgsmaprenderercustompainterjob.cpp
@@ -326,7 +326,7 @@ bool QgsMapRendererJob::needTemporaryImage( QgsMapLayer* ml )
           || ( vl->featureBlendMode() != QPainter::CompositionMode_SourceOver )
           || ( vl->layerTransparency() != 0 ) ) )
     {
-      //layer properties require rasterisation
+      //layer properties require rasterization
       return true;
     }
   }

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1512,7 +1512,7 @@ void QgsVectorLayer::setDataSource( const QString& dataSource, const QString& ba
   QgsWkbTypes::GeometryType geomType = mValid && mDataProvider ? geometryType() : QgsWkbTypes::UnknownGeometry;
 
   mDataSource = dataSource;
-  mLayerName = capitaliseLayerName( baseName );
+  mLayerName = capitalizeLayerName( baseName );
   setName( mLayerName );
   setDataProvider( provider );
 

diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp
@@ -220,7 +220,7 @@ void QgsNewHttpConnection::accept()
   if ( !txtPassword->text().isEmpty() &&
        QMessageBox::question( this,
                               tr( "Saving passwords" ),
-                              tr( "WARNING: You have entered a password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button.\nNote: giving the password is optional. It will be requested interactivly, when needed." ),
+                              tr( "WARNING: You have entered a password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button.\nNote: Giving the password is optional. It will be requested interactively, when needed." ),
                               QMessageBox::Ok | QMessageBox::Cancel ) == QMessageBox::Cancel )
   {
     return;

diff --git a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
@@ -548,7 +548,7 @@ void eVisGenericEventBrowserGui::displayImage()
       //keep the extent the same just center the map canvas in the display so our feature is in the middle
       QgsRectangle myRect( myPoint.x() - ( mCanvas->extent().width() / 2 ), myPoint.y() - ( mCanvas->extent().height() / 2 ), myPoint.x() + ( mCanvas->extent().width() / 2 ), myPoint.y() + ( mCanvas->extent().height() / 2 ) );
 
-      // only change the extents if the point is beyond the current extents to minimise repaints
+      // only change the extents if the point is beyond the current extents to minimize repaints
       if ( !mCanvas->extent().contains( myPoint ) )
       {
         mCanvas->setExtent( myRect );

diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -2902,15 +2902,15 @@
                      </spacer>
                     </item>
                     <item row="1" column="1">
-                     <widget class="QCheckBox" name="capitaliseCheckBox">
+                     <widget class="QCheckBox" name="capitalizeCheckBox">
                       <property name="sizePolicy">
                        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
                         <horstretch>0</horstretch>
                         <verstretch>0</verstretch>
                        </sizepolicy>
                       </property>
                       <property name="text">
-                       <string>Capitalise layer names</string>
+                       <string>Capitalize layer names</string>
                       </property>
                      </widget>
                     </item>
@@ -5457,7 +5457,7 @@
   <tabstop>pbnSelectionColor</tabstop>
   <tabstop>pbnCanvasColor</tabstop>
   <tabstop>cmbLegendDoubleClickAction</tabstop>
-  <tabstop>capitaliseCheckBox</tabstop>
+  <tabstop>capitalizeCheckBox</tabstop>
   <tabstop>mLegendLayersBoldChkBx</tabstop>
   <tabstop>mLegendGroupsBoldChkBx</tabstop>
   <tabstop>cbxLegendClassifiers</tabstop>

diff --git a/src/ui/qgstextformatwidgetbase.ui b/src/ui/qgstextformatwidgetbase.ui
@@ -6274,7 +6274,7 @@ font-style: italic;</string>
                             <item>
                              <widget class="QLabel" name="label_14">
                               <property name="text">
-                               <string>Minimise placing labels</string>
+                               <string>Minimize placing labels</string>
                               </property>
                              </widget>
                             </item>