diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp index fcbf29a7406172f8a506106a23ce50b7bff44689..59ab1cadaae452939e0bdbef11a4cbdd8117c1a2 100644 --- a/src/plugins/git/stashdialog.cpp +++ b/src/plugins/git/stashdialog.cpp @@ -104,12 +104,12 @@ StashDialog::StashDialog(QWidget *parent) : ui(new Ui::StashDialog), m_model(new StashModel), m_proxyModel(new QSortFilterProxyModel), - m_deleteAllButton(new QPushButton(tr("Delete all..."))), + m_deleteAllButton(new QPushButton(tr("Delete All..."))), m_deleteSelectionButton(new QPushButton(tr("Delete..."))), m_showCurrentButton(new QPushButton(tr("Show"))), m_restoreCurrentButton(new QPushButton(tr("Restore..."))), //: Restore a git stash to new branch to be created - m_restoreCurrentInBranchButton(new QPushButton(tr("Restore to branch..."))), + m_restoreCurrentInBranchButton(new QPushButton(tr("Restore to Branch..."))), m_refreshButton(new QPushButton(tr("Refresh"))) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -193,7 +193,7 @@ void StashDialog::refresh(const QString &repository, bool force) void StashDialog::deleteAll() { - const QString title = tr("Delete stashes"); + const QString title = tr("Delete Stashes"); if (!ask(title, tr("Do you want to delete all stashes?"))) return; QString errorMessage; @@ -208,7 +208,7 @@ void StashDialog::deleteSelection() { const QList<int> rows = selectedRows(); QTC_ASSERT(!rows.isEmpty(), return) - const QString title = tr("Delete stashes"); + const QString title = tr("Delete Stashes"); if (!ask(title, tr("Do you want to delete %n stash(es)?", 0, rows.size()))) return; QString errorMessage; @@ -262,7 +262,7 @@ static inline QString nextStash(const QString &stash) StashDialog::ModifiedRepositoryAction StashDialog::promptModifiedRepository(const QString &stash) { QMessageBox box(QMessageBox::Question, - tr("Repository modified"), + tr("Repository Modified"), tr("%1 cannot be restored since the repository is modified.\n" "You can choose between stashing the changes or discarding them.").arg(stash), QMessageBox::Cancel, this); diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 1d5aac70b26d6083521e35c965b93c8fefe02bfd..a4faad3778a9cb7a097a9ea9b9b211ab70d7a677 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -647,7 +647,7 @@ bool MercurialPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *sub bool dummyPrompt = mercurialSettings.prompt(); const VCSBase::VCSBaseSubmitEditor::PromptSubmitResult response = - commitEditor->promptSubmit(tr("Close commit editor"), tr("Do you want to commit the changes?"), + commitEditor->promptSubmit(tr("Close Commit Editor"), tr("Do you want to commit the changes?"), tr("Message check failed. Do you want to proceed?"), &dummyPrompt, mercurialSettings.prompt()); diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index b256ba0b2d50a10887fd2f02ab94f29a23de73bf..624a095884fbbf3870ebb53fedc14f41707c4bb7 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -295,7 +295,7 @@ static inline QString actionOpenText(const QFileSystemModel *model, return FolderNavigationWidget::tr("Open"); const QString fileName = model->fileName(index); if (fileName == QLatin1String("..")) - return FolderNavigationWidget::tr("Open parent folder"); + return FolderNavigationWidget::tr("Open Parent Folder"); return FolderNavigationWidget::tr("Open \"%1\"").arg(fileName); } @@ -321,7 +321,7 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev) } // Open file dialog to choose a path starting from current - QAction *actionChooseFolder = menu.addAction(tr("Choose folder...")); + QAction *actionChooseFolder = menu.addAction(tr("Choose Folder...")); QAction *action = menu.exec(ev->globalPos()); if (!action) @@ -333,7 +333,7 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev) return; } if (action == actionChooseFolder) { // Open file dialog - const QString newPath = QFileDialog::getExistingDirectory(this, tr("Choose folder"), currentDirectory()); + const QString newPath = QFileDialog::getExistingDirectory(this, tr("Choose Folder"), currentDirectory()); if (!newPath.isEmpty()) setCurrentDirectory(newPath); return; @@ -357,16 +357,16 @@ QString FolderNavigationWidget::msgGraphicalShellAction() #elif defined(Q_OS_MAC) return tr("Show in Finder..."); #else - return tr("Show containing folder..."); + return tr("Show Containing Folder..."); #endif } QString FolderNavigationWidget::msgTerminalAction() { #ifdef Q_OS_WIN - return tr("Open Command Prompt here..."); + return tr("Open Command Prompt Here..."); #else - return tr("Open Terminal here..."); + return tr("Open Terminal Here..."); #endif } @@ -394,7 +394,7 @@ void FolderNavigationWidget::showInGraphicalShell(QWidget *parent, const QString const QString explorer = Environment::systemEnvironment().searchInPath(QLatin1String("explorer.exe")); if (explorer.isEmpty()) { QMessageBox::warning(parent, - tr("Launching Windows Explorer failed"), + tr("Launching Windows Explorer Failed"), tr("Could not find explorer.exe in path to launch Windows Explorer.")); return; } diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp index d7ca889f84357c9af33a3d53ab8d8ca997f00936..24be946afd96f898f0f8c9422468a0e2ca5aa272 100644 --- a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp +++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp @@ -42,7 +42,7 @@ void XUIFileDialog::runOpenFileDialog(const QString& path, QWidget* parent, QObj if (dir.isNull()) dir = XUIFileDialog::defaultFolder(); - QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Open file"); + QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Open File"); QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(";;"), 0, QFileDialog::ReadOnly); QmlDesigner::Internal::SignalEmitter emitter; @@ -64,7 +64,7 @@ void XUIFileDialog::runSaveFileDialog(const QString& path, QWidget* parent, QObj dialog->setDirectory(dir); dialog->open(receiver, member); #else // !Q_WS_MAC - QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Save file"); + QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Save File"); QString fileName = QFileDialog::getSaveFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(";;")); QmlDesigner::Internal::SignalEmitter emitter; diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp index c885e9739b2ae15f50341aafa1cb3739965d1aae..79cc8c99c8c88a9903e84c8e655be6f4f5cd4f3e 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp +++ b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp @@ -158,7 +158,7 @@ QDialog *PluginManager::createAboutPluginDialog(QWidget *parent) { QDialog *rc = new QDialog(parent); rc->setWindowFlags(rc->windowFlags() & ~Qt::WindowContextHelpButtonHint & Qt::Sheet); - rc->setWindowTitle(QCoreApplication::translate("QmlDesigner::PluginManager", "About plugins")); + rc->setWindowTitle(QCoreApplication::translate("QmlDesigner::PluginManager", "About Plugins")); QTreeView *treeView = new QTreeView; treeView->setModel(createModel(treeView)); treeView->expandAll(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui index 7515271a3159df86f1f6306b844c1a3a2f8568fe..c04735264ab8fc9ff6d519143c8f0ae114ef0725 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui @@ -62,7 +62,7 @@ qlineargradient(spread:pad, x1:0.585, y1:0.0284091, x2:0.517, y2:1, stop:0 rgba( </font> </property> <property name="text"> - <string>Id:</string> + <string>ID:</string> </property> </widget> </item> @@ -82,7 +82,7 @@ qlineargradient(spread:pad, x1:0.585, y1:0.0284091, x2:0.517, y2:1, stop:0 rgba( </font> </property> <property name="text"> - <string>Property Name:</string> + <string>Property name:</string> </property> </widget> </item> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp index 4a9473362f0d5a17c00a1185c0849b1a5aa244c8..bae7dd372298df181ca11c62520fdc1be38c1960 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp @@ -681,8 +681,8 @@ void S60CreatePackageStepConfigWidget::updateFromUi() void S60CreatePackageStepConfigWidget::resetPassphrases() { - QMessageBox msgBox(QMessageBox::Question, tr("Reset passwords"), - tr("Do you want to reset all saved passwords for used keys?"), + QMessageBox msgBox(QMessageBox::Question, tr("Reset Passphrases"), + tr("Do you want to reset all passphrases saved for keys used?"), QMessageBox::Reset|QMessageBox::Cancel, this); if (msgBox.exec() == QMessageBox::Reset) m_signStep->resetPassphrases(); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui index d8309d0f4bbaaced98a2eb8ef1ec3fd89aac5ec3..55aafb1b68e840d2964645697c9793d55a4a8411 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui @@ -98,7 +98,7 @@ <string>Resets saved passphrases for all used keys</string> </property> <property name="text"> - <string>Reset passphrases</string> + <string>Reset Passphrases</string> </property> </widget> </item> diff --git a/src/plugins/regexp/regexpwindow.cpp b/src/plugins/regexp/regexpwindow.cpp index 2c7ea37c5187c7d807a98dc91211deb3e532b77d..d003f89a3342141ca2fc09f9815091cfb1eaf052 100644 --- a/src/plugins/regexp/regexpwindow.cpp +++ b/src/plugins/regexp/regexpwindow.cpp @@ -44,17 +44,17 @@ using namespace RegExp::Internal; RegExpWindow::RegExpWindow(QWidget *parent) : QWidget(parent), patternLabel(new QLabel(tr("&Pattern:"))), - escapedPatternLabel(new QLabel(tr("&Escaped Pattern:"))), - syntaxLabel(new QLabel(tr("&Pattern Syntax:"))), + escapedPatternLabel(new QLabel(tr("&Escaped pattern:"))), + syntaxLabel(new QLabel(tr("&Pattern syntax:"))), textLabel(new QLabel(tr("&Text:"))), patternComboBox (new QComboBox), escapedPatternLineEdit(new QLineEdit), textComboBox(new QComboBox), - caseSensitiveCheckBox(new QCheckBox(tr("Case &Sensitive"))), + caseSensitiveCheckBox(new QCheckBox(tr("Case &sensitive"))), minimalCheckBox(new QCheckBox(tr("&Minimal"))), syntaxComboBox(new QComboBox), - indexLabel(new QLabel(tr("Index of Match:"))), - matchedLengthLabel(new QLabel(tr("Matched Length:"))), + indexLabel(new QLabel(tr("Index of match:"))), + matchedLengthLabel(new QLabel(tr("Matched length:"))), indexEdit(new QLineEdit), matchedLengthEdit(new QLineEdit) { @@ -79,10 +79,10 @@ RegExpWindow::RegExpWindow(QWidget *parent) : mainLayout->addWidget(escapedPatternLabel, 1, 0); mainLayout->addWidget(escapedPatternLineEdit, 1, 1); - syntaxComboBox->addItem(tr("Regular expression v1"), QRegExp::RegExp); - syntaxComboBox->addItem(tr("Regular expression v2"), QRegExp::RegExp2); + syntaxComboBox->addItem(tr("Regular Expression v1"), QRegExp::RegExp); + syntaxComboBox->addItem(tr("Regular Expression v2"), QRegExp::RegExp2); syntaxComboBox->addItem(tr("Wildcard"), QRegExp::Wildcard); - syntaxComboBox->addItem(tr("Fixed string"), QRegExp::FixedString); + syntaxComboBox->addItem(tr("Fixed String"), QRegExp::FixedString); syntaxLabel->setBuddy(syntaxComboBox); @@ -267,14 +267,14 @@ void RegExpWindow::contextMenuEvent(QContextMenuEvent *event) { QMenu menu(this); - QAction *enterQuotedAction = menu.addAction(tr("Enter pattern from code...")); + QAction *enterQuotedAction = menu.addAction(tr("Enter Pattern from Code...")); connect(enterQuotedAction, SIGNAL(triggered()), this, SLOT(enterEscaped())); menu.addSeparator(); - QAction *clearPatternsAction = menu.addAction(tr("Clear patterns")); + QAction *clearPatternsAction = menu.addAction(tr("Clear Patterns")); connect(clearPatternsAction, SIGNAL(triggered()), patternComboBox, SLOT(clear())); - QAction *clearTextsAction = menu.addAction(tr("Clear texts")); + QAction *clearTextsAction = menu.addAction(tr("Clear Text")); connect(clearTextsAction, SIGNAL(triggered()), textComboBox, SLOT(clear())); event->accept(); @@ -283,7 +283,7 @@ void RegExpWindow::contextMenuEvent(QContextMenuEvent *event) void RegExpWindow::enterEscaped() { - const QString escapedPattern = QInputDialog::getText (this, tr("Enter pattern from code"), tr("Pattern")); + const QString escapedPattern = QInputDialog::getText (this, tr("Enter Pattern from Code"), tr("Pattern")); if ( escapedPattern.isEmpty()) return; patternComboBox->lineEdit()->setText(unescapePattern(escapedPattern)); diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 57ab5857a2a6142023d5f86db535715cc1747408..14b395f5873c9953f4803c66560b27cee80e3849 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -581,11 +581,11 @@ void VCSBasePlugin::createRepository() const bool rc = d->m_versionControl->vcsCreateRepository(directory); const QString nativeDir = QDir::toNativeSeparators(directory); if (rc) { - QMessageBox::information(mw, tr("Repository created"), + QMessageBox::information(mw, tr("Repository Created"), tr("A version control repository has been created in %1."). arg(nativeDir)); } else { - QMessageBox::warning(mw, tr("Repository creation failed"), + QMessageBox::warning(mw, tr("Repository Creation Failed"), tr("A version control repository could not be created in %1."). arg(nativeDir)); } diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index ad3b7249022971fba740b99314411728f8532b65..333452b70e0c8e6b749c9daca47d9a0c7cacd19d 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -139,13 +139,13 @@ VCSBaseSubmitEditor::VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *pa m_d->m_widget->addDescriptionEditContextMenuAction(sep); // Run check action if (!settings.submitMessageCheckScript.isEmpty()) { - QAction *checkAction = new QAction(tr("Check message"), this); + QAction *checkAction = new QAction(tr("Check Message"), this); connect(checkAction, SIGNAL(triggered()), this, SLOT(slotCheckSubmitMessage())); m_d->m_widget->addDescriptionEditContextMenuAction(checkAction); } // Insert nick if (!settings.nickNameMailMap.isEmpty()) { - QAction *insertAction = new QAction(tr("Insert name..."), this); + QAction *insertAction = new QAction(tr("Insert Name..."), this); connect(insertAction, SIGNAL(triggered()), this, SLOT(slotInsertNickName())); m_d->m_widget->addDescriptionEditContextMenuAction(insertAction); } @@ -540,7 +540,7 @@ void VCSBaseSubmitEditor::slotCheckSubmitMessage() { QString errorMessage; if (!checkSubmitMessage(&errorMessage)) { - QMessageBox msgBox(QMessageBox::Warning, tr("Submit Message Check failed"), + QMessageBox msgBox(QMessageBox::Warning, tr("Submit Message Check Failed"), errorMessage, QMessageBox::Ok, m_d->m_widget); msgBox.setMinimumWidth(checkDialogMinimumWidth); msgBox.exec();