diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp
index 6e64a06f..9e91af04 100644
--- a/cockatrice/src/window_main.cpp
+++ b/cockatrice/src/window_main.cpp
@@ -339,26 +339,29 @@ QString MainWindow::extractInvalidUsernameMessage(QString & in)
QStringList rules = in.split(QChar('|'));
if (rules.size() == 7)
{
- out += tr("The username must respect these rules:") + "
"
- + "- " + tr("length between %1 and %2 characters").arg(rules.at(0)).arg(rules.at(1)) + "
";
- if(rules.at(2).toInt() > 0)
- out += "- " + tr("it can contain lowercase characters") + "
";
- if(rules.at(3).toInt() > 0)
- out += "- " + tr("it can contain uppercase characters") + "
";
- if(rules.at(4).toInt() > 0)
- out += "- " + tr("it can contain numeric characters") + "
";
- if(rules.at(6).size() > 0)
- out += "- " + tr("it can contain the following punctuation: %1").arg(
-#if QT_VERSION < 0x050000
- Qt::escape(rules.at(6))
-#else
- rules.at(6).toHtmlEscaped()
-#endif
- ) + "
";
- if(rules.at(5).toInt() == 0)
- out += "- " + tr("the first character can't be a punctuation") + "
";
+ out += tr("Your username must respect these rules:") + "
";
+
+ out += "- " + tr("is %1 - %2 characters long").arg(rules.at(0)).arg(rules.at(1)) + "
";
+ out += "- " + tr("can %1 contain lowercase characters").arg((rules.at(2).toInt() > 0) ? "" : tr("NOT")) + "
";
+ out += "- " + tr("can %1 contain uppercase characters").arg((rules.at(3).toInt() > 0) ? "" : tr("NOT")) + "
";
+ out += "- " + tr("can %1 contain numeric characters").arg((rules.at(4).toInt() > 0) ? "" : tr("NOT")) + "
";
+
+ if (rules.at(6).size() > 0)
+ {
+ out += "- " + tr("can contain the following punctuation: %1").arg(
+ #if QT_VERSION < 0x050000
+ Qt::escape(rules.at(6))
+ #else
+ rules.at(6).toHtmlEscaped()
+ #endif
+ ) + "
";
+ }
+
+ out += "- " + tr("first character can %1 be a punctuation mark").arg((rules.at(5).toInt() == 0) ? "" : tr("NOT")) + "
";
out += "
";
- } else {
+ }
+ else
+ {
out += tr("You may only use A-Z, a-z, 0-9, _, ., and - in your username.");
}