diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp index b1c1d3a6d78..93e5feb7625 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp @@ -188,10 +188,15 @@ QString S60PublisherOvi::localisedVendorNames() const bool S60PublisherOvi::isVendorNameValid(const QString &vendorName) const { - //Check the given vendor name + // vendorName cannot containg "Nokia" + if (vendorName.trimmed().contains(Constants::REJECTED_VENDOR_NAMES_NOKIA, Qt::CaseInsensitive)) + return false; + + // vendorName cannot be any of the rejected vendor names foreach (const QString &rejectedVendorName, m_rejectedVendorNames) if (vendorName.trimmed().compare(rejectedVendorName, Qt::CaseInsensitive) == 0) return false; + return true; } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui index 676d889af9f..17af23edf94 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui @@ -17,7 +17,7 @@ - Choose a build configuration + Choose a build configuration: @@ -41,7 +41,7 @@ Only Qt versions above 4.6.3 are made available in this wizard. -This is because previous Qt Versions have limitations in building suitable sis files. +Previous Qt versions have limitations in building suitable SIS files. diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp index 4546db5a055..34a891e89e1 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp @@ -139,8 +139,9 @@ void S60PublishingSisSettingsPageOvi::globalVendorNameChanged() ui->globalVendorNameErrorLabel, ui->globalVendorNameErrorReasonLabel, tr("%1 is a default vendor name used for testing and development.
" - "The Vendor_Name field cannot be, or contain, the name 'Nokia' in it.
" - "It is recommended to also not use the default name of 'Vendor'/'Vendor-EN', or to leave the entry blank.
" + "The Vendor_Name field cannot contain the name 'Nokia'.
" + "You are advised against using the default names 'Vendor' and 'Vendor-EN'.
" + "You should also not leave the entry blank.
" "see Packaging and Signing for guidelines.
") .arg("\"" + ui->globalVendorNameLineEdit->text() + "\"")); m_publisher->setVendorName(ui->globalVendorNameLineEdit->text()); @@ -160,15 +161,20 @@ void S60PublishingSisSettingsPageOvi::localisedVendorNamesChanged() } } + QString pluralOrSingular = tr("is a default vendor name"); + if (wrongVendorNames.count() > 1) + pluralOrSingular = tr("are default vendor names"); + reflectSettingState(settingState, ui->localisedVendorNamesOkLabel, ui->localisedVendorNamesErrorLabel, ui->localisedVendorNamesErrorReasonLabel, - tr("%1 are default vendor names used for testing and development.
" - "The Vendor_Name field cannot be, or contain, the name 'Nokia' in it.
" - "It is recommended to also not use the default name of 'Vendor'/'Vendor-EN', or to leave the entry blank.
" - "see Packaging and Signing for guidelines.
") - .arg(wrongVendorNames.join(", "))); + tr("%1 %2 used for testing and development.
" + "The Vendor_Name field cannot contain the name 'Nokia'.
" + "You are advised against using the default names 'Vendor' and 'Vendor-EN'.
" + "You should also not leave the entry blank.
" + "See " + "Packaging and Signing for guidelines.
").arg(wrongVendorNames.join(", "), pluralOrSingular)); m_publisher->setLocalVendorNames(ui->localisedVendorNamesLineEdit->text()); } @@ -178,15 +184,19 @@ void S60PublishingSisSettingsPageOvi::qtVersionChanged() void S60PublishingSisSettingsPageOvi::uid3Changed() { - QString testUID3ErrorMsg = tr("The App UID %1 is only for testing and development.
" - "SIS packages built with it, cannot be distributed via the OVI Store.
"); + QString testUID3ErrorMsg = tr("The application UID %1 is only for testing and development.
" + "SIS packages built with it cannot be distributed via the Ovi Store.
"); - QString symbianSignedUID3ErrorMsg = tr("The App UID %1 is a symbiansigned.com UID.
" - "Apps with this UID will be rejected by Ovi Sign.
" - "If you want to continue with this UID, sign your app on symbiansigned.com and upload the signed app to Ovi.
"); + QString symbianSignedUID3ErrorMsg = tr("The application UID %1 is a symbiansigned.com UID.
" + "Applications with this UID will be rejected by " + "Application Signing Services for Ovi Store.
" + "If you want to continue with a symbiansigned.com UID, " + "sign your application on symbiansigned.com and upload the " + "signed application to Publish to Ovi.
"); - QString errorMsg = tr("The App UID %1 is not an acceptable UID.
" - " SIS packages built with it, cannot be signed by Ovi.
"); + QString errorMsg = tr("The application UID %1 is not an acceptable UID.
" + "SIS packages built with it cannot be signed by " + "Application Signing Services for Ovi Store.
"); if (m_publisher->isTestUID3(ui->uid3LineEdit->text())) { errorMsg = testUID3ErrorMsg; @@ -198,16 +208,20 @@ void S60PublishingSisSettingsPageOvi::uid3Changed() ui->uid3OkLabel, ui->uid3ErrorLabel, ui->uid3ErrorReasonLabel, - tr("The App UID is a global unique indentifier of the SIS package.
") + + tr("The application UID is a global unique indentifier of the SIS package.
") + errorMsg.arg(ui->uid3LineEdit->text()) + - tr("To get a unique App UID for your package file,
" + tr("To get a unique application UID for your package file,
" "please register at publish.ovi.com")); if (m_publisher->isUID3Valid(ui->uid3LineEdit->text())) { ui->uid3WarningLabel->show(); - ui->uid3WarningReasonLabel->setText("If this UID is from symbiansigned.com, It will be rejected by Ovi Sign.
" - "If you want to continue with this UID, sign your app on symbiansigned.com and upload the signed app to Ovi.
" - "It is however recommended you obtain a UID from publish.ovi.com"); + ui->uid3WarningReasonLabel->setText("If this UID is from symbiansigned.com, It will be " + "rejected by Application Signing Services for Ovi Store.
" + "If you want to continue with a symbiansigned.com UID, " + "sign your application on symbiansigned.com and upload " + "the signed application to Publish to Ovi.
" + "It is, however, recommended that you obtain a UID from " + "publish.ovi.com"); ui->uid3WarningReasonLabel->show(); } else { ui->uid3WarningLabel->hide(); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui index 31d41e5d228..3a3d00fb240 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui @@ -26,7 +26,7 @@ - Global Vendor Name + Global vendor name: @@ -43,7 +43,7 @@ - Qt Version used in builds + Qt version used in builds: @@ -76,7 +76,7 @@ - App UID + Application UID: @@ -100,7 +100,7 @@ - Capabilities + Capabilities: @@ -264,7 +264,7 @@ - Localised Vendor Names + Localised vendor names: diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardfactories.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardfactories.cpp index 09330e0a839..d8360406904 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardfactories.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardfactories.cpp @@ -50,19 +50,21 @@ S60PublishingWizardFactoryOvi::S60PublishingWizardFactoryOvi(QObject *parent) QString S60PublishingWizardFactoryOvi::displayName() const { - return tr("Publish for Qt Symbian Application on Ovi Store "); + return tr("Publish Qt Symbian Applications to Ovi Store"); } QString S60PublishingWizardFactoryOvi::description() const { - return tr("This wizard will check your resulting sis file and " - "some of your meta data to make sure it complies with " - "Ovi Store submission regulations.\n\n" - "This wizard is used to create sis files which can be submitted to publish to Ovi.\n\n" - "It cannot be used if you are using UID3s from Symbian Signed.\n\n" + return tr("This wizard checks " + "your project file to make sure it complies with " + "Ovi Store submission criteria.\n\n" + "The wizard creates SIS files that can be submitted " + "to Publish to Ovi.\n\n" + "You cannot use it if you use application UIDs from Symbian Signed.\n\n" "You cannot use it for the Certified Signed and Manufacturer level capabilities:\n" - "i.e. NetworkControl, MultimediaDD, CommDD, DiskAdmin, AllFiles, DRM and TCB\n\n" - "Your application will also be rejected by Ovi QA if it uses an unreleased Qt Version."); + "NetworkControl, MultimediaDD, CommDD, DiskAdmin, AllFiles, DRM and TCB.\n\n" + "Your application will also be rejected by Ovi QA if you choose " + "an unreleased Qt version on the next page."); } bool S60PublishingWizardFactoryOvi::canCreateWizard(const Project *project) const diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.cpp index be40db30ada..6b04ce9f47f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.cpp @@ -61,12 +61,12 @@ S60PublishingWizardOvi::S60PublishingWizardOvi(const Project *project, QWidget * addPage(m_buildSettingsPage); m_sisSettingsPage = new S60PublishingSisSettingsPageOvi(m_publisher); - m_sisSettingsPage->setTitle(tr(".Pro File Checks")); + m_sisSettingsPage->setTitle(tr("Project File Checks")); m_sisSettingsPage->setCommitPage(true); addPage(m_sisSettingsPage); m_resultsPage = new S60PublishingResultsPageOvi(m_publisher); - m_resultsPage->setTitle(tr("Creating Uploadable Sis File")); + m_resultsPage->setTitle(tr("Creating an Uploadable SIS File")); m_resultsPage->setFinalPage(true); addPage(m_resultsPage);