diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-14 18:55:28 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-14 18:55:39 +0100 |
| commit | 1aac1448dee95c6d2455274021b00bb8c853fd32 (patch) | |
| tree | 910c700c225f53cd39c89ab61119a58df718cda3 | |
| parent | 6b5fbc9073aa9ed9ea1d2675368a030ba05c6ad0 (diff) | |
| parent | 81bad8b3867ca7becf0ff3b524a714c5d781190e (diff) | |
Merge pull request #3538
81bad8b [Qt] 2 minor translation changes (Philip Kaufmann)
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 | ||||
| -rw-r--r-- | src/qt/forms/optionsdialog.ui | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index b8342b5a99..c215df5db2 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -359,7 +359,7 @@ void BitcoinApplication::requestShutdown() QWidget *shutdownWindow = new QWidget(); QVBoxLayout *layout = new QVBoxLayout(); 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."))); shutdownWindow->setLayout(layout); diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 9056ab7696..e0d99aac39 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -473,7 +473,7 @@ <item> <widget class="QLabel" name="overriddenByCommandLineInfoLabel"> <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 name="textFormat"> <enum>Qt::PlainText</enum> |