diff options
author | Friedemann Kleint <[email protected]> | 2012-07-27 15:43:00 +0200 |
---|---|---|
committer | Friedemann Kleint <[email protected]> | 2012-07-27 17:08:12 +0200 |
commit | bf980649d2f28266838b7e16e8828a2271d8a69c (patch) | |
tree | 0a9b6a0bebea42de04404f1d737fe75c885af6b8 /src/plugins/madde | |
parent | 5635272b44a8a5a79fbb073180ca8aa8414d1dab (diff) |
tr()-Fixes for 2.6.
- ProjectExplorer::Profile should appear as 'Target' in the UI.
- Fix messagebox title capitalization
- Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class
names, add where applicable to replace
QCoreApplication::translate().
- Introduce message utility function for the commonly used
'No tool chain set up for this profile' message to
ToolChainProfileInformation.
- Introduce message utility functions related to adding files
to version control to VcsManager to be shared by QmlJsEditor.
- Fix typos.
- Remove QObject::tr(), QCoreApplication::tr().
- Do not translate diagnostic console warnings of
QmlProfiler.
Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/madde')
-rw-r--r-- | src/plugins/madde/debianmanager.cpp | 3 | ||||
-rw-r--r-- | src/plugins/madde/maddedevice.h | 2 | ||||
-rw-r--r-- | src/plugins/madde/maemopublisherfremantlefree.cpp | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/madde/debianmanager.cpp b/src/plugins/madde/debianmanager.cpp index 399f1b0040c..a2b6442bd31 100644 --- a/src/plugins/madde/debianmanager.cpp +++ b/src/plugins/madde/debianmanager.cpp @@ -127,8 +127,7 @@ QByteArray section(Core::Id deviceType) { void raiseError(const QString &reason) { - QMessageBox::critical(0, QCoreApplication::translate("Madde::DebianManager", - "Error creating debian project templates"), reason); + QMessageBox::critical(0, Madde::Internal::DebianManager::tr("Error Creating Debian Project Templates"), reason); } QString defaultPackageFileName(ProjectExplorer::Project *project) diff --git a/src/plugins/madde/maddedevice.h b/src/plugins/madde/maddedevice.h index 27feaa10bfb..052471cb4b0 100644 --- a/src/plugins/madde/maddedevice.h +++ b/src/plugins/madde/maddedevice.h @@ -39,7 +39,7 @@ namespace Internal { class MaddeDevice : public RemoteLinux::LinuxDeviceConfiguration { - Q_DECLARE_TR_FUNCTIONS(MaddeDevice) + Q_DECLARE_TR_FUNCTIONS(Madde::Internal::MaddeDevice) public: typedef QSharedPointer<MaddeDevice> Ptr; typedef QSharedPointer<const MaddeDevice> ConstPtr; diff --git a/src/plugins/madde/maemopublisherfremantlefree.cpp b/src/plugins/madde/maemopublisherfremantlefree.cpp index 9ea038b0cb7..f754e9e1100 100644 --- a/src/plugins/madde/maemopublisherfremantlefree.cpp +++ b/src/plugins/madde/maemopublisherfremantlefree.cpp @@ -312,8 +312,10 @@ void MaemoPublisherFremantleFree::handleProcessFinished(bool failedToStart) // Toolchain might be null! (yes because this sucks) ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainProfileInformation::toolChain(m_buildConfig->target()->profile()); - if (!tc) - finishWithFailure(QString(), tr("Make distclean failed. No toolchain in profile.")); + if (!tc) { + finishWithFailure(QString(), tr("Make distclean failed: %1") + .arg(ProjectExplorer::ToolChainProfileInformation::msgNoToolChainInTarget())); + } m_process->start(tc->makeCommand(), QStringList() << QLatin1String("distclean")); } break; |