diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp index 8c3a11b73..e198a9cef 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp +++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp @@ -545,12 +545,12 @@ void MasterPasswordDialog::accept() QByteArray currentPassField = AesInterface::passwordToHash(ui->currentPassword->text()); if (m_backend->isMasterPasswordSetted() && !m_backend->isPasswordVerified(currentPassField)) { - QMessageBox::information(this, tr("Warning!"), tr("You entred wrong password!")); + QMessageBox::information(this, tr("Warning!"), tr("You entered a wrong password!")); return; } if (ui->newPassword->text() != ui->confirmPassword->text()) { - QMessageBox::information(this, tr("Warning!"), tr("New/Confirm password fields don't match!")); + QMessageBox::information(this, tr("Warning!"), tr("New/Confirm password fields do not match!")); return; } @@ -578,8 +578,8 @@ void MasterPasswordDialog::reject() if (m_backend->isActive() && !m_backend->isMasterPasswordSetted()) { // master password not setted QMessageBox::information(this, AutoFill::tr("Warning!"), - AutoFill::tr("This backend needs a master password setted! " - "QupZilla just switch to its default backend")); + AutoFill::tr("This backend needs a master password to be set! " + "QupZilla just switches to its default backend")); // active default backend mApp->autoFill()->passwordManager()->switchBackend("database"); return; @@ -642,7 +642,7 @@ void MasterPasswordDialog::clearMasterPasswordAndConvert(bool forcedAskPass) mApp->autoFill()->passwordManager()->switchBackend("database"); } else { - QMessageBox::information(this, tr("Warning!"), tr("There are some data that were not decrypted. The master password was not cleared!")); + QMessageBox::information(this, tr("Warning!"), tr("Some data has not been decrypted. The master password was not cleared!")); mApp->autoFill()->passwordManager()->switchBackend("database"); } } diff --git a/src/lib/autofill/passwordbackends/masterpassworddialog.ui b/src/lib/autofill/passwordbackends/masterpassworddialog.ui index 68cc379df..190990ce4 100644 --- a/src/lib/autofill/passwordbackends/masterpassworddialog.ui +++ b/src/lib/autofill/passwordbackends/masterpassworddialog.ui @@ -27,7 +27,7 @@ Set/Change Master Password... - This backend doesn't work without master password. + This backend does not work without a master password. @@ -37,7 +37,7 @@ Clear Master Password... - This option clears master password and moves all encrypted data to "DataBase (Plain Text)" backend, and switch to it. + This option clears the master password and moves all encrypted data to the "DataBase (Plain Text)" backend, and switches to it. @@ -55,7 +55,7 @@ - The Master Password is used to protect site passwords and form data. If you set Master Password you will be asked to enter it once per session. + The Master Password is used to protect site passwords and form data. If you set a Master Password you will be asked to enter it once per session. true @@ -111,7 +111,7 @@ - <b>Note:</b> Master Password is not resetable. Don't forgot it, please. + <b>Note:</b> The Master Password is not resettable. Do not forget it, please. Qt::RichText