From 2de2af5ee0e0b484d29f58d8f2821260f6edbb1a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 1 Oct 2012 15:26:13 +0200 Subject: [PATCH] tr()-fixes for 2.6. Change-Id: I6ad0e25d084cfccde6776c8d4cdaae43ea071b55 Reviewed-by: Leena Miettinen Reviewed-by: Tobias Hunger --- src/libs/ssh/sshconnection.cpp | 4 ++-- src/plugins/qtsupport/qtoptionspage.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index 7d748d02677..a78a5505252 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -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'; diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 17ba2f8ab16..895743fa66f 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -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;