Merge branch 'master' into clientSideEncryptionV3

This commit is contained in:
Tomaz Canabrava 2017-11-11 16:28:20 +01:00
commit 05d826a954

View file

@ -334,7 +334,7 @@ void OwncloudSetupPage::slotCertificateAccepted()
addCertDial->reinit(); // FIXME: Why not just have this only created on use? addCertDial->reinit(); // FIXME: Why not just have this only created on use?
validatePage(); validatePage();
} else { } else {
addCertDial->showErrorMessage("Could not load certificate"); addCertDial->showErrorMessage(tr("Could not load certificate. Maybe wrong password?"));
addCertDial->show(); addCertDial->show();
} }
} }