diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2015-12-22 14:05:20 +0100 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2015-12-22 14:05:39 +0100 |
| commit | a1c185be546bb566190b92d81fd9c79a32da8180 (patch) | |
| tree | 888091cb729092ff08736c1997f4430dd8b39d18 /src | |
| parent | 595f93977c5636add1f4f2e64cd2d9b19c65a578 (diff) | |
| parent | fa5769e95a44427e1ed7d63795d4ff60985f0059 (diff) | |
| download | bitcoin-a1c185be546bb566190b92d81fd9c79a32da8180.tar.xz | |
Merge pull request #7218
fa5769e [qt] Fix misleading translation (MarcoFalke)
fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke)
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 2 | ||||
| -rw-r--r-- | src/qt/utilitydialog.cpp | 2 | ||||
| -rw-r--r-- | src/torcontrol.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index e709f8515b..00411741f1 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1153,7 +1153,7 @@ </message> <message> <location line="+1"/> - <source>Reset all settings changes made over the GUI</source> + <source>Reset all settings changed in the GUI</source> <translation type="unfinished"></translation> </message> </context> diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 81b597e2eb..088578b7a9 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -84,7 +84,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : strUsage += HelpMessageOpt("-min", tr("Start minimized").toStdString()); strUsage += HelpMessageOpt("-rootcertificates=<file>", tr("Set SSL root certificates for payment request (default: -system-)").toStdString()); strUsage += HelpMessageOpt("-splash", strprintf(tr("Show splash screen on startup (default: %u)").toStdString(), DEFAULT_SPLASHSCREEN)); - strUsage += HelpMessageOpt("-resetguisettings", tr("Reset all settings changes made over the GUI").toStdString()); + strUsage += HelpMessageOpt("-resetguisettings", tr("Reset all settings changed in the GUI").toStdString()); if (showDebug) { strUsage += HelpMessageOpt("-uiplatform", strprintf("Select platform to customize UI for (one of windows, macosx, other; default: %s)", BitcoinGUI::DEFAULT_UIPLATFORM)); } diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index 8eccc81e30..4ebcb9b667 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -618,7 +618,7 @@ void TorController::disconnected_cb(TorControlConnection& conn) if (!reconnect) return; - LogPrint("tor", "tor: Disconnected from Tor control port %s, trying to reconnect\n", target); + LogPrint("tor", "tor: Not connected to Tor control port %s, trying to reconnect\n", target); // Single-shot timer for reconnect. Use exponential backoff. struct timeval time = MillisToTimeval(int64_t(reconnect_timeout * 1000.0)); |