Fix typos and cleanup in various files by rex4539 · Pull Request #12593 · bitcoin/bitcoin

rex4539 · 2018-03-04T09:42:37Z

No description provided.

randolf

These are excellent edits, but I need you to do the following...

Move all the changes in src/qt/locale/bitcoin_el_GR.ts to a separate Pull Request because this is in a different language than all the other changes (I don't know enough German to review German-language corrections).

Revert change in test/functional/p2p_fingerprint.py back to its original "its" (line 7).

Thank you.

UPDATE: Thank you for making these changes.

NOTE: The Greek (not German) Translation corrections can be found in PR #12598.

rex4539 · 2018-03-04T16:52:51Z

The translation corrections are actually Greek :)

rex4539 · 2018-03-04T18:17:13Z

I have no idea how idea how to move all the changes in src/qt/locale/bitcoin_el_GR.ts to a separate Pull Request (and then I guess remove that commit from the PR).

The commits are already squashed and googling didn't help.

If you can post the exact commands I need to paste into the command line, I would be happy to apply them.

Another solution would be to have the person who usually reviews the Greek translations review and approve.

randolf · 2018-03-04T18:49:54Z

@rex4539 Ah, Greek. Ha! Thanks for correcting me on that (I should have clued in that German's code should be "de" and not "el" -- I was thrown off by "GR").

The problem is that I can't approve something that I don't understand. I'll ask someone to take a look at this and give you some suggestions on the git commands to use. In the meantime, there's also the #github channel in irc.freenode.net which has a lot very helpful people as well (they've been a great help to me in the past).

dongcarl · 2018-03-04T19:25:03Z

@rex4539 on branch rex4539-typos:

git reset --soft 90a0aed51194ad82da8e011b96f9561c685e40b7
git reset HEAD src/qt/locale/bitcoin_el_GR.ts
<make other changes if needed>
git commit -m 'blah blah'
<then force push to your own remote>

It'll say that the .ts file is not staged for commit but that's what you want.

practicalswift · 2018-03-05T09:10:26Z

src/core_write.cpp

Capitalization changes like these are unlikely to achieve consensus ACK, so please skip the changes made to this file to maximize the likelihood of merge :-)

While this change may appear to be purely cosmetic, I do think that it's okay since it is being included with a number of other changes and because the overall intention is to ensure greater consistency.

I didn't change this one. Let me know if you still need this changed.

I would revert this change in order to maximize the chance of merge.

practicalswift · 2018-03-05T09:11:32Z

src/secp256k1/src/java/org/bitcoin/NativeSecp256k1Test.java

These changes should be reported upstream (to the secp256k1 project: https://github.com/bitcoin-core/secp256k1) . Please skip the changes made to this file.

practicalswift · 2018-03-05T09:12:00Z

src/univalue/lib/univalue_get.cpp

These changes should be reported upstream (to the univalue project: https://github.com/bitcoin-core/univalue). Please skip the changes made to this file.

practicalswift · 2018-03-05T09:12:51Z

test/functional/wallet_basic.py

Please revert this change. It looks accidental.

Hopefully fixed.

No, the change is still there. You can check it on https://github.com/bitcoin/bitcoin/pull/12593/files after pushing your latest version.

This was very weird. It's some strange character encoding that my machine somehow automatically converts when the file is opened. I did several attempts to fix it using the command line and different text editors and I think I did it...

practicalswift · 2018-03-05T09:16:47Z

src/net_processing.cpp

Nit: Prefer "it is" to "it's". Applies to "its"/"it's" changes below.

Either "it is" or "it's" is acceptable to me. Since you prefer "it is" I support this.

I prefer "it is" since it is unambiguous. "It's" can be "it is" or "it has".

practicalswift · 2018-03-05T09:18:07Z

src/validation.cpp

Shouldn't this be "re-added"?

practicalswift · 2018-03-05T09:18:22Z

src/wallet/rpcwallet.cpp

Shouldn't this be "re-added"?

practicalswift · 2018-03-05T09:22:49Z

src/test/util_tests.cpp

Already reported in #12543.

So should I revert this one or just do nothing?

Revert or rebase on top of master now that #12543 is merged.

Reverted. Not familiar with git rebase and such...

practicalswift · 2018-03-05T09:22:55Z

src/test/util_tests.cpp

Already reported in #12543.

So should I revert this one or just do nothing?

Revert or rebase on top of master now that #12543 is merged.

Reverted. Not familiar with git rebase and such...

practicalswift · 2018-03-05T09:23:54Z

test/functional/wallet_dump.py

Already reported in #12543.

So should I revert this one or just do nothing?

Revert or rebase on top of master now that #12543 is merged.

Reverted. Not familiar with git rebase and such...

practicalswift · 2018-03-05T15:26:15Z

src/test/cuckoocache_tests.cpp

Nit: Also change "marked erased" to "marked as erased".

practicalswift · 2018-03-05T15:29:33Z

src/wallet/wallet.cpp

A bit unclear. Perhaps change it to "as we're not yet aware that it is in the mempool"?

practicalswift · 2018-03-05T20:02:58Z

Please revert the unrelated change in wallet_basic.py (the Unicode check) and squash the commits into one commit.

rex4539 · 2018-03-05T20:20:38Z

Could you please post the exact command(s) I need to paste into the command line?

Not familiar at all with squashing :)

practicalswift · 2018-03-05T20:22:52Z

Seems like you accidentally re-introduced some of the previous reverts.

Please make sure that:

There is only be one commit listed here: https://github.com/bitcoin/bitcoin/pull/12593/commits
There are only wanted changes listed here: https://github.com/bitcoin/bitcoin/pull/12593/files

rex4539 · 2018-03-05T20:44:21Z

ok, I think I reverted all the newly-accidental commits. All typos should be the correct ones now.

If you could just post the exact command(s) I need to paste into the command line so I could squash?

rex4539 · 2018-03-15T17:12:56Z

@practicalswift Squashed and ready for merge :)

practicalswift · 2018-03-15T22:56:02Z

utACK 5fe43d6

maflcko · 2018-03-17T21:02:06Z

src/leveldb/db/version_set.cc

  // We can search level-by-level since entries never hop across
  // levels.  Therefore we are guaranteed that if we find data
-  // in an smaller level, later levels are irrelevant.
+  // in a smaller level, later levels are irrelevant.


Please submit those upstream

rex4539 · 2018-03-18T14:30:09Z

Unfortunately I messed up my repo while attempting to squash so I made a new PR #12716 with just the fixes.

4d9b425 Fix typos (Dimitris Apostolou) Pull request description: Unfortunately I messed up my repo while trying to squash #12593 so I created a PR with just the correct fixes. Tree-SHA512: 295d77b51bd2a9381f1802c263de7ffb2edd670d9647391e32f9a414705b3c8b483bb0e469a9b85ab6a70919ea13397fa8dfda2aea7a398b64b187f178fe6a06

4d9b425 Fix typos (Dimitris Apostolou) Pull request description: Unfortunately I messed up my repo while trying to squash bitcoin#12593 so I created a PR with just the correct fixes. Tree-SHA512: 295d77b51bd2a9381f1802c263de7ffb2edd670d9647391e32f9a414705b3c8b483bb0e469a9b85ab6a70919ea13397fa8dfda2aea7a398b64b187f178fe6a06 Signed-off-by: pasta <[email protected]>

randolf suggested changes Mar 4, 2018

View reviewed changes

randolf approved these changes Mar 4, 2018

View reviewed changes

randolf mentioned this pull request Mar 4, 2018

Several corrections to Greek translation #12598

Closed

practicalswift reviewed Mar 5, 2018

View reviewed changes

fanquake added the Docs label Mar 5, 2018

practicalswift reviewed Mar 5, 2018

View reviewed changes

maflcko reviewed Mar 17, 2018

View reviewed changes

Fix typos and cleanup

7dd4542

rex4539 mentioned this pull request Mar 18, 2018

Fix typos and cleanup in various files #12716

Merged

rex4539 closed this Mar 18, 2018

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Conversation

rex4539 commented Mar 4, 2018

Uh oh!

randolf left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rex4539 commented Mar 4, 2018

Uh oh!

rex4539 commented Mar 4, 2018

Uh oh!

randolf commented Mar 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dongcarl commented Mar 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

practicalswift Mar 5, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

practicalswift Mar 5, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

practicalswift Mar 5, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

randolf left a comment •

edited

Loading

randolf commented Mar 4, 2018 •

edited

Loading

dongcarl commented Mar 4, 2018 •

edited

Loading

practicalswift Mar 5, 2018 •

edited

Loading

practicalswift Mar 5, 2018 •

edited

Loading

practicalswift Mar 5, 2018 •

edited

Loading