diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-29 08:17:05 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-29 08:17:05 +0100 |
| commit | 242b7bd209ccdfa77875607ee7c6a03bfbe2504e (patch) | |
| tree | 28969d7f8d3a13d3a9667cde57d7e84f8a5d2e2e /src/plugins/git/gitclient.cpp | |
| parent | cd041f3f93937ae0ce229a0c6c71a54ce49991b7 (diff) | |
| parent | b926435576112005dd8ec5bd7d3588a54317ec0e (diff) | |
| download | qt-creator-242b7bd209ccdfa77875607ee7c6a03bfbe2504e.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 764ba726b0..416c29e5d3 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2767,7 +2767,7 @@ void GitClient::continuePreviousGitCommand(const QString &workingDirectory, == GitClient::StatusChanged; } if (!hasChanges) - msgBoxText.prepend(tr("No changes found. ")); + msgBoxText.prepend(tr("No changes found.") + QLatin1Char(' ')); QMessageBox msgBox(QMessageBox::Question, msgBoxTitle, msgBoxText, QMessageBox::NoButton, Core::ICore::mainWindow()); if (hasChanges || isRebase) @@ -2808,7 +2808,7 @@ QString GitClient::extendedShowDescription(const QString &workingDirectory, cons if (branchCount > 20) { const int leave = 10; //: Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" in git show. - moreBranches = tr(" and %n more", 0, branchCount - leave); + moreBranches = QLatin1Char(' ') + tr("and %n more", 0, branchCount - leave); branches.erase(branches.begin() + leave, branches.end()); } if (!branches.isEmpty()) { |