Merge pull request #3336

57c0b1ed Fix typos in various files (Dimitris Apostolou)

3 files changed, 6 insertions, 6 deletions

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 6d941163e..d6fb1edb8 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -1632,7 +1632,7 @@ void wallet2::pull_blocks(uint64_t start_height, uint64_t &blocks_start_height,
     THROW_WALLET_EXCEPTION_IF(*result == CORE_RPC_STATUS_BUSY, tools::error::daemon_busy, "getversion");
     if (*result != CORE_RPC_STATUS_OK)
     {
-      MDEBUG("Cannot determined daemon RPC version, not asking for pruned blocks");
+      MDEBUG("Cannot determine daemon RPC version, not asking for pruned blocks");
       req.prune = false; // old daemon
     }
   }
@@ -2777,9 +2777,9 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
     GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, nettype, uint8_t, Uint, false, static_cast<uint8_t>(m_nettype));
     // The network type given in the program argument is inconsistent with the network type saved in the wallet
     THROW_WALLET_EXCEPTION_IF(static_cast<uint8_t>(m_nettype) != field_nettype, error::wallet_internal_error,
-      (boost::format("%s wallet can not be opened as %s wallet")
-        % (field_nettype == 0 ? "Mainnet" : field_nettype == 1 ? "Testnet" : "Stagenet")
-        % (m_nettype == MAINNET ? "mainnet" : m_nettype == TESTNET ? "testnet" : "stagenet")).str());
+    (boost::format("%s wallet cannot be opened as %s wallet")
+    % (field_nettype == 0 ? "Mainnet" : field_nettype == 1 ? "Testnet" : "Stagenet")
+    % (m_nettype == MAINNET ? "mainnet" : m_nettype == TESTNET ? "testnet" : "stagenet")).str());
   }
   else
   {
diff --git a/src/wallet/wallet_errors.h b/src/wallet/wallet_errors.h
index 892a7922c..214d51cde 100644
--- a/src/wallet/wallet_errors.h
+++ b/src/wallet/wallet_errors.h
@@ -391,7 +391,7 @@ namespace tools
     struct get_tx_pool_error : public refresh_error
     {
       explicit get_tx_pool_error(std::string&& loc)
-        : refresh_error(std::move(loc), "error getting tranaction pool")
+        : refresh_error(std::move(loc), "error getting transaction pool")
       {
       }
 
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 70874c65a..a9d211532 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -2684,7 +2684,7 @@ namespace tools
     }
     else
     {
-      er.message = "Success, but cannot update spent status after import multisig info as dameon is untrusted";
+      er.message = "Success, but cannot update spent status after import multisig info as daemon is untrusted";
     }
 
     return true;