diff --git a/src/plugins/find/finddialog.ui b/src/plugins/find/finddialog.ui index 9b9ec6f9caf..e61f02292f3 100644 --- a/src/plugins/find/finddialog.ui +++ b/src/plugins/find/finddialog.ui @@ -122,7 +122,7 @@ - Use regular E&xpressions + Use regular e&xpressions diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index bd38e8c40dc..449d4e0b777 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1672,7 +1672,7 @@ bool ProjectExplorerPlugin::coreAboutToClose() if (d->m_buildManager->isBuilding()) { QMessageBox box; QPushButton *closeAnyway = box.addButton(tr("Cancel Build && Close"), QMessageBox::AcceptRole); - QPushButton *cancelClose = box.addButton(tr("Do not Close"), QMessageBox::RejectRole); + QPushButton *cancelClose = box.addButton(tr("Do Not Close"), QMessageBox::RejectRole); box.setDefaultButton(cancelClose); box.setWindowTitle(tr("Close Qt Creator?")); box.setText(tr("A project is currently being built.")); @@ -2063,7 +2063,7 @@ void ProjectExplorerPlugin::addExistingFiles() if (!notAdded.isEmpty()) { QString message = tr("Could not add following files to project %1:\n").arg(projectNode->displayName()); QString files = notAdded.join("\n"); - QMessageBox::warning(core->mainWindow(), tr("Add files to project failed"), + QMessageBox::warning(core->mainWindow(), tr("Adding Files to Project Failed"), message + files); foreach (const QString &file, notAdded) fileNames.removeOne(file); @@ -2086,7 +2086,7 @@ void ProjectExplorerPlugin::addExistingFiles() if (!notAddedToVc.isEmpty()) { const QString message = tr("Could not add following files to version control (%1)\n").arg(vcManager->displayName()); const QString filesNotAdded = notAddedToVc.join(QString(QLatin1Char('\n'))); - QMessageBox::warning(core->mainWindow(), tr("Add files to version control failed"), + QMessageBox::warning(core->mainWindow(), tr("Adding to Version Control Failed"), message + filesNotAdded); } } @@ -2144,7 +2144,7 @@ void ProjectExplorerPlugin::removeFile() Q_ASSERT(projectNode); if (!projectNode->removeFiles(fileNode->fileType(), QStringList(filePath))) { - QMessageBox::warning(core->mainWindow(), tr("Remove File Failed"), + QMessageBox::warning(core->mainWindow(), tr("Removing File Failed"), tr("Could not remove file %1 from project %2.").arg(filePath).arg(projectNode->displayName())); return; } @@ -2159,7 +2159,7 @@ void ProjectExplorerPlugin::removeFile() if (file.exists()) { // could have been deleted by vc if (!file.remove()) - QMessageBox::warning(core->mainWindow(), tr("Delete file failed"), + QMessageBox::warning(core->mainWindow(), tr("Deleting File Failed"), tr("Could not delete file %1.").arg(filePath)); } } @@ -2194,7 +2194,7 @@ void ProjectExplorerPlugin::deleteFile() QFile file(filePath); if (file.exists()) { if (!file.remove()) - QMessageBox::warning(core->mainWindow(), tr("Delete file failed"), + QMessageBox::warning(core->mainWindow(), tr("Deleting File Failed"), tr("Could not delete file %1.").arg(filePath)); } } diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 33a23faf7ce..25199985fb5 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1042,7 +1042,7 @@ void Qt4PriFileNode::changeFiles(const FileType fileType, while (!lines.isEmpty() && lines.last().isEmpty()) lines.removeLast(); } else { - m_project->proFileParseError(tr("Error while reading PRO file %1: %2") + m_project->proFileParseError(tr("Error while reading .pro file %1: %2") .arg(m_projectFilePath, qfile.errorString())); return; } diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui index bb75e9ba569..5e58283012c 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.ui +++ b/src/plugins/qt4projectmanager/qtversionmanager.ui @@ -149,11 +149,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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Unable to detect MSVC version.</span></p></body></html> + Unable to detect MSVC version. diff --git a/src/plugins/vcsbase/nicknamedialog.ui b/src/plugins/vcsbase/nicknamedialog.ui index 0f464abc75b..21c157365e2 100644 --- a/src/plugins/vcsbase/nicknamedialog.ui +++ b/src/plugins/vcsbase/nicknamedialog.ui @@ -11,7 +11,7 @@ - Nick Names + Nicknames diff --git a/src/shared/help/bookmarkdialog.ui b/src/shared/help/bookmarkdialog.ui index 7a878f96568..18c9f985e57 100644 --- a/src/shared/help/bookmarkdialog.ui +++ b/src/shared/help/bookmarkdialog.ui @@ -1,7 +1,8 @@ - + + BookmarkDialog - - + + 0 0 @@ -9,66 +10,66 @@ 135 - - + + 0 0 - + Add Bookmark - + - + - + - - + + Bookmark: - - - Add in Folder: + + + Add in folder: - + - + - + - + - - + + 25 20 - + + - - + + Qt::Horizontal @@ -76,9 +77,9 @@ - - - + + + 0 0 @@ -86,20 +87,20 @@ - + - - + + New Folder - - + + Qt::Horizontal - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -116,11 +117,11 @@ BookmarkDialog accept() - + 248 254 - + 157 274 @@ -132,11 +133,11 @@ BookmarkDialog reject() - + 316 260 - + 286 274 diff --git a/src/shared/qrceditor/qrceditor.cpp b/src/shared/qrceditor/qrceditor.cpp index 8cb7303a885..54f7e2a44cd 100644 --- a/src/shared/qrceditor/qrceditor.cpp +++ b/src/shared/qrceditor/qrceditor.cpp @@ -249,7 +249,7 @@ void QrcEditor::resolveLocationIssues(QStringList &files) } if (QFile::exists(copyName)) { if (!QFile::remove(copyName)) { - QMessageBox::critical(this, tr("Overwrite failed"), + QMessageBox::critical(this, tr("Overwriting Failed"), tr("Could not overwrite file %1.") .arg(QDir::toNativeSeparators(copyName))); // Remove file @@ -260,7 +260,7 @@ void QrcEditor::resolveLocationIssues(QStringList &files) } } if (!QFile::copy(file, copyName)) { - QMessageBox::critical(this, tr("Copying failed"), + QMessageBox::critical(this, tr("Copying Failed"), tr("Could not copy the file to %1.") .arg(QDir::toNativeSeparators(copyName))); // Remove file diff --git a/src/shared/qrceditor/resourceview.cpp b/src/shared/qrceditor/resourceview.cpp index 814d044c9bc..9b046ab55f9 100644 --- a/src/shared/qrceditor/resourceview.cpp +++ b/src/shared/qrceditor/resourceview.cpp @@ -399,7 +399,7 @@ QModelIndex ResourceView::addPrefix() QStringList ResourceView::fileNamesToAdd() { - return QFileDialog::getOpenFileNames(this, tr("Open file"), + return QFileDialog::getOpenFileNames(this, tr("Open File"), m_qrcModel->absolutePath(QString()), tr("All files (*)")); } @@ -494,7 +494,7 @@ void ResourceView::changePrefix(const QModelIndex &index) QString dummy; m_qrcModel->getItem(preindex, prefixBefore, dummy); - QString const prefixAfter = QInputDialog::getText(this, tr("Change Prefix"), tr("Input Prefix:"), + QString const prefixAfter = QInputDialog::getText(this, tr("Change Prefix"), tr("Input prefix:"), QLineEdit::Normal, prefixBefore, &ok); if (ok)