diff options
51 files changed, 79 insertions, 70 deletions
diff --git a/ANONYMITY_NETWORKS.md b/ANONYMITY_NETWORKS.md index 6eede44aa..cb0e378c3 100644 --- a/ANONYMITY_NETWORKS.md +++ b/ANONYMITY_NETWORKS.md @@ -43,11 +43,11 @@ additional peers can be found through typical p2p peerlist sharing. ### Outbound Connections Connecting to an anonymous address requires the command line option -`--proxy` which tells `monerod` the ip/port of a socks proxy provided by a +`--tx-proxy` which tells `monerod` the ip/port of a socks proxy provided by a separate process. On most systems the configuration will look like: -> `--proxy tor,127.0.0.1:9050,10` -> `--proxy i2p,127.0.0.1:9000` +> `--tx-proxy tor,127.0.0.1:9050,10` +> `--tx-proxy i2p,127.0.0.1:9000` which tells `monerod` that ".onion" p2p addresses can be forwarded to a socks proxy at IP 127.0.0.1 port 9050 with a max of 10 outgoing connections and @@ -114,7 +114,7 @@ encryption. Options `--add-exclusive-node` and `--add-peer` recognize ".onion" and ".b32.i2p" addresses, and will properly forward those addresses to the proxy -provided with `--proxy tor,...` or `--proxy i2p,...`. +provided with `--tx-proxy tor,...` or `--tx-proxy i2p,...`. Option `--anonymous-inbound` also recognizes ".onion" and ".b32.i2p" addresses, and will automatically be sent out to outgoing Tor/I2P connections so the peer diff --git a/CMakeLists.txt b/CMakeLists.txt index a8b2569fa..03ede0483 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -620,7 +620,7 @@ else() add_cxx_flag_if_supported(-Wformat-security CXX_SECURITY_FLAGS) # -fstack-protector - if (NOT WIN32 AND NOT OPENBSD) + if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1))) add_c_flag_if_supported(-fstack-protector C_SECURITY_FLAGS) add_cxx_flag_if_supported(-fstack-protector CXX_SECURITY_FLAGS) add_c_flag_if_supported(-fstack-protector-strong C_SECURITY_FLAGS) @@ -628,9 +628,11 @@ else() endif() # New in GCC 8.2 - if (NOT WIN32 AND NOT OPENBSD) + if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1))) add_c_flag_if_supported(-fcf-protection=full C_SECURITY_FLAGS) add_cxx_flag_if_supported(-fcf-protection=full CXX_SECURITY_FLAGS) + endif() + if (NOT WIN32 AND NOT OPENBSD) add_c_flag_if_supported(-fstack-clash-protection C_SECURITY_FLAGS) add_cxx_flag_if_supported(-fstack-clash-protection CXX_SECURITY_FLAGS) endif() @@ -642,8 +644,8 @@ else() endif() # linker - if (NOT WIN32) - # Windows binaries die on startup with PIE + if (NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1))) + # Windows binaries die on startup with PIE when compiled with GCC <9.x add_linker_flag_if_supported(-pie LD_SECURITY_FLAGS) endif() add_linker_flag_if_supported(-Wl,-z,relro LD_SECURITY_FLAGS) @@ -667,6 +669,7 @@ else() if (WIN32) add_linker_flag_if_supported(-Wl,--dynamicbase LD_SECURITY_FLAGS) add_linker_flag_if_supported(-Wl,--nxcompat LD_SECURITY_FLAGS) + add_linker_flag_if_supported(-Wl,--high-entropy-va LD_SECURITY_FLAGS) endif() message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}") diff --git a/contrib/depends/packages/cppzmq.mk b/contrib/depends/packages/cppzmq.mk index 6c0faf084..33178f445 100644 --- a/contrib/depends/packages/cppzmq.mk +++ b/contrib/depends/packages/cppzmq.mk @@ -1,8 +1,8 @@ package=cppzmq -$(package)_version=4.2.3 +$(package)_version=4.4.1 $(package)_download_path=https://github.com/zeromq/cppzmq/archive/ $(package)_file_name=v$($(package)_version).tar.gz -$(package)_sha256_hash=3e6b57bf49115f4ae893b1ff7848ead7267013087dc7be1ab27636a97144d373 +$(package)_sha256_hash=117fc1ca24d98dbe1a60c072cde13be863d429134907797f8e03f654ce679385 $(package)_dependencies=zeromq define $(package)_stage_cmds diff --git a/contrib/depends/packages/zeromq.mk b/contrib/depends/packages/zeromq.mk index f17dbeebe..c3a405a60 100644 --- a/contrib/depends/packages/zeromq.mk +++ b/contrib/depends/packages/zeromq.mk @@ -1,8 +1,8 @@ package=zeromq -$(package)_version=4.1.5 +$(package)_version=4.1.7 $(package)_download_path=https://github.com/zeromq/zeromq4-1/releases/download/v$($(package)_version)/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf +$(package)_sha256_hash=31c383cfcd3be1dc8a66e448c403029e793687e70473b89c4cc0bd626e7da299 $(package)_patches=9114d3957725acd34aa8b8d011585812f3369411.patch 9e6745c12e0b100cd38acecc16ce7db02905e27c.patch define $(package)_set_vars diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt index 339587ffa..1ce7118ad 100644 --- a/src/net/CMakeLists.txt +++ b/src/net/CMakeLists.txt @@ -32,5 +32,5 @@ set(net_headers dandelionpp.h error.h i2p_address.h parse.h socks.h socks_connec tor_address.h zmq.h) monero_add_library(net ${net_sources} ${net_headers}) -target_link_libraries(net common epee ${Boost_ASIO_LIBRARY}) +target_link_libraries(net common epee ${ZMQ_LIB} ${Boost_ASIO_LIBRARY}) diff --git a/src/p2p/net_node.cpp b/src/p2p/net_node.cpp index ae23bb7fd..58c1717e0 100644 --- a/src/p2p/net_node.cpp +++ b/src/p2p/net_node.cpp @@ -144,7 +144,7 @@ namespace nodetool const command_line::arg_descriptor<std::vector<std::string> > arg_p2p_add_exclusive_node = {"add-exclusive-node", "Specify list of peers to connect to only." " If this option is given the options add-priority-node and seed-node are ignored"}; const command_line::arg_descriptor<std::vector<std::string> > arg_p2p_seed_node = {"seed-node", "Connect to a node to retrieve peer addresses, and disconnect"}; - const command_line::arg_descriptor<std::vector<std::string> > arg_proxy = {"proxy", "<network-type>,<socks-ip:port>[,max_connections][,disable_noise] i.e. \"tor,127.0.0.1:9050,100,disable_noise\""}; + const command_line::arg_descriptor<std::vector<std::string> > arg_tx_proxy = {"tx-proxy", "Send local txes through proxy: <network-type>,<socks-ip:port>[,max_connections][,disable_noise] i.e. \"tor,127.0.0.1:9050,100,disable_noise\""}; const command_line::arg_descriptor<std::vector<std::string> > arg_anonymous_inbound = {"anonymous-inbound", "<hidden-service-address>,<[bind-ip:]port>[,max_connections] i.e. \"x.onion,127.0.0.1:18083,100\""}; const command_line::arg_descriptor<bool> arg_p2p_hide_my_port = {"hide-my-port", "Do not announce yourself as peerlist candidate", false, true}; const command_line::arg_descriptor<bool> arg_no_sync = {"no-sync", "Don't synchronize the blockchain with other peers", false}; @@ -167,7 +167,7 @@ namespace nodetool std::vector<proxy> proxies{}; - const std::vector<std::string> args = command_line::get_arg(vm, arg_proxy); + const std::vector<std::string> args = command_line::get_arg(vm, arg_tx_proxy); proxies.reserve(args.size()); for (const boost::string_ref arg : args) @@ -175,11 +175,11 @@ namespace nodetool proxies.emplace_back(); auto next = boost::algorithm::make_split_iterator(arg, boost::algorithm::first_finder(",")); - CHECK_AND_ASSERT_MES(!next.eof() && !next->empty(), boost::none, "No network type for --" << arg_proxy.name); + CHECK_AND_ASSERT_MES(!next.eof() && !next->empty(), boost::none, "No network type for --" << arg_tx_proxy.name); const boost::string_ref zone{next->begin(), next->size()}; ++next; - CHECK_AND_ASSERT_MES(!next.eof() && !next->empty(), boost::none, "No ipv4:port given for --" << arg_proxy.name); + CHECK_AND_ASSERT_MES(!next.eof() && !next->empty(), boost::none, "No ipv4:port given for --" << arg_tx_proxy.name); const boost::string_ref proxy{next->begin(), next->size()}; ++next; @@ -187,7 +187,7 @@ namespace nodetool { if (2 <= count) { - MERROR("Too many ',' characters given to --" << arg_proxy.name); + MERROR("Too many ',' characters given to --" << arg_tx_proxy.name); return boost::none; } @@ -198,7 +198,7 @@ namespace nodetool proxies.back().max_connections = get_max_connections(*next); if (proxies.back().max_connections == 0) { - MERROR("Invalid max connections given to --" << arg_proxy.name); + MERROR("Invalid max connections given to --" << arg_tx_proxy.name); return boost::none; } } @@ -213,7 +213,7 @@ namespace nodetool proxies.back().zone = epee::net_utils::zone::i2p; break; default: - MERROR("Invalid network for --" << arg_proxy.name); + MERROR("Invalid network for --" << arg_tx_proxy.name); return boost::none; } @@ -221,7 +221,7 @@ namespace nodetool std::uint16_t port = 0; if (!epee::string_tools::parse_peer_from_string(ip, port, std::string{proxy}) || port == 0) { - MERROR("Invalid ipv4:port given for --" << arg_proxy.name); + MERROR("Invalid ipv4:port given for --" << arg_tx_proxy.name); return boost::none; } proxies.back().address = ip::tcp::endpoint{ip::address_v4{boost::endian::native_to_big(ip)}, port}; @@ -258,7 +258,7 @@ namespace nodetool inbounds.back().max_connections = get_max_connections(*next); if (inbounds.back().max_connections == 0) { - MERROR("Invalid max connections given to --" << arg_proxy.name); + MERROR("Invalid max connections given to --" << arg_tx_proxy.name); return boost::none; } } diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h index 29db5403e..8d861ce29 100644 --- a/src/p2p/net_node.h +++ b/src/p2p/net_node.h @@ -524,7 +524,7 @@ namespace nodetool extern const command_line::arg_descriptor<std::vector<std::string> > arg_p2p_add_priority_node; extern const command_line::arg_descriptor<std::vector<std::string> > arg_p2p_add_exclusive_node; extern const command_line::arg_descriptor<std::vector<std::string> > arg_p2p_seed_node; - extern const command_line::arg_descriptor<std::vector<std::string> > arg_proxy; + extern const command_line::arg_descriptor<std::vector<std::string> > arg_tx_proxy; extern const command_line::arg_descriptor<std::vector<std::string> > arg_anonymous_inbound; extern const command_line::arg_descriptor<bool> arg_p2p_hide_my_port; extern const command_line::arg_descriptor<bool> arg_no_sync; diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index a5921b8bf..f8094bfa8 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -104,7 +104,7 @@ namespace nodetool command_line::add_arg(desc, arg_p2p_add_priority_node); command_line::add_arg(desc, arg_p2p_add_exclusive_node); command_line::add_arg(desc, arg_p2p_seed_node); - command_line::add_arg(desc, arg_proxy); + command_line::add_arg(desc, arg_tx_proxy); command_line::add_arg(desc, arg_anonymous_inbound); command_line::add_arg(desc, arg_p2p_hide_my_port); command_line::add_arg(desc, arg_no_sync); @@ -475,7 +475,7 @@ namespace nodetool network_zone& zone = add_zone(proxy.zone); if (zone.m_connect != nullptr) { - MERROR("Listed --" << arg_proxy.name << " twice with " << epee::net_utils::zone_to_string(proxy.zone)); + MERROR("Listed --" << arg_tx_proxy.name << " twice with " << epee::net_utils::zone_to_string(proxy.zone)); return false; } zone.m_connect = &socks_connect; @@ -503,7 +503,7 @@ namespace nodetool { if (zone.second.m_connect == nullptr) { - MERROR("Set outgoing peer for " << epee::net_utils::zone_to_string(zone.first) << " but did not set --" << arg_proxy.name); + MERROR("Set outgoing peer for " << epee::net_utils::zone_to_string(zone.first) << " but did not set --" << arg_tx_proxy.name); return false; } } @@ -525,7 +525,7 @@ namespace nodetool if (zone.m_connect == nullptr && tx_relay_zones <= 1) { - MERROR("Listed --" << arg_anonymous_inbound.name << " without listing any --" << arg_proxy.name << ". The latter is necessary for sending origin txes over anonymity networks"); + MERROR("Listed --" << arg_anonymous_inbound.name << " without listing any --" << arg_tx_proxy.name << ". The latter is necessary for sending local txes over anonymity networks"); return false; } diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 5c01e99fb..03693a57c 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -5187,7 +5187,7 @@ void simple_wallet::check_background_mining(const epee::wipeable_string &passwor if (setup == tools::wallet2::BackgroundMiningMaybe) { message_writer() << tr("The daemon is not set up to background mine."); - message_writer() << tr("With background mining enabled, the daemon will mine when idle and not on batttery."); + message_writer() << tr("With background mining enabled, the daemon will mine when idle and not on battery."); message_writer() << tr("Enabling this supports the network you are using, and makes you eligible for receiving new monero"); std::string accepted = input_line(tr("Do you want to do it now? (Y/Yes/N/No): ")); if (std::cin.eof() || !command_line::is_yes(accepted)) { diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 5cebc7c23..9b3e7e8b4 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -390,6 +390,11 @@ std::unique_ptr<tools::wallet2> make_basic(const boost::program_options::variabl { auto parsed = tools::login::parse( command_line::get_arg(vm, opts.daemon_login), false, [password_prompter](bool verify) { + if (!password_prompter) + { + MERROR("Password needed without prompt function"); + return boost::optional<tools::password_container>(); + } return password_prompter("Daemon client password", verify); } ); @@ -3524,6 +3529,7 @@ void wallet2::detach_blockchain(uint64_t height, std::map<std::pair<uint64_t, ui THROW_WALLET_EXCEPTION_IF(it_pk == m_pub_keys.end(), error::wallet_internal_error, "public key not found"); m_pub_keys.erase(it_pk); } + transfers_detached = std::distance(it, m_transfers.end()); m_transfers.erase(it, m_transfers.end()); size_t blocks_detached = m_blockchain.size() - height; diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index c128210c4..ec21b2897 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -288,7 +288,7 @@ namespace tools if (setup == tools::wallet2::BackgroundMiningMaybe) { MINFO("The daemon is not set up to background mine."); - MINFO("With background mining enabled, the daemon will mine when idle and not on batttery."); + 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("Set setup-background-mining to 1 in monero-wallet-cli to change."); return; @@ -307,7 +307,7 @@ namespace tools return; } - MINFO("Background mining enabled. The daemon will mine when idle and not on batttery."); + MINFO("Background mining enabled. The daemon will mine when idle and not on battery."); } //------------------------------------------------------------------------------------------------------------------------------ bool wallet_rpc_server::not_open(epee::json_rpc::error& er) diff --git a/translations/monero.ts b/translations/monero.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero.ts +++ b/translations/monero.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_ar.ts b/translations/monero_ar.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_ar.ts +++ b/translations/monero_ar.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_bg.ts b/translations/monero_bg.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_bg.ts +++ b/translations/monero_bg.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_bn.ts b/translations/monero_bn.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_bn.ts +++ b/translations/monero_bn.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_cat.ts b/translations/monero_cat.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_cat.ts +++ b/translations/monero_cat.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_cs.ts b/translations/monero_cs.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_cs.ts +++ b/translations/monero_cs.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_da.ts b/translations/monero_da.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_da.ts +++ b/translations/monero_da.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_de.ts b/translations/monero_de.ts index c617f8437..f91eb6ffd 100644 --- a/translations/monero_de.ts +++ b/translations/monero_de.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_eo.ts b/translations/monero_eo.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_eo.ts +++ b/translations/monero_eo.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_es.ts b/translations/monero_es.ts index 48e9857b4..a9f684720 100644 --- a/translations/monero_es.ts +++ b/translations/monero_es.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_fa.ts b/translations/monero_fa.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_fa.ts +++ b/translations/monero_fa.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_fi.ts b/translations/monero_fi.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_fi.ts +++ b/translations/monero_fi.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_fr.ts b/translations/monero_fr.ts index 13a4f3759..555944346 100644 --- a/translations/monero_fr.ts +++ b/translations/monero_fr.ts @@ -2944,7 +2944,7 @@ votre portefeuille à nouveau (mais les clés de votre portefeuille ne risquent </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_ga.ts b/translations/monero_ga.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_ga.ts +++ b/translations/monero_ga.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_he.ts b/translations/monero_he.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_he.ts +++ b/translations/monero_he.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_hi.ts b/translations/monero_hi.ts index 13473c4eb..bb3c2cfff 100644 --- a/translations/monero_hi.ts +++ b/translations/monero_hi.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_hr.ts b/translations/monero_hr.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_hr.ts +++ b/translations/monero_hr.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_hu.ts b/translations/monero_hu.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_hu.ts +++ b/translations/monero_hu.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_id.ts b/translations/monero_id.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_id.ts +++ b/translations/monero_id.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_it.ts b/translations/monero_it.ts index 5842a3d4e..2ee5d3aaf 100644 --- a/translations/monero_it.ts +++ b/translations/monero_it.ts @@ -2107,7 +2107,7 @@ di nuovo il tuo portafoglio (le chiavi del tuo portafoglio NON sono in nessun ca </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_ja.ts b/translations/monero_ja.ts index 052949755..33484a46c 100644 --- a/translations/monero_ja.ts +++ b/translations/monero_ja.ts @@ -2153,7 +2153,7 @@ your wallet again (your wallet keys are NOT at risk in any case). </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_kmr.ts b/translations/monero_kmr.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_kmr.ts +++ b/translations/monero_kmr.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_ko.ts b/translations/monero_ko.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_ko.ts +++ b/translations/monero_ko.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_lt.ts b/translations/monero_lt.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_lt.ts +++ b/translations/monero_lt.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_nl.ts b/translations/monero_nl.ts index 48b707f57..4b22d1075 100644 --- a/translations/monero_nl.ts +++ b/translations/monero_nl.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_pl.ts b/translations/monero_pl.ts index ca4505f80..7493cdf18 100644 --- a/translations/monero_pl.ts +++ b/translations/monero_pl.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_pt-br.ts b/translations/monero_pt-br.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_pt-br.ts +++ b/translations/monero_pt-br.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_pt-pt.ts b/translations/monero_pt-pt.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_pt-pt.ts +++ b/translations/monero_pt-pt.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_ro.ts b/translations/monero_ro.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_ro.ts +++ b/translations/monero_ro.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_ru.ts b/translations/monero_ru.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_ru.ts +++ b/translations/monero_ru.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_sk.ts b/translations/monero_sk.ts index 2631ed142..a8653aff6 100644 --- a/translations/monero_sk.ts +++ b/translations/monero_sk.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_sl.ts b/translations/monero_sl.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_sl.ts +++ b/translations/monero_sl.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_sr.ts b/translations/monero_sr.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_sr.ts +++ b/translations/monero_sr.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_sv.ts b/translations/monero_sv.ts index de881a406..cc376f1a7 100644 --- a/translations/monero_sv.ts +++ b/translations/monero_sv.ts @@ -2169,7 +2169,7 @@ din plånbok igen (din plånboks nycklar är dock INTE hotade i vilket fall som </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_tr.ts b/translations/monero_tr.ts index a53baf953..b6d2705f8 100644 --- a/translations/monero_tr.ts +++ b/translations/monero_tr.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_uk.ts b/translations/monero_uk.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_uk.ts +++ b/translations/monero_uk.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_ur.ts b/translations/monero_ur.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_ur.ts +++ b/translations/monero_ur.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_zh-cn.ts b/translations/monero_zh-cn.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_zh-cn.ts +++ b/translations/monero_zh-cn.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_zh-tw.ts b/translations/monero_zh-tw.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_zh-tw.ts +++ b/translations/monero_zh-tw.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/translations/monero_zu.ts.ts b/translations/monero_zu.ts.ts index 05e463f61..1cb820f0b 100644 --- a/translations/monero_zu.ts.ts +++ b/translations/monero_zu.ts.ts @@ -3427,7 +3427,7 @@ By using 'sync' processing of waiting messages with multisig sync info </message> <message> <location filename="../src/simplewallet/simplewallet.cpp" line="4893"/> - <source>With background mining enabled, the daemon will mine when idle and not on batttery.</source> + <source>With background mining enabled, the daemon will mine when idle and not on battery.</source> <translation type="unfinished"></translation> </message> <message> |