From 035c4af1e32286b77476c04ca5eaf35b77176b65 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 9 Oct 2009 15:00:11 +0200 Subject: S60 -> Symbian for visible strings Reviewed-By: con (cherry picked from commit 5a0566249b84cb521c3a4fc93d7ccc680e451cea) --- src/plugins/debugger/gdb/trkoptionspage.cpp | 2 +- .../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 11 ++++++----- .../qt-s60/s60emulatorrunconfiguration.cpp | 14 +++++++------- src/plugins/welcome/communitywelcomepagewidget.cpp | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/plugins/debugger/gdb/trkoptionspage.cpp b/src/plugins/debugger/gdb/trkoptionspage.cpp index 2962e3c2ce..98b103b8d7 100644 --- a/src/plugins/debugger/gdb/trkoptionspage.cpp +++ b/src/plugins/debugger/gdb/trkoptionspage.cpp @@ -40,7 +40,7 @@ namespace Debugger { namespace Internal { -const char * const TRK_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::TrkOptionsPage", "S60 / Trk"); +const char * const TRK_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::TrkOptionsPage", "Symbian Trk"); TrkOptionsPage::TrkOptionsPage(const TrkOptionsPtr &options) : m_options(options) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 4dde9723de..6d11b7a763 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -470,7 +470,7 @@ QStringList S60DeviceRunConfigurationFactory::availableCreationTypes(Project *pr QStringList applicationProFiles; QList list = qt4project->applicationProFiles(); foreach (Qt4ProFileNode * node, list) { - applicationProFiles.append("QtS60DeviceRunConfiguration." + node->path()); + applicationProFiles.append("QtSymbianDeviceRunConfiguration." + node->path()); } return applicationProFiles; } else { @@ -480,8 +480,8 @@ QStringList S60DeviceRunConfigurationFactory::availableCreationTypes(Project *pr QString S60DeviceRunConfigurationFactory::displayNameForType(const QString &type) const { - QString fileName = type.mid(QString("QtS60DeviceRunConfiguration.").size()); - return tr("%1 on S60 Device").arg(QFileInfo(fileName).completeBaseName()); + QString fileName = type.mid(QString("QtSymbianDeviceRunConfiguration.").size()); + return tr("%1 on Symbian Device").arg(QFileInfo(fileName).completeBaseName()); } QSharedPointer S60DeviceRunConfigurationFactory::create(Project *project, const QString &type) @@ -489,7 +489,7 @@ QSharedPointer S60DeviceRunConfigurationFactory::create(Projec Qt4Project *p = qobject_cast(project); Q_ASSERT(p); if (type.startsWith("QtS60DeviceRunConfiguration.")) { - QString fileName = type.mid(QString("QtS60DeviceRunConfiguration.").size()); + QString fileName = type.mid(QString("QtSymbianDeviceRunConfiguration.").size()); return QSharedPointer(new S60DeviceRunConfiguration(p, fileName)); } Q_ASSERT(type == "Qt4ProjectManager.DeviceRunConfiguration"); @@ -564,7 +564,8 @@ void S60DeviceRunControlBase::start() if (!checkConfiguration(&errorMessage, &settingsCategory, &settingsPage)) { error(this, errorMessage); emit finished(); - Core::ICore::instance()->showWarningWithOptions(tr("S60 Debugger"), errorMessage, QString(), + Core::ICore::instance()->showWarningWithOptions(tr("Debugger for Symbian Platform"), + errorMessage, QString(), settingsCategory, settingsPage); return; } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp index e44851bb92..9c23d201d7 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp @@ -52,9 +52,9 @@ S60EmulatorRunConfiguration::S60EmulatorRunConfiguration(Project *project, const m_cachedTargetInformationValid(false) { if (!m_proFilePath.isEmpty()) - setName(tr("%1 in S60 Emulator").arg(QFileInfo(m_proFilePath).completeBaseName())); + setName(tr("%1 in Symbian Emulator").arg(QFileInfo(m_proFilePath).completeBaseName())); else - setName(tr("QtS60EmulatorRunConfiguration")); + setName(tr("QtSymbianEmulatorRunConfiguration")); connect(project, SIGNAL(activeBuildConfigurationChanged()), this, SLOT(invalidateCachedTargetInformation())); @@ -141,7 +141,7 @@ void S60EmulatorRunConfiguration::updateTarget() if (!reader->readProFile(m_proFilePath)) { delete reader; - Core::ICore::instance()->messageManager()->printToOutputPane(tr("Could not parse %1. The QtS60 emulator run configuration %2 can not be started.").arg(m_proFilePath).arg(name())); + Core::ICore::instance()->messageManager()->printToOutputPane(tr("Could not parse %1. The Qt for Symbian emulator run configuration %2 can not be started.").arg(m_proFilePath).arg(name())); return; } @@ -228,7 +228,7 @@ QStringList S60EmulatorRunConfigurationFactory::availableCreationTypes(Project * QStringList applicationProFiles; QList list = qt4project->applicationProFiles(); foreach (Qt4ProFileNode * node, list) { - applicationProFiles.append("QtS60EmulatorRunConfiguration." + node->path()); + applicationProFiles.append("QtSymbianEmulatorRunConfiguration." + node->path()); } return applicationProFiles; } else { @@ -238,7 +238,7 @@ QStringList S60EmulatorRunConfigurationFactory::availableCreationTypes(Project * QString S60EmulatorRunConfigurationFactory::displayNameForType(const QString &type) const { - QString fileName = type.mid(QString("QtS60EmulatorRunConfiguration.").size()); + QString fileName = type.mid(QString("QtSymbianEmulatorRunConfiguration.").size()); return tr("%1 in S60 Emulator").arg(QFileInfo(fileName).completeBaseName()); } @@ -246,8 +246,8 @@ QSharedPointer S60EmulatorRunConfigurationFactory::create(Proj { Qt4Project *p = qobject_cast(project); Q_ASSERT(p); - if (type.startsWith("QtS60EmulatorRunConfiguration.")) { - QString fileName = type.mid(QString("QtS60EmulatorRunConfiguration.").size()); + if (type.startsWith("QtSymbianEmulatorRunConfiguration.")) { + QString fileName = type.mid(QString("QtSymbianEmulatorRunConfiguration.").size()); return QSharedPointer(new S60EmulatorRunConfiguration(p, fileName)); } Q_ASSERT(type == "Qt4ProjectManager.EmulatorRunConfiguration"); diff --git a/src/plugins/welcome/communitywelcomepagewidget.cpp b/src/plugins/welcome/communitywelcomepagewidget.cpp index 40b39517c1..5b54f23cb7 100644 --- a/src/plugins/welcome/communitywelcomepagewidget.cpp +++ b/src/plugins/welcome/communitywelcomepagewidget.cpp @@ -58,7 +58,7 @@ CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) : ui->sitesTreeWidget->addItem(tr("Qt Labs"), QLatin1String("http://labs.trolltech.com")); ui->sitesTreeWidget->addItem(tr("Qt Git Hosting"), QLatin1String("http://qt.gitorious.org")); ui->sitesTreeWidget->addItem(tr("Qt Centre"), QLatin1String("http://www.qtcentre.org")); - ui->sitesTreeWidget->addItem(tr("Qt for S60 at Forum Nokia"), QLatin1String("http://discussion.forum.nokia.com/forum/forumdisplay.php?f=196")); + ui->sitesTreeWidget->addItem(tr("Qt for Symbian at Forum Nokia"), QLatin1String("http://discussion.forum.nokia.com/forum/forumdisplay.php?f=196")); } CommunityWelcomePageWidget::~CommunityWelcomePageWidget() -- cgit v1.2.3