[Qt, Trivial] misc small trivial pull-requests #5922

pull Diapolo wants to merge 3 commits into bitcoin:master from Diapolo:qt-trivial changing 11 files +25 −26

Diapolo commented at 10:31 AM on March 18, 2015: none

See individual commit messages for descriptions. Likely this is for @theuni :).
laanwj commented at 12:06 PM on March 18, 2015: member

It's more efficient if you file these with @theuni's repository on the trivial-next branch directly: https://github.com/theuni/bitcoin
theuni commented at 5:29 AM on March 19, 2015: member

Yes, please do that.

I'll go ahead and review/pull these (along with some others that are waiting) tomorrow, but submitting them directly to the trivial tree would be much better.
theuni commented at 6:27 AM on March 20, 2015: member
I'm not comfortable pulling these into trivial.
1. The authenticated/secure debate has been hashed out here before and I'm not sure how it ended up.
2. The defaultConfirmTarget mixes a small functional change with a cosmetic one.
Diapolo commented at 10:40 AM on March 20, 2015: none

Feel free to just take the one commit that matches your Trivial specs :). I didn't want to start a new debate, but recently I've been using the authenticated term when dealing with payment requests and also took that from pull-request discussions, when discussing with others.
laanwj commented at 10:53 AM on March 20, 2015: member

The authenticated/secure debate has been hashed out here before and I'm not sure how it ended up.

"Authenticated" is more apt. "Insecure" is ambiguous.
laanwj commented at 10:54 AM on March 20, 2015: member

Agree @cfields that functional changes, even minor ones, should not end up in the trivial branch. That could be very dangerous, even a small change can result in big bugs.
sandakersmann commented at 1:08 AM on March 21, 2015: contributor

I thought there was consensus for writing bitcoin with a lower case b when we are talking about the currency.
Diapolo commented at 5:27 PM on March 21, 2015: none

@sandakersmann You're right and I removed that, my fault, sorry! @laanwj I removed the code change from that pull, you're right it doesn't belong here. @theuni Seems the Authenticated/Insecure change is consensus then, right :)?

[Qt, Trivial] misc minor string changes

- write "Bitcoins" uppercase
- replace secure/insecure for payment requests with
  authenticated/unauthenticated
- change a translatable string for payment request expiry to match another
  existing string to only get ONE resulting string to translate

2233463df9

[Qt, Trivial] fix header groupings + space, intdentation fixes 4763e3d58b
[Qt, Trivial] remove two unneeded includes of wallet/db.h 093404f212
Diapolo commented at 6:10 PM on March 24, 2015: none

Moved to: https://github.com/theuni/bitcoin/pull/7
Diapolo closed this on Mar 24, 2015
Diapolo deleted the branch on Mar 27, 2015
MarcoFalke locked this on Sep 8, 2021

Contributors