aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-03-14 13:38:50 +0200
committerRiccardo Spagni <ric@spagni.net>2018-03-14 13:38:50 +0200
commitf2e8e8d23cf64ec2300dd3c99647065f841103aa (patch)
treeaead139b7525eee5d6f749103c5c68fb8109a25e
parentMerge pull request #3381 (diff)
parentfix error message typo in wallet2.cpp (diff)
downloadmonero-f2e8e8d23cf64ec2300dd3c99647065f841103aa.tar.xz
Merge pull request #3377
aa8bef0c fix error message typo in wallet2.cpp (cryptochangements34)
-rw-r--r--src/wallet/wallet2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index b0488fc03..d01c22c16 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -324,7 +324,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
// compatibility checks
if (!field_seed_found && !field_viewkey_found && !field_spendkey_found)
{
- THROW_WALLET_EXCEPTION(tools::error::wallet_internal_error, tools::wallet2::tr("At least one of Electrum-style word list and private view key and private spend key must be specified"));
+ THROW_WALLET_EXCEPTION(tools::error::wallet_internal_error, tools::wallet2::tr("At least one of either an Electrum-style word list, private view key, or private spend key must be specified"));
}
if (field_seed_found && (field_viewkey_found || field_spendkey_found))
{