Merge pull request #345

3c13da5 boost doesn't like %zu for size_t, replace with %u (moneromooo-monero)

2 files changed, 252 insertions, 235 deletions

diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index da5be17e3..b226018d4 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -1356,7 +1356,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &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<std::string> &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 da832ff29..f6209b755 100644
--- a/translations/monero.ts
+++ b/translations/monero.ts
@@ -4,298 +4,310 @@
 <context>
     <name>cryptonote::simple_wallet</name>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="202"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="219"/>
         <source>Commands: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="233"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="250"/>
         <source>This wallet is watch-only and cannot have a seed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="253"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="270"/>
         <source>The wallet is non-deterministic. Cannot display seed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="263"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="280"/>
         <source>This wallet is watch-only and doesn&apos;t have a seed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="268"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="285"/>
         <source>This wallet is non-deterministic and doesn&apos;t have a seed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="275"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="495"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="857"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="864"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="292"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="322"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="556"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="918"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="925"/>
         <source>failed to read wallet password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="283"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="300"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="330"/>
         <source>invalid password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="303"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="315"/>
+        <source>This wallet is watch-only and cannot transfer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="349"/>
         <source>start_mining [&lt;number_of_threads&gt;] - Start mining in daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="304"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="350"/>
         <source>Stop mining in daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="305"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="351"/>
         <source>Save current blockchain data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="306"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="352"/>
         <source>Resynchronize transactions and balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="307"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="353"/>
         <source>Show current wallet balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="308"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="354"/>
         <source>incoming_transfers [available|unavailable] - Show incoming transfers - all of them or filter them by availability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="309"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="355"/>
         <source>payments &lt;payment_id_1&gt; [&lt;payment_id_2&gt; ... &lt;payment_id_N&gt;] - Show payments &lt;payment_id_1&gt;, ... &lt;payment_id_N&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="310"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="356"/>
         <source>Show blockchain height</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="311"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="357"/>
         <source>transfer [&lt;mixin_count&gt;] &lt;addr_1&gt; &lt;amount_1&gt; [&lt;addr_2&gt; &lt;amount_2&gt; ... &lt;addr_N&gt; &lt;amount_N&gt;] [payment_id] - Transfer &lt;amount_1&gt;,... &lt;amount_N&gt; to &lt;address_1&gt;,... &lt;address_N&gt;, respectively. &lt;mixin_count&gt; is the number of transactions yours is indistinguishable from (from 0 to maximum available)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="312"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="358"/>
         <source>Send all dust outputs to the same address with mixin 0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="313"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="359"/>
         <source>set_log &lt;level&gt; - Change current log detalization level, &lt;level&gt; is a number 0-4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="314"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="360"/>
         <source>Show current wallet public address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="315"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="361"/>
         <source>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</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="316"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="362"/>
         <source>Save wallet synchronized data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="317"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="363"/>
         <source>Save watch only keys file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="318"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="364"/>
         <source>Get viewkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="319"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="365"/>
         <source>Get spendkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="320"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="366"/>
         <source>Get deterministic seed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="321"/>
-        <source>available options: seed language - Set wallet seed langage</source>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="368"/>
+        <source>Show this help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="322"/>
-        <source>Show this help</source>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="367"/>
+        <source>available options: seed language - Set wallet seed langage; always-confirm-transfers &lt;1|0&gt; - whether to confirm unsplit txes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="329"/>
-        <source>set: needs an argument. available options: seed</source>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="375"/>
+        <source>set: needs an argument. available options: seed, always-confirm-transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="338"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="384"/>
         <source>set seed: needs an argument. available options: language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="350"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="399"/>
+        <source>set always-confirm-transfers: needs an argument (0 or 1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="411"/>
         <source>set: unrecognized argument(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="358"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="419"/>
         <source>use: set_log &lt;log_level_number_0-4&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="364"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="425"/>
         <source>wrong number format, use: set_log &lt;log_level_number_0-4&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="369"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="430"/>
         <source>wrong number range, use: set_log &lt;log_level_number_0-4&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="384"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="445"/>
         <source>Specify wallet file name (e.g., wallet.bin). If the wallet doesn&apos;t exist, it will be created.
 Wallet file name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="390"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="756"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="451"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="817"/>
         <source>wallet file path not valid: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="409"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="470"/>
         <source>Attempting to generate or restore wallet, but specified file(s) exist.  Exiting to not risk overwriting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="423"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="484"/>
         <source>The wallet doesn&apos;t exist, generating new one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="428"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="489"/>
         <source>Keys file wasn&apos;t found: failed to open wallet: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="442"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="503"/>
         <source>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.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="458"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="519"/>
         <source>you can&apos;t specify daemon host or port several times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="464"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="525"/>
         <source>Specifying more than one of --generate-new-wallet=&quot;wallet_name&quot;, --wallet-file=&quot;wallet_name&quot; and --generate-from-keys doesn&apos;t make sense!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="510"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="571"/>
         <source>Cannot specify both --restore-deterministic-wallet and --non-deterministic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="519"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="580"/>
         <source>specify a recovery parameter with the --electrum-seed=&quot;words list here&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="526"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="587"/>
         <source>electrum-style word list failed verification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="537"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="598"/>
         <source>--generate-from-view-key needs a address:viewkey:filename triple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="547"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="608"/>
         <source>Failed to parse address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="555"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="616"/>
         <source>Failed to parse view key secret key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="609"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="670"/>
         <source>wallet failed to connect to daemon: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="610"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="671"/>
         <source>Daemon either is not started or passed wrong port. Please, make sure that daemon is running or restart the wallet with correct daemon address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="630"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="691"/>
         <source>List of available languages for your wallet&apos;s seed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="639"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="700"/>
         <source>Enter the number corresponding to the language of your choice: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="646"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="651"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="707"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="712"/>
         <source>Invalid language choice passed. Please try again.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="674"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="735"/>
         <source>You had been using a deprecated version of the wallet. Please use the new seed that we provide.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="690"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="751"/>
         <source>Generated new wallet: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="692"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="739"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="753"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="800"/>
         <source>view key: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="696"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="743"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="757"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="804"/>
         <source>failed to generate new wallet: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="709"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="770"/>
         <source>Your wallet has been generated.
 To start synchronizing with the daemon use &quot;refresh&quot; command.
 Use &quot;help&quot; command to see the list of available commands.
@@ -306,509 +318,509 @@ your wallet again. Your wallet key is NOT under risk anyway.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="737"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="798"/>
         <source>Generated new watch-only wallet: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="768"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="829"/>
         <source>Opened watch-only wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="768"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="829"/>
         <source>Opened wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="777"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="838"/>
         <source>You had been using a deprecated version of the wallet. Please proceed to upgrade your wallet.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="790"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="851"/>
         <source>You had been using a deprecated version of the wallet. Your wallet file format is being upgraded now.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="798"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="859"/>
         <source>failed to load wallet: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="807"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="868"/>
         <source>Use &quot;help&quot; command to see the list of available commands.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="817"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="878"/>
         <source>failed to deinit wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="839"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="900"/>
         <source>Wallet data saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="854"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="915"/>
         <source>Password for the new watch-only wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="861"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="922"/>
         <source>Enter new password again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="869"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="930"/>
         <source>passwords do not match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="906"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="967"/>
         <source>invalid arguments. Please use start_mining [&lt;number_of_threads&gt;], &lt;number_of_threads&gt; should be from 1 to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="915"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="976"/>
         <source>Mining started in daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="917"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="978"/>
         <source>mining has NOT been started: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="931"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="992"/>
         <source>Mining stopped in daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="933"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="994"/>
         <source>mining has NOT been stopped: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="947"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1008"/>
         <source>Blockchain saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="949"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1010"/>
         <source>Blockchain can&apos;t be saved: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="961"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="970"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="979"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1022"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1031"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1040"/>
         <source>Height </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="962"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="971"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="980"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1023"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1032"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1041"/>
         <source>transaction </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="963"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1024"/>
         <source>received </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="972"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1033"/>
         <source>spent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="981"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1042"/>
         <source>unsupported transaction format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="990"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1051"/>
         <source>Starting refresh...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1013"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1074"/>
         <source>Refresh done, blocks received: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1018"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1386"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1523"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1079"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1446"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1583"/>
         <source>daemon is busy. Please try later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1022"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1083"/>
         <source>no connection to daemon. Please, make sure daemon is running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1027"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1395"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1532"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1088"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1455"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1592"/>
         <source>RPC error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1032"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1093"/>
         <source>Error refreshing: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1037"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1446"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1583"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1098"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1506"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1643"/>
         <source>internal error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1042"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1451"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1588"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1103"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1511"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1648"/>
         <source>unexpected error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1047"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1456"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1593"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1108"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1516"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1653"/>
         <source>unknown error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1052"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1113"/>
         <source>refresh failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1052"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1113"/>
         <source>Blocks received: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1060"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1121"/>
         <source>balance: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1061"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1122"/>
         <source>unlocked balance: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1062"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1123"/>
         <source>including unlocked dust: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1094"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1134"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1155"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1195"/>
         <source>amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1094"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1155"/>
         <source>spent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1094"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1155"/>
         <source>global index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1094"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1155"/>
         <source>tx id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1110"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1171"/>
         <source>No incoming transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1114"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1175"/>
         <source>No incoming available transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1118"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1179"/>
         <source>No incoming unavailable transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1129"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1190"/>
         <source>expected at least one payment_id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1134"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1195"/>
         <source>payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1134"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1195"/>
         <source>transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1134"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1195"/>
         <source>height</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1134"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1195"/>
         <source>unlock time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1146"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1207"/>
         <source>No payments with id </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1167"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1247"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1228"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1308"/>
         <source>payment id has invalid format, expected 64-character string: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1193"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1254"/>
         <source>failed to get blockchain height: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1219"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1280"/>
         <source>wrong number of arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1225"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1470"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1286"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1530"/>
         <source>This is a watch only wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1280"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1341"/>
         <source>DNSSEC validation passed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1284"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1345"/>
         <source>WARNING: DNSSEC validation was unsuccessful, this address may not be correct!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1287"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1348"/>
         <source>For URL: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1289"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1350"/>
         <source> Monero Address = </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1291"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1352"/>
         <source>Is this OK? (Y/n) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1297"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1358"/>
         <source>yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1297"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1358"/>
         <source>no</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1299"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1360"/>
         <source>You have cancelled the transfer request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1305"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1366"/>
         <source>Failed to get a Monero address from: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1311"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1372"/>
         <source>Not yet supported: Multiple Monero addresses found for given URL: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1315"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1376"/>
         <source>Wrong address: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1322"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1383"/>
         <source>A single transaction cannot use more than one payment id: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1333"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1394"/>
         <source>Failed to set up payment id, though it was decoded correctly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1343"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1404"/>
         <source>amount is wrong: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1344"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1405"/>
         <source>expected number from 0 to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1359"/>
-        <source>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)</source>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1420"/>
+        <source>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)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1365"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1503"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1550"/>
+        <source>Sweeping %s in %u transactions for a total fee of %s.  Is this okay?  (Y/Yes/N/No)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1425"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1563"/>
         <source>Transaction cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1378"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1438"/>
         <source>Money successfully sent, transaction </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1390"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1527"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1450"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1587"/>
         <source>no connection to daemon. Please, make sure daemon is running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1399"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1536"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1459"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1596"/>
         <source>failed to get random outputs to mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1403"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1540"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1463"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1600"/>
         <source>not enough money to transfer, available only %s, transaction amount %s = %s + %s (fee)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1412"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1549"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1472"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1609"/>
         <source>not enough outputs for specified mixin_count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1415"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1552"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1475"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1612"/>
         <source>output amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1415"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1552"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1475"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1612"/>
         <source>found outputs to mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1420"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1557"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1480"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1617"/>
         <source>transaction was not constructed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1424"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1561"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1484"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1621"/>
         <source>transaction %s was rejected by daemon with status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1432"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1569"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1492"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1629"/>
         <source>one of destinations is zero</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1436"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1573"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1496"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1633"/>
         <source>Failed to find a suitable way to split transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1441"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1578"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1501"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1638"/>
         <source>unknown transfer error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1488"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1548"/>
         <source>Sweeping </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1490"/>
-        <source>Sweeping %s in %zu transactions for a total fee of %s.  Is this okay?  (Y/Yes/N/No)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1496"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1556"/>
         <source>Sweeping %s for a total fee of %s.  Is this okay?  (Y/Yes/N/No)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1515"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1575"/>
         <source>Money successfully sent, transaction: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1602"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1662"/>
         <source>wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1622"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1682"/>
         <source>integrated_address only takes one or zero arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1628"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1688"/>
         <source>Random payment ID: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1629"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1689"/>
         <source>Matching integrated address: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1645"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1705"/>
         <source>Integrated address: account %s, payment id %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1650"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1710"/>
         <source>Standard address: account: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1655"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1715"/>
         <source>Failed to parse payment id or address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -816,179 +828,184 @@ your wallet again. Your wallet key is NOT under risk anyway.
 <context>
     <name>sw</name>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="80"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="81"/>
         <source>Use wallet &lt;arg&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="81"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="82"/>
         <source>Generate new wallet and save it to &lt;arg&gt; or &lt;address&gt;.wallet by default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="82"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="83"/>
         <source>Generate wallet from (address:viewkey:filename) and save it to &lt;filename&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="83"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="84"/>
         <source>Use daemon instance at &lt;host&gt;:&lt;port&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="84"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="85"/>
         <source>Use daemon instance at host &lt;arg&gt; instead of localhost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="85"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="86"/>
         <source>Wallet password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="86"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="87"/>
         <source>Specify electrum seed for wallet recovery/creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="87"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="88"/>
         <source>Recover wallet using electrum-style mnemonic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="88"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="89"/>
         <source>creates non-deterministic view and spend keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="89"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="90"/>
         <source>Use daemon instance at port &lt;arg&gt; instead of 8081</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="91"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="92"/>
         <source>Specify log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="92"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="93"/>
         <source>Used to deploy test nets. The daemon must be launched with --testnet flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="93"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="94"/>
         <source>Restricts RPC to view only commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="104"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="105"/>
         <source>daemon is busy. Please try later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="113"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="114"/>
         <source>possible lost connection to daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="194"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="195"/>
         <source>Error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1674"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="209"/>
+        <source>yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1734"/>
         <source>General options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1678"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1738"/>
         <source>Wallet options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1691"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1751"/>
         <source>default_log: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1716"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1723"/>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1754"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1776"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1783"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1814"/>
         <source>wallet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1717"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1777"/>
         <source>Usage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1759"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1819"/>
         <source>Logging at log level %d to %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1769"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1829"/>
         <source>Wallet file not set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1774"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1834"/>
         <source>Daemon address not set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1779"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1839"/>
         <source>Wallet password not set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1800"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1860"/>
         <source>Loading wallet...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1804"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1864"/>
         <source>Loaded ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1808"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1868"/>
         <source>Wallet initialization failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1813"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1873"/>
         <source>Failed to initialize wallet rpc server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1819"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1879"/>
         <source>Starting wallet rpc server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1821"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1881"/>
         <source>Stopped wallet rpc server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1824"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1884"/>
         <source>Storing wallet...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1826"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1886"/>
         <source>Stored ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1830"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1890"/>
         <source>Failed to store wallet: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/simplewallet/simplewallet.cpp" line="1837"/>
+        <location filename="../src/simplewallet/simplewallet.cpp" line="1897"/>
         <source>Failed to initialize wallet</source>
         <translation type="unfinished"></translation>
     </message>