mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-25 06:25:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5221 from nextcloud/Valdnet-patch-4

Browse source 
l10n: Correct spelling
This commit is contained in:
Claudio Cambra 2022-12-01 22:14:32 +01:00 committed by GitHub
commit 182512b269
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/accountsettings.cpp
View file

@ -92,8 +92,8 @@ void showEnableE2eeWithVirtualFilesWarningDialog(std::function<void(void)> onAcc
messageBox->setText(AccountSettings::tr("End-to-end Encryption with Virtual Files")); 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. " 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 " "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 encrypted. To get the best experience with virtual files and "
"End-to-end Encryption, make sure the encrypted folder is marked with " "end-to-end encryption, make sure the encrypted folder is marked with "
"\"Make always available locally\".")); "\"Make always available locally\"."));
messageBox->setIcon(QMessageBox::Warning); messageBox->setIcon(QMessageBox::Warning);
const auto dontEncryptButton = messageBox->addButton(QMessageBox::StandardButton::Cancel); const auto dontEncryptButton = messageBox->addButton(QMessageBox::StandardButton::Cancel);
@ -1480,7 +1480,7 @@ void AccountSettings::initializeE2eEncryption()
slotE2eEncryptionMnemonicReady(); slotE2eEncryptionMnemonicReady();
} else { } else {
_ui->encryptionMessage->setMessageType(KMessageWidget::Information); _ui->encryptionMessage->setMessageType(KMessageWidget::Information);
_ui->encryptionMessage->setText(tr("This account supports End-to-end encryption")); _ui->encryptionMessage->setText(tr("This account supports end-to-end encryption"));
_ui->encryptionMessage->setIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/black/state-info.svg"))); _ui->encryptionMessage->setIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/black/state-info.svg")));
_ui->encryptionMessage->hide(); _ui->encryptionMessage->hide();

2
src/libsync/clientsideencryption.cpp
View file

@ -1248,7 +1248,7 @@ void ClientSideEncryption::encryptPrivateKey(const AccountPtr &account)
} }
void ClientSideEncryption::decryptPrivateKey(const AccountPtr &account, const QByteArray &key) { void ClientSideEncryption::decryptPrivateKey(const AccountPtr &account, const QByteArray &key) {
QString msg = tr("Please enter your End-to-End encryption passphrase:<br>" QString msg = tr("Please enter your end-to-end encryption passphrase:<br>"
"<br>" "<br>"
"Username: %2<br>" "Username: %2<br>"
"Account: %3<br>") "Account: %3<br>")