diff options
9 files changed, 26 insertions, 26 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 21cf5d2a81..5c0ad23cc6 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -209,8 +209,8 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer: //TODO configuration name should be part of the cmakeopenprojectwizard bool ok; QString buildConfigurationName = QInputDialog::getText(0, - tr("New configuration"), - tr("New Configuration Name:"), + tr("New Configuration"), + tr("New configuration name:"), QLineEdit::Normal, QString(), &ok); diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index f60d20cb26..ffbf7b2788 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -285,16 +285,16 @@ void CMakeRunPage::initWidgets() if (m_cmakeWizard->cmakeManager()->isCMakeExecutableValid()) { m_cmakeExecutable = 0; } else { - QString text = tr("Please specify the path to the cmake executable. No cmake executable was found in the path."); + QString text = tr("Please specify the path to the CMake executable. No CMake executable was found in the path."); QString cmakeExecutable = m_cmakeWizard->cmakeManager()->cmakeExecutable(); if (!cmakeExecutable.isEmpty()) { QFileInfo fi(cmakeExecutable); if (!fi.exists()) - text += tr(" The cmake executable (%1) does not exist.").arg(cmakeExecutable); + text += tr(" The CMake executable (%1) does not exist.").arg(cmakeExecutable); else if (!fi.isExecutable()) text += tr(" The path %1 is not a executable.").arg(cmakeExecutable); else - text += tr(" The path %1 is not a valid cmake.").arg(cmakeExecutable); + text += tr(" The path %1 is not a valid CMake.").arg(cmakeExecutable); } fl->addRow(new QLabel(text, this)); @@ -340,31 +340,31 @@ void CMakeRunPage::initializePage() if (m_cmakeWizard->existsUpToDateXmlFile()) { m_descriptionLabel->setText( tr("The directory %1 already contains a cbp file, which is recent enough. " - "You can pass special arguments or change the used toolchain here and rerun cmake. " - "Or simply finish the wizard directly").arg(m_buildDirectory)); + "You can pass special arguments or change the used toolchain here and rerun CMake. " + "Or simply finish the wizard directly.").arg(m_buildDirectory)); } else { m_descriptionLabel->setText( - tr("The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running cmake. " - "Some projects require command line arguments to the initial cmake call.").arg(m_buildDirectory)); + tr("The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running CMake. " + "Some projects require command line arguments to the initial CMake call.").arg(m_buildDirectory)); } } else if (m_mode == CMakeRunPage::NeedToUpdate) { m_descriptionLabel->setText(tr("The directory %1 contains an outdated .cbp file. Qt " - "Creator needs to update this file by running cmake. " + "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 " + "add them below. Note that CMake remembers command " "line arguments from the previous runs.").arg(m_buildDirectory)); } else if(m_mode == CMakeRunPage::Recreate) { m_descriptionLabel->setText(tr("The directory %1 specified in a build-configuration, " "does not contain a cbp file. Qt Creator needs to " - "recreate this file, by running cmake. " + "recreate this file, by running CMake. " "Some projects require command line arguments to " - "the initial cmake call. Note that cmake remembers command " + "the initial CMake call. Note that CMake remembers command " "line arguments from the previous runs.").arg(m_buildDirectory)); } else if(m_mode == CMakeRunPage::ChangeDirectory) { m_buildDirectory = m_cmakeWizard->buildDirectory(); - m_descriptionLabel->setText(tr("Qt Creator needs to run cmake in the new build directory. " + m_descriptionLabel->setText(tr("Qt Creator needs to run CMake in the new build directory. " "Some projects require command line arguments to the " - "initial cmake call.")); + "initial CMake call.")); } else if (m_mode == CMakeRunPage::WantToUpdate) { m_descriptionLabel->setText(tr("Refreshing cbp file in %1.").arg(m_buildDirectory)); } @@ -466,7 +466,7 @@ void CMakeRunPage::runCMake() } else { m_runCMake->setEnabled(true); m_argumentsLineEdit->setEnabled(true); - m_output->appendPlainText(tr("No valid cmake executable specified.")); + m_output->appendPlainText(tr("No valid CMake executable specified.")); } } diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index d511f951d9..8daf3947d9 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -345,7 +345,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration * boxlayout->addWidget(m_workingDirectoryEdit); boxlayout->addWidget(resetButton); - fl->addRow(tr("Working Directory:"), boxlayout); + fl->addRow(tr("Working directory:"), boxlayout); QWidget *debuggerLabelWidget = new QWidget(this); QVBoxLayout *debuggerLabelLayout = new QVBoxLayout(debuggerLabelWidget); diff --git a/src/plugins/debugger/attachcoredialog.ui b/src/plugins/debugger/attachcoredialog.ui index 513b12eeab..6fa4f764d9 100644 --- a/src/plugins/debugger/attachcoredialog.ui +++ b/src/plugins/debugger/attachcoredialog.ui @@ -38,7 +38,7 @@ <item row="1" column="0"> <widget class="QLabel" name="coreLabel"> <property name="text"> - <string>Core File:</string> + <string>Core file:</string> </property> </widget> </item> diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp index 1fd45537a8..6f0740e08f 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp @@ -173,8 +173,8 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(ProjectExplorer::Ta // wizards will show up, that incorporate choosing the name bool ok; QString buildConfigurationName = QInputDialog::getText(0, - tr("New configuration"), - tr("New Configuration Name:"), + tr("New Configuration"), + tr("New configuration name:"), QLineEdit::Normal, QString(), &ok); diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp index 1790072cce..8b589fc059 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp @@ -359,7 +359,7 @@ void BuildSettingsWidget::cloneConfiguration(BuildConfiguration *sourceConfigura return; //: Title of a the cloned BuildConfiguration window, text of the window - QString newDisplayName(QInputDialog::getText(this, tr("Clone configuration"), tr("New Configuration Name:"))); + QString newDisplayName(QInputDialog::getText(this, tr("Clone Configuration"), tr("New configuration name:"))); if (newDisplayName.isEmpty()) return; diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp index f66b167309..8ad1bf897d 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp @@ -98,7 +98,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE m_workingDirectory = new CustomDirectoryPathChooser(this); m_workingDirectory->setExpectedKind(Utils::PathChooser::Directory); - layout->addRow(tr("Working Directory:"), m_workingDirectory); + layout->addRow(tr("Working directory:"), m_workingDirectory); m_useTerminalCheck = new QCheckBox(tr("Run in &Terminal"), this); layout->addRow(QString(), m_useTerminalCheck); diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index ffbad6ab2b..a6403ccf0f 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -700,8 +700,8 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(ProjectExplorer::Target bool ok; QString buildConfigurationName = QInputDialog::getText(0, - tr("New configuration"), - tr("New Configuration Name:"), + tr("New Configuration"), + tr("New configuration name:"), QLineEdit::Normal, version->displayName(), &ok); diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index 21406b0647..6433c06e18 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -692,8 +692,8 @@ void BookmarkManager::removeBookmarkItem(QTreeView *treeView, QString data = index.data(Qt::UserRole + 10).toString(); if (data == QLatin1String("Folder") && item->rowCount() > 0) { int value = QMessageBox::question(treeView, tr("Remove"), - tr("You are going to delete a Folder which will also<br>" - "remove its content. Are you sure you would like to continue?"), + tr("Deleting a folder also removes its content.<br>" + "Do you want to continue?"), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel); if (value == QMessageBox::Cancel) |