nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3377

Browse Source 
aa8bef0c fix error message typo in wallet2.cpp (cryptochangements34)
This commit is contained in:
Riccardo Spagni 2018-03-14 13:38:50 +02:00
commit f2e8e8d23c
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/wallet2.cpp
View File

@ -324,7 +324,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
// compatibility checks // compatibility checks
if (!field_seed_found && !field_viewkey_found && !field_spendkey_found) 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)) if (field_seed_found && (field_viewkey_found || field_spendkey_found))
{ {