diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 14df232ccbd..acca04a2ea8 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -438,9 +438,9 @@ bool AndroidConfigurations::createAVD(int minApiLevel) const QStringListModel model(sdkTargets(minApiLevel)); avdDialog.targetComboBox->setModel(&model); if (!model.rowCount()) { - QMessageBox::critical(0, tr("Create AVD Error"), - tr("Cannot create a new AVD, not enough android SDKs available\n" - "Please install one SDK with api version >=%1"). + QMessageBox::critical(0, tr("Error Creating AVD"), + tr("Cannot create a new AVD, no sufficiently recent Android SDK available.\n" + "Please install an SDK of at least API version %1."). arg(minApiLevel)); return false; } diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp index d8575fc3b20..e06012a8e89 100644 --- a/src/plugins/android/androiddeploystep.cpp +++ b/src/plugins/android/androiddeploystep.cpp @@ -250,12 +250,12 @@ bool AndroidDeployStep::deployPackage() SLOT(handleBuildError())); if (m_runDeployAction == DeployLocal) { - writeOutput(tr("Clean old Qt libs")); + writeOutput(tr("Clean old Qt libraries")); runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(), QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("shell") << QLatin1String("rm") << QLatin1String("-r") << QLatin1String("/data/local/qt")); - writeOutput(tr("Deploy Qt libs ... this may take some time, please wait")); + writeOutput(tr("Deploy Qt libraries ... this may take some time, please wait")); const QString tempPath = QDir::tempPath() + QLatin1String("/android_qt_libs_") + m_packageName; AndroidPackageCreationStep::removeDirectory(tempPath); QStringList stripFiles; @@ -279,7 +279,7 @@ bool AndroidDeployStep::deployPackage() if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(), QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("install") << QLatin1String("-r ") << m_runQASIPackagePath)) { - raiseError(tr("Qt Android smart installer instalation failed")); + raiseError(tr("Qt Android smart installer installation failed")); disconnect(deployProc, 0, this, 0); deployProc->deleteLater(); return false; @@ -299,7 +299,7 @@ bool AndroidDeployStep::deployPackage() if (!runCommand(deployProc, AndroidConfigurations::instance().adbToolPath().toString(), QStringList() << QLatin1String("-s") << m_deviceSerialNumber << QLatin1String("install") << package)) { - raiseError(tr("Package instalation failed")); + raiseError(tr("Package installation failed")); disconnect(deployProc, 0, this, 0); deployProc->deleteLater(); return false; diff --git a/src/plugins/android/androiddeploystepwidget.ui b/src/plugins/android/androiddeploystepwidget.ui index 14e79732ce0..50e1eb620db 100644 --- a/src/plugins/android/androiddeploystepwidget.ui +++ b/src/plugins/android/androiddeploystepwidget.ui @@ -23,10 +23,10 @@ - Use devices qt libs + Use Qt libraries from device - Use device's Qt libs + Use Qt libraries from device true @@ -38,21 +38,21 @@ - Push local qt libs to device. -You must have Qt libs compiled for that platform + Push local Qt libraries to device. +You must have Qt libraries compiled for that platform - Deploy local Qt libs + Deploy local Qt libraries - Check this option to force the application to use local qt libs instead of system libs. + Check this option to force the application to use local Qt libraries instead of system libraries. - Use local Qt libs + Use local Qt libraries @@ -70,7 +70,7 @@ You must have Qt libs compiled for that platform - Choose and install Ministro system wide qt shared libraries. + Choose and install Ministro system wide Qt shared libraries. This option is useful when you want to try your application on devices which don't have Android Market (e.g. Android Emulator). diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp index bac29035a57..acaaddd6097 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -142,7 +142,7 @@ bool AndroidPackageCreationStep::init() { const Qt4BuildConfiguration *bc = qobject_cast(target()->activeBuildConfiguration()); if (!bc) { - raiseError(tr("Cannot create android package: current build configuration is not Qt4.")); + raiseError(tr("Cannot create Android package: current build configuration is not Qt 4.")); return false; } Qt4Project *project = static_cast(target()->project()); @@ -188,15 +188,24 @@ BuildStepConfigWidget *AndroidPackageCreationStep::createConfigWidget() return new AndroidPackageCreationWidget(this); } +static inline QString msgCannotFindElfInformation() +{ + return AndroidPackageCreationStep::tr("Cannot find ELF information"); +} + +static inline QString msgCannotFindExecutable(const QString &appPath) +{ + return AndroidPackageCreationStep::tr("Cannot find '%1'.\n" + "Please make sure your application is " + "built successfully and is selected in Application tab ('Run option').").arg(appPath); +} + void AndroidPackageCreationStep::checkRequiredLibraries() { QProcess readelfProc; QString appPath = AndroidManager::targetApplicationPath(target()); if (!QFile::exists(appPath)) { - raiseError(tr("Cannot find read elf information"), - tr("Cannot find '%1'.\n" - "Please make sure your application is " - "built successfully and is selected in Application tab ('Run option') ").arg(appPath)); + raiseError(msgCannotFindElfInformation(), msgCannotFindExecutable(appPath)); return; } readelfProc.start(AndroidConfigurations::instance().readelfPath(target()->activeRunConfiguration()->abi().architecture()).toString(), @@ -244,10 +253,7 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun() { QProcess readelfProc; if (!m_appPath.toFileInfo().exists()) { - raiseError(tr("Can't find read elf information"), - tr("Can't find '%1'.\n" - "Please make sure your application is " - "built successfully and is selected in Application tab ('Run option') ").arg(m_appPath.toUserOutput())); + raiseError(msgCannotFindElfInformation(), msgCannotFindExecutable(m_appPath.toUserOutput())); return; } readelfProc.start(m_readElf.toString(), QStringList() << QLatin1String("-d") << QLatin1String("-W") << m_appPath.toUserOutput()); diff --git a/src/plugins/android/androidpackagecreationwidget.ui b/src/plugins/android/androidpackagecreationwidget.ui index ef0f66b79db..0b38270faa3 100644 --- a/src/plugins/android/androidpackagecreationwidget.ui +++ b/src/plugins/android/androidpackagecreationwidget.ui @@ -36,14 +36,7 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Android target SDK:</span></p></td></tr></table></body></html> + <b>Android target SDK:</b> @@ -53,14 +46,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Package name:</span></p></td></tr></table></body></html> + <b>Package name:</b> @@ -99,14 +85,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:600; font-style:normal;"> -<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Version code:</p></td></tr></table></body></html> + <b>Version code:</b> @@ -141,14 +120,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:600; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Version name:</p></td></tr></table></body></html> + <b>Version name:</b> @@ -169,14 +141,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Application name:</span></p></td></tr></table></body></html> + <b>Application name:</b> @@ -186,14 +151,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Run:</span></p></td></tr></table></body></html> + <b>Run:</b> Qt::AutoText @@ -212,14 +170,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Application icon:</span></p></td></tr></table></body></html> + <b>Application icon:</b> @@ -425,592 +376,592 @@ p, li { white-space: pre-wrap; } - android.permission.ACCESS_CHECKIN_PROPERTIES + android.permission.ACCESS_CHECKIN_PROPERTIES - android.permission.ACCESS_COARSE_LOCATION + android.permission.ACCESS_COARSE_LOCATION - android.permission.ACCESS_FINE_LOCATION + android.permission.ACCESS_FINE_LOCATION - android.permission.ACCESS_LOCATION_EXTRA_COMMANDS + android.permission.ACCESS_LOCATION_EXTRA_COMMANDS - android.permission.ACCESS_MOCK_LOCATION + android.permission.ACCESS_MOCK_LOCATION - android.permission.ACCESS_NETWORK_STATE + android.permission.ACCESS_NETWORK_STATE - android.permission.ACCESS_SURFACE_FLINGER + android.permission.ACCESS_SURFACE_FLINGER - android.permission.ACCESS_WIFI_STATE + android.permission.ACCESS_WIFI_STATE - android.permission.ACCOUNT_MANAGER + android.permission.ACCOUNT_MANAGER - android.permission.AUTHENTICATE_ACCOUNTS + android.permission.AUTHENTICATE_ACCOUNTS - android.permission.BATTERY_STATS + android.permission.BATTERY_STATS - android.permission.BIND_APPWIDGET + android.permission.BIND_APPWIDGET - android.permission.BIND_DEVICE_ADMIN + android.permission.BIND_DEVICE_ADMIN - android.permission.BIND_INPUT_METHOD + android.permission.BIND_INPUT_METHOD - android.permission.BIND_REMOTEVIEWS + android.permission.BIND_REMOTEVIEWS - android.permission.BIND_WALLPAPER + android.permission.BIND_WALLPAPER - android.permission.BLUETOOTH + android.permission.BLUETOOTH - android.permission.BLUETOOTH_ADMIN + android.permission.BLUETOOTH_ADMIN - android.permission.BRICK + android.permission.BRICK - android.permission.BROADCAST_PACKAGE_REMOVED + android.permission.BROADCAST_PACKAGE_REMOVED - android.permission.BROADCAST_SMS + android.permission.BROADCAST_SMS - android.permission.BROADCAST_STICKY + android.permission.BROADCAST_STICKY - android.permission.BROADCAST_WAP_PUSH + android.permission.BROADCAST_WAP_PUSH - android.permission.CALL_PHONE + android.permission.CALL_PHONE - android.permission.CALL_PRIVILEGED + android.permission.CALL_PRIVILEGED - android.permission.CAMERA + android.permission.CAMERA - android.permission.CHANGE_COMPONENT_ENABLED_STATE + android.permission.CHANGE_COMPONENT_ENABLED_STATE - android.permission.CHANGE_CONFIGURATION + android.permission.CHANGE_CONFIGURATION - android.permission.CHANGE_NETWORK_STATE + android.permission.CHANGE_NETWORK_STATE - android.permission.CHANGE_WIFI_MULTICAST_STATE + android.permission.CHANGE_WIFI_MULTICAST_STATE - android.permission.CHANGE_WIFI_STATE + android.permission.CHANGE_WIFI_STATE - android.permission.CLEAR_APP_CACHE + android.permission.CLEAR_APP_CACHE - android.permission.CLEAR_APP_USER_DATA + android.permission.CLEAR_APP_USER_DATA - android.permission.CONTROL_LOCATION_UPDATES + android.permission.CONTROL_LOCATION_UPDATES - android.permission.DELETE_CACHE_FILES + android.permission.DELETE_CACHE_FILES - android.permission.DELETE_PACKAGES + android.permission.DELETE_PACKAGES - android.permission.DEVICE_POWER + android.permission.DEVICE_POWER - android.permission.DIAGNOSTIC + android.permission.DIAGNOSTIC - android.permission.DISABLE_KEYGUARD + android.permission.DISABLE_KEYGUARD - android.permission.DUMP + android.permission.DUMP - android.permission.EXPAND_STATUS_BAR + android.permission.EXPAND_STATUS_BAR - android.permission.FACTORY_TEST + android.permission.FACTORY_TEST - android.permission.FLASHLIGHT + android.permission.FLASHLIGHT - android.permission.FORCE_BACK + android.permission.FORCE_BACK - android.permission.GET_ACCOUNTS + android.permission.GET_ACCOUNTS - android.permission.GET_PACKAGE_SIZE + android.permission.GET_PACKAGE_SIZE - android.permission.GET_TASKS + android.permission.GET_TASKS - android.permission.GLOBAL_SEARCH + android.permission.GLOBAL_SEARCH - android.permission.HARDWARE_TEST + android.permission.HARDWARE_TEST - android.permission.INJECT_EVENTS + android.permission.INJECT_EVENTS - android.permission.INSTALL_LOCATION_PROVIDER + android.permission.INSTALL_LOCATION_PROVIDER - android.permission.INSTALL_PACKAGES + android.permission.INSTALL_PACKAGES - android.permission.INTERNAL_SYSTEM_WINDOW + android.permission.INTERNAL_SYSTEM_WINDOW - android.permission.INTERNET + android.permission.INTERNET - android.permission.KILL_BACKGROUND_PROCESSES + android.permission.KILL_BACKGROUND_PROCESSES - android.permission.MANAGE_ACCOUNTS + android.permission.MANAGE_ACCOUNTS - android.permission.MANAGE_APP_TOKENS + android.permission.MANAGE_APP_TOKENS - android.permission.MASTER_CLEAR + android.permission.MASTER_CLEAR - android.permission.MODIFY_AUDIO_SETTINGS + android.permission.MODIFY_AUDIO_SETTINGS - android.permission.MODIFY_PHONE_STATE + android.permission.MODIFY_PHONE_STATE - android.permission.MOUNT_FORMAT_FILESYSTEMS + android.permission.MOUNT_FORMAT_FILESYSTEMS - android.permission.MOUNT_UNMOUNT_FILESYSTEMS + android.permission.MOUNT_UNMOUNT_FILESYSTEMS - android.permission.NFC + android.permission.NFC - android.permission.PERSISTENT_ACTIVITY + android.permission.PERSISTENT_ACTIVITY - android.permission.PROCESS_OUTGOING_CALLS + android.permission.PROCESS_OUTGOING_CALLS - android.permission.READ_CALENDAR + android.permission.READ_CALENDAR - android.permission.READ_CONTACTS + android.permission.READ_CONTACTS - android.permission.READ_FRAME_BUFFER + android.permission.READ_FRAME_BUFFER - com.android.browser.permission.READ_HISTORY_BOOKMARKS + com.android.browser.permission.READ_HISTORY_BOOKMARKS - android.permission.READ_INPUT_STATE + android.permission.READ_INPUT_STATE - android.permission.READ_LOGS + android.permission.READ_LOGS - android.permission.READ_OWNER_DATA + android.permission.READ_OWNER_DATA - android.permission.READ_PHONE_STATE + android.permission.READ_PHONE_STATE - android.permission.READ_SMS + android.permission.READ_SMS - android.permission.READ_SYNC_SETTINGS + android.permission.READ_SYNC_SETTINGS - android.permission.READ_SYNC_STATS + android.permission.READ_SYNC_STATS - android.permission.REBOOT + android.permission.REBOOT - android.permission.RECEIVE_BOOT_COMPLETED + android.permission.RECEIVE_BOOT_COMPLETED - android.permission.RECEIVE_MMS + android.permission.RECEIVE_MMS - android.permission.RECEIVE_SMS + android.permission.RECEIVE_SMS - android.permission.RECEIVE_WAP_PUSH + android.permission.RECEIVE_WAP_PUSH - android.permission.RECORD_AUDIO + android.permission.RECORD_AUDIO - android.permission.REORDER_TASKS + android.permission.REORDER_TASKS - android.permission.RESTART_PACKAGES + android.permission.RESTART_PACKAGES - android.permission.SEND_SMS + android.permission.SEND_SMS - android.permission.SET_ACTIVITY_WATCHER + android.permission.SET_ACTIVITY_WATCHER - com.android.alarm.permission.SET_ALARM + com.android.alarm.permission.SET_ALARM - android.permission.SET_ALWAYS_FINISH + android.permission.SET_ALWAYS_FINISH - android.permission.SET_ANIMATION_SCALE + android.permission.SET_ANIMATION_SCALE - android.permission.SET_DEBUG_APP + android.permission.SET_DEBUG_APP - android.permission.SET_ORIENTATION + android.permission.SET_ORIENTATION - android.permission.SET_PREFERRED_APPLICATIONS + android.permission.SET_PREFERRED_APPLICATIONS - android.permission.SET_PROCESS_LIMIT + android.permission.SET_PROCESS_LIMIT - android.permission.SET_TIME + android.permission.SET_TIME - android.permission.SET_TIME_ZONE + android.permission.SET_TIME_ZONE - android.permission.SET_WALLPAPER + android.permission.SET_WALLPAPER - android.permission.SET_WALLPAPER_HINTS + android.permission.SET_WALLPAPER_HINTS - android.permission.SIGNAL_PERSISTENT_PROCESSES + android.permission.SIGNAL_PERSISTENT_PROCESSES - android.permission.STATUS_BAR + android.permission.STATUS_BAR - android.permission.SUBSCRIBED_FEEDS_READ + android.permission.SUBSCRIBED_FEEDS_READ - android.permission.SUBSCRIBED_FEEDS_WRITE + android.permission.SUBSCRIBED_FEEDS_WRITE - android.permission.SYSTEM_ALERT_WINDOW + android.permission.SYSTEM_ALERT_WINDOW - android.permission.UPDATE_DEVICE_STATS + android.permission.UPDATE_DEVICE_STATS - android.permission.USE_CREDENTIALS + android.permission.USE_CREDENTIALS - android.permission.USE_SIP + android.permission.USE_SIP - android.permission.VIBRATE + android.permission.VIBRATE - android.permission.WAKE_LOCK + android.permission.WAKE_LOCK - android.permission.WRITE_APN_SETTINGS + android.permission.WRITE_APN_SETTINGS - android.permission.WRITE_CALENDAR + android.permission.WRITE_CALENDAR - android.permission.WRITE_CONTACTS + android.permission.WRITE_CONTACTS - android.permission.WRITE_EXTERNAL_STORAGE + android.permission.WRITE_EXTERNAL_STORAGE - android.permission.WRITE_GSERVICES + android.permission.WRITE_GSERVICES - com.android.browser.permission.WRITE_HISTORY_BOOKMARKS + com.android.browser.permission.WRITE_HISTORY_BOOKMARKS - android.permission.WRITE_OWNER_DATA + android.permission.WRITE_OWNER_DATA - android.permission.WRITE_SECURE_SETTINGS + android.permission.WRITE_SECURE_SETTINGS - android.permission.WRITE_SETTINGS + android.permission.WRITE_SETTINGS - android.permission.WRITE_SMS + android.permission.WRITE_SMS - android.permission.WRITE_SYNC_SETTINGS + android.permission.WRITE_SYNC_SETTINGS diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 36a9c3ecaf3..5c61c7d89c2 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -88,7 +88,8 @@ QList AndroidQtVersion::detectQtAbis() const QString AndroidQtVersion::description() const { - return tr("Android::Internal::AndroidQtVersion", "Qt Version is meant for Android"); + //: Qt Version is meant for Android + return tr("Android"); } Core::FeatureSet AndroidQtVersion::availableFeatures() const diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 1592cfcb939..9dfbce194bb 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -78,6 +78,7 @@ QVariant AVDModel::headerData(int section, Qt::Orientation orientation, int role if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { switch (section) { case 0: + //: AVD - Android Virtual Device return tr("AVD Name"); case 1: return tr("AVD Target"); @@ -356,7 +357,7 @@ void AndroidSettingsWidget::browseAntLocation() void AndroidSettingsWidget::browseGdbLocation() { Utils::FileName gdbPath = AndroidConfigurations::instance().gdbPath(ProjectExplorer::Abi::ArmArchitecture); - Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdb executable"), gdbPath.toString())); + Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Executable"), gdbPath.toString())); if (file.isEmpty()) return; m_ui->GdbLocationLineEdit->setText(file.toUserOutput()); @@ -366,7 +367,7 @@ void AndroidSettingsWidget::browseGdbLocation() void AndroidSettingsWidget::browseGdbserverLocation() { Utils::FileName gdbserverPath = AndroidConfigurations::instance().gdbServerPath(ProjectExplorer::Abi::ArmArchitecture); - Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdbserver android executable"), gdbserverPath.toString())); + Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Server Android Executable"), gdbserverPath.toString())); if (file.isEmpty()) return; m_ui->GdbserverLocationLineEdit->setText(file.toUserOutput()); @@ -376,7 +377,7 @@ void AndroidSettingsWidget::browseGdbserverLocation() void AndroidSettingsWidget::browseGdbLocationX86() { Utils::FileName gdbPath = AndroidConfigurations::instance().gdbPath(ProjectExplorer::Abi::X86Architecture); - Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdb executable"), gdbPath.toString())); + Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Executable"), gdbPath.toString())); if (file.isEmpty()) return; m_ui->GdbLocationLineEditx86->setText(file.toUserOutput()); @@ -386,7 +387,7 @@ void AndroidSettingsWidget::browseGdbLocationX86() void AndroidSettingsWidget::browseGdbserverLocationX86() { Utils::FileName gdbserverPath = AndroidConfigurations::instance().gdbServerPath(ProjectExplorer::Abi::X86Architecture); - Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select gdbserver android executable"), gdbserverPath.toString())); + Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select GDB Server Android Executable"), gdbserverPath.toString())); if (file.isEmpty()) return; m_ui->GdbserverLocationLineEditx86->setText(file.toUserOutput()); @@ -396,7 +397,7 @@ void AndroidSettingsWidget::browseGdbserverLocationX86() void AndroidSettingsWidget::browseOpenJDKLocation() { Utils::FileName openJDKPath = AndroidConfigurations::instance().openJDKPath(); - Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select OpenJDK path"), openJDKPath.toString())); + Utils::FileName file = Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Select OpenJDK Path"), openJDKPath.toString())); if (file.isEmpty()) return; m_ui->OpenJDKLocationLineEdit->setText(file.toUserOutput()); diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index d4ca2a469bc..0fca6e8a43e 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -178,7 +178,7 @@ void AndroidToolChain::setQtVersionId(int id) setTargetAbi(version->qtAbis().at(0)); toolChainUpdated(); - setDisplayName(AndroidToolChainFactory::tr("Android Gcc for %1").arg(version->displayName())); + setDisplayName(AndroidToolChainFactory::tr("Android GCC for %1").arg(version->displayName())); } int AndroidToolChain::qtVersionId() const diff --git a/src/plugins/qnx/blackberrycreatepackagestep.cpp b/src/plugins/qnx/blackberrycreatepackagestep.cpp index 8b9f8da77a7..4e1e2837634 100644 --- a/src/plugins/qnx/blackberrycreatepackagestep.cpp +++ b/src/plugins/qnx/blackberrycreatepackagestep.cpp @@ -87,7 +87,7 @@ bool BlackBerryCreatePackageStep::init() const QString packageCmd = target()->activeBuildConfiguration()->environment().searchInPath(QLatin1String(PACKAGER_CMD)); if (packageCmd.isEmpty()) { - raiseError(tr("Could not find packager command '%s' in the build environment") + raiseError(tr("Could not find packager command '%1' in the build environment") .arg(QLatin1String(PACKAGER_CMD))); return false; } diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.ui b/src/plugins/qnx/blackberrydeviceconfigurationwidget.ui index 1972ba0eeb3..c8d14acfba2 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.ui +++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.ui @@ -34,7 +34,7 @@ - Device &password + Device &password: pwdLineEdit diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp index 2af97c7694d..fff076867f1 100644 --- a/src/plugins/qnx/qnxqtversion.cpp +++ b/src/plugins/qnx/qnxqtversion.cpp @@ -64,7 +64,8 @@ QString QnxQtVersion::type() const QString QnxQtVersion::description() const { - return tr("QNX %1", "Qt Version is meant for QNX").arg(archString()); + //: Qt Version is meant for QNX + return tr("QNX %1").arg(archString()); } Core::FeatureSet QnxQtVersion::availableFeatures() const @@ -81,12 +82,12 @@ QString QnxQtVersion::platformName() const QString QnxQtVersion::platformDisplayName() const { - return QCoreApplication::tr("QNX"); + return tr("QNX"); } QString QnxQtVersion::sdkDescription() const { - return QCoreApplication::tr("QNX Software Development Platform:"); + return tr("QNX Software Development Platform:"); } QMultiMap QnxQtVersion::environment() const