feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

tr()-fixes for 2.6.

Browse Source 
Change-Id: I6ad0e25d084cfccde6776c8d4cdaae43ea071b55
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Friedemann Kleint
2012-10-01 15:26:13 +02:00
committed by Tobias Hunger
parent 599e4881c2
commit 2de2af5ee0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/ssh/sshconnection.cpp
View File

@@ -357,8 +357,8 @@ void SshConnectionPrivate::handleServerId()
if (newLinePos > 255 - 1) { if (newLinePos > 255 - 1) {
throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR, throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR,
"Identification string too long.", "Identification string too long.",
tr("Server identification string is %1 characters long, but the maximum " tr("Server identification string is %n characters long, but the maximum "
"allowed length is 255.").arg(newLinePos + 1)); "allowed length is 255.", 0, newLinePos + 1));
} }
const bool hasCarriageReturn = m_incomingData.at(newLinePos - 1) == '\r'; const bool hasCarriageReturn = m_incomingData.at(newLinePos - 1) == '\r';

4
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -636,7 +636,7 @@ void QtOptionsPageWidget::addQtDir()
{ {
Utils::FileName qtVersion = Utils::FileName::fromString( Utils::FileName qtVersion = Utils::FileName::fromString(
QFileInfo(QFileDialog::getOpenFileName(this, QFileInfo(QFileDialog::getOpenFileName(this,
tr("Select a qmake executable"), tr("Select a qmake Executable"),
QString(), QString(),
filterForQmakeFileDialog(), filterForQmakeFileDialog(),
0, 0,
@@ -646,7 +646,7 @@ void QtOptionsPageWidget::addQtDir()
BaseQtVersion *version = QtVersionManager::instance()->qtVersionForQMakeBinary(qtVersion); BaseQtVersion *version = QtVersionManager::instance()->qtVersionForQMakeBinary(qtVersion);
if (version) { if (version) {
// Already exist // 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\".") tr("This Qt version was already registered as \"%1\".")
.arg(version->displayName())); .arg(version->displayName()));
return; return;