From 3c13da568d25c544c48e1b0317c9ef08e6bc6fda Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sat, 18 Jul 2015 21:50:34 +0100 Subject: [PATCH] boost doesn't like %zu for size_t, replace with %u --- src/simplewallet/simplewallet.cpp | 4 +- translations/monero.ts | 519 +++++++++++++++--------------- 2 files changed, 270 insertions(+), 253 deletions(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index da5be17e..b226018d 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1356,7 +1356,7 @@ bool simple_wallet::transfer(const std::vector &args_) // if more than one tx necessary, prompt user to confirm if (ptx_vector.size() > 1) { - std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %zu transactions. " + std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %u transactions. " "This will result in a transaction fee being applied to each transaction. Is this okay? (Y/Yes/N/No)")) % ptx_vector.size()).str(); std::string accepted = command_line::input_line(prompt_str); @@ -1487,7 +1487,7 @@ bool simple_wallet::sweep_dust(const std::vector &args_) std::string prompt_str = tr("Sweeping ") + print_money(total_dust); if (ptx_vector.size() > 1) { - prompt_str = (boost::format(tr("Sweeping %s in %zu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % + prompt_str = (boost::format(tr("Sweeping %s in %u transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % print_money(total_dust) % ptx_vector.size() % print_money(total_fee)).str(); diff --git a/translations/monero.ts b/translations/monero.ts index da832ff2..f6209b75 100644 --- a/translations/monero.ts +++ b/translations/monero.ts @@ -4,298 +4,310 @@ cryptonote::simple_wallet - + Commands: - + This wallet is watch-only and cannot have a seed. - + The wallet is non-deterministic. Cannot display seed. - + This wallet is watch-only and doesn't have a seed. - + This wallet is non-deterministic and doesn't have a seed. - - - - + + + + + failed to read wallet password - + + invalid password - + + This wallet is watch-only and cannot transfer. + + + + start_mining [<number_of_threads>] - Start mining in daemon - + Stop mining in daemon - + Save current blockchain data - + Resynchronize transactions and balance - + Show current wallet balance - + incoming_transfers [available|unavailable] - Show incoming transfers - all of them or filter them by availability - + payments <payment_id_1> [<payment_id_2> ... <payment_id_N>] - Show payments <payment_id_1>, ... <payment_id_N> - + Show blockchain height - + transfer [<mixin_count>] <addr_1> <amount_1> [<addr_2> <amount_2> ... <addr_N> <amount_N>] [payment_id] - Transfer <amount_1>,... <amount_N> to <address_1>,... <address_N>, respectively. <mixin_count> is the number of transactions yours is indistinguishable from (from 0 to maximum available) - + Send all dust outputs to the same address with mixin 0 - + set_log <level> - Change current log detalization level, <level> is a number 0-4 - + Show current wallet public address - + Convert a payment ID to an integrated address for the current wallet public address (no arguments use a random payment ID), or display standard addres and payment ID corresponding to an integrated addres - + Save wallet synchronized data - + Save watch only keys file - + Get viewkey - + Get spendkey - + Get deterministic seed - - available options: seed language - Set wallet seed langage - - - - + Show this help - - set: needs an argument. available options: seed + + available options: seed language - Set wallet seed langage; always-confirm-transfers <1|0> - whether to confirm unsplit txes - - set seed: needs an argument. available options: language - - - - - set: unrecognized argument(s) - - - - - use: set_log <log_level_number_0-4> - - - - - wrong number format, use: set_log <log_level_number_0-4> - - - - - wrong number range, use: set_log <log_level_number_0-4> + + set: needs an argument. available options: seed, always-confirm-transfers + set seed: needs an argument. available options: language + + + + + set always-confirm-transfers: needs an argument (0 or 1) + + + + + set: unrecognized argument(s) + + + + + use: set_log <log_level_number_0-4> + + + + + wrong number format, use: set_log <log_level_number_0-4> + + + + + wrong number range, use: set_log <log_level_number_0-4> + + + + Specify wallet file name (e.g., wallet.bin). If the wallet doesn't exist, it will be created. Wallet file name: - - + + wallet file path not valid: - + Attempting to generate or restore wallet, but specified file(s) exist. Exiting to not risk overwriting. - + The wallet doesn't exist, generating new one - + Keys file wasn't found: failed to open wallet: - + PLEASE NOTE: the following 25 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control. - + you can't specify daemon host or port several times - + Specifying more than one of --generate-new-wallet="wallet_name", --wallet-file="wallet_name" and --generate-from-keys doesn't make sense! - + Cannot specify both --restore-deterministic-wallet and --non-deterministic - + specify a recovery parameter with the --electrum-seed="words list here" - + electrum-style word list failed verification - + --generate-from-view-key needs a address:viewkey:filename triple - + Failed to parse address - + Failed to parse view key secret key - + wallet failed to connect to daemon: - + Daemon either is not started or passed wrong port. Please, make sure that daemon is running or restart the wallet with correct daemon address. - + List of available languages for your wallet's seed: - + Enter the number corresponding to the language of your choice: - - + + Invalid language choice passed. Please try again. - + You had been using a deprecated version of the wallet. Please use the new seed that we provide. - + Generated new wallet: - - + + view key: - - + + failed to generate new wallet: - + Your wallet has been generated. To start synchronizing with the daemon use "refresh" command. Use "help" command to see the list of available commands. @@ -306,509 +318,509 @@ your wallet again. Your wallet key is NOT under risk anyway. - + Generated new watch-only wallet: - + Opened watch-only wallet - + Opened wallet - + You had been using a deprecated version of the wallet. Please proceed to upgrade your wallet. - + You had been using a deprecated version of the wallet. Your wallet file format is being upgraded now. - + failed to load wallet: - + Use "help" command to see the list of available commands. - + failed to deinit wallet - + Wallet data saved - + Password for the new watch-only wallet - + Enter new password again - + passwords do not match - + invalid arguments. Please use start_mining [<number_of_threads>], <number_of_threads> should be from 1 to - + Mining started in daemon - + mining has NOT been started: - + Mining stopped in daemon - + mining has NOT been stopped: - + Blockchain saved - + Blockchain can't be saved: - - - + + + Height - - - + + + transaction - + received - + spent - + unsupported transaction format - + Starting refresh... - + Refresh done, blocks received: - - - + + + daemon is busy. Please try later - + no connection to daemon. Please, make sure daemon is running - - - + + + RPC error: - + Error refreshing: - - - + + + internal error: - - - + + + unexpected error: - - - + + + unknown error - + refresh failed: - + Blocks received: - + balance: - + unlocked balance: - + including unlocked dust: - - + + amount - + spent - + global index - + tx id - + No incoming transfers - + No incoming available transfers - + No incoming unavailable transfers - + expected at least one payment_id - + payment - + transaction - + height - + unlock time - + No payments with id - - + + payment id has invalid format, expected 64-character string: - + failed to get blockchain height: - + wrong number of arguments - - + + This is a watch only wallet - + DNSSEC validation passed - + WARNING: DNSSEC validation was unsuccessful, this address may not be correct! - + For URL: - + Monero Address = - + Is this OK? (Y/n) - + yes - + no - + You have cancelled the transfer request - + Failed to get a Monero address from: - + Not yet supported: Multiple Monero addresses found for given URL: - + Wrong address: - + A single transaction cannot use more than one payment id: - + Failed to set up payment id, though it was decoded correctly - + amount is wrong: - + expected number from 0 to - - Your transaction needs to be split into %zu transactions. This will result in a transaction fee being applied to each transaction. Is this okay? (Y/Yes/N/No) + + Your transaction needs to be split into %u transactions. This will result in a transaction fee being applied to each transaction. Is this okay? (Y/Yes/N/No) - - + + Sweeping %s in %u transactions for a total fee of %s. Is this okay? (Y/Yes/N/No) + + + + + Transaction cancelled. - + Money successfully sent, transaction - - + + no connection to daemon. Please, make sure daemon is running. - - + + failed to get random outputs to mix - - + + not enough money to transfer, available only %s, transaction amount %s = %s + %s (fee) - - + + not enough outputs for specified mixin_count - - + + output amount - - + + found outputs to mix - - + + transaction was not constructed - - + + transaction %s was rejected by daemon with status: - - + + one of destinations is zero - - + + Failed to find a suitable way to split transactions - - + + unknown transfer error: - + Sweeping - - Sweeping %s in %zu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No) - - - - + Sweeping %s for a total fee of %s. Is this okay? (Y/Yes/N/No) - + Money successfully sent, transaction: - + wallet - + integrated_address only takes one or zero arguments - + Random payment ID: - + Matching integrated address: - + Integrated address: account %s, payment id %s - + Standard address: account: - + Failed to parse payment id or address @@ -816,179 +828,184 @@ your wallet again. Your wallet key is NOT under risk anyway. sw - + Use wallet <arg> - + Generate new wallet and save it to <arg> or <address>.wallet by default - + Generate wallet from (address:viewkey:filename) and save it to <filename> - + Use daemon instance at <host>:<port> - + Use daemon instance at host <arg> instead of localhost - + Wallet password - + Specify electrum seed for wallet recovery/creation - + Recover wallet using electrum-style mnemonic - + creates non-deterministic view and spend keys - + Use daemon instance at port <arg> instead of 8081 - + Specify log file - + Used to deploy test nets. The daemon must be launched with --testnet flag - + Restricts RPC to view only commands - + daemon is busy. Please try later - + possible lost connection to daemon - + Error: - + + yes + + + + General options - + Wallet options - + default_log: - - - + + + wallet - + Usage: - + Logging at log level %d to %s - + Wallet file not set. - + Daemon address not set. - + Wallet password not set. - + Loading wallet... - + Loaded ok - + Wallet initialization failed: - + Failed to initialize wallet rpc server - + Starting wallet rpc server - + Stopped wallet rpc server - + Storing wallet... - + Stored ok - + Failed to store wallet: - + Failed to initialize wallet