Commit 028fe7f6 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by hjk
Browse files

Remove leading newline characters from translated messages.



Change-Id: I237ad558e27a619f9162ebec2ef4ede9ed2cdeea
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 6343e101
......@@ -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();
......
......@@ -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);
......
......@@ -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;
}
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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;
......
......@@ -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());
......
......@@ -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);
......
......@@ -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);
}
......
Markdown is supported
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