Commit d71c0b27 authored by Zach's avatar Zach
Browse files

Merge pull request #1090 from tooomm/patch-1

expanded wording of name conflicts for tokens /2
parents 15dcfd15 7db7b7fb
...@@ -136,7 +136,7 @@ void DlgEditTokens::actAddToken() ...@@ -136,7 +136,7 @@ void DlgEditTokens::actAddToken()
do { do {
name = QInputDialog::getText(this, tr("Add token"), tr("Please enter the name of the token:")); name = QInputDialog::getText(this, tr("Add token"), tr("Please enter the name of the token:"));
if (!name.isEmpty() && cardDatabaseModel->getDatabase()->getCard(name, false)) { if (!name.isEmpty() && cardDatabaseModel->getDatabase()->getCard(name, false)) {
QMessageBox::critical(this, tr("Error"), tr("The chosen name conflicts with an existing card or token.\n Make sure to enable the 'token set' in 'Edit sets...' dialog to display them correctly.")); QMessageBox::critical(this, tr("Error"), tr("The chosen name conflicts with an existing card or token.\nMake sure to enable the 'token set' in the 'Edit sets...' dialog to display them correctly."));
askAgain = true; askAgain = true;
} else } else
askAgain = false; askAgain = false;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment