github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-11-15 09:23:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.6.x' into 0.7.x

Browse Source 
Conflicts:
	src/bitcoinrpc.cpp
	src/crypter.h
	src/main.cpp
	src/qt/bitcoin.cpp
	src/qt/qtipcserver.cpp
	src/util.cpp
This commit is contained in:
Luke Dashjr
2012-11-14 21:32:36 +00:00
parent 2857d51fea f1a9aad789
commit c6911a9755
19 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet.cpp
+4 -4
View File
@@ -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 "";
}