diff --git a/src/blockchain_utilities/blockchain_blackball.cpp b/src/blockchain_utilities/blockchain_blackball.cpp index b377558..7eb8706 100644 --- a/src/blockchain_utilities/blockchain_blackball.cpp +++ b/src/blockchain_utilities/blockchain_blackball.cpp @@ -959,7 +959,7 @@ static void open_db(const std::string &filename, MDB_env **env, MDB_txn **txn, M dbr = mdb_env_set_maxdbs(*env, 1); CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to set max env dbs: " + std::string(mdb_strerror(dbr))); const std::string actual_filename = filename; - MINFO("Opening monero blockchain at " << actual_filename); + MINFO("Opening Salvium blockchain at " << actual_filename); dbr = mdb_env_open(*env, actual_filename.c_str(), flags, 0664); CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to open rings database file '" + actual_filename + "': " + std::string(mdb_strerror(dbr))); diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 67eaa4e..89e408e 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -170,7 +170,7 @@ namespace cryptonote }; static const command_line::arg_descriptor arg_check_updates = { "check-updates" - , "Check for new versions of monero: [disabled|notify|download|update]" + , "Check for new versions of Salvium: [disabled|notify|download|update]" , "disabled" }; static const command_line::arg_descriptor arg_fluffy_blocks = { @@ -504,7 +504,7 @@ namespace cryptonote if (boost::filesystem::exists(old_files / "blockchain.bin")) { MWARNING("Found old-style blockchain.bin in " << old_files.string()); - MWARNING("Monero now uses a new format. You can either remove blockchain.bin to start syncing"); + MWARNING("Salvium now uses a new format. You can either remove blockchain.bin to start syncing"); MWARNING("the blockchain anew, or use salvium-blockchain-export and salvium-blockchain-import to"); MWARNING("convert your existing blockchain.bin to the new format. See README.md for instructions."); return false; @@ -1878,7 +1878,7 @@ namespace cryptonote //----------------------------------------------------------------------------------------------- bool core::check_updates() { - static const char software[] = "monero"; + static const char software[] = "salvium"; #ifdef BUILD_TAG static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG); static const char subdir[] = "cli"; // because it can never be simple diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 7b0a5c4..d5a930d 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -2169,8 +2169,8 @@ void wallet2::scan_output(const cryptonote::transaction &tx, bool miner_tx, cons if (!m_encrypt_keys_after_refresh) { boost::optional pwd = m_callback->on_get_password(pool ? "output found in pool" : "output received"); - THROW_WALLET_EXCEPTION_IF(!pwd, error::password_needed, tr("Password is needed to compute key image for incoming monero")); - THROW_WALLET_EXCEPTION_IF(!verify_password(*pwd), error::password_needed, tr("Invalid password: password is needed to compute key image for incoming monero")); + THROW_WALLET_EXCEPTION_IF(!pwd, error::password_needed, tr("Password is needed to compute key image for incoming SALs")); + THROW_WALLET_EXCEPTION_IF(!verify_password(*pwd), error::password_needed, tr("Invalid password: password is needed to compute key image for incoming SALs")); m_encrypt_keys_after_refresh.reset(new wallet_keys_unlocker(*this, m_ask_password == AskPasswordToDecrypt && !m_unattended && !m_watch_only, *pwd)); } } @@ -14908,7 +14908,7 @@ mms::multisig_wallet_state wallet2::get_multisig_wallet_state() const state.num_transfer_details = m_transfers.size(); if (state.multisig) { - THROW_WALLET_EXCEPTION_IF(!m_original_keys_available, error::wallet_internal_error, "MMS use not possible because own original Monero address not available"); + THROW_WALLET_EXCEPTION_IF(!m_original_keys_available, error::wallet_internal_error, "MMS use not possible because own original Salvium address not available"); state.address = m_original_address; state.view_secret_key = m_original_view_secret_key; } diff --git a/src/wallet/wallet_args.cpp b/src/wallet/wallet_args.cpp index 7cb5465..32fca5a 100644 --- a/src/wallet/wallet_args.cpp +++ b/src/wallet/wallet_args.cpp @@ -149,8 +149,7 @@ namespace wallet_args if (command_line::get_arg(vm, command_line::arg_help)) { Print(print) << "Salvium '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL; - Print(print) << wallet_args::tr("This is the command line monero wallet. It needs to connect to a monero\n" - "daemon to work correctly.") << ENDL; + Print(print) << wallet_args::tr("This is the command line Salvium wallet. It needs to connect to a Salvium daemon to work correctly.") << ENDL; Print(print) << wallet_args::tr("Usage:") << ENDL << " " << usage; Print(print) << desc_all; should_terminate = true; diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 598ef0d..9caf7f0 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -320,7 +320,7 @@ namespace tools { MINFO("The daemon is not set up to background mine."); MINFO("With background mining enabled, the daemon will mine when idle and not on battery."); - MINFO("Enabling this supports the network you are using, and makes you eligible for receiving new monero"); + MINFO("Enabling this supports the network you are using, and makes you eligible for receiving new SALs"); MINFO("Set setup-background-mining to 1 in salvium-wallet-cli to change."); return; } @@ -4780,7 +4780,7 @@ int main(int argc, char** argv) { std::tie(vm, should_terminate) = wallet_args::main( argc, argv, "salvium-wallet-rpc [--wallet-file=|--generate-from-json=|--wallet-dir=] [--rpc-bind-port=]", - tools::wallet_rpc_server::tr("This is the RPC monero wallet. It needs to connect to a monero\ndaemon to work correctly."), + tools::wallet_rpc_server::tr("This is the RPC Salvium wallet. It needs to connect to a Salvium daemon to work correctly."), desc_params, po::positional_options_description(), [](const std::string &s, bool emphasis){ tools::scoped_message_writer(emphasis ? epee::console_color_white : epee::console_color_default, true) << s; },