Commit 5585426e authored by Daniel Teske's avatar Daniel Teske
Browse files

Ui: No spaces before "..."



Change-Id: Ic76ef1bea53e2cf5c2d109688247e84c1aa70f6b
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@nokia.com>
parent 272e203b
......@@ -345,7 +345,7 @@ private:
m_ui->keyDirPathChooser->setEnabled(false);
m_ui->createKeysButton->setEnabled(false);
m_ui->statusLabel->setText(tr("Creating keys ... "));
m_ui->statusLabel->setText(tr("Creating keys... "));
SshKeyGenerator keyGenerator;
if (!keyGenerator.generateKeys(SshKeyGenerator::Rsa,
SshKeyGenerator::Mixed, 1024)) {
......
......@@ -195,7 +195,7 @@ void AbstractMaemoInstallPackageToSysrootStep::run(QFutureInterface<bool> &fi)
connect(m_installerProcess, SIGNAL(readyReadStandardError()),
SLOT(handleInstallerStderr()));
emit addOutput(tr("Installing package to sysroot ..."), MessageOutput);
emit addOutput(tr("Installing package to sysroot..."), MessageOutput);
const int packageFileSize = QFileInfo(m_packageFilePath).size() / (1024*1024);
const QStringList args = madArguments() << m_packageFilePath;
MaemoGlobal::callMadAdmin(*m_installerProcess, args, m_qmakeCommand, true);
......@@ -340,7 +340,7 @@ bool MaemoCopyToSysrootStep::init()
void MaemoCopyToSysrootStep::run(QFutureInterface<bool> &fi)
{
emit addOutput(tr("Copying files to sysroot ..."), MessageOutput);
emit addOutput(tr("Copying files to sysroot..."), MessageOutput);
QDir sysrootDir(m_systemRoot);
const QChar sep = QLatin1Char('/');
......
......@@ -121,7 +121,7 @@ void AbstractMaemoPackageCreationStep::run(QFutureInterface<bool> &fi)
SLOT(handleBuildOutput()));
connect(buildProc, SIGNAL(readyReadStandardError()), this,
SLOT(handleBuildOutput()));
emit addOutput(tr("Creating package file ..."), MessageOutput);
emit addOutput(tr("Creating package file..."), MessageOutput);
const bool success = createPackage(buildProc, fi);
disconnect(buildProc, 0, this, 0);
buildProc->deleteLater();
......
......@@ -128,7 +128,7 @@ void MaemoPublisherFremantleFree::createPackage()
m_tmpProjectDir = tmpDirContainer() + QLatin1Char('/')
+ m_project->displayName();
if (QFileInfo(tmpDirContainer()).exists()) {
emit progressReport(tr("Removing left-over temporary directory ..."));
emit progressReport(tr("Removing left-over temporary directory..."));
QString error;
if (!Utils::FileUtils::removeRecursively(tmpDirContainer(), &error)) {
finishWithFailure(tr("Error removing temporary directory: %1").arg(error),
......@@ -137,7 +137,7 @@ void MaemoPublisherFremantleFree::createPackage()
}
}
emit progressReport(tr("Setting up temporary directory ..."));
emit progressReport(tr("Setting up temporary directory..."));
if (!QDir::temp().mkdir(QFileInfo(tmpDirContainer()).fileName())) {
finishWithFailure(tr("Error: Could not create temporary directory."),
tr("Publishing failed: Could not create source package."));
......@@ -161,7 +161,7 @@ void MaemoPublisherFremantleFree::createPackage()
return;
}
emit progressReport(tr("Cleaning up temporary directory ..."));
emit progressReport(tr("Cleaning up temporary directory..."));
AbstractMaemoPackageCreationStep::preparePackagingProcess(m_process,
m_buildConfig, m_tmpProjectDir);
setState(RunningQmake);
......@@ -399,7 +399,7 @@ void MaemoPublisherFremantleFree::uploadPackage()
connect(m_uploader, SIGNAL(processClosed(int)), SLOT(handleUploadJobFinished(int)));
connect(m_uploader, SIGNAL(processOutputAvailable(QByteArray)),
SLOT(handleScpStdOut(QByteArray)));
emit progressReport(tr("Starting scp ..."));
emit progressReport(tr("Starting scp..."));
setState(StartingScp);
m_uploader->run("scp -td " + m_remoteDir.toUtf8(), m_sshParams);
}
......@@ -451,7 +451,7 @@ void MaemoPublisherFremantleFree::prepareToSendFile()
setState(PreparingToUploadFile);
const QString &nextFilePath = m_filesToUpload.first();
emit progressReport(tr("Uploading file %1 ...")
emit progressReport(tr("Uploading file %1...")
.arg(QDir::toNativeSeparators(nextFilePath)));
QFileInfo info(nextFilePath);
m_uploader->writeDataToProcess("C0644 " + QByteArray::number(info.size())
......
......@@ -67,7 +67,7 @@
<item row="2" column="2">
<widget class="QPushButton" name="vcsManageButton">
<property name="text">
<string>Manage ...</string>
<string>Manage...</string>
</property>
</widget>
</item>
......
......@@ -549,10 +549,10 @@ void QmlProfilerTool::connectToClient()
return;
if (d->m_connectMode == QmlProfilerToolPrivate::TcpConnection) {
logStatus(QString("QML Profiler: Connecting to %1:%2 ...").arg(d->m_tcpHost, QString::number(d->m_tcpPort)));
logStatus(QString("QML Profiler: Connecting to %1:%2...").arg(d->m_tcpHost, QString::number(d->m_tcpPort)));
d->m_client->connectToHost(d->m_tcpHost, d->m_tcpPort);
} else {
logStatus(QString("QML Profiler: Connecting to %1 ...").arg(d->m_tcpHost));
logStatus(QString("QML Profiler: Connecting to %1...").arg(d->m_tcpHost));
d->m_client->connectToOst(d->m_ostDevice);
}
}
......
......@@ -183,7 +183,7 @@ void CodaRunControl::slotError(const QString &error)
void CodaRunControl::slotCodaLogMessage(const QString &log)
{
if (debug > 1)
qDebug("CODA log: %s", qPrintable(log.size()>200?log.left(200).append(QLatin1String(" ...")): log));
qDebug("CODA log: %s", qPrintable(log.size()>200?log.left(200).append(QLatin1String("...")): log));
}
void CodaRunControl::slotCodaEvent(const CodaEvent &event)
......
......@@ -92,7 +92,7 @@ DebuggingHelperBuildTask::DebuggingHelperBuildTask(const BaseQtVersion *version,
toolChain->addToEnvironment(m_environment);
log(QCoreApplication::translate("QtVersion", "Building helper(s) with toolchain '%1' ...\n"
log(QCoreApplication::translate("QtVersion", "Building helper(s) with toolchain '%1'...\n"
).arg(toolChain->displayName()), QString());
if (toolChain->targetAbi().os() == Abi::LinuxOS
......
......@@ -162,7 +162,7 @@ void AbstractRemoteLinuxDebugSupport::handleAdapterSetupRequested()
QTC_ASSERT(d->state == Inactive, return);
d->state = StartingRunner;
showMessage(tr("Preparing remote side ...\n"), AppStuff);
showMessage(tr("Preparing remote side...\n"), AppStuff);
disconnect(runner(), 0, this, 0);
connect(runner(), SIGNAL(error(QString)), this, SLOT(handleSshError(QString)));
connect(runner(), SIGNAL(readyForExecution()), this, SLOT(startExecution()));
......
......@@ -90,7 +90,7 @@ void AbstractRemoteLinuxRunControl::handleSshError(const QString &error)
void AbstractRemoteLinuxRunControl::startExecution()
{
appendMessage(tr("Starting remote process ...\n"), Utils::NormalMessageFormat);
appendMessage(tr("Starting remote process...\n"), Utils::NormalMessageFormat);
runner()->startExecution(QString::fromLatin1("%1 %2 %3")
.arg(runner()->commandPrefix())
.arg(runner()->remoteExecutable())
......
......@@ -507,7 +507,7 @@ void UrlTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType type)
{
Q_UNUSED(type);
menu->addSeparator();
menu->addAction(createOpenUrlAction(tr("Open URL in browser ...")));
menu->addAction(createOpenUrlAction(tr("Open URL in browser...")));
menu->addAction(createCopyUrlAction(tr("Copy URL location")));
}
......@@ -572,7 +572,7 @@ void EmailTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType type
{
Q_UNUSED(type);
menu->addSeparator();
menu->addAction(createOpenUrlAction(tr("Send email to ...")));
menu->addAction(createOpenUrlAction(tr("Send email to...")));
menu->addAction(createCopyUrlAction(tr("Copy email address")));
}
......
......@@ -111,11 +111,11 @@ QmlProfilerApplication::~QmlProfilerApplication()
{
if (!m_process)
return;
logStatus("Terminating process ...");
logStatus("Terminating process...");
m_process->disconnect();
m_process->terminate();
if (!m_process->waitForFinished(1000)) {
logStatus("Killing process ...");
logStatus("Killing process...");
m_process->kill();
}
delete m_process;
......@@ -247,7 +247,7 @@ void QmlProfilerApplication::run()
m_process->setProcessChannelMode(QProcess::MergedChannels);
connect(m_process, SIGNAL(readyRead()), this, SLOT(processHasOutput()));
connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(processFinished()));
logStatus(QString("Starting '%1 %2' ...").arg(m_programPath, arguments.join(" ")));
logStatus(QString("Starting '%1 %2'...").arg(m_programPath, arguments.join(" ")));
m_process->start(m_programPath, arguments);
if (!m_process->waitForStarted()) {
logError(QString("Could not run '%1': %2").arg(m_programPath, m_process->errorString()));
......@@ -265,12 +265,12 @@ void QmlProfilerApplication::tryToConnect()
if (!m_verbose && !(m_connectionAttempts % 5)) {// print every 5 seconds
if (!m_verbose)
logError(QString("Could not connect to %1:%2 for %3 seconds ...").arg(
logError(QString("Could not connect to %1:%2 for %3 seconds...").arg(
m_hostName, QString::number(m_port), QString::number(m_connectionAttempts)));
}
if (m_connection.state() == QAbstractSocket::UnconnectedState) {
logStatus(QString("Connecting to %1:%2 ...").arg(m_hostName, QString::number(m_port)));
logStatus(QString("Connecting to %1:%2...").arg(m_hostName, QString::number(m_port)));
m_connection.connectToHost(m_hostName, m_port);
}
}
......@@ -321,7 +321,7 @@ void QmlProfilerApplication::processFinished()
exit(0);
}
} else {
logError("Process crashed! Exiting ...");
logError("Process crashed! Exiting...");
exit(3);
}
}
......
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