allow translation of "options" used in the --help message / split translation of RPC console welcome message and remove the need to take care of "<br>" / remove some spaces in strings and misc other stuff related to translations

This commit is contained in:
Philip Kaufmann 2012-05-16 15:34:29 +02:00
parent 49232d1abf
commit 8b4d653663
7 changed files with 16 additions and 16 deletions

View File

@ -149,7 +149,7 @@ HelpMessageBox::HelpMessageBox(QWidget *parent):
header = tr("Bitcoin-Qt") + " " + tr("version") + " " + header = tr("Bitcoin-Qt") + " " + tr("version") + " " +
QString::fromStdString(FormatFullVersion()) + "\n\n" + QString::fromStdString(FormatFullVersion()) + "\n\n" +
tr("Usage:") + "\n" + tr("Usage:") + "\n" +
" bitcoin-qt [options] " + "\n"; " bitcoin-qt [" + tr("options") + "] " + "\n";
coreOptions = QString::fromStdString(HelpMessage()); coreOptions = QString::fromStdString(HelpMessage());
uiOptions = tr("UI options") + ":\n" + uiOptions = tr("UI options") + ":\n" +
" -lang=<lang> " + tr("Set language, for example \"de_DE\" (default: system locale)") + "\n" + " -lang=<lang> " + tr("Set language, for example \"de_DE\" (default: system locale)") + "\n" +

View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Sign Message Dialog</string> <string>Sign Message</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

View File

@ -207,9 +207,9 @@ void RPCConsole::clear()
"b { color: #006060; } " "b { color: #006060; } "
); );
message(CMD_REPLY, tr("Welcome to the Bitcoin RPC console.<br>" 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>" tr("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); tr("Type <b>help</b> for an overview of available commands.")), true);
} }
void RPCConsole::message(int category, const QString &message, bool html) void RPCConsole::message(int category, const QString &message, bool html)

View File

@ -25,7 +25,7 @@ VerifyMessageDialog::VerifyMessageDialog(AddressTableModel *addressModel, QWidge
#if (QT_VERSION >= 0x040700) #if (QT_VERSION >= 0x040700)
/* Do not move this to the XML file, Qt before 4.7 will choke on it */ /* Do not move this to the XML file, Qt before 4.7 will choke on it */
ui->lnSig->setPlaceholderText(tr("Enter Bitcoin signature")); 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 #endif
GUIUtil::setupAddressWidget(ui->lnAddress, this); GUIUtil::setupAddressWidget(ui->lnAddress, this);