typo fixes, translation string updates and german translation update

jef-n · jef-n · commit b72ddcab7e4d · 2012-08-25T11:28:32.000+02:00
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -948,7 +948,7 @@ void QgsRasterLayerProperties::on_pbnDefaultValues_clicked()
   {
     if ( mRasterLayer->isNoDataValueValid() )
     {
-      // I dont think that noDataValue should be added to transparency list
+      // I don't think that noDataValue should be added to transparency list
 #if 0
       tableTransparency->insertRow( tableTransparency->rowCount() );
       setTransparencyCell( 0, 0, mRasterLayer->noDataValue() );
@@ -1313,7 +1313,7 @@ void QgsRasterLayerProperties::pixelSelected( const QgsPoint& canvasPoint )
           if ( value == tr( "null (no data)" ) || // Very bad! TODO: improve identify
                mRasterLayer->dataProvider()->isNoDataValue( bands.at( i ), value.toDouble() ) )
           {
-            return; // Dont add nodata, transparent anyway
+            return; // Don't add nodata, transparent anyway
           }
           values.append( value.toDouble() );
         }
@@ -1578,13 +1578,15 @@ void QgsRasterLayerProperties::updatePipeList()
     texts << QString( "%1 ms" ).arg( interface->time() );
     QTreeWidgetItem *item = new QTreeWidgetItem( texts );
 
+#if 0
     // Switching on/off would be possible but problematic - drawer is not pipe
-    // memer so we dont know required output format
-    // Checkobxes are very usefel however for QgsRasterPipe debugging.
-    //bool on = interface->on();
-    //item->setCheckState( 0, on ? Qt::Checked : Qt::Unchecked );
+    // memer so we don't know required output format
+    // Checkboxes are very useful however for QgsRasterPipe debugging.
+    bool on = interface->on();
+    item->setCheckState( 0, on ? Qt::Checked : Qt::Unchecked );
 
-    //Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
+    Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
+#endif
     Qt::ItemFlags flags = Qt::ItemIsEnabled;
     item->setFlags( flags );
 
diff --git a/src/core/qgsrasterdataprovider.cpp b/src/core/qgsrasterdataprovider.cpp
@@ -767,7 +767,7 @@ bool QgsRasterDataProvider::hasHistogram( int theBandNo,
 {
   QgsDebugMsg( QString( "theBandNo = %1 theBinCount = %2 theMinimum = %3 theMaximum = %4 theSampleSize = %5" ).arg( theBandNo ).arg( theBinCount ).arg( theMinimum ).arg( theMaximum ).arg( theSampleSize ) );
   // histogramDefaults() needs statistics if theMinimum or theMaximum is NaN ->
-  // do other checks which dont need statistics before histogramDefaults()
+  // do other checks which don't need statistics before histogramDefaults()
   if ( mHistograms.size() == 0 ) return false;
 
   QgsRasterHistogram myHistogram;
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2440,7 +2440,7 @@ int QgsVectorLayer::splitFeatures( const QList<QgsPoint>& splitLine, bool topolo
 
         if ( mDataProvider )
         {
-          //use default value where possible (primary key issue), otherwise the value from the original (splitted) feature
+          //use default value where possible (primary key issue), otherwise the value from the original (split) feature
           QgsAttributeMap newAttributes = select_it->attributeMap();
           QVariant defaultValue;
           foreach ( int j, newAttributes.keys() )
diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp
@@ -232,7 +232,7 @@ if ( error == NoDataConflict )
   destProvider->remove();
   delete destProvider;
 
-  // But we dont know which band -> wider all
+  // But we don't know which band -> wider all
   for ( int i = 0; i < nBands; i++ )
   {
     double destNoDataValue;
diff --git a/src/core/raster/qgsrasterinterface.cpp b/src/core/raster/qgsrasterinterface.cpp
@@ -194,7 +194,7 @@ void QgsRasterInterface::setStatsOn( bool on )
 double QgsRasterInterface::time( bool cumulative )
 {
   // We can calculate total time only, because we have to subtract time of previous
-  // interface(s) and we dont know how to assign bands to each other
+  // interface(s) and we don't know how to assign bands to each other
   double t = 0;
   for ( int i = 1; i < mTime.size(); i++ )
   {
diff --git a/src/core/raster/qgsrasterpipe.cpp b/src/core/raster/qgsrasterpipe.cpp
@@ -152,7 +152,7 @@ bool QgsRasterPipe::set( QgsRasterInterface* theInterface )
 
   Role role = interfaceRole( theInterface );
 
-  // We dont know where to place unknown interface
+  // We don't know where to place unknown interface
   if ( role == UnknownRole ) return false;
 
   //if ( mInterfacesMap.value ( role ) )
diff --git a/src/core/symbology-ng/qgsstylev2.h b/src/core/symbology-ng/qgsstylev2.h
@@ -84,7 +84,7 @@ class CORE_EXPORT QgsStyleV2
      *  \param name is the name of the color ramp being added or updated
      *  \param colorRamp is the Vector color ramp
      *  \param update set to true when the style DB has to be updated, by default it is false
-     *  \return sucess status of the operation
+     *  \return success status of the operation
      */
     bool addColorRamp( QString name, QgsVectorColorRampV2* colorRamp, bool update = false );
 
@@ -110,7 +110,7 @@ class CORE_EXPORT QgsStyleV2
      *  \param name is the name of the symbol being added or updated
      *  \param symbol is the Vector symbol
      *  \param update set to true when the style DB has to be updated, by default it is false
-     *  \return sucess status of the operation
+     *  \return success status of the operation
      */
     bool addSymbol( QString name, QgsSymbolV2* symbol, bool update = false );
 
@@ -162,7 +162,7 @@ class CORE_EXPORT QgsStyleV2
      *  \param type is either SymbolEntity or ColorrampEntity
      *  \param symbol is the name of the symbol or colorramp
      *  \param tags is the list of tags that are to be removed as QStringList
-     *  \return returns the sucess state of the operation
+     *  \return returns the success state of the operation
      */
     bool detagSymbol( StyleEntity type, QString symbol, QStringList tags );
 
@@ -244,7 +244,7 @@ class CORE_EXPORT QgsStyleV2
      *  \param symbol is the pointer to the new QgsSymbolV2 being saved
      *  \param groupid is the id of the group to which the symbol belongs. Pass 0 if it doesn't belong to any group or not known.
      *  \param tags is a list of tags that are associated with the symbol as a QStringList.
-     *  \return returns the sucess state of the save operation
+     *  \return returns the success state of the save operation
      */
     bool saveSymbol( QString name, QgsSymbolV2* symbol, int groupid, QStringList tags );
 
@@ -254,7 +254,7 @@ class CORE_EXPORT QgsStyleV2
      *  \param ramp is the pointer to the new QgsVectorColorRampV2 being saved
      *  \param groupid is the id of the group to which the Color Ramp belongs. Pass 0 if it doesn't belong to any group or not known.
      *  \param tags is a list of tags that are associated with the color ramp as a QStringList.
-     *  \return returns the sucess state of the save operation
+     *  \return returns the success state of the save operation
      */
     bool saveColorRamp( QString name, QgsVectorColorRampV2* ramp, int groupid, QStringList tags );
 
diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -374,7 +374,7 @@ void QgsRasterLayerSaveAsDialog::updateResolutionStateMsg()
     default:
       break;
   }
-  msg = tr( "Resolution" ) + " (" + tr( "current" ) + ": " + msg + ")";
+  msg = tr( "Resolution (current: %1)" ).arg( msg );
   mResolutionGroupBox->setTitle( msg );
 }
 
@@ -406,7 +406,7 @@ void QgsRasterLayerSaveAsDialog::updateExtentStateMsg()
     default:
       break;
   }
-  msg = tr( "Extent" ) + " (" + tr( "current" ) + ": " + msg + ")";
+  msg = tr( "Extent (current: %1)" ).arg( msg );
   mExtentGroupBox->setTitle( msg );
 }
 
@@ -479,13 +479,13 @@ void QgsRasterLayerSaveAsDialog::updateCrsGroup()
   QgsDebugMsg( "Entered" );
 
   mCrsComboBox->setItemText( mCrsComboBox->findData( OriginalCrs ),
-                             tr( "Layer" ) + " (" + mLayerCrs.description() + ", " + mLayerCrs.authid() + ")" );
+                             tr( "Layer (%1, %2)" ).arg( mLayerCrs.description() ).arg( mLayerCrs.authid() ) );
 
   mCrsComboBox->setItemText( mCrsComboBox->findData( CurrentCrs ),
-                             tr( "Project" ) + " (" + mCurrentCrs.description() + ", " + mCurrentCrs.authid() + ")" );
+                             tr( "Project (%1, %2)" ).arg( mCurrentCrs.description() ).arg( mCurrentCrs.authid() ) );
 
   mCrsComboBox->setItemText( mCrsComboBox->findData( UserCrs ),
-                             tr( "Selected" ) + " (" + mUserCrs.description() + ", " + mUserCrs.authid() + ")" );
+                             tr( "Selected (%1, %2)" ).arg( mUserCrs.description() ).arg( mUserCrs.authid() ) );
 }
 
 QgsCoordinateReferenceSystem QgsRasterLayerSaveAsDialog::outputCrs()
diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp
@@ -672,7 +672,7 @@ void QgsRasterHistogramWidget::histoAction( const QString actionName, bool actio
     return;
   }
   // Load actions
-  // TODO - seperate calculations from rendererwidget so we can do them without
+  // TODO - separate calculations from rendererwidget so we can do them without
   else if ( actionName.left( 5 ) == "Load " && mRendererWidget )
   {
     QVector<int> myBands;
diff --git a/src/gui/symbology-ng/qgslayerpropertieswidget.cpp b/src/gui/symbology-ng/qgslayerpropertieswidget.cpp
@@ -86,8 +86,8 @@ QgsLayerPropertiesWidget::QgsLayerPropertiesWidget( QgsSymbolLayerV2* layer, con
   mVectorLayer = vl;
 
   setupUi( this );
-  // initalize the sub-widgets
-  // XXX Should this thing be here this way? Initalize all th widgets just for the sake of one layer?
+  // initialize the sub-widgets
+  // XXX Should this thing be here this way? Initialize all the widgets just for the sake of one layer?
   // TODO Make this on demand creation
   _initWidgetFunctions();
 
diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.h b/src/gui/symbology-ng/qgssymbolv2selectordialog.h
@@ -82,7 +82,7 @@ class GUI_EXPORT QgsSymbolV2SelectorDialog : public QDialog, private Ui::QgsSymb
     //! Slot to update tree when a new symbol from style
     void symbolChanged();
     //! alters tree and sets proper widget when Layer Type is changed
-    //! @note: The layer is recieved from the LayerPropertiesWidget
+    //! @note: The layer is received from the LayerPropertiesWidget
     void changeLayer( QgsSymbolLayerV2* layer );
 
 
diff --git a/src/mapserver/qgsconfigparser.h b/src/mapserver/qgsconfigparser.h
@@ -118,7 +118,7 @@ class QgsConfigParser
     /**Appends service metadata to the capabilities document*/
     virtual void serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const;
 
-    /**Returns service Adress (or empty string if not defined in the configuration*/
+    /**Returns service address (or empty string if not defined in the configuration*/
     virtual QString serviceUrl() const { return QString(); }
 
     QColor selectionColor() const { return mSelectionColor; }
diff --git a/src/providers/wcs/qgswcscapabilities.cpp b/src/providers/wcs/qgswcscapabilities.cpp
@@ -771,7 +771,7 @@ bool QgsWcsCapabilities::parseDescribeCoverageDom10( QByteArray const &xml, QgsW
         coverage->hasSize = true;
       }
     }
-    // RectifiedGrid has also gml:origin which we dont need I think (attention however
+    // RectifiedGrid has also gml:origin which we don't need I think (attention however
     // it should contain gml:Point but mapserver 6.0.3 / WCS 1.0.0 is using gml:pos instead)
     // RectifiedGrid also contains 2 gml:offsetVector which could be used to get resolution
     // but it should be sufficient to calc resolution from size
diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp
@@ -1367,38 +1367,40 @@ QString QgsWcsProvider::coverageMetadata( QgsWcsCoverageSummary coverage )
   metadata += htmlRow( tr( "Name (identifier)" ), coverage.identifier );
   metadata += htmlRow( tr( "Title" ), coverage.title );
   metadata += htmlRow( tr( "Abstract" ), coverage.abstract );
-  // We dont have size, nativeCrs, nativeBoundingBox etc. until describe coverage which would be heavy for all coverages
-  //metadata += htmlRow ( tr( "Fixed Width" ), QString::number( coverage.width ) );
-  //metadata += htmlRow ( tr( "Fixed Height" ), QString::number( coverage.height ) );
-  //metadata += htmlRow ( tr( "Native CRS" ), coverage.nativeCrs );
-  //metadata += htmlRow ( tr( "Native Bounding Box" ), coverage.nativeBoundingBox.toString() );
+#if 0
+  // We don't have size, nativeCrs, nativeBoundingBox etc. until describe coverage which would be heavy for all coverages
+  metadata += htmlRow( tr( "Fixed Width" ), QString::number( coverage.width ) );
+  metadata += htmlRow( tr( "Fixed Height" ), QString::number( coverage.height ) );
+  metadata += htmlRow( tr( "Native CRS" ), coverage.nativeCrs );
+  metadata += htmlRow( tr( "Native Bounding Box" ), coverage.nativeBoundingBox.toString() );
+#endif
 
   metadata += htmlRow( tr( "WGS 84 Bounding Box" ), coverage.wgs84BoundingBox.toString() );
 
   // Layer Coordinate Reference Systems
   // TODO(?): supportedCrs and supportedFormat are not available in 1.0
   // until coverage is described - it would be confusing to show it only if available
-  /*
+#if 0
   for ( int j = 0; j < qMin( coverage.supportedCrs.size(), 10 ); j++ )
   {
-    metadata += htmlRow ( tr( "Available in CRS" ), coverage.supportedCrs.value(j) );
+    metadata += htmlRow( tr( "Available in CRS" ), coverage.supportedCrs.value( j ) );
   }
 
   if ( coverage.supportedCrs.size() > 10 )
   {
-    metadata += htmlRow ( tr( "Available in CRS" ), tr( "(and %n more)", "crs", coverage.supportedCrs.size() - 10 ) );
+    metadata += htmlRow( tr( "Available in CRS" ), tr( "(and %n more)", "crs", coverage.supportedCrs.size() - 10 ) );
   }
 
   for ( int j = 0; j < qMin( coverage.supportedFormat.size(), 10 ); j++ )
   {
-    metadata += htmlRow ( tr( "Available in format" ), coverage.supportedFormat.value(j) );
+    metadata += htmlRow( tr( "Available in format" ), coverage.supportedFormat.value( j ) );
   }
 
   if ( coverage.supportedFormat.size() > 10 )
   {
-    metadata += htmlRow ( tr( "Available in format" ), tr( "(and %n more)", "crs", coverage.supportedFormat.size() - 10 ) );
+    metadata += htmlRow( tr( "Available in format" ), tr( "(and %n more)", "crs", coverage.supportedFormat.size() - 10 ) );
   }
-  */
+#endif
 
   // Close the nested table
   metadata += "</table>";
@@ -1417,11 +1419,13 @@ QString QgsWcsProvider::metadata()
   metadata += tr( "Coverages" );
   metadata += "</a>";
 
+#if 0
 #if QT_VERSION >= 0x40500
   // TODO
-  //metadata += "<a href=\"#cachestats\">";
-  //metadata += tr( "Cache Stats" );
-  //metadata += "</a> ";
+  metadata += "<a href=\"#cachestats\">";
+  metadata += tr( "Cache Stats" );
+  metadata += "</a> ";
+#endif
 #endif
 
   metadata += "</td></tr>";
@@ -1446,17 +1450,19 @@ QString QgsWcsProvider::metadata()
   metadata += htmlRow(( "WCS Version" ), mCapabilities.version() );
   metadata += htmlRow( tr( "Title" ), mCapabilities.capabilities().title );
   metadata +=  htmlRow( tr( "Abstract" ), mCapabilities.capabilities().abstract );
+#if 0
   // TODO: probably apply stylesheet in QgsWcsCapabilities and save as html
-  //metadata += htmlRow ( tr( "Keywords" ), mCapabilities.service.keywordList.join( "<br />" ) );
-  //metadata += htmlRow (  tr( "Online Resource" ), "-" );
-  //metadata += htmlRow (  tr( "Contact Person" ),
-  //  mCapabilities.service.contactInformation.contactPersonPrimary.contactPerson
-  //    + "<br />" + mCapabilities.service.contactInformation.contactPosition;
-  //    + "<br />" + mCapabilities.service.contactInformation.contactPersonPrimary.contactOrganization );
-  //metadata += htmlRow ( tr( "Fees" ), mCapabilities.service.fees );
-  //metadata += htmlRow ( tr( "Access Constraints" ), mCapabilities.service.accessConstraints );
-  //metadata += htmlRow ( tr( "Image Formats" ), mCapabilities.capability.request.getMap.format.join( "<br />" ) );
-  //metadata += htmlRow (  tr( "GetCapabilitiesUrl" ), mBaseUrl );
+  metadata += htmlRow( tr( "Keywords" ), mCapabilities.service.keywordList.join( "<br />" ) );
+  metadata += htmlRow( tr( "Online Resource" ), "-" );
+  metadata += htmlRow( tr( "Contact Person" ),
+                       mCapabilities.service.contactInformation.contactPersonPrimary.contactPerson
+                       + "<br />" + mCapabilities.service.contactInformation.contactPosition;
+                       + "<br />" + mCapabilities.service.contactInformation.contactPersonPrimary.contactOrganization );
+  metadata += htmlRow( tr( "Fees" ), mCapabilities.service.fees );
+  metadata += htmlRow( tr( "Access Constraints" ), mCapabilities.service.accessConstraints );
+  metadata += htmlRow( tr( "Image Formats" ), mCapabilities.capability.request.getMap.format.join( "<br />" ) );
+  metadata += htmlRow( tr( "GetCapabilitiesUrl" ), mBaseUrl );
+#endif
   metadata += htmlRow( tr( "Get Coverage Url" ), mCapabilities.getCoverageUrl() + ( mIgnoreGetCoverageUrl ? tr( "&nbsp;<font color=\"red\">(advertised but ignored)</font>" ) : "" ) );
 
   // Close the nested table
diff --git a/src/ui/qgsprojectpropertiesbase.ui b/src/ui/qgsprojectpropertiesbase.ui
@@ -194,11 +194,7 @@
        <item row="1" column="0">
         <widget class="QGroupBox" name="btnGrpMapUnits">
          <property name="toolTip">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Used when CRS transformation is turned off.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>Used when CRS transformation is turned off</string>
          </property>
          <property name="title">
           <string>Canvas units</string>
diff --git a/src/ui/qgsrasterformatsaveoptionswidgetbase.ui b/src/ui/qgsrasterformatsaveoptionswidgetbase.ui
@@ -186,7 +186,7 @@
        <item>
         <widget class="QLineEdit" name="mOptionsLineEdit">
          <property name="toolTip">
-          <string>Insert KEY=VALUE pairs seperated by spaces</string>
+          <string>Insert KEY=VALUE pairs separated by spaces</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui
diff --git a/src/ui/qgsrasterlayersaveasdialogbase.ui b/src/ui/qgsrasterlayersaveasdialogbase.ui
diff --git a/src/ui/qgsrasterpyramidsoptionswidgetbase.ui b/src/ui/qgsrasterpyramidsoptionswidgetbase.ui
diff --git a/tests/src/providers/testqgswcsprovider.cpp b/tests/src/providers/testqgswcsprovider.cpp

Original file line number	Diff line number	Diff line change
`@@ -767,7 +767,7 @@ bool QgsRasterDataProvider::hasHistogram( int theBandNo,`
`767`	`767`	`{`
`768`	`768`	`QgsDebugMsg( QString( "theBandNo = %1 theBinCount = %2 theMinimum = %3 theMaximum = %4 theSampleSize = %5" ).arg( theBandNo ).arg( theBinCount ).arg( theMinimum ).arg( theMaximum ).arg( theSampleSize ) );`
`769`	`769`	`// histogramDefaults() needs statistics if theMinimum or theMaximum is NaN ->`
`770`		`- // do other checks which dont need statistics before histogramDefaults()`
	`770`	`+ // do other checks which don't need statistics before histogramDefaults()`
`771`	`771`	`if ( mHistograms.size() == 0 ) return false;`
`772`	`772`
`773`	`773`	`QgsRasterHistogram myHistogram;`
Original file line number	Diff line number	Diff line change
`@@ -2440,7 +2440,7 @@ int QgsVectorLayer::splitFeatures( const QList<QgsPoint>& splitLine, bool topolo`
`2440`	`2440`
`2441`	`2441`	`if ( mDataProvider )`
`2442`	`2442`	`{`
`2443`		`- //use default value where possible (primary key issue), otherwise the value from the original (splitted) feature`
	`2443`	`+ //use default value where possible (primary key issue), otherwise the value from the original (split) feature`
`2444`	`2444`	`QgsAttributeMap newAttributes = select_it->attributeMap();`
`2445`	`2445`	`QVariant defaultValue;`
`2446`	`2446`	`foreach ( int j, newAttributes.keys() )`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ if ( error == NoDataConflict )`
`232`	`232`	`destProvider->remove();`
`233`	`233`	`delete destProvider;`
`234`	`234`
`235`		`- // But we dont know which band -> wider all`
	`235`	`+ // But we don't know which band -> wider all`
`236`	`236`	`for ( int i = 0; i < nBands; i++ )`
`237`	`237`	`{`
`238`	`238`	`double destNoDataValue;`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ void QgsRasterInterface::setStatsOn( bool on )`
`194`	`194`	`double QgsRasterInterface::time( bool cumulative )`
`195`	`195`	`{`
`196`	`196`	`// We can calculate total time only, because we have to subtract time of previous`
`197`		`- // interface(s) and we dont know how to assign bands to each other`
	`197`	`+ // interface(s) and we don't know how to assign bands to each other`
`198`	`198`	`double t = 0;`
`199`	`199`	`for ( int i = 1; i < mTime.size(); i++ )`
`200`	`200`	`{`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ void QgsRasterLayerSaveAsDialog::updateResolutionStateMsg()`
`374`	`374`	`default:`
`375`	`375`	`break;`
`376`	`376`	`}`
`377`		`- msg = tr( "Resolution" ) + " (" + tr( "current" ) + ": " + msg + ")";`
	`377`	`+ msg = tr( "Resolution (current: %1)" ).arg( msg );`
`378`	`378`	`mResolutionGroupBox->setTitle( msg );`
`379`	`379`	`}`
`380`	`380`
`@@ -406,7 +406,7 @@ void QgsRasterLayerSaveAsDialog::updateExtentStateMsg()`
`406`	`406`	`default:`
`407`	`407`	`break;`
`408`	`408`	`}`
`409`		`- msg = tr( "Extent" ) + " (" + tr( "current" ) + ": " + msg + ")";`
	`409`	`+ msg = tr( "Extent (current: %1)" ).arg( msg );`
`410`	`410`	`mExtentGroupBox->setTitle( msg );`
`411`	`411`	`}`
`412`	`412`
`@@ -479,13 +479,13 @@ void QgsRasterLayerSaveAsDialog::updateCrsGroup()`
`479`	`479`	`QgsDebugMsg( "Entered" );`
`480`	`480`
`481`	`481`	`mCrsComboBox->setItemText( mCrsComboBox->findData( OriginalCrs ),`
`482`		`- tr( "Layer" ) + " (" + mLayerCrs.description() + ", " + mLayerCrs.authid() + ")" );`
	`482`	`+ tr( "Layer (%1, %2)" ).arg( mLayerCrs.description() ).arg( mLayerCrs.authid() ) );`
`483`	`483`
`484`	`484`	`mCrsComboBox->setItemText( mCrsComboBox->findData( CurrentCrs ),`
`485`		`- tr( "Project" ) + " (" + mCurrentCrs.description() + ", " + mCurrentCrs.authid() + ")" );`
	`485`	`+ tr( "Project (%1, %2)" ).arg( mCurrentCrs.description() ).arg( mCurrentCrs.authid() ) );`
`486`	`486`
`487`	`487`	`mCrsComboBox->setItemText( mCrsComboBox->findData( UserCrs ),`
`488`		`- tr( "Selected" ) + " (" + mUserCrs.description() + ", " + mUserCrs.authid() + ")" );`
	`488`	`+ tr( "Selected (%1, %2)" ).arg( mUserCrs.description() ).arg( mUserCrs.authid() ) );`
`489`	`489`	`}`
`490`	`490`
`491`	`491`	`QgsCoordinateReferenceSystem QgsRasterLayerSaveAsDialog::outputCrs()`
Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ void QgsRasterHistogramWidget::histoAction( const QString actionName, bool actio`
`672`	`672`	`return;`
`673`	`673`	`}`
`674`	`674`	`// Load actions`
`675`		`- // TODO - seperate calculations from rendererwidget so we can do them without`
	`675`	`+ // TODO - separate calculations from rendererwidget so we can do them without`
`676`	`676`	`else if ( actionName.left( 5 ) == "Load " && mRendererWidget )`
`677`	`677`	`{`
`678`	`678`	`QVector<int> myBands;`
Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,7 @@ bool QgsWcsCapabilities::parseDescribeCoverageDom10( QByteArray const &xml, QgsW`
`771`	`771`	`coverage->hasSize = true;`
`772`	`772`	`}`
`773`	`773`	`}`
`774`		`- // RectifiedGrid has also gml:origin which we dont need I think (attention however`
	`774`	`+ // RectifiedGrid has also gml:origin which we don't need I think (attention however`
`775`	`775`	`// it should contain gml:Point but mapserver 6.0.3 / WCS 1.0.0 is using gml:pos instead)`
`776`	`776`	`// RectifiedGrid also contains 2 gml:offsetVector which could be used to get resolution`
`777`	`777`	`// but it should be sufficient to calc resolution from size`