Merge pull request #3093

d188840 Improved terminology from create to generate (Maxithi)
monero-project · Jan 26, 2018 · f31f5c9 · f31f5c9
2 parents 0a94399 + d188840
commit f31f5c9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
@@ -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};

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
@@ -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);

diff --git a/translations/monero.ts b/translations/monero.ts
@@ -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>

diff --git a/translations/monero_fr.ts b/translations/monero_fr.ts
@@ -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"/>

diff --git a/translations/monero_it.ts b/translations/monero_it.ts
@@ -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>