Mercurial > hg > bitcoin
changeset 2638:34b8ee037e5e draft
Merge pull request #1323 from Diapolo/string_fixes
translation updates / string updates
author | Wladimir J. van der Laan <laanwj@gmail.com> |
---|---|
date | Sun, 20 May 2012 01:34:06 -0700 (2012-05-20) |
parents | 272e07593f2f (current diff) 82012fa9ba2d (diff) |
children | c4ef3fe2ae15 da82af3de0ff |
files | src/init.cpp src/net.cpp src/qt/bitcoin.cpp src/qt/rpcconsole.cpp |
diffstat | 7 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/init.cpp +++ b/src/init.cpp @@ -650,7 +650,7 @@ if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee)) return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"].c_str())); if (nTransactionFee > 0.25 * COIN) - InitWarning(_("Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.")); + InitWarning(_("Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.")); } //
--- a/src/net.cpp +++ b/src/net.cpp @@ -1760,7 +1760,7 @@ { int nErr = WSAGetLastError(); if (nErr == WSAEADDRINUSE) - strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin is probably already running."), addrBind.ToString().c_str()); + strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin is probably already running."), addrBind.ToString().c_str()); else strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString().c_str(), nErr, strerror(nErr)); printf("%s\n", strError.c_str());
--- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -147,14 +147,14 @@ QMessageBox(parent) { header = tr("Bitcoin-Qt") + " " + tr("version") + " " + - QString::fromStdString(FormatFullVersion()) + "\n\n" + + QString::fromStdString(FormatFullVersion()) + "\n\n" + tr("Usage:") + "\n" + - " bitcoin-qt [options] " + "\n"; + " bitcoin-qt [" + tr("options") + "] " + "\n"; coreOptions = QString::fromStdString(HelpMessage()); uiOptions = tr("UI options") + ":\n" + - " -lang=<lang> " + tr("Set language, for example \"de_DE\" (default: system locale)") + "\n" + - " -min " + tr("Start minimized") + "\n" + - " -splash " + tr("Show splash screen on startup (default: 1)") + "\n"; + " -lang=<lang> " + tr("Set language, for example \"de_DE\" (default: system locale)") + "\n" + + " -min " + tr("Start minimized") + "\n" + + " -splash " + tr("Show splash screen on startup (default: 1)") + "\n"; setWindowTitle(tr("Bitcoin-Qt")); setTextFormat(Qt::PlainText);
--- a/src/qt/forms/messagepage.ui +++ b/src/qt/forms/messagepage.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Sign Message Dialog</string> + <string>Sign Message</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item>
--- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -249,7 +249,7 @@ QHBoxLayout *lang_hbox = new QHBoxLayout(); lang_hbox->addSpacing(18); - QLabel *lang_label = new QLabel(tr("User Interface &Language: ")); + QLabel *lang_label = new QLabel(tr("User Interface &Language:")); lang_hbox->addWidget(lang_label); lang = new QValueComboBox(this); // Make list of languages @@ -270,7 +270,7 @@ QHBoxLayout *unit_hbox = new QHBoxLayout(); unit_hbox->addSpacing(18); - QLabel *unit_label = new QLabel(tr("&Unit to show amounts in: ")); + QLabel *unit_label = new QLabel(tr("&Unit to show amounts in:")); unit_hbox->addWidget(unit_label); unit = new QValueComboBox(this); unit->setModel(new BitcoinUnits(this)); @@ -354,7 +354,7 @@ QHBoxLayout *proxy_hbox = new QHBoxLayout(); proxy_hbox->addSpacing(18); - QLabel *proxy_ip_label = new QLabel(tr("Proxy &IP: ")); + QLabel *proxy_ip_label = new QLabel(tr("Proxy &IP:")); proxy_hbox->addWidget(proxy_ip_label); proxy_ip = new QLineEdit(); proxy_ip->setMaximumWidth(140); @@ -363,7 +363,7 @@ proxy_ip->setToolTip(tr("IP address of the proxy (e.g. 127.0.0.1)")); proxy_ip_label->setBuddy(proxy_ip); proxy_hbox->addWidget(proxy_ip); - QLabel *proxy_port_label = new QLabel(tr("&Port: ")); + QLabel *proxy_port_label = new QLabel(tr("&Port:")); proxy_hbox->addWidget(proxy_port_label); proxy_port = new QLineEdit(); proxy_port->setMaximumWidth(55);
--- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -209,9 +209,9 @@ "b { color: #006060; } " ); - message(CMD_REPLY, tr("Welcome to the Bitcoin RPC console.<br>" - "Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.<br>" - "Type <b>help</b> for an overview of available commands."), true); + message(CMD_REPLY, (tr("Welcome to the Bitcoin RPC console.") + "<br>" + + tr("Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.") + "<br>" + + tr("Type <b>help</b> for an overview of available commands.")), true); } void RPCConsole::message(int category, const QString &message, bool html)
--- a/src/qt/verifymessagedialog.cpp +++ b/src/qt/verifymessagedialog.cpp @@ -25,7 +25,7 @@ #if (QT_VERSION >= 0x040700) /* Do not move this to the XML file, Qt before 4.7 will choke on it */ ui->lnSig->setPlaceholderText(tr("Enter Bitcoin signature")); - ui->lnAddress->setPlaceholderText(tr("Click \"Apply\" to obtain address")); + ui->lnAddress->setPlaceholderText(tr("Click \"Verify Message\" to obtain address")); #endif GUIUtil::setupAddressWidget(ui->lnAddress, this);