[qt] Fix misleading translation#7218
Conversation
There was a problem hiding this comment.
Is the former (current) not more clear what -resetguisettings does?
There was a problem hiding this comment.
What about
Reset all settings changed in the GUI
There was a problem hiding this comment.
Reset all settings changed in the GUI
Yes. This would be better IMO.
maflcko
force-pushed
the
MarcoFalke-2015-trivial7
branch
from
fac178d to
fa5769e
Compare
|
ACK fa5769e (no backport because of transiflex). |
No opinion on this but this could be merged into 0.12 without rebase. Is there a translation update before the final release? |
According to @laanwj, string freezing was done in 2015-12-01 (http://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-September/011182.html). People already translated 0.12er strings (https://www.transifex.com/bitcoin/bitcoin/qt-translation-012x/). |
|
Will pull translation from transifex a few times before the final 0.12 release, but it's too late to change strings. |
There was a problem hiding this comment.
I'm confused. Didn't this get in in a previous change?
|
Ok then, let's not do a backport. |
Tor ephemeral hidden services Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6503 (included to reduce merge conflicts) - bitcoin/bitcoin#6639 - bitcoin/bitcoin#6643 - bitcoin/bitcoin#7090 - bitcoin/bitcoin#7035 - bitcoin/bitcoin#7170 - bitcoin/bitcoin#7218 (non-QT part) - bitcoin/bitcoin#7313 - bitcoin/bitcoin#7438 - bitcoin/bitcoin#7553 - bitcoin/bitcoin#7637 - bitcoin/bitcoin#7683 - bitcoin/bitcoin#7813 - bitcoin/bitcoin#7703 - bitcoin/bitcoin#8203 - bitcoin/bitcoin#9004 - bitcoin/bitcoin#9234 - bitcoin/bitcoin#9911 (partial) Closes #2061.
* Merge pull request #7154 a3c3ddb [Qt] add InMempool() info to transaction details (Jonas Schnelli) * Merge pull request #7218 fa5769e [qt] Fix misleading translation (MarcoFalke) fa8c8d7 torcontrol debug: Change to a blanket message that covers both cases (MarcoFalke) * Merge pull request bitcoin#7255 6fd0a07 Remove hardcoded fee from CoinControl ToolTip (fanquake) 5fdf32d Replace some instances of formatWithUnit with formatHtmlWithUnit (fanquake) * Merge pull request bitcoin#7263 a5a0831 Double semicolon cleanup. (21E14) * Merge pull request bitcoin#7334 fa989fb [qt] coincontrol workaround is still needed in qt5.4 (fixed in qt5.5) (MarcoFalke) * Merge pull request bitcoin#7329 9d263bd Typo fixes in comments (Chris Wheeler) * Merge bitcoin#7396: [Qt] Add option to increase/decrease font size in the console window 43abb02 [Qt] Add a new chevron/arrow icon for the console prompt line (Jonas Schnelli) 56c9e66 [Qt] keep scroll position in GUI console after changing font size (Jonas Schnelli) 3a3a927 [Qt] Add option to increase/decrease font size in the console window (Jonas Schnelli) * Merge bitcoin#7628: QT: Add 'copy full transaction details' option b51ed40 QT: Add 'copy full transaction details' option (Eric Shaw) * Merge bitcoin#7668: Fix history deletion bug after font size change 21e45a0 Fix history deletion bug after font change (Andrew C) * Copy/Move font size related icons into theme folders * Use formatTxDate for date/time in TxPlainTextRole
4 participants
The first commit fixes #7035 (comment)
The second commit was on my list to fix before 0.12 but I somehow forgot it. People complain about this at transifex.