Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-26 21:29:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4862

Browse Source 
3998a937 Enhance help text for print_ring. (Tadeas Moravec)
3900fb77 Enhance help text for incoming_transfers. (Tadeas Moravec)
This commit is contained in:
Riccardo Spagni 2018-12-04 17:09:40 +02:00
commit eba668c6ad
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
6 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/simplewallet/simplewallet.cpp
View File

@ -1409,7 +1409,7 @@ bool simple_wallet::print_ring(const std::vector<std::string> &args)
crypto::hash txid; crypto::hash txid;
if (args.size() != 1) if (args.size() != 1)
{ {
fail_msg_writer() << tr("usage: print_ring <key_image|txid>"); fail_msg_writer() << tr("usage: print_ring <key_image> | <txid>");
return true; return true;
} }
@ -2348,7 +2348,9 @@ simple_wallet::simple_wallet()
m_cmd_binder.set_handler("incoming_transfers", m_cmd_binder.set_handler("incoming_transfers",
boost::bind(&simple_wallet::show_incoming_transfers, this, _1), boost::bind(&simple_wallet::show_incoming_transfers, this, _1),
tr("incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]]"), tr("incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]]"),
tr("Show the incoming transfers, all or filtered by availability and address index.")); tr("Show the incoming transfers, all or filtered by availability and address index.\n\n"
"Output format:\n"
"Amount, Spent(\"T\"|\"F\"), \"locked\"|\"unlocked\", RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image] "));
m_cmd_binder.set_handler("payments", m_cmd_binder.set_handler("payments",
boost::bind(&simple_wallet::show_payments, this, _1), boost::bind(&simple_wallet::show_payments, this, _1),
tr("payments <PID_1> [<PID_2> ... <PID_N>]"), tr("payments <PID_1> [<PID_2> ... <PID_N>]"),
@ -2656,7 +2658,9 @@ simple_wallet::simple_wallet()
m_cmd_binder.set_handler("print_ring", m_cmd_binder.set_handler("print_ring",
boost::bind(&simple_wallet::print_ring, this, _1), boost::bind(&simple_wallet::print_ring, this, _1),
tr("print_ring <key_image> | <txid>"), tr("print_ring <key_image> | <txid>"),
tr("Print the ring(s) used to spend a given key image or transaction (if the ring size is > 1)")); tr("Print the ring(s) used to spend a given key image or transaction (if the ring size is > 1)\n\n"
"Output format:\n"
"Key Image, \"absolute\", list of rings"));
m_cmd_binder.set_handler("set_ring", m_cmd_binder.set_handler("set_ring",
boost::bind(&simple_wallet::set_ring, this, _1), boost::bind(&simple_wallet::set_ring, this, _1),
tr("set_ring <filename> | ( <key_image> absolute|relative <index> [<index>...] )"), tr("set_ring <filename> | ( <key_image> absolute|relative <index> [<index>...] )"),
@ -4440,7 +4444,7 @@ bool simple_wallet::show_incoming_transfers(const std::vector<std::string>& args
{ {
if (args.size() > 3) if (args.size() > 3)
{ {
fail_msg_writer() << tr("usage: incoming_transfers [available|unavailable] [verbose] [index=<N>]"); fail_msg_writer() << tr("usage: incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]]");
return true; return true;
} }
auto local_args = args; auto local_args = args;
@ -4482,7 +4486,7 @@ bool simple_wallet::show_incoming_transfers(const std::vector<std::string>& args
if (local_args.size() > 0) if (local_args.size() > 0)
{ {
fail_msg_writer() << tr("usage: incoming_transfers [available|unavailable] [verbose] [index=<N>]"); fail_msg_writer() << tr("usage: incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]]");
return true; return true;
} }

14
translations/monero.ts
View File

@ -1196,7 +1196,7 @@ This transaction will unlock on block %llu, in approximately %s days (assuming 2
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="1356"/> <location filename="../src/simplewallet/simplewallet.cpp" line="1356"/>
<source>usage: print_ring &lt;key_image|txid&gt;</source> <source>usage: print_ring &lt;key_image&gt; | &lt;txid&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1453,7 +1453,10 @@ This transaction will unlock on block %llu, in approximately %s days (assuming 2
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="2247"/> <location filename="../src/simplewallet/simplewallet.cpp" line="2247"/>
<source>Show the incoming transfers, all or filtered by availability and address index.</source> <source>Show the incoming transfers, all or filtered by availability and address index.
Output format:
Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;locked&quot;|&quot;unlocked&quot;, RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image]</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1976,7 +1979,10 @@ Pending or Failed: &quot;failed&quot;|&quot;pending&quot;, &quot;o
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="2534"/> <location filename="../src/simplewallet/simplewallet.cpp" line="2534"/>
<source>Print the ring(s) used to spend a given key image or transaction (if the ring size is &gt; 1)</source> <source>Print the ring(s) used to spend a given key image or transaction (if the ring size is &gt; 1)
Output format:
Key Image, &quot;absolute&quot;, list of rings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2826,7 +2832,7 @@ your wallet again (your wallet keys are NOT at risk in any case).
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="4317"/> <location filename="../src/simplewallet/simplewallet.cpp" line="4317"/>
<location filename="../src/simplewallet/simplewallet.cpp" line="4359"/> <location filename="../src/simplewallet/simplewallet.cpp" line="4359"/>
<source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N&gt;]</source> <source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N1&gt;[,&lt;N2&gt;[,...]]]</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

18
translations/monero_fr.ts
View File

@ -1541,8 +1541,11 @@ Cette transaction sera déverrouillée au bloc %llu, dans approximativement %s j
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="2247"/> <location filename="../src/simplewallet/simplewallet.cpp" line="2247"/>
<source>Show the incoming transfers, all or filtered by availability and address index.</source> <source>Show the incoming transfers, all or filtered by availability and address index.
<translation>Afficher les transferts entrants, tous ou filtrés par disponibilité et index d&apos;adresse.</translation>
Output format:
Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;locked&quot;|&quot;unlocked&quot;, RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image]</source>
<translation type="unfinished">Afficher les transferts entrants, tous ou filtrés par disponibilité et index d&apos;adresse.</translation>
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="2250"/> <location filename="../src/simplewallet/simplewallet.cpp" line="2250"/>
@ -2271,8 +2274,8 @@ votre portefeuille à nouveau (mais les clés de votre portefeuille ne risquent
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="4317"/> <location filename="../src/simplewallet/simplewallet.cpp" line="4317"/>
<location filename="../src/simplewallet/simplewallet.cpp" line="4359"/> <location filename="../src/simplewallet/simplewallet.cpp" line="4359"/>
<source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N&gt;]</source> <source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N1&gt;[,&lt;N2&gt;[,...]]]</source>
<translation>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N&gt;]</translation> <translation>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N1&gt;[,&lt;N2&gt;[,...]]]</translation>
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="4378"/> <location filename="../src/simplewallet/simplewallet.cpp" line="4378"/>
@ -2984,8 +2987,11 @@ subaddress-lookahead &lt;major&gt;:&lt;minor&gt;
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="2534"/> <location filename="../src/simplewallet/simplewallet.cpp" line="2534"/>
<source>Print the ring(s) used to spend a given key image or transaction (if the ring size is &gt; 1)</source> <source>Print the ring(s) used to spend a given key image or transaction (if the ring size is &gt; 1)
<translation>Afficher le(s) cercle(s) utilisé(s) pour dépenser une image de clé ou une transaction (si la taille de cercle est &gt; 1)</translation>
Output format:
Key Image, &quot;absolute&quot;, list of rings</source>
<translation type="unfinished">Afficher le(s) cercle(s) utilisé(s) pour dépenser une image de clé ou une transaction (si la taille de cercle est &gt; 1)</translation>
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="2537"/> <location filename="../src/simplewallet/simplewallet.cpp" line="2537"/>

9
translations/monero_it.ts
View File

@ -1364,8 +1364,11 @@ Questa transazione verrà sbloccata al blocco %llu, in approssimativamente %s gi
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="1586"/> <location filename="../src/simplewallet/simplewallet.cpp" line="1586"/>
<source>Show the incoming transfers, all or filtered by availability and address index.</source> <source>Show the incoming transfers, all or filtered by availability and address index.
<translation>Mostra i trasferimenti in entrata, tutti o filtrati per disponibilità ed indice di indirizzo.</translation>
Output format:
Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;locked&quot;|&quot;unlocked&quot;, RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image]</source>
<translation type="unfinished">Mostra i trasferimenti in entrata, tutti o filtrati per disponibilità ed indice di indirizzo.</translation>
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="1589"/> <location filename="../src/simplewallet/simplewallet.cpp" line="1589"/>
@ -2191,7 +2194,7 @@ your wallet again (your wallet keys are NOT at risk in any case).
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="3339"/> <location filename="../src/simplewallet/simplewallet.cpp" line="3339"/>
<location filename="../src/simplewallet/simplewallet.cpp" line="3381"/> <location filename="../src/simplewallet/simplewallet.cpp" line="3381"/>
<source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N&gt;]</source> <source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N1&gt;[,&lt;N2&gt;[,...]]]</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

7
translations/monero_ja.ts
View File

@ -1461,7 +1461,10 @@ This transaction will unlock on block %llu, in approximately %s days (assuming 2
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="1586"/> <location filename="../src/simplewallet/simplewallet.cpp" line="1586"/>
<source>Show the incoming transfers, all or filtered by availability and address index.</source> <source>Show the incoming transfers, all or filtered by availability and address index.
Output format:
Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;locked&quot;|&quot;unlocked&quot;, RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image]</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2279,7 +2282,7 @@ your wallet again (your wallet keys are NOT at risk in any case).
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="3339"/> <location filename="../src/simplewallet/simplewallet.cpp" line="3339"/>
<location filename="../src/simplewallet/simplewallet.cpp" line="3381"/> <location filename="../src/simplewallet/simplewallet.cpp" line="3381"/>
<source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N&gt;]</source> <source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N1&gt;[,&lt;N2&gt;[,...]]]</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

11
translations/monero_sv.ts
View File

@ -1469,8 +1469,11 @@ Denna transaktion låses upp vid block %llu, om ungefär %s dagar (förutsatt en
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="1586"/> <location filename="../src/simplewallet/simplewallet.cpp" line="1586"/>
<source>Show the incoming transfers, all or filtered by availability and address index.</source> <source>Show the incoming transfers, all or filtered by availability and address index.
<translation>Visa inkommande överföringar: alla eller filtrerade efter tillgänglighet och adressindex.</translation>
Output format:
Amount, Spent(&quot;T&quot;|&quot;F&quot;), &quot;locked&quot;|&quot;unlocked&quot;, RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image]</source>
<translation type="unfinished">Visa inkommande överföringar: alla eller filtrerade efter tillgänglighet och adressindex.</translation>
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="1589"/> <location filename="../src/simplewallet/simplewallet.cpp" line="1589"/>
@ -2351,8 +2354,8 @@ 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="3339"/> <location filename="../src/simplewallet/simplewallet.cpp" line="3339"/>
<location filename="../src/simplewallet/simplewallet.cpp" line="3381"/> <location filename="../src/simplewallet/simplewallet.cpp" line="3381"/>
<source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N&gt;]</source> <source>usage: incoming_transfers [available|unavailable] [verbose] [index=&lt;N1&gt;[,&lt;N2&gt;[,...]]]</source>
<translation>användning: incoming_transfers [available|unavailable] [verbose] [index=&lt;N&gt;]</translation> <translation>användning: incoming_transfers [available|unavailable] [verbose] [index=&lt;N1&gt;[,&lt;N2&gt;[,...]]]</translation>
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="3400"/> <location filename="../src/simplewallet/simplewallet.cpp" line="3400"/>