nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #347

Browse Source 
9b83a43 Update after recent simplewallet string changes (moneromooo-monero)
35378f1 simplewallet: fix context/string order mismatch (moneromooo-monero)
e62692f simplewallet: use unsigned long long instead of size_t in message (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-07-20 12:05:52 +02:00
commit 1737fec297
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 232 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/simplewallet/simplewallet.cpp
View File

@ -1421,9 +1421,9 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
total_fee += ptx_vector[n].fee; total_fee += ptx_vector[n].fee;
} }
std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %u transactions. " std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %llu transactions. "
"This will result in a transaction fee being applied to each transaction, for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % "This will result in a transaction fee being applied to each transaction, for a total fee of %s. Is this okay? (Y/Yes/N/No)")) %
ptx_vector.size() % print_money(total_fee)).str(); ((unsigned long long)ptx_vector.size()) % print_money(total_fee)).str();
std::string accepted = command_line::input_line(prompt_str); std::string accepted = command_line::input_line(prompt_str);
if (accepted != "Y" && accepted != "y" && accepted != "Yes" && accepted != "yes") if (accepted != "Y" && accepted != "y" && accepted != "Yes" && accepted != "yes")
{ {
@ -1552,9 +1552,9 @@ bool simple_wallet::sweep_dust(const std::vector<std::string> &args_)
std::string prompt_str = tr("Sweeping ") + print_money(total_dust); std::string prompt_str = tr("Sweeping ") + print_money(total_dust);
if (ptx_vector.size() > 1) { if (ptx_vector.size() > 1) {
prompt_str = (boost::format(tr("Sweeping %s in %u transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % prompt_str = (boost::format(tr("Sweeping %s in %llu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) %
print_money(total_dust) % print_money(total_dust) %
ptx_vector.size() % ((unsigned long long)ptx_vector.size()) %
print_money(total_fee)).str(); print_money(total_fee)).str();
} }
else { else {

2
src/simplewallet/simplewallet.h
View File

@ -169,7 +169,7 @@ namespace cryptonote
if (std::chrono::milliseconds(1) < current_time - m_print_time || force) if (std::chrono::milliseconds(1) < current_time - m_print_time || force)
{ {
std::cout << QT_TRANSLATE_NOOP("Height ", "cryptonote::simple_wallet") << height << " / " << m_blockchain_height << '\r'; std::cout << QT_TRANSLATE_NOOP("cryptonote::simple_wallet", "Height ") << height << " / " << m_blockchain_height << '\r';
m_print_time = current_time; m_print_time = current_time;
} }
} }

454
translations/monero.ts
View File

File diff suppressed because it is too large Load Diff