Commit 2de2af5e authored by Friedemann Kleint's avatar Friedemann Kleint Committed by Tobias Hunger
Browse files

tr()-fixes for 2.6.



Change-Id: I6ad0e25d084cfccde6776c8d4cdaae43ea071b55
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 599e4881
......@@ -357,8 +357,8 @@ void SshConnectionPrivate::handleServerId()
if (newLinePos > 255 - 1) {
throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR,
"Identification string too long.",
tr("Server identification string is %1 characters long, but the maximum "
"allowed length is 255.").arg(newLinePos + 1));
tr("Server identification string is %n characters long, but the maximum "
"allowed length is 255.", 0, newLinePos + 1));
}
const bool hasCarriageReturn = m_incomingData.at(newLinePos - 1) == '\r';
......
......@@ -636,7 +636,7 @@ void QtOptionsPageWidget::addQtDir()
{
Utils::FileName qtVersion = Utils::FileName::fromString(
QFileInfo(QFileDialog::getOpenFileName(this,
tr("Select a qmake executable"),
tr("Select a qmake Executable"),
QString(),
filterForQmakeFileDialog(),
0,
......@@ -646,7 +646,7 @@ void QtOptionsPageWidget::addQtDir()
BaseQtVersion *version = QtVersionManager::instance()->qtVersionForQMakeBinary(qtVersion);
if (version) {
// Already exist
QMessageBox::warning(this, tr("Qt known"),
QMessageBox::warning(this, tr("Qt Version Already Registered"),
tr("This Qt version was already registered as \"%1\".")
.arg(version->displayName()));
return;
......
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