Merge pull request #3538

81bad8b [Qt] 2 minor translation changes (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-01-14 18:55:28 +01:00
commit 1aac1448de
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 2 additions and 2 deletions

View file

@ -359,7 +359,7 @@ void BitcoinApplication::requestShutdown()
QWidget *shutdownWindow = new QWidget(); QWidget *shutdownWindow = new QWidget();
QVBoxLayout *layout = new QVBoxLayout(); QVBoxLayout *layout = new QVBoxLayout();
layout->addWidget(new QLabel( layout->addWidget(new QLabel(
tr("Bitcoin Core is shutting down...\n") + tr("Bitcoin Core is shutting down...") + "<br /><br />" +
tr("Do not shut down the computer until this window disappears."))); tr("Do not shut down the computer until this window disappears.")));
shutdownWindow->setLayout(layout); shutdownWindow->setLayout(layout);

View file

@ -473,7 +473,7 @@
<item> <item>
<widget class="QLabel" name="overriddenByCommandLineInfoLabel"> <widget class="QLabel" name="overriddenByCommandLineInfoLabel">
<property name="text"> <property name="text">
<string>Active command-line options that override above options: </string> <string>Active command-line options that override above options:</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>