aboutsummaryrefslogtreecommitdiff
path: root/src/qt/bitcoingui.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-11-14 21:25:35 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-11-14 21:25:35 +0000
commit8045273a015cc72857ca168b0ad224b3acbbaf8a (patch)
tree83d29b870603d38c5a6952791f06393408100f61 /src/qt/bitcoingui.cpp
parentff31f1fa10e2062465520ad8a3ff846c23b7a96f (diff)
parentd9b50a8cfdfa0b327629dc18076dbd1563dfba3e (diff)
downloadbitcoin-8045273a015cc72857ca168b0ad224b3acbbaf8a.tar.xz
Merge branch '0.5.x' into 0.6.0.x
Diffstat (limited to 'src/qt/bitcoingui.cpp')
-rw-r--r--src/qt/bitcoingui.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index d3fa0c6a46..8c86cdaee0 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -612,11 +612,9 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)
void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee)
{
- QString strMessage =
- tr("This transaction is over the size limit. You can still send it for a fee of %1, "
- "which goes to the nodes that process your transaction and helps to support the network. "
- "Do you want to pay the fee?").arg(
- BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, nFeeRequired));
+ QString strMessage = tr("This transaction is over the size limit. You can still send it for a fee of %1, "
+ "which goes to the nodes that process your transaction and helps to support the network. "
+ "Do you want to pay the fee?").arg(BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, nFeeRequired));
QMessageBox::StandardButton retval = QMessageBox::question(
this, tr("Sending..."), strMessage,
QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Yes);