feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

tr()-fixes in git.

Browse Source 
- 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>
This commit is contained in:
Friedemann Kleint
2013-07-15 16:16:15 +02:00
parent 42b4e57f55
commit aec9124723
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/branchdialog.cpp
View File

@@ -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,