diff --git a/src/common/checksums.cpp b/src/common/checksums.cpp index c604842a34..142c05ec51 100644 --- a/src/common/checksums.cpp +++ b/src/common/checksums.cpp @@ -355,11 +355,11 @@ void ValidateChecksumHeader::slotChecksumCalculated(const QByteArray &checksumTy const QByteArray &checksum) { if (checksumType != _expectedChecksumType) { - emit validationFailed(tr("The checksum header contained an unknown checksum type '%1'").arg(QString::fromLatin1(_expectedChecksumType))); + emit validationFailed(tr("The checksum header contained an unknown checksum type \"%1\"").arg(QString::fromLatin1(_expectedChecksumType))); return; } if (checksum != _expectedChecksum) { - emit validationFailed(tr("The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'").arg(QString::fromUtf8(_expectedChecksum), QString::fromUtf8(checksum))); + emit validationFailed(tr(R"(The downloaded file does not match the checksum, it will be resumed. "%1" != "%2")").arg(QString::fromUtf8(_expectedChecksum), QString::fromUtf8(checksum))); return; } emit validated(checksumType, checksum); diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index abe0a2e686..1df8d32518 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -86,11 +86,11 @@ void showEnableE2eeWithVirtualFilesWarningDialog(std::function onAcc const auto messageBox = new QMessageBox; messageBox->setAttribute(Qt::WA_DeleteOnClose); messageBox->setText(AccountSettings::tr("End-to-End Encryption with Virtual Files")); - messageBox->setInformativeText(AccountSettings::tr("You seem to have the Virtual Files feature enabled on this folder. At " - " the moment, it is not possible to implicitly download virtual files that are " - "End-to-End encrypted. To get the best experience with Virtual Files and" - " End-to-End Encryption, make sure the encrypted folder is marked with" - " \"Make always available locally\".")); + messageBox->setInformativeText(AccountSettings::tr("You seem to have the Virtual Files feature enabled on this folder. " + "At the moment, it is not possible to implicitly download virtual files that are " + "End-to-End encrypted. To get the best experience with Virtual Files and " + "End-to-End Encryption, make sure the encrypted folder is marked with " + "\"Make always available locally\".")); messageBox->setIcon(QMessageBox::Warning); const auto dontEncryptButton = messageBox->addButton(QMessageBox::StandardButton::Cancel); Q_ASSERT(dontEncryptButton); diff --git a/test/testchecksumvalidator.cpp b/test/testchecksumvalidator.cpp index 82c1b10704..246af61a96 100644 --- a/test/testchecksumvalidator.cpp +++ b/test/testchecksumvalidator.cpp @@ -197,13 +197,13 @@ using namespace OCC::Utility; QTRY_VERIFY(_successDown); - _expectedError = QStringLiteral("The downloaded file does not match the checksum, it will be resumed. '543345' != '%1'").arg(QString::fromUtf8(_expected)); + _expectedError = QStringLiteral("The downloaded file does not match the checksum, it will be resumed. \"543345\" != \"%1\"").arg(QString::fromUtf8(_expected)); _errorSeen = false; file->seek(0); vali->start(_testfile, "Adler32:543345"); QTRY_VERIFY(_errorSeen); - _expectedError = QLatin1String("The checksum header contained an unknown checksum type 'Klaas32'"); + _expectedError = QLatin1String("The checksum header contained an unknown checksum type \"Klaas32\""); _errorSeen = false; file->seek(0); vali->start(_testfile, "Klaas32:543345");