Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3093 

d188840c Improved terminology from create to generate (Maxithi)
This commit is contained in:
Riccardo Spagni 2018-01-25 16:49:54 -08:00
parent 0a94399a05 d188840cc2
commit f31f5c9a3e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/simplewallet/simplewallet.cpp
View File

@ -122,7 +122,7 @@ namespace
const command_line::arg_descriptor<std::string> arg_electrum_seed = {"electrum-seed", sw::tr("Specify Electrum seed for wallet recovery/creation"), ""};
const command_line::arg_descriptor<bool> arg_restore_deterministic_wallet = {"restore-deterministic-wallet", sw::tr("Recover wallet using Electrum-style mnemonic seed"), false};
const command_line::arg_descriptor<bool> arg_restore_multisig_wallet = {"restore-multisig-wallet", sw::tr("Recover multisig wallet using Electrum-style mnemonic seed"), false};
const command_line::arg_descriptor<bool> arg_non_deterministic = {"non-deterministic", sw::tr("Create non-deterministic view and spend keys"), false};
const command_line::arg_descriptor<bool> arg_non_deterministic = {"non-deterministic", sw::tr("Generate non-deterministic view and spend keys"), false};
const command_line::arg_descriptor<bool> arg_trusted_daemon = {"trusted-daemon", sw::tr("Enable commands which rely on a trusted daemon"), false};
const command_line::arg_descriptor<bool> arg_allow_mismatched_daemon_version = {"allow-mismatched-daemon-version", sw::tr("Allow communicating with a daemon that uses a different RPC version"), false};
const command_line::arg_descriptor<uint64_t> arg_restore_height = {"restore-height", sw::tr("Restore from specific blockchain height"), 0};

2
src/wallet/wallet2.cpp
View File

@ -357,7 +357,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file,
const bool deprecated_wallet = restore_deterministic_wallet && ((old_language == crypto::ElectrumWords::old_language_name) ||
crypto::ElectrumWords::get_is_old_style_seed(field_seed));
THROW_WALLET_EXCEPTION_IF(deprecated_wallet, tools::error::wallet_internal_error,
tools::wallet2::tr("Cannot create deprecated wallets from JSON"));
tools::wallet2::tr("Cannot generate deprecated wallets from JSON"));
wallet.reset(make_basic(vm, opts, password_prompter).release());
wallet->set_refresh_from_block_height(field_scan_from_height);

4
translations/monero.ts
View File

@ -2367,7 +2367,7 @@ Outputs per *: </source>
</message>
<message>
<location filename="../src/simplewallet/simplewallet.cpp" line="122"/>
<source>Create non-deterministic view and spend keys</source>
<source>Generate non-deterministic view and spend keys</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -2582,7 +2582,7 @@ Outputs per *: </source>
</message>
<message>
<location filename="../src/wallet/wallet2.cpp" line="356"/>
<source>Cannot create deprecated wallets from JSON</source>
<source>Cannot generate deprecated wallets from JSON</source>
<translation type="unfinished"></translation>
</message>
<message>

8
translations/monero_fr.ts
View File

@ -2417,8 +2417,8 @@ Sorties par * : </translation>
</message>
<message>
<location filename="../src/simplewallet/simplewallet.cpp" line="122"/>
<source>Create non-deterministic view and spend keys</source>
<translation>Créer des clés d&apos;audit et de dépense non déterministes</translation>
<source>Generate non-deterministic view and spend keys</source>
<translation>Générer des clés d&apos;audit et de dépense non déterministes</translation>
</message>
<message>
<location filename="../src/simplewallet/simplewallet.cpp" line="123"/>
@ -2632,8 +2632,8 @@ Sorties par * : </translation>
</message>
<message>
<location filename="../src/wallet/wallet2.cpp" line="356"/>
<source>Cannot create deprecated wallets from JSON</source>
<translation>Impossible de créer un portefeuille obsolète à partir de JSON</translation>
<source>Cannot generate deprecated wallets from JSON</source>
<translation>Impossible de générer un portefeuille obsolète à partir de JSON</translation>
</message>
<message>
<location filename="../src/wallet/wallet2.cpp" line="403"/>

4
translations/monero_it.ts
View File

@ -2386,7 +2386,7 @@ Outputs per *: </source>
</message>
<message>
<location filename="../src/simplewallet/simplewallet.cpp" line="122"/>
<source>Create non-deterministic view and spend keys</source>
<source>Generate non-deterministic view and spend keys</source>
<translation>Crea chiavi di visualizzione e chiavi di spesa non-deterministiche</translation>
</message>
<message>
@ -2601,7 +2601,7 @@ Outputs per *: </source>
</message>
<message>
<location filename="../src/wallet/wallet2.cpp" line="356"/>
<source>Cannot create deprecated wallets from JSON</source>
<source>Cannot generate deprecated wallets from JSON</source>
<translation>Impossibile creare portafogli disapprovati da JSON</translation>
</message>
<message>