summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp2
-rw-r--r--src/plugins/cpptools/cppchecksymbols.cpp12
-rw-r--r--src/plugins/madde/maemoinstalltosysrootstep.cpp4
-rw-r--r--src/plugins/madde/maemoqemumanager.cpp2
-rw-r--r--src/plugins/qmljseditor/qmljspreviewrunner.cpp2
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp4
-rw-r--r--src/plugins/remotelinux/linuxdevicetester.cpp4
-rw-r--r--src/plugins/remotelinux/packageuploader.cpp2
-rw-r--r--src/plugins/valgrind/callgrind/callgrindcontroller.cpp2
9 files changed, 18 insertions, 16 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index d72616b764..3eb9212d12 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -395,7 +395,7 @@ ChooseCMakePage::ChooseCMakePage(CMakeOpenProjectWizard *cmakeWizard)
// Show a field for the user to enter
m_cmakeExecutable = new Utils::PathChooser(this);
m_cmakeExecutable->setExpectedKind(Utils::PathChooser::ExistingCommand);
- fl->addRow("cmake Executable:", m_cmakeExecutable);
+ fl->addRow(tr("cmake Executable:"), m_cmakeExecutable);
connect(m_cmakeExecutable, SIGNAL(editingFinished()),
this, SLOT(cmakeExecutableChanged()));
diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp
index dcd1358b94..6e32d6e83a 100644
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -509,9 +509,11 @@ bool CheckSymbols::visit(SimpleDeclarationAST *ast)
// Add a diagnostic message if non-virtual function has override/final marker
if ((_usages.back().kind != SemanticInfo::VirtualMethodUse)) {
if (funTy->isOverride())
- warning(declrIdNameAST, "Only virtual methods can be marked `override'");
+ warning(declrIdNameAST, QCoreApplication::translate(
+ "CPlusplus::CheckSymbols", "Only virtual methods can be marked `override'"));
else if (funTy->isFinal())
- warning(declrIdNameAST, "Only virtual methods can be marked `final'");
+ warning(declrIdNameAST, QCoreApplication::translate(
+ "CPlusplus::CheckSymbols", "Only virtual methods can be marked `final'"));
}
}
}
@@ -712,7 +714,7 @@ void CheckSymbols::checkNamespace(NameAST *name)
}
const unsigned length = tokenAt(name->lastToken() - 1).end() - tokenAt(name->firstToken()).begin();
- warning(line, column, QCoreApplication::translate("CheckUndefinedSymbols", "Expected a namespace-name"), length);
+ warning(line, column, QCoreApplication::translate("CPlusPlus::CheckSymbols", "Expected a namespace-name"), length);
}
bool CheckSymbols::hasVirtualDestructor(Class *klass) const
@@ -1280,9 +1282,9 @@ bool CheckSymbols::maybeAddFunction(const QList<LookupItem> &candidates, NameAST
// Add a diagnostic message if argument count does not match
if (matchType == Match_TooFewArgs)
- warning(line, column, "Too few arguments", length);
+ warning(line, column, QCoreApplication::translate("CPlusplus::CheckSymbols", "Too few arguments", length);
else if (matchType == Match_TooManyArgs)
- warning(line, column, "Too many arguments", length);
+ warning(line, column, QCoreApplication::translate("CPlusplus::CheckSymbols", "Too many arguments", length);
const Use use(line, column, length, kind);
addUse(use);
diff --git a/src/plugins/madde/maemoinstalltosysrootstep.cpp b/src/plugins/madde/maemoinstalltosysrootstep.cpp
index 1c1d0699a4..7f6f1a3ba7 100644
--- a/src/plugins/madde/maemoinstalltosysrootstep.cpp
+++ b/src/plugins/madde/maemoinstalltosysrootstep.cpp
@@ -346,14 +346,14 @@ bool MaemoMakeInstallToSysrootStep::init()
const Qt4BuildConfiguration * const bc
= qobject_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
if (!bc) {
- addOutput("Cannot deploy: No active build dconfiguration.",
+ addOutput(tr("Cannot deploy: No active build dconfiguration."),
ErrorMessageOutput);
return false;
}
const QtSupport::BaseQtVersion *const qtVersion
= QtSupport::QtKitInformation::qtVersion(target()->kit());
if (!qtVersion) {
- addOutput("Cannot deploy: Unusable build configuration.",
+ addOutput(tr("Cannot deploy: Unusable build configuration."),
ErrorMessageOutput);
return false;
diff --git a/src/plugins/madde/maemoqemumanager.cpp b/src/plugins/madde/maemoqemumanager.cpp
index eddcb42ab9..1a569e3932 100644
--- a/src/plugins/madde/maemoqemumanager.cpp
+++ b/src/plugins/madde/maemoqemumanager.cpp
@@ -87,7 +87,7 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent)
m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-stop.png", iconSize,
QIcon::Normal, QIcon::On);
- m_qemuAction = new QAction("MeeGo Emulator", this);
+ m_qemuAction = new QAction(tr("MeeGo Emulator"), this);
m_qemuAction->setIcon(m_qemuStarterIcon.pixmap(iconSize));
m_qemuAction->setToolTip(tr("Start MeeGo Emulator"));
connect(m_qemuAction, SIGNAL(triggered()), this, SLOT(startRuntime()));
diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.cpp b/src/plugins/qmljseditor/qmljspreviewrunner.cpp
index 5fb75a77ef..463a92fd59 100644
--- a/src/plugins/qmljseditor/qmljspreviewrunner.cpp
+++ b/src/plugins/qmljseditor/qmljspreviewrunner.cpp
@@ -67,7 +67,7 @@ void QmlJSPreviewRunner::run(const QString &filename)
Utils::QtcProcess::quoteArg(filename));
} else {
- errorMessage = "No file specified.";
+ errorMessage = tr("No file specified.");
}
if (!errorMessage.isEmpty())
diff --git a/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp b/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
index 642db1bde4..96b75f026d 100644
--- a/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
@@ -806,7 +806,7 @@ void QmlProfilerDataModel::complete()
compileStatistics(traceStartTime(), traceEndTime());
setState(Done);
} else {
- emit error("Unexpected complete signal in data model");
+ emit error(tr("Unexpected complete signal in data model"));
}
}
@@ -1666,7 +1666,7 @@ void QmlProfilerDataModel::setState(QmlProfilerDataModel::State state)
QTC_ASSERT(d->listState == ProcessingData || d->listState == Empty, return);
break;
default:
- emit error("Trying to set unknown state in events list");
+ emit error(tr("Trying to set unknown state in events list"));
break;
}
diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index 10a66cc4c1..e7801c77cb 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -124,7 +124,7 @@ void GenericLinuxDeviceTester::handleConnected()
d->process = d->connection->createRemoteProcess("uname -rsm");
connect(d->process.data(), SIGNAL(closed(int)), SLOT(handleProcessFinished(int)));
- emit progressMessage("Checking kernel version...");
+ emit progressMessage(tr("Checking kernel version..."));
d->state = RunningUname;
d->process->start();
}
@@ -172,7 +172,7 @@ void GenericLinuxDeviceTester::handlePortListReady()
QTC_ASSERT(d->state == TestingPorts, return);
if (d->portsGatherer.usedPorts().isEmpty()) {
- emit progressMessage("All specified ports are available.\n");
+ emit progressMessage(tr("All specified ports are available.\n"));
} else {
QString portList;
foreach (const int port, d->portsGatherer.usedPorts())
diff --git a/src/plugins/remotelinux/packageuploader.cpp b/src/plugins/remotelinux/packageuploader.cpp
index 1e27435f49..e1ace23e29 100644
--- a/src/plugins/remotelinux/packageuploader.cpp
+++ b/src/plugins/remotelinux/packageuploader.cpp
@@ -110,7 +110,7 @@ void PackageUploader::handleSftpChannelInitialized()
setState(Inactive);
emit uploadFinished(tr("Package upload failed: Could not open file."));
} else {
- emit progress("Starting upload...");
+ emit progress(tr("Starting upload..."));
setState(Uploading);
}
}
diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index 861252bee1..7e4afcde3a 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
@@ -148,7 +148,7 @@ void CallgrindController::processError(QProcess::ProcessError)
{
QTC_ASSERT(m_process, return);
const QString error = m_process->errorString();
- emit statusMessage(QString("An error occurred while trying to run %1: %2").arg(CALLGRIND_CONTROL_BINARY).arg(error));
+ emit statusMessage(tr("An error occurred while trying to run %1: %2").arg(CALLGRIND_CONTROL_BINARY).arg(error));
m_process->deleteLater();
m_process = 0;
View Lorry Controller Status