forked from qt-creator/qt-creator
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 <tobias.hunger@nokia.com>
This commit is contained in:
@@ -44,7 +44,7 @@ AndroidDevice::AndroidDevice()
|
||||
IDevice::Hardware,
|
||||
Core::Id(Constants::ANDROID_DEVICE_ID))
|
||||
{
|
||||
setDisplayName(QCoreApplication::translate("ProjectExplorer::AndroidDevice", "Run on Android"));
|
||||
setDisplayName(QCoreApplication::translate("Android::Internal::AndroidDevice", "Run on Android"));
|
||||
setDeviceState(DeviceReadyToUse);
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ IDevice::DeviceInfo AndroidDevice::deviceInformation() const
|
||||
|
||||
QString AndroidDevice::displayType() const
|
||||
{
|
||||
return QCoreApplication::translate("ProjectExplorer::AndroidDevice", "Android");
|
||||
return QCoreApplication::translate("Android::Internal::AndroidDevice", "Android");
|
||||
}
|
||||
|
||||
IDeviceWidget *AndroidDevice::createWidget()
|
||||
|
||||
@@ -67,8 +67,7 @@ QList<Core::Id> AndroidPackageCreationFactory::availableCreationIds(ProjectExplo
|
||||
QString AndroidPackageCreationFactory::displayNameForId(const Core::Id id) const
|
||||
{
|
||||
if (id == AndroidPackageCreationStep::CreatePackageId)
|
||||
return QCoreApplication::translate("Qt4ProjectManager::Internal::AndroidPackageCreationFactory",
|
||||
"Create Android (.apk) Package");
|
||||
return tr("Create Android (.apk) Package");
|
||||
return QString();
|
||||
}
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@ namespace Internal {
|
||||
|
||||
class AndroidPackageCreationFactory : public ProjectExplorer::IBuildStepFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit AndroidPackageCreationFactory(QObject *parent = 0);
|
||||
|
||||
|
||||
@@ -65,8 +65,7 @@ QList<Core::Id> AndroidPackageInstallationFactory::availableCreationIds(BuildSte
|
||||
QString AndroidPackageInstallationFactory::displayNameForId(const Core::Id id) const
|
||||
{
|
||||
if (id == AndroidPackageInstallationStep::Id)
|
||||
return QCoreApplication::translate("Qt4ProjectManager::Internal::AndroidPackageInstallationFactory",
|
||||
"Deploy to device");
|
||||
return tr("Deploy to device");
|
||||
return QString();
|
||||
}
|
||||
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
|
||||
#include <qtsupport/qtsupportconstants.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
|
||||
using namespace Android::Internal;
|
||||
|
||||
AndroidQtVersion::AndroidQtVersion()
|
||||
@@ -77,7 +75,7 @@ QString AndroidQtVersion::invalidReason() const
|
||||
{
|
||||
QString tmp = BaseQtVersion::invalidReason();
|
||||
if (tmp.isEmpty() && qtAbis().isEmpty())
|
||||
return QCoreApplication::translate("QtVersion", "Failed to detect the ABI(s) used by the Qt version.");
|
||||
return tr("Failed to detect the ABI(s) used by the Qt version.");
|
||||
return tmp;
|
||||
}
|
||||
|
||||
@@ -90,7 +88,7 @@ QList<ProjectExplorer::Abi> AndroidQtVersion::detectQtAbis() const
|
||||
|
||||
QString AndroidQtVersion::description() const
|
||||
{
|
||||
return QCoreApplication::translate("QtVersion", "Android", "Qt Version is meant for Android");
|
||||
return tr("Android::Internal::AndroidQtVersion", "Qt Version is meant for Android");
|
||||
}
|
||||
|
||||
Core::FeatureSet AndroidQtVersion::availableFeatures() const
|
||||
|
||||
@@ -30,13 +30,17 @@
|
||||
|
||||
#ifndef ANDROIDQTVERSION_H
|
||||
#define ANDROIDQTVERSION_H
|
||||
|
||||
#include <qtsupport/baseqtversion.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
|
||||
namespace Android {
|
||||
namespace Internal {
|
||||
|
||||
class AndroidQtVersion : public QtSupport::BaseQtVersion
|
||||
{
|
||||
Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidQtVersion)
|
||||
public:
|
||||
AndroidQtVersion();
|
||||
AndroidQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString());
|
||||
|
||||
Reference in New Issue
Block a user