search

bitcoinxt / website

Website sources for bitcoinxt.software
6 stars 12 forks source link

Compared with English version, synced and translated #56

Closed bchtrue closed 6 years ago

bchtrue commented 6 years ago

@chaintip fixes #55

Please, reviews. I'm not an GitHub expert. Maybe something goes wrong. Syncing two files to find actually differences was not an easy task. Maybe something went wrong, but hope all fine :)

chaintip commented 6 years ago

If this pull request is merged to fix issue #55 first, @bchtrue will claim the 0.01010399 BCH| ~ 15.11 USD bounty and all future tips to the issue.

dagurval commented 6 years ago

Thanks @bchtrue for this update!

Before I merge, can you squash the commits into a single commit? You'll have to git push --force after squashing.

bchtrue commented 6 years ago

@dagurval I do it from github web interface. I can try to delete all and then open new pull request (if it's possible).

Added: After some googling I found that possible to squash it on merge from your side. Please, look at this:

https://stackoverflow.com/questions/35948131/github-squash-commits-from-web-interface-on-pull-request-after-review-comments

But before merging can you, please, test ru.yml? I did all the work at text editor with diff tool and I'm not totally sure about correct markdown. Hope I did not brake it. I do not have any webserver to test. Although I'm pretty sure that everything is correct.

dagurval commented 6 years ago

I tested, and it's almost there. Found three nits. Could you fix them?

Thanks for figuring out squash from the web interface. I never noticed that.

bchtrue commented 6 years ago

@dagurval Thanks. Working on this. I see two problems from the report above (missing pipe and title)., I will look for the third. Give me some time to review and fix all. Thanks :)

bchtrue commented 6 years ago

@dagurval Fixed: markdown, missing translations, fixed previous russian translation mistakes, missing chars in words, some misunderstanding, spelling and grammar mistakes.

bchtrue commented 6 years ago

Sure, sorry for this typo. I will fix it tomorrow. I want to review the translation again and change some words.

Actually, I do not like this description in English. Too many "Bitcoin" words there and they stay too close together. Also, I do not like calling "Bitcoin XT" as "software fork"... Maybe "software" without "fork" or "project" or something. What do you think? I'm about the word "fork" in this context. Maybe, it can confuse some readers/noobs, because it may sound for them like "Bitcoin XT is other type of cryprocurrency fork.".

P.S. It was my mistake to start editing English version. I was thinking about opening new pull request to show changes at en.yml that I suggest to review, but it was merged to this pull request :(

dagurval commented 6 years ago

I took the liberty to squash the updates to ru.yml into one commit and remove unintended changes to en.yml. I hope this was OK with you @bchtrue.

If it's OK with you, I'll merge this now. It's always possible to make more changes in a new PR.

I kept a copy of the original commits here: https://github.com/dagurval/website/commits/bchtrue-backup

bchtrue commented 6 years ago

Yes, en.yml was only to show suggestions. Thank you :) All fine

chaintip commented 6 years ago

Nice work @bchtrue! Your pull request has been merged and the bounty of 0.01010399 BCH| ~ 12.26 USD will be sent to your wallet, once you link it with chaintip.

dagurval commented 6 years ago

Thanks @bchtrue, your updates are now live at https://bitcoinxt.software :-)