summaryrefslogtreecommitdiff
path: root/src/plugins/git/branchdialog.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-07-15 16:16:15 +0200
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2013-07-15 17:10:26 +0200
commitaec9124723a80b9f78e39c505d02dbab49f8120b (patch)
treeb6b4e9479c60a5fb693ffe857157b919ecd6267a /src/plugins/git/branchdialog.cpp
parent42b4e57f5563c15eee39a242c98306cedcd7bc03 (diff)
downloadqt-creator-aec9124723a80b9f78e39c505d02dbab49f8120b.tar.gz
tr()-fixes in git.
- Do concatenate message pieces that may not fit grammatically. - Common message for "Cannot launch". - Add period marker. Change-Id: Ic67b27e30143febebc9153a3cefe523ebfd4bc49 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/branchdialog.cpp')
-rw-r--r--src/plugins/git/branchdialog.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index c425276102..979a3b9004 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -240,12 +240,13 @@ void BranchDialog::remove()
const bool isTag = m_model->isTag(selected);
const bool wasMerged = isTag ? true : m_model->branchIsMerged(selected);
- QString message = tr("Would you like to delete the %1 '%2'?");
+ QString message;
if (isTag)
- message = message.arg(tr("tag"));
+ message = tr("Would you like to delete the tag '%1'?").arg(branchName);
+ else if (wasMerged)
+ message = tr("Would you like to delete the branch '%1'?").arg(branchName);
else
- message = message.arg(wasMerged ? tr("branch") : tr("<b>unmerged</b> branch"));
- message = message.arg(branchName);
+ message = tr("Would you like to delete the <b>unmerged</b> branch '%1'?").arg(branchName);
if (QMessageBox::question(this, isTag ? tr("Delete Tag") : tr("Delete Branch"),
message, QMessageBox::Yes | QMessageBox::No,