Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

Fixed some typos in passwordbackends

Browse Source
This commit is contained in:
Jonathan Hooverman 2013-06-28 13:46:46 +02:00
parent f01157d71c
commit eee53c8a42
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp
View File

@ -545,12 +545,12 @@ void MasterPasswordDialog::accept()
QByteArray currentPassField = AesInterface::passwordToHash(ui->currentPassword->text()); QByteArray currentPassField = AesInterface::passwordToHash(ui->currentPassword->text());
if (m_backend->isMasterPasswordSetted() && !m_backend->isPasswordVerified(currentPassField)) { 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; return;
} }
if (ui->newPassword->text() != ui->confirmPassword->text()) { 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; return;
} }
@ -578,8 +578,8 @@ void MasterPasswordDialog::reject()
if (m_backend->isActive() && !m_backend->isMasterPasswordSetted()) { if (m_backend->isActive() && !m_backend->isMasterPasswordSetted()) {
// master password not setted // master password not setted
QMessageBox::information(this, AutoFill::tr("Warning!"), QMessageBox::information(this, AutoFill::tr("Warning!"),
AutoFill::tr("This backend needs a master password setted! " AutoFill::tr("This backend needs a master password to be set! "
"QupZilla just switch to its default backend")); "QupZilla just switches to its default backend"));
// active default backend // active default backend
mApp->autoFill()->passwordManager()->switchBackend("database"); mApp->autoFill()->passwordManager()->switchBackend("database");
return; return;
@ -642,7 +642,7 @@ void MasterPasswordDialog::clearMasterPasswordAndConvert(bool forcedAskPass)
mApp->autoFill()->passwordManager()->switchBackend("database"); mApp->autoFill()->passwordManager()->switchBackend("database");
} }
else { 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"); mApp->autoFill()->passwordManager()->switchBackend("database");
} }
} }

8
src/lib/autofill/passwordbackends/masterpassworddialog.ui
View File

@ -27,7 +27,7 @@
<string>Set/Change Master Password...</string> <string>Set/Change Master Password...</string>
</property> </property>
<property name="description"> <property name="description">
<string>This backend doesn't work without master password.</string> <string>This backend does not work without a master password.</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -37,7 +37,7 @@
<string>Clear Master Password...</string> <string>Clear Master Password...</string>
</property> </property>
<property name="description"> <property name="description">
<string>This option clears master password and moves all encrypted data to &quot;DataBase (Plain Text)&quot; backend, and switch to it.</string> <string>This option clears the master password and moves all encrypted data to the &quot;DataBase (Plain Text)&quot; backend, and switches to it.</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -55,7 +55,7 @@
<item> <item>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>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.</string> <string>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.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -111,7 +111,7 @@
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>&lt;b&gt;Note:&lt;/b&gt; Master Password is not resetable. Don't forgot it, please.</string> <string>&lt;b&gt;Note:&lt;/b&gt; The Master Password is not resettable. Do not forget it, please.</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>