diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:26:56 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:26:56 +0000 |
commit | f1a9aad7893173b0351ad32e684dad6f31598210 (patch) | |
tree | 21373860cc7f22da72e28d97263813f53e450920 /src/wallet.cpp | |
parent | 8b11b682f14f20cf2935c4a5abb4dbd3d508e46e (diff) | |
parent | 8045273a015cc72857ca168b0ad224b3acbbaf8a (diff) | |
download | bitcoin-f1a9aad7893173b0351ad32e684dad6f31598210.tar.xz |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/init.cpp
src/main.cpp
src/serialize.h
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 3c09f3ce3e..c115a53340 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1216,7 +1216,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; } @@ -1224,9 +1224,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; } @@ -1235,7 +1235,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 ""; |