1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr1798'

This commit is contained in:
tux3 2015-06-05 13:12:05 +02:00
commit 676c483046
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -82,19 +82,19 @@ void LoginScreen::onCreateNewProfile()
if (pass.size()!=0 && pass.size() < 6)
{
QMessageBox::critical(this, tr("Couldn't create a new profile"), tr("The password must be at least 6 characters."));
QMessageBox::critical(this, tr("Couldn't create a new profile"), tr("The password must be at least 6 characters long."));
return;
}
if (ui->newPassConfirm->text() != pass)
{
QMessageBox::critical(this, tr("Couldn't create a new profile"), tr("The passwords are different."));
QMessageBox::critical(this, tr("Couldn't create a new profile"), tr("The passwords you've entered are different.\nPlease make sure to enter same password twice."));
return;
}
if (Profile::exists(name))
{
QMessageBox::critical(this, tr("Couldn't create a new profile"), tr("This profile already exists."));
QMessageBox::critical(this, tr("Couldn't create a new profile"), tr("A profile with this name already exists."));
return;
}
@ -102,7 +102,7 @@ void LoginScreen::onCreateNewProfile()
if (!profile)
{
// Unknown error
QMessageBox::critical(this, tr("Couldn't create a new profile"), tr("Couldn't create a new profile."));
QMessageBox::critical(this, tr("Couldn't create a new profile"), tr("Unknown error: Couldn't create a new profile.\nIf you encountered this error, please report it."));
return;
}