summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-10-22 17:09:14 +0200
committerLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-10-23 12:53:28 +0000
commit2af989376b84add63f4b9edbee5ac39b042d2801 (patch)
tree72bf9b21c6ba6ffa251e55a6143b3fe28b27857d
parentc7717c204ad6e1c0738e4f7ebf7a938f916b5cb7 (diff)
downloadqt-creator-3.6.0-beta1.tar.gz
CMake: fix UI textv3.6.0-beta1
Change-Id: I6803aa799e495007358dbc5f5ee6b8e1d2c6e874 Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp18
-rw-r--r--src/plugins/cmakeprojectmanager/cmakesettingspage.cpp2
2 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index 507fa1363e..c89765d3c8 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -489,19 +489,19 @@ QByteArray CMakeRunPage::cachedGeneratorFromFile(const QString &cache)
void CMakeRunPage::initializePage()
{
if (m_mode == CMakeRunPage::NeedToUpdate) {
- m_descriptionLabel->setText(tr("The build directory \"%1\" for the buildconfiguration \"%2\" "
+ m_descriptionLabel->setText(tr("The build directory \"%1\" for build configuration \"%2\" "
"for target \"%3\" contains an outdated .cbp file. Qt "
"Creator needs to update this file by running CMake. "
- "If you want to add additional command line arguments, "
- "add them below. Note that CMake remembers command "
- "line arguments from the previous runs.")
+ "You can add command line arguments below. Note that "
+ "CMake remembers command line arguments from the "
+ "previous runs.")
.arg(m_buildDirectory)
.arg(m_buildConfigurationName)
.arg(m_kitName));
} else if (m_mode == CMakeRunPage::Recreate) {
- m_descriptionLabel->setText(tr("The directory \"%1\" specified in the build-configuration \"%2\", "
- "for target \"%3\" does not contain a cbp file. "
- "Qt Creator needs to recreate this file, by running CMake. "
+ m_descriptionLabel->setText(tr("The directory \"%1\" specified in build configuration \"%2\", "
+ "for target \"%3\" does not contain a .cbp file. "
+ "Qt Creator needs to recreate this file by running CMake. "
"Some projects require command line arguments to "
"the initial CMake call. Note that CMake remembers command "
"line arguments from the previous runs.")
@@ -514,7 +514,7 @@ void CMakeRunPage::initializePage()
"Some projects require command line arguments to the "
"initial CMake call."));
} else if (m_mode == CMakeRunPage::WantToUpdate) {
- m_descriptionLabel->setText(tr("Refreshing cbp file in \"%1\" for buildconfiguration \"%2\" "
+ m_descriptionLabel->setText(tr("Refreshing the .cbp file in \"%1\" for build configuration \"%2\" "
"for target \"%3\".")
.arg(m_buildDirectory)
.arg(m_buildConfigurationName)
@@ -597,7 +597,7 @@ void CMakeRunPage::runCMake()
m_runCMake->setEnabled(true);
m_argumentsLineEdit->setEnabled(true);
m_generatorComboBox->setEnabled(true);
- m_output->appendPlainText(tr("Selected Kit has no valid CMake executable specified."));
+ m_output->appendPlainText(tr("Selected kit has no valid CMake executable specified."));
}
}
diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
index 8df23e8f72..c2c6294644 100644
--- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
@@ -392,7 +392,7 @@ public:
m_makeDefButton = new QPushButton(tr("Make Default"), this);
m_makeDefButton->setEnabled(false);
- m_makeDefButton->setToolTip(tr("Set as the default CMake Tool to use when creating a new Kit, or no value is set."));
+ m_makeDefButton->setToolTip(tr("Set as the default CMake Tool to use when creating a new kit or when no value is set."));
m_preferNinjaCheckBox = new QCheckBox(tr("Prefer Ninja generator (CMake 2.8.9 or higher required)"));
m_preferNinjaCheckBox->setChecked(CMakeToolManager::preferNinja());