Mercurial > hg > easyhg
comparison src/mainwindow.cpp @ 475:dec4695f64e0
Merge
author | Chris Cannam |
---|---|
date | Tue, 26 Jul 2011 13:42:09 +0100 |
parents | 101d113943c2 |
children | 7e8688784980 |
comparison
equal
deleted
inserted
replaced
474:8bdc8f27d19c | 475:dec4695f64e0 |
---|---|
454 | 454 |
455 if (ConfirmCommentDialog::confirmAndGetLongComment | 455 if (ConfirmCommentDialog::confirmAndGetLongComment |
456 (this, | 456 (this, |
457 cf, | 457 cf, |
458 tr("<h3>%1</h3><p>%2%3").arg(cf) | 458 tr("<h3>%1</h3><p>%2%3").arg(cf) |
459 .arg(tr("You are about to commit the following files to %1:").arg(branchText)) | 459 .arg(tr("You are about to commit changes to the following files in %1:").arg(branchText)) |
460 .arg(subsetNote), | 460 .arg(subsetNote), |
461 tr("<h3>%1</h3><p>%2%3").arg(cf) | 461 tr("<h3>%1</h3><p>%2%3").arg(cf) |
462 .arg(tr("You are about to commit %n file(s) to %1.", "", reportFiles.size()).arg(branchText)) | 462 .arg(tr("You are about to commit changes to %n file(s) in %1.", "", reportFiles.size()).arg(branchText)) |
463 .arg(subsetNote), | 463 .arg(subsetNote), |
464 reportFiles, | 464 reportFiles, |
465 comment, | 465 comment, |
466 tr("Co&mmit"))) { | 466 tr("Co&mmit"))) { |
467 | 467 |