diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-03 10:28:52 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-03 10:52:49 +0100 |
commit | 3cd836c1d855b92e7c73ab31979f471c4f8dad68 (patch) | |
tree | e9a112104b43bb0e139a48517e97b56eb45548c9 /src | |
parent | aeedd8a53b2df0ca2bf0429ce37f97cd45b35ba6 (diff) | |
parent | fab83476acf4a1eaeb5d6c3fe6195b9ff80b193c (diff) |
Merge pull request #7158
fab8347 [qt] Use tr() instead of _() (MarcoFalke)
Diffstat (limited to 'src')
-rw-r--r-- | src/qt/locale/bitcoin_en.ts | 37 | ||||
-rw-r--r-- | src/qt/utilitydialog.cpp | 14 |
2 files changed, 43 insertions, 8 deletions
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 0c5529955f..e709f8515b 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1121,6 +1121,41 @@ <source>command-line options</source> <translation type="unfinished">command-line options</translation> </message> + <message> + <location line="+9"/> + <source>UI Options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Choose data directory on startup (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Start minimized</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Show splash screen on startup (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Reset all settings changes made over the GUI</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Intro</name> @@ -2888,7 +2923,7 @@ <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+96"/> + <location filename="../utilitydialog.cpp" line="+78"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"></translation> </message> diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index f609289749..81b597e2eb 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -75,16 +75,16 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : std::string strUsage = HelpMessage(HMM_BITCOIN_QT); const bool showDebug = GetBoolArg("-help-debug", false); - strUsage += HelpMessageGroup(_("UI Options:")); + strUsage += HelpMessageGroup(tr("UI Options:").toStdString()); if (showDebug) { strUsage += HelpMessageOpt("-allowselfsignedrootcertificates", strprintf("Allow self signed root certificates (default: %u)", DEFAULT_SELFSIGNED_ROOTCERTS)); } - strUsage += HelpMessageOpt("-choosedatadir", strprintf(_("Choose data directory on startup (default: %u)"), DEFAULT_CHOOSE_DATADIR)); - strUsage += HelpMessageOpt("-lang=<lang>", _("Set language, for example \"de_DE\" (default: system locale)")); - strUsage += HelpMessageOpt("-min", _("Start minimized")); - strUsage += HelpMessageOpt("-rootcertificates=<file>", _("Set SSL root certificates for payment request (default: -system-)")); - strUsage += HelpMessageOpt("-splash", strprintf(_("Show splash screen on startup (default: %u)"), DEFAULT_SPLASHSCREEN)); - strUsage += HelpMessageOpt("-resetguisettings", _("Reset all settings changes made over the GUI")); + strUsage += HelpMessageOpt("-choosedatadir", strprintf(tr("Choose data directory on startup (default: %u)").toStdString(), DEFAULT_CHOOSE_DATADIR)); + strUsage += HelpMessageOpt("-lang=<lang>", tr("Set language, for example \"de_DE\" (default: system locale)").toStdString()); + 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()); if (showDebug) { strUsage += HelpMessageOpt("-uiplatform", strprintf("Select platform to customize UI for (one of windows, macosx, other; default: %s)", BitcoinGUI::DEFAULT_UIPLATFORM)); } |