highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 07:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source
This commit is contained in:
Luke Dashjr
2012-11-14 21:25:35 +00:00
parent ff31f1fa10 d9b50a8cfd
commit 8045273a01
12 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet.cpp
View File

@@ -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 "";