diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-02-28 14:37:46 +0100 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-02-28 14:58:45 +0100 |
commit | 028fe7f627b082b50bf4d0d4b8c51454ac1511be (patch) | |
tree | 81f267aab8594a251ec375317d8253ef34466a05 /src | |
parent | 6343e101f20037d9807f48a04a525b218ffb00ca (diff) |
Remove leading newline characters from translated messages.
Change-Id: I237ad558e27a619f9162ebec2ef4ede9ed2cdeea
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src')
9 files changed, 15 insertions, 12 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index a2c642af23..ae2daf0e68 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -160,10 +160,10 @@ void AndroidRunner::checkPID() if (m_wasStarted) { m_wasStarted = false; m_checkPIDTimer.stop(); - emit remoteProcessFinished(tr("\n\n'%1' died.").arg(m_packageName)); + emit remoteProcessFinished(QLatin1String("\n\n") + tr("\"%1\" died.").arg(m_packageName)); } else { if (++m_tries > 3) - emit remoteProcessFinished(tr("\n\nUnable to start '%1'").arg(m_packageName)); + emit remoteProcessFinished(QLatin1String("\n\n") + tr("Unable to start \"%1\"").arg(m_packageName)); } } else if (!m_wasStarted){ if (m_useCppDebugger) { @@ -343,7 +343,7 @@ void AndroidRunner::stop() m_tries = 0; if (m_processPID != -1) { forceStop(); - emit remoteProcessFinished(tr("\n\n'%1' terminated.").arg(m_packageName)); + emit remoteProcessFinished(QLatin1String("\n\n") + tr("\"%1\" terminated.").arg(m_packageName)); } //QObject::disconnect(&m_adbLogcatProcess, 0, this, 0); m_adbLogcatProcess.kill(); diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp index 78b50547f1..b7c58544c9 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp @@ -232,7 +232,8 @@ void ReadOnlyFilesDialog::promptFailWarning(const QStringList &files, ReadOnlyRe } else { title = tr("Could Not Change Permissions on Some Files"); message = d->failWarning; - message += tr("\nSee details for a complete list of files."); + message += QLatin1Char('\n'); + message += tr("See details for a complete list of files."); details = files.join(QLatin1String("\n")); } QMessageBox msgBox(QMessageBox::Warning, title, message); diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 7c0283032a..190610e0d5 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -1804,7 +1804,7 @@ void DebuggerEngine::checkForReleaseBuild(const DebuggerStartParameters &sp) foreach (const QByteArray &name, interesting) { const QString found = seen.contains(name) ? tr("Found.") : tr("Not found."); - detailedWarning.append(tr("\nSection %1: %2").arg(_(name)).arg(found)); + detailedWarning.append(QLatin1Char('\n') + tr("Section %1: %2").arg(_(name)).arg(found)); } break; } diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp index 134c61b93b..34c160c386 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp @@ -170,7 +170,8 @@ void DeviceUsedPortsGatherer::handleProcessClosed(int exitStatus) if (!errMsg.isEmpty()) { if (!d->remoteStderr.isEmpty()) { - errMsg += tr("\nRemote error output was: %1") + errMsg += QLatin1Char('\n'); + errMsg += tr("Remote error output was: %1") .arg(QString::fromUtf8(d->remoteStderr)); } emit error(errMsg); diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp index 6d878c15e2..81ede1d17b 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp @@ -118,7 +118,7 @@ void SshDeviceProcessList::handleProcessError(const QString &errorMessage) QString fullMessage = errorMessage; const QByteArray remoteStderr = d->process.readAllStandardError(); if (!remoteStderr.isEmpty()) - fullMessage += tr("\nRemote stderr was: %1").arg(QString::fromUtf8(remoteStderr)); + fullMessage += QLatin1Char('\n') + tr("Remote stderr was: %1").arg(QString::fromUtf8(remoteStderr)); reportError(fullMessage); } diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp index 7c2d906428..d5865a75c1 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp @@ -314,10 +314,11 @@ void AbstractRemoteLinuxDeployService::handleConnectionFailure() break; case Connecting: { QString errorMsg = tr("Could not connect to host: %1").arg(d->connection->errorString()); + errorMsg += QLatin1Char('\n'); if (deviceConfiguration()->machineType() == IDevice::Emulator) - errorMsg += tr("\nDid the emulator fail to start?"); + errorMsg += tr("Did the emulator fail to start?"); else - errorMsg += tr("\nIs the device connected and set up for network access?"); + errorMsg += tr("Is the device connected and set up for network access?"); emit errorMessage(errorMsg); setFinished(); break; diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp index 978a9cfddd..088b50de34 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp @@ -101,7 +101,7 @@ void RemoteLinuxEnvironmentReader::remoteProcessFinished() const QString remoteStderr = QString::fromUtf8(m_deviceProcess->readAllStandardError()).trimmed(); if (!remoteStderr.isEmpty()) - errorMessage += tr("\nRemote stderr was: '%1'").arg(remoteStderr); + errorMessage += QLatin1Char('\n') + tr("Remote stderr was: \"%1\"").arg(remoteStderr); emit error(errorMessage); } else { QString remoteOutput = QString::fromUtf8(m_deviceProcess->readAllStandardOutput()); diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/texteditor/codecselector.cpp index 4f195df1e4..577e935b8d 100644 --- a/src/plugins/texteditor/codecselector.cpp +++ b/src/plugins/texteditor/codecselector.cpp @@ -73,7 +73,7 @@ CodecSelector::CodecSelector(QWidget *parent, BaseTextDocument *doc) m_label = new QLabel(this); QString decodingErrorHint; if (m_hasDecodingError) - decodingErrorHint = tr("\nThe following encodings are likely to fit:"); + decodingErrorHint = QLatin1Char('\n') + tr("The following encodings are likely to fit:"); m_label->setText(tr("Select encoding for \"%1\".%2").arg(QFileInfo(doc->filePath()).fileName()).arg(decodingErrorHint)); m_listWidget = new CodecListWidget(this); diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp index 6914788cbe..9a69ed5bdc 100644 --- a/src/plugins/texteditor/generichighlighter/manager.cpp +++ b/src/plugins/texteditor/generichighlighter/manager.cpp @@ -467,7 +467,7 @@ void Manager::downloadDefinitionsFinished() else text = tr("Error downloading one or more definitions."); if (writeError) - text.append(tr("\nPlease check the directory's access rights.")); + text.append(QLatin1Char('\n') + tr("Please check the directory's access rights.")); QMessageBox::critical(0, tr("Download Error"), text); } |