diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec635144f60..00000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/compat.in b/debian/compat.in new file mode 100644 index 00000000000..7a1172f248b --- /dev/null +++ b/debian/compat.in @@ -0,0 +1,2 @@ +#buster bionic eoan focal#9 +#sid#10 diff --git a/debian/libqgis-3d{QGIS_ABI}.lintian-overrides b/debian/libqgis-3d{QGIS_ABI}.lintian-overrides new file mode 100644 index 00000000000..3404235745a --- /dev/null +++ b/debian/libqgis-3d{QGIS_ABI}.lintian-overrides @@ -0,0 +1,2 @@ +spelling-error-in-binary * Pres Press +spelling-error-in-binary * wHE when diff --git a/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides b/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides index 59c6ba81cbc..b44b19d20dc 100644 --- a/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides +++ b/debian/libqgis-analysis{QGIS_ABI}.lintian-overrides @@ -1,2 +1,7 @@ no-symbols-control-file * shlib-calls-exit * +spelling-error-in-binary * Addd Add +spelling-error-in-binary * PrES Press +spelling-error-in-binary * Pres Press +spelling-error-in-binary * liK link +spelling-error-in-binary * pres press diff --git a/debian/libqgis-app{QGIS_ABI}.lintian-overrides b/debian/libqgis-app{QGIS_ABI}.lintian-overrides index 237b71a70c3..fae574cac29 100644 --- a/debian/libqgis-app{QGIS_ABI}.lintian-overrides +++ b/debian/libqgis-app{QGIS_ABI}.lintian-overrides @@ -1 +1,7 @@ no-symbols-control-file * +spelling-error-in-binary * MoR More +spelling-error-in-binary * Pres Press +spelling-error-in-binary * Righ Right +spelling-error-in-binary * Rigt Right +spelling-error-in-binary * pres press +spelling-error-in-binary * whE when diff --git a/debian/libqgis-core{QGIS_ABI}.lintian-overrides b/debian/libqgis-core{QGIS_ABI}.lintian-overrides index 9449cfe76d0..ec395f184ea 100644 --- a/debian/libqgis-core{QGIS_ABI}.lintian-overrides +++ b/debian/libqgis-core{QGIS_ABI}.lintian-overrides @@ -1,2 +1,13 @@ shlib-calls-exit * no-symbols-control-file * +spelling-error-in-binary * Buid Build +spelling-error-in-binary * ObAY Obey +spelling-error-in-binary * PreS Press +spelling-error-in-binary * Pres Press +spelling-error-in-binary * aKs ask +spelling-error-in-binary * cHEK check +spelling-error-in-binary * dsFg dfsg +spelling-error-in-binary * nam name +spelling-error-in-binary * prEs press +spelling-error-in-binary * pres press +spelling-error-in-binary * tAHt that diff --git a/debian/libqgis-gui{QGIS_ABI}.lintian-overrides b/debian/libqgis-gui{QGIS_ABI}.lintian-overrides index 9449cfe76d0..12c3751ffe6 100644 --- a/debian/libqgis-gui{QGIS_ABI}.lintian-overrides +++ b/debian/libqgis-gui{QGIS_ABI}.lintian-overrides @@ -1,2 +1,10 @@ shlib-calls-exit * no-symbols-control-file * +spelling-error-in-binary * Lik Link +spelling-error-in-binary * LsIt List +spelling-error-in-binary * TEh The +spelling-error-in-binary * aKs ask +spelling-error-in-binary * akS ask +spelling-error-in-binary * hapen happen +spelling-error-in-binary * oFO of +spelling-error-in-binary * yElD yield diff --git a/debian/libqgispython{QGIS_ABI}.lintian-overrides b/debian/libqgispython{QGIS_ABI}.lintian-overrides index 237b71a70c3..80da46538e2 100644 --- a/debian/libqgispython{QGIS_ABI}.lintian-overrides +++ b/debian/libqgispython{QGIS_ABI}.lintian-overrides @@ -1 +1,2 @@ no-symbols-control-file * +spelling-error-in-binary * Pres Press diff --git a/debian/python3-qgis.lintian-overrides b/debian/python3-qgis.lintian-overrides index a2435037709..8e16348bde3 100644 --- a/debian/python3-qgis.lintian-overrides +++ b/debian/python3-qgis.lintian-overrides @@ -1 +1,10 @@ hardening-no-fortify-functions * +spelling-error-in-binary * Afe Safe +spelling-error-in-binary * Buid Build +spelling-error-in-binary * IiF If +spelling-error-in-binary * Iif If +spelling-error-in-binary * Wih With +spelling-error-in-binary * afe safe +spelling-error-in-binary * lik link +spelling-error-in-binary * mor more +spelling-error-in-binary * onself oneself diff --git a/debian/qgis-plugin-grass.lintian-overrides b/debian/qgis-plugin-grass.lintian-overrides index 970046b533b..e793bd32b83 100644 --- a/debian/qgis-plugin-grass.lintian-overrides +++ b/debian/qgis-plugin-grass.lintian-overrides @@ -1,2 +1,3 @@ package-name-doesnt-match-sonames * no-symbols-control-file * +spelling-error-in-binary * naM name diff --git a/debian/qgis-provider.lintian-overrides b/debian/qgis-provider.lintian-overrides new file mode 100644 index 00000000000..d25002f93bf --- /dev/null +++ b/debian/qgis-provider.lintian-overrides @@ -0,0 +1,4 @@ +spelling-error-in-binary * Pres Press +spelling-error-in-binary * nams names +spelling-error-in-binary * neeS needs +spelling-error-in-binary * pres press diff --git a/debian/qgis-providers.lintian-overrides b/debian/qgis-providers.lintian-overrides new file mode 100644 index 00000000000..7abf487689c --- /dev/null +++ b/debian/qgis-providers.lintian-overrides @@ -0,0 +1,2 @@ +spelling-error-in-binary * pres press +spelling-error-in-binary * Pres Press diff --git a/debian/qgis.lintian-overrides b/debian/qgis.lintian-overrides new file mode 100644 index 00000000000..ebbb8776d7a --- /dev/null +++ b/debian/qgis.lintian-overrides @@ -0,0 +1,3 @@ +spelling-error-in-binary * NAm Name +spelling-error-in-binary * Ofo Of +spelling-error-in-binary * yAu you diff --git a/external/mdal/frmts/mdal_esri_tin.cpp b/external/mdal/frmts/mdal_esri_tin.cpp index 8471b1155b6..84a0f76082e 100644 --- a/external/mdal/frmts/mdal_esri_tin.cpp +++ b/external/mdal/frmts/mdal_esri_tin.cpp @@ -61,7 +61,7 @@ std::unique_ptr MDAL::DriverEsriTin::load( const std::string &uri, c inMsx.seekg( -4, std::ios::end ); int32_t mskBegin; if ( ! readValue( mskBegin, inMsx, true ) ) - throw MDAL::Error( MDAL_Status::Err_UnknownFormat, "Unable to find the beggining of data in msk file" ); + throw MDAL::Error( MDAL_Status::Err_UnknownFormat, "Unable to find the beginning of data in msk file" ); //read information in mskFile inMsk.seekg( -mskBegin * 2, std::ios::end ); @@ -80,7 +80,7 @@ std::unique_ptr MDAL::DriverEsriTin::load( const std::string &uri, c //read mask file if ( c % 32 == 0 && c < maskBitsCount ) //first bit in the mask array have to be used-->read next maskInt if ( ! readValue( maskInt, inMsk, true ) ) - throw MDAL::Error( MDAL_Status::Err_UnknownFormat, "Unable to read information in mask file" ); + throw MDAL::Error( MDAL_Status::Err_UnknownFormat, "Unable to read information in msk file" ); Face f; for ( int i = 0; i < 3; ++i ) diff --git a/external/mdal/frmts/mdal_flo2d.cpp b/external/mdal/frmts/mdal_flo2d.cpp index 76e1861a8d1..8fcdda585e6 100644 --- a/external/mdal/frmts/mdal_flo2d.cpp +++ b/external/mdal/frmts/mdal_flo2d.cpp @@ -723,7 +723,7 @@ std::unique_ptr< MDAL::Mesh > MDAL::DriverFlo2D::load( const std::string &result catch ( MDAL_Status error ) { - MDAL::Log::error( error, name(), "error occured while loading file " + resultsFile ); + MDAL::Log::error( error, name(), "error occurred while loading file " + resultsFile ); mMesh.reset(); } catch ( MDAL::Error err ) @@ -898,7 +898,7 @@ bool MDAL::DriverFlo2D::persist( DatasetGroup *group ) } catch ( MDAL_Status error ) { - MDAL::Log::error( error, name(), "error occured" ); + MDAL::Log::error( error, name(), "error occurred" ); return true; } catch ( MDAL::Error err ) diff --git a/external/mdal/frmts/mdal_gdal.cpp b/external/mdal/frmts/mdal_gdal.cpp index c56dd4a49c1..b992ef61062 100644 --- a/external/mdal/frmts/mdal_gdal.cpp +++ b/external/mdal/frmts/mdal_gdal.cpp @@ -612,7 +612,7 @@ std::unique_ptr MDAL::DriverGdal::load( const std::string &fileName, } catch ( MDAL_Status error ) { - MDAL::Log::error( error, name(), "error occured while loading " + fileName ); + MDAL::Log::error( error, name(), "error occurred while loading " + fileName ); mMesh.reset(); } catch ( MDAL::Error err ) diff --git a/external/mdal/frmts/mdal_hec2d.cpp b/external/mdal/frmts/mdal_hec2d.cpp index ee9966b313e..f7b2a439ad3 100644 --- a/external/mdal/frmts/mdal_hec2d.cpp +++ b/external/mdal/frmts/mdal_hec2d.cpp @@ -728,7 +728,7 @@ std::unique_ptr MDAL::DriverHec2D::load( const std::string &resultsF } catch ( MDAL_Status error ) { - MDAL::Log::error( error, name(), "Error occured while loading file " + resultsFile ); + MDAL::Log::error( error, name(), "Error occurred while loading file " + resultsFile ); mMesh.reset(); } catch ( MDAL::Error err ) diff --git a/external/mdal/frmts/mdal_xdmf.cpp b/external/mdal/frmts/mdal_xdmf.cpp index a3673d05120..8e94e3220e5 100644 --- a/external/mdal/frmts/mdal_xdmf.cpp +++ b/external/mdal/frmts/mdal_xdmf.cpp @@ -652,7 +652,7 @@ void MDAL::DriverXdmf::load( const std::string &datFile, } catch ( MDAL_Status err ) { - MDAL::Log::error( err, "Error occured while loading file " + mDatFile ); + MDAL::Log::error( err, "Error occurred while loading file " + mDatFile ); } catch ( MDAL::Error err ) { diff --git a/external/mdal/frmts/mdal_xms_tin.cpp b/external/mdal/frmts/mdal_xms_tin.cpp index ce9bd41fab4..16f17650aa3 100644 --- a/external/mdal/frmts/mdal_xms_tin.cpp +++ b/external/mdal/frmts/mdal_xms_tin.cpp @@ -105,7 +105,7 @@ std::unique_ptr MDAL::DriverXmsTin::load( const std::string &meshFil // Read triangles if ( !std::getline( in, line ) ) { - MDAL::Log::error( MDAL_Status::Err_IncompatibleMesh, name(), meshFile + " does not contain valid triangle definition" ); + MDAL::Log::error( MDAL_Status::Err_IncompatibleMesh, name(), meshFile + " does not contain valid triangle definitions" ); return nullptr; } chunks = split( line, ' ' ); @@ -127,7 +127,7 @@ std::unique_ptr MDAL::DriverXmsTin::load( const std::string &meshFil if ( chunks.size() != 3 ) { // should have 3 indexes - MDAL::Log::error( MDAL_Status::Err_IncompatibleMesh, name(), meshFile + " does not contain valid triangle defintion" ); + MDAL::Log::error( MDAL_Status::Err_IncompatibleMesh, name(), meshFile + " does not contain valid triangle definitions" ); return nullptr; } diff --git a/external/mdal/mdal.cpp b/external/mdal/mdal.cpp index 744ebc4fb0f..ff21322dcc0 100644 --- a/external/mdal/mdal.cpp +++ b/external/mdal/mdal.cpp @@ -858,7 +858,7 @@ void MDAL_G_closeEditMode( MDAL_DatasetGroupH group ) bool error = dr->persist( g ); if ( error ) { - MDAL::Log::error( MDAL_Status::Err_InvalidData, "Persist error occured in driver" ); + MDAL::Log::error( MDAL_Status::Err_InvalidData, "Persist error occurred in driver" ); } } diff --git a/external/mdal/mdal_datetime.cpp b/external/mdal/mdal_datetime.cpp index 6e9f0a59d7d..f62841bf31c 100644 --- a/external/mdal/mdal_datetime.cpp +++ b/external/mdal/mdal_datetime.cpp @@ -246,16 +246,16 @@ void MDAL::DateTime::setWithGregorianJulianCalendarDate( MDAL::DateTime::DateTim std::string MDAL::DateTime::toString( MDAL::DateTime::DateTimeValues values ) const { - int miliseconds = int( ( values.seconds - int( values.seconds ) ) * 1000 + 0.5 ); + int milliseconds = int( ( values.seconds - int( values.seconds ) ) * 1000 + 0.5 ); std::string msStr; - if ( miliseconds > 0 ) + if ( milliseconds > 0 ) { - if ( miliseconds < 10 ) - msStr = prependZero( std::to_string( miliseconds ), 3 ); - else if ( miliseconds < 100 ) - msStr = prependZero( std::to_string( miliseconds ), 2 ); - else if ( miliseconds < 1000 ) - msStr = std::to_string( miliseconds ); + if ( milliseconds < 10 ) + msStr = prependZero( std::to_string( milliseconds ), 3 ); + else if ( milliseconds < 100 ) + msStr = prependZero( std::to_string( milliseconds ), 2 ); + else if ( milliseconds < 1000 ) + msStr = std::to_string( milliseconds ); msStr = std::string( "," ).append( msStr ); } diff --git a/external/o2/src/o0simplecrypt.h b/external/o2/src/o0simplecrypt.h index 3e3363c59d9..b3faf4b2604 100644 --- a/external/o2/src/o0simplecrypt.h +++ b/external/o2/src/o0simplecrypt.h @@ -82,7 +82,7 @@ public: ProtectionHash /*!< A cryptographic hash is used to verify the integrity of the data. This method produces a much stronger, but longer check */ }; /** - Error describes the type of error that occured. + Error describes the type of error that occurred. */ enum Error { ErrorNoError, /*!< No error occurred. */ @@ -175,7 +175,7 @@ public: Decrypts a cyphertext string encrypted with this class with the set key back to the plain text version. - If an error occured, such as non-matching keys between encryption and decryption, + If an error occurred, such as non-matching keys between encryption and decryption, an empty string or a string containing nonsense may be returned. */ QString decryptToString(const QString& cyphertext) ; @@ -183,7 +183,7 @@ public: Decrypts a cyphertext string encrypted with this class with the set key back to the plain text version. - If an error occured, such as non-matching keys between encryption and decryption, + If an error occurred, such as non-matching keys between encryption and decryption, an empty string or a string containing nonsense may be returned. */ QByteArray decryptToByteArray(const QString& cyphertext) ; @@ -191,7 +191,7 @@ public: Decrypts a cyphertext binary encrypted with this class with the set key back to the plain text version. - If an error occured, such as non-matching keys between encryption and decryption, + If an error occurred, such as non-matching keys between encryption and decryption, an empty string or a string containing nonsense may be returned. */ QString decryptToString(QByteArray cypher) ; @@ -199,7 +199,7 @@ public: Decrypts a cyphertext binary encrypted with this class with the set key back to the plain text version. - If an error occured, such as non-matching keys between encryption and decryption, + If an error occurred, such as non-matching keys between encryption and decryption, an empty string or a string containing nonsense may be returned. */ QByteArray decryptToByteArray(QByteArray cypher) ; diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat index 20443d04cce..8fb13fb8eb2 100644 --- a/scripts/spell_check/spelling.dat +++ b/scripts/spell_check/spelling.dat @@ -1838,6 +1838,7 @@ corespond:correspond coresponded:corresponded corespondence:correspondence coresponding:corresponding +correponsding:corresponding coresponds:corresponds coridal:cordial cornmitted:committed