diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-07 11:58:23 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-07 11:58:23 +0100 |
| commit | 5432dd1f5c43d9859e08e6e3a33baf600b33950d (patch) | |
| tree | cdfa0d672607bfa86fae687e774338bc5066bf94 /src/plugins/git/gerrit | |
| parent | d3bb3c09535963eb8b711edb08ee79b7dcc9a393 (diff) | |
| parent | 631d9cd711ed348699bb265b7c9333600c8636e3 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/coreplugin/locator/locator.cpp
src/plugins/imageviewer/imageviewerplugin.cpp
src/plugins/remotelinux/remotelinuxplugin.cpp
src/tools/clangbackend/source/tokeninfo.cpp
tests/unit/unittest/data/highlightingmarks.cpp
Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
Diffstat (limited to 'src/plugins/git/gerrit')
| -rw-r--r-- | src/plugins/git/gerrit/gerritpushdialog.cpp | 18 | ||||
| -rw-r--r-- | src/plugins/git/gerrit/gerritpushdialog.ui | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index b18354905ee..17e36c4fd25 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -226,22 +226,22 @@ void GerritPushDialog::onRemoteChanged(bool force) m_currentSupportsWip = supportsWip; m_ui->wipCheckBox->setEnabled(supportsWip); if (supportsWip) { - m_ui->wipCheckBox->setToolTip(tr("Checked - Mark change as WIP\n" - "Unchecked - Mark change as ready\n" - "Partially checked - Do not change current state")); + m_ui->wipCheckBox->setToolTip(tr("Checked - Mark change as WIP.\n" + "Unchecked - Mark change as ready for review.\n" + "Partially checked - Do not change current state.")); m_ui->draftCheckBox->setTristate(true); if (m_ui->draftCheckBox->checkState() != Qt::Checked) m_ui->draftCheckBox->setCheckState(Qt::PartiallyChecked); - m_ui->draftCheckBox->setToolTip(tr("Checked - Mark change as private\n" - "Unchecked - Unmark change as private\n" - "Partially checked - Do not change current state")); + m_ui->draftCheckBox->setToolTip(tr("Checked - Mark change as private.\n" + "Unchecked - Remove mark.\n" + "Partially checked - Do not change current state.")); } else { - m_ui->wipCheckBox->setToolTip(tr("Supported on Gerrit 2.15 and up")); + m_ui->wipCheckBox->setToolTip(tr("Supported on Gerrit 2.15 and later.")); m_ui->draftCheckBox->setTristate(false); if (m_ui->draftCheckBox->checkState() != Qt::Checked) m_ui->draftCheckBox->setCheckState(Qt::Unchecked); - m_ui->draftCheckBox->setToolTip(tr("Checked - Mark change as draft\n" - "Unchecked - Unmark change as draft")); + m_ui->draftCheckBox->setToolTip(tr("Checked - The change is a draft.\n" + "Unchecked - The change is not a draft.")); } } diff --git a/src/plugins/git/gerrit/gerritpushdialog.ui b/src/plugins/git/gerrit/gerritpushdialog.ui index a72b8d82a61..ff06a8da0f7 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.ui +++ b/src/plugins/git/gerrit/gerritpushdialog.ui @@ -82,14 +82,14 @@ Unchecked - Unmark change as private Semi-checked - Do not change current state</string> </property> <property name="text"> - <string>&Draft/Private</string> + <string>&Draft/private</string> </property> </widget> </item> <item> <widget class="QCheckBox" name="wipCheckBox"> <property name="text"> - <string>&Work-In-Progress</string> + <string>&Work-in-progress</string> </property> <property name="tristate"> <bool>true</bool> |