Replace minimise by minimize

DelazJ · DelazJ · commit c440cecedfb5 · 2016-12-30T00:02:07.000+01:00
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/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/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/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>

Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,7 @@ void QgsGPSInformationWidget::displayGPSInformation( const QgsGPSInformation& in`
`703`	`703`	`QgsRectangle myExtentLimit( mpCanvas->extent() );`
`704`	`704`	`myExtentLimit.scale( mSpinMapExtentMultiplier->value() * 0.01 );`
`705`	`705`
`706`		`- // only change the extents if the point is beyond the current extents to minimise repaints`
	`706`	`+ // only change the extents if the point is beyond the current extents to minimize repaints`
`707`	`707`	`if ( radRecenterMap->isChecked() \|\|`
`708`	`708`	`( radRecenterWhenNeeded->isChecked() && !myExtentLimit.contains( myPoint ) ) )`
`709`	`709`	`{`
Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ QList<QColor> QgsLimitedRandomColorRamp::randomColors( int count,`
`393`	`393`	`for ( int i = 0; i < count; ++i )`
`394`	`394`	`{`
`395`	`395`	`//increment hue by golden ratio (approx 137.507 degrees)`
`396`		`- //as this minimises hue nearness as count increases`
	`396`	`+ //as this minimizes hue nearness as count increases`
`397`	`397`	`//see http://basecase.org/env/on-rainbows for more details`
`398`	`398`	`currentHueAngle += 137.50776;`
`399`	`399`	`//scale hue to between hueMax and hueMin`
Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ void eVisGenericEventBrowserGui::displayImage()`
`548`	`548`	`//keep the extent the same just center the map canvas in the display so our feature is in the middle`
`549`	`549`	`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 ) );`
`550`	`550`
`551`		`- // only change the extents if the point is beyond the current extents to minimise repaints`
	`551`	`+ // only change the extents if the point is beyond the current extents to minimize repaints`
`552`	`552`	`if ( !mCanvas->extent().contains( myPoint ) )`
`553`	`553`	`{`
`554`	`554`	`mCanvas->setExtent( myRect );`