diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:32:36 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:32:36 +0000 |
commit | c6911a9755ef8daf7b9ae7d277c78ebf8e25b230 (patch) | |
tree | 70fc4b026a6bb78f6d152678dfb1092d5914754e /src/wallet.cpp | |
parent | 2857d51fea8a982e2229a4d7b36f56b2d24bf011 (diff) | |
parent | f1a9aad7893173b0351ad32e684dad6f31598210 (diff) | |
download | bitcoin-c6911a9755ef8daf7b9ae7d277c78ebf8e25b230.tar.xz |
Merge branch '0.6.x' into 0.7.x
Conflicts:
src/bitcoinrpc.cpp
src/crypter.h
src/main.cpp
src/qt/bitcoin.cpp
src/qt/qtipcserver.cpp
src/util.cpp
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 1a6a1082b1..1cfc6cab0c 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1329,7 +1329,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; } @@ -1337,9 +1337,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; } @@ -1348,7 +1348,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."); return ""; } |