diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:25:35 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:25:35 +0000 |
commit | 8045273a015cc72857ca168b0ad224b3acbbaf8a (patch) | |
tree | 83d29b870603d38c5a6952791f06393408100f61 /src/wallet.cpp | |
parent | ff31f1fa10e2062465520ad8a3ff846c23b7a96f (diff) | |
parent | d9b50a8cfdfa0b327629dc18076dbd1563dfba3e (diff) | |
download | bitcoin-8045273a015cc72857ca168b0ad224b3acbbaf8a.tar.xz |
Merge branch '0.5.x' into 0.6.0.x
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r-- | src/wallet.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index f0a3066471..fb2fc7efbc 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1207,7 +1207,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, if (IsLocked()) { - string strError = _("Error: Wallet locked, unable to create transaction "); + string strError = _("Error: Wallet locked, unable to create transaction."); printf("SendMoney() : %s", strError.c_str()); return strError; } @@ -1215,9 +1215,9 @@ string CWallet::SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, { string strError; if (nValue + nFeeRequired > GetBalance()) - strError = strprintf(_("Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds "), FormatMoney(nFeeRequired).c_str()); + strError = strprintf(_("Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds."), FormatMoney(nFeeRequired).c_str()); else - strError = _("Error: Transaction creation failed "); + strError = _("Error: Transaction creation failed."); printf("SendMoney() : %s", strError.c_str()); return strError; } @@ -1226,7 +1226,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, return "ABORTED"; if (!CommitTransaction(wtxNew, reservekey)) - return _("Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."); + return _("Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."); MainFrameRepaint(); return ""; |