UI strings: Typo, and a few "Bitcoin" -> "Bitcoin Core" #4619

pull pryds wants to merge 3 commits into bitcoin:master from pryds:master changing 10 files +18 −15

pryds commented at 9:10 PM on August 1, 2014: contributor

No description provided.
sipa commented at 9:37 PM on August 1, 2014: member

ACK
laanwj commented at 3:47 AM on August 2, 2014: member

There is no point in this change. Bitcoinstrings.cpp is an auto-generated file, and without a change to the source messages it will just break translations.

If you want to change these messages you need to find them in src/*.cpp and change there, then run make translate to re-generate the translation files.
pryds commented at 7:29 AM on August 2, 2014: contributor

@laanwj makes total sense; my bad. I've now reverted the changes to the auto-generated file and applied the changes to the relevant src/*.cpp files instead.
fanquake commented at 7:35 AM on August 2, 2014: member

@pryds ACK You'll need to squash your commits.
laanwj commented at 8:34 AM on August 2, 2014: member

Yup, this is the right way. ACK (after squashing commits)

fix compilation error in core_io.h

- error: 'vector' in namespace 'std' does not name a type
- add <vector> include in core_io.h
- remove <vector> includes from core_read.cpp and core_write.cpp

27f6ec824c

add license header to core_io.h, core_read/_write.cpp 4168396b7e
Typo, and a few "Bitcoin" -> "Bitcoin Core" 55cf3140ab
BitcoinPullTester commented at 9:25 AM on August 2, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4619_55cf3140abc21d5eaf51c73cb398ce61ec46b22f/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
pryds commented at 9:36 AM on August 2, 2014: contributor

Ok, I seem to have messed things up while squashing, mixing in someone else's commits. If this cannot be used, I will delete my fork, remake it and do a clean commit and new pull request.
laanwj commented at 9:56 AM on August 2, 2014: member

Just leave it like this, I'll cherry-pick the changes to messages.
Diapolo commented at 11:18 AM on August 2, 2014: none

Needs a rebase I guess, as the missing license headers in the io files were already added. Oh you need to rebase to current master to remove my 2 commits from your pull :).
pryds commented at 12:58 PM on August 2, 2014: contributor

Yes, those should be changes that are already in master. What happened is that I did a fetch upstream, then merge inbetween my own commits.
laanwj referenced this in commit 2b410c2fe1 on Aug 4, 2014
laanwj commented at 8:31 AM on August 4, 2014: member

Merged via 2b410c2
laanwj closed this on Aug 4, 2014
Michagogo commented at 12:31 PM on August 7, 2014: contributor

@pryds Just a tip: in general, if you have a branch that you're making for a PR and you want to bring it up to date with new commits to upstream/master, what you want is not a merge, but rather a rebase.
reddink referenced this in commit 2eccfb7020 on May 27, 2020
MarcoFalke locked this on Sep 8, 2021

Contributors