diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-05 10:22:45 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-05 10:22:45 +0100 |
| commit | 0619de868110586e8a6561ecbc1d62c80da09501 (patch) | |
| tree | 1a4364a3660f57d5f10ac5a7471d30e3f555c5f4 /src/plugins/vcsbase | |
| parent | 44886ad65a2226511a6b9a4383189e4ab804e47f (diff) | |
| parent | 26f6cbf8b59dffa7f47b315031b7055ec3421315 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/tools/clangpchmanagerbackend/source/taskscheduler.h
Change-Id: I518adaf647df412887c2a372416634359f09ad2a
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 7def2dc94f7..d66759cd171 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -575,7 +575,7 @@ VcsBaseSubmitEditor::PromptSubmitResult message = tr("What do you want to do with these changes?"); } else { message = tr("Cannot %1%2.\nWhat do you want to do?", - "%2 is an optional error message with ': ' prefix. Do not separate it from %1.") + "%2 is an optional error message with ': ' prefix. Don't add space in front.") .arg(commitName.toLower(), errorMessage.isEmpty() ? errorMessage : ": " + errorMessage); } |