diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 784ceffe9..77eacaf16 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1409,7 +1409,7 @@ bool simple_wallet::print_ring(const std::vector &args) crypto::hash txid; if (args.size() != 1) { - fail_msg_writer() << tr("usage: print_ring "); + fail_msg_writer() << tr("usage: print_ring | "); return true; } @@ -2348,7 +2348,9 @@ simple_wallet::simple_wallet() m_cmd_binder.set_handler("incoming_transfers", boost::bind(&simple_wallet::show_incoming_transfers, this, _1), tr("incoming_transfers [available|unavailable] [verbose] [index=[,[,...]]]"), - 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", boost::bind(&simple_wallet::show_payments, this, _1), tr("payments [ ... ]"), @@ -2656,7 +2658,9 @@ simple_wallet::simple_wallet() m_cmd_binder.set_handler("print_ring", boost::bind(&simple_wallet::print_ring, this, _1), tr("print_ring | "), - 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", boost::bind(&simple_wallet::set_ring, this, _1), tr("set_ring | ( absolute|relative [...] )"), @@ -4440,7 +4444,7 @@ bool simple_wallet::show_incoming_transfers(const std::vector& args { if (args.size() > 3) { - fail_msg_writer() << tr("usage: incoming_transfers [available|unavailable] [verbose] [index=]"); + fail_msg_writer() << tr("usage: incoming_transfers [available|unavailable] [verbose] [index=[,[,...]]]"); return true; } auto local_args = args; @@ -4482,7 +4486,7 @@ bool simple_wallet::show_incoming_transfers(const std::vector& args if (local_args.size() > 0) { - fail_msg_writer() << tr("usage: incoming_transfers [available|unavailable] [verbose] [index=]"); + fail_msg_writer() << tr("usage: incoming_transfers [available|unavailable] [verbose] [index=[,[,...]]]"); return true; } diff --git a/translations/monero.ts b/translations/monero.ts index e28a2a058..23eadff84 100644 --- a/translations/monero.ts +++ b/translations/monero.ts @@ -1196,7 +1196,7 @@ This transaction will unlock on block %llu, in approximately %s days (assuming 2 - usage: print_ring <key_image|txid> + usage: print_ring <key_image> | <txid> @@ -1453,7 +1453,10 @@ This transaction will unlock on block %llu, in approximately %s days (assuming 2 - Show the incoming transfers, all or filtered by availability and address index. + Show the incoming transfers, all or filtered by availability and address index. + +Output format: +Amount, Spent("T"|"F"), "locked"|"unlocked", RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image] @@ -1976,7 +1979,10 @@ Pending or Failed: "failed"|"pending", "o - Print the ring(s) used to spend a given key image or transaction (if the ring size is > 1) + Print the ring(s) used to spend a given key image or transaction (if the ring size is > 1) + +Output format: +Key Image, "absolute", list of rings @@ -2826,7 +2832,7 @@ your wallet again (your wallet keys are NOT at risk in any case). - usage: incoming_transfers [available|unavailable] [verbose] [index=<N>] + usage: incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]] diff --git a/translations/monero_fr.ts b/translations/monero_fr.ts index 27c38ee10..238ba17df 100644 --- a/translations/monero_fr.ts +++ b/translations/monero_fr.ts @@ -1541,8 +1541,11 @@ Cette transaction sera déverrouillée au bloc %llu, dans approximativement %s j - Show the incoming transfers, all or filtered by availability and address index. - Afficher les transferts entrants, tous ou filtrés par disponibilité et index d'adresse. + Show the incoming transfers, all or filtered by availability and address index. + +Output format: +Amount, Spent("T"|"F"), "locked"|"unlocked", RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image] + Afficher les transferts entrants, tous ou filtrés par disponibilité et index d'adresse. @@ -2271,8 +2274,8 @@ votre portefeuille à nouveau (mais les clés de votre portefeuille ne risquent - usage: incoming_transfers [available|unavailable] [verbose] [index=<N>] - usage: incoming_transfers [available|unavailable] [verbose] [index=<N>] + usage: incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]] + usage: incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]] @@ -2984,8 +2987,11 @@ subaddress-lookahead <major>:<minor> - Print the ring(s) used to spend a given key image or transaction (if the ring size is > 1) - Afficher le(s) cercle(s) utilisé(s) pour dépenser une image de clé ou une transaction (si la taille de cercle est > 1) + Print the ring(s) used to spend a given key image or transaction (if the ring size is > 1) + +Output format: +Key Image, "absolute", list of rings + Afficher le(s) cercle(s) utilisé(s) pour dépenser une image de clé ou une transaction (si la taille de cercle est > 1) diff --git a/translations/monero_it.ts b/translations/monero_it.ts index 5ab96d7dc..09872fea8 100644 --- a/translations/monero_it.ts +++ b/translations/monero_it.ts @@ -1364,8 +1364,11 @@ Questa transazione verrà sbloccata al blocco %llu, in approssimativamente %s gi - Show the incoming transfers, all or filtered by availability and address index. - Mostra i trasferimenti in entrata, tutti o filtrati per disponibilità ed indice di indirizzo. + Show the incoming transfers, all or filtered by availability and address index. + +Output format: +Amount, Spent("T"|"F"), "locked"|"unlocked", RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image] + Mostra i trasferimenti in entrata, tutti o filtrati per disponibilità ed indice di indirizzo. @@ -2191,7 +2194,7 @@ your wallet again (your wallet keys are NOT at risk in any case). - usage: incoming_transfers [available|unavailable] [verbose] [index=<N>] + usage: incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]] diff --git a/translations/monero_ja.ts b/translations/monero_ja.ts index 17815d982..7305b42f8 100644 --- a/translations/monero_ja.ts +++ b/translations/monero_ja.ts @@ -1461,7 +1461,10 @@ This transaction will unlock on block %llu, in approximately %s days (assuming 2 - Show the incoming transfers, all or filtered by availability and address index. + Show the incoming transfers, all or filtered by availability and address index. + +Output format: +Amount, Spent("T"|"F"), "locked"|"unlocked", RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image] @@ -2279,7 +2282,7 @@ your wallet again (your wallet keys are NOT at risk in any case). - usage: incoming_transfers [available|unavailable] [verbose] [index=<N>] + usage: incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]] diff --git a/translations/monero_sv.ts b/translations/monero_sv.ts index b2387cdb1..26ad43f7b 100644 --- a/translations/monero_sv.ts +++ b/translations/monero_sv.ts @@ -1469,8 +1469,11 @@ Denna transaktion låses upp vid block %llu, om ungefär %s dagar (förutsatt en - Show the incoming transfers, all or filtered by availability and address index. - Visa inkommande överföringar: alla eller filtrerade efter tillgänglighet och adressindex. + Show the incoming transfers, all or filtered by availability and address index. + +Output format: +Amount, Spent("T"|"F"), "locked"|"unlocked", RingCT, Global Index, Transaction Hash, Address Index, [Public Key, Key Image] + Visa inkommande överföringar: alla eller filtrerade efter tillgänglighet och adressindex. @@ -2351,8 +2354,8 @@ din plånbok igen (din plånboks nycklar är dock INTE hotade i vilket fall som - usage: incoming_transfers [available|unavailable] [verbose] [index=<N>] - användning: incoming_transfers [available|unavailable] [verbose] [index=<N>] + usage: incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]] + användning: incoming_transfers [available|unavailable] [verbose] [index=<N1>[,<N2>[,...]]]