diff --git a/src/util/error.cpp b/src/util/error.cpp index 311b46487..471bfbc84 100644 --- a/src/util/error.cpp +++ b/src/util/error.cpp @@ -1,55 +1,55 @@ // Copyright (c) 2010-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include #include #include #include bilingual_str TransactionErrorString(const TransactionError error) { switch (error) { case TransactionError::OK: return Untranslated("No error"); case TransactionError::MISSING_INPUTS: return Untranslated("Missing inputs"); case TransactionError::ALREADY_IN_CHAIN: return Untranslated("Transaction already in block chain"); case TransactionError::P2P_DISABLED: return Untranslated( "Peer-to-peer functionality missing or disabled"); case TransactionError::MEMPOOL_REJECTED: - return Untranslated("Transaction rejected by AcceptToMemoryPool"); + return Untranslated("Transaction rejected by mempool"); case TransactionError::MEMPOOL_ERROR: - return Untranslated("AcceptToMemoryPool failed"); + return Untranslated("Mempool internal error"); case TransactionError::INVALID_PSBT: return Untranslated("PSBT is not sane"); case TransactionError::PSBT_MISMATCH: return Untranslated( "PSBTs not compatible (different transactions)"); case TransactionError::SIGHASH_MISMATCH: return Untranslated( "Specified sighash value does not match existing value"); case TransactionError::MAX_FEE_EXCEEDED: return Untranslated("Fee exceeds maximum configured by user (e.g. " "-maxtxfee, maxfeerate)"); // no default case, so the compiler can warn about missing cases } assert(false); } bilingual_str ResolveErrMsg(const std::string &optname, const std::string &strBind) { return strprintf(_("Cannot resolve -%s address: '%s'"), optname, strBind); } bilingual_str AmountHighWarn(const std::string &optname) { return strprintf(_("%s is set very high!"), optname); } bilingual_str AmountErrMsg(const std::string &optname, const std::string &strValue) { return strprintf(_("Invalid amount for -%s=: '%s'"), optname, strValue); }