Merge pull request #4820 from nextcloud/Valdnet-patch-2

i18n: Spelling unification

src/gui/accountmanager.cpp

@@ -403,7 +403,7 @@ void AccountManager::displayMnemonic(const QString& mnemonic)
     auto *widget = new QDialog;
     Ui_Dialog ui;
     ui.setupUi(widget);
-    widget->setWindowTitle(tr("End-to-end encryption mnemonic"));
+    widget->setWindowTitle(tr("End-to-End encryption mnemonic"));
     ui.label->setText(tr("To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. "
                          "Please note these down and keep them safe. "
                          "They will be needed to add other devices to your account (like your mobile phone or laptop)."));

src/gui/accountsettings.cpp

@@ -94,7 +94,7 @@ void showEnableE2eeWithVirtualFilesWarningDialog(std::function<void(void)> onAcc
     messageBox->setIcon(QMessageBox::Warning);
     const auto dontEncryptButton = messageBox->addButton(QMessageBox::StandardButton::Cancel);
     Q_ASSERT(dontEncryptButton);
-    dontEncryptButton->setText(AccountSettings::tr("Don't encrypt folder"));
+    dontEncryptButton->setText(AccountSettings::tr("Do not encrypt folder"));
     const auto encryptButton = messageBox->addButton(QMessageBox::StandardButton::Ok);
     Q_ASSERT(encryptButton);
     encryptButton->setText(AccountSettings::tr("Encrypt folder"));
@@ -230,7 +230,7 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
     if (_accountState->account()->e2e()->newMnemonicGenerated()) {
         slotNewMnemonicGenerated();
     } else {
-        _ui->encryptionMessage->setText(tr("This account supports end-to-end encryption"));
+        _ui->encryptionMessage->setText(tr("This account supports End-to-End encryption"));
 
         auto *mnemonic = new QAction(tr("Display mnemonic"), this);
         connect(mnemonic, &QAction::triggered, this, &AccountSettings::requestMnemonic);
@@ -251,7 +251,7 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
 
 void AccountSettings::slotNewMnemonicGenerated()
 {
-    _ui->encryptionMessage->setText(tr("This account supports end-to-end encryption"));
+    _ui->encryptionMessage->setText(tr("This account supports End-to-End encryption"));
 
     auto *mnemonic = new QAction(tr("Enable encryption"), this);
     connect(mnemonic, &QAction::triggered, this, &AccountSettings::requestMnemonic);

src/libsync/clientsideencryption.cpp

@@ -1238,7 +1238,7 @@ bool ClientSideEncryption::newMnemonicGenerated() const
 }
 
 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>"
                      "Username: %2<br>"
                      "Account: %3<br>")