Merge branch 'translation-fixes' of https://github.com/tcatm/bitcoin
This commit is contained in:
commit
aad945f9b1
|
@ -29,7 +29,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*10
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Don't attempt to use UPnP to map the listening port"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Don't attempt to use UPnP to map the listening port"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to use UPnP to map the listening port"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to use UPnP to map the listening port"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Fee per kB to add to transactions you send"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"),
|
||||||
|
@ -82,4 +82,4 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
|
||||||
"Warning: Please check that your computer's date and time are correct. If "
|
"Warning: Please check that your computer's date and time are correct. If "
|
||||||
"your clock is wrong Bitcoin will not work properly."),
|
"your clock is wrong Bitcoin will not work properly."),
|
||||||
QT_TRANSLATE_NOOP("bitcoin-core", "beta"),
|
QT_TRANSLATE_NOOP("bitcoin-core", "beta"),
|
||||||
};
|
};
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -214,7 +214,7 @@ MainOptionsPage::MainOptionsPage(QWidget *parent):
|
||||||
proxy_hbox->addStretch(1);
|
proxy_hbox->addStretch(1);
|
||||||
|
|
||||||
layout->addLayout(proxy_hbox);
|
layout->addLayout(proxy_hbox);
|
||||||
QLabel *fee_help = new QLabel(tr("Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended."));
|
QLabel *fee_help = new QLabel(tr("Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended."));
|
||||||
fee_help->setWordWrap(true);
|
fee_help->setWordWrap(true);
|
||||||
layout->addWidget(fee_help);
|
layout->addWidget(fee_help);
|
||||||
|
|
||||||
|
@ -223,7 +223,7 @@ MainOptionsPage::MainOptionsPage(QWidget *parent):
|
||||||
QLabel *fee_label = new QLabel(tr("Pay transaction &fee"));
|
QLabel *fee_label = new QLabel(tr("Pay transaction &fee"));
|
||||||
fee_hbox->addWidget(fee_label);
|
fee_hbox->addWidget(fee_label);
|
||||||
fee_edit = new BitcoinAmountField();
|
fee_edit = new BitcoinAmountField();
|
||||||
fee_edit->setToolTip(tr("Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended."));
|
fee_edit->setToolTip(tr("Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended."));
|
||||||
|
|
||||||
fee_label->setBuddy(fee_edit);
|
fee_label->setBuddy(fee_edit);
|
||||||
fee_hbox->addWidget(fee_edit);
|
fee_hbox->addWidget(fee_edit);
|
||||||
|
|
Loading…
Reference in New Issue