Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compared with English version, synced and translated #56

Merged
merged 1 commit into from Mar 1, 2018
Merged

Compared with English version, synced and translated #56

merged 1 commit into from Mar 1, 2018

Conversation

bchtrue
Copy link
Contributor

@bchtrue bchtrue commented Feb 20, 2018

@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
Copy link

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
Copy link
Member

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
Copy link
Contributor Author

bchtrue commented Feb 21, 2018

@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.

Copy link
Member

@dagurval dagurval left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

APT:
This key is missing: apt.apt.upgrade

FAQ:
For section "hard-fork-alternatives", the title is empty.

_i18n/ru.yml Outdated
@@ -69,25 +72,28 @@ index:
takepart:
title: "Примите участие!"
contact:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be contact: | (pipe missing)

@dagurval
Copy link
Member

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
Copy link
Contributor Author

bchtrue commented Feb 22, 2018

@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
Copy link
Contributor Author

bchtrue commented Feb 22, 2018

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

Copy link
Member

@dagurval dagurval left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. I've tested to find any obvious errors, I've also used google translate on parts of the translation to look for errors in contents.

There was one typo (Bitcoin XP), will you fix it @bchtrue?

_i18n/ru.yml Outdated
header:
scalingicon: "Масштабирование<br>Биткоина"
usersicon: "Приоритет<br>за пользователями"
communityicon: "Прагматичное<br>сообщество"
info: |
Bitcoin XT - это воплощение полной ноды биткоин-сети, которая соответствует первоначальному видению Биткоина: простые, надёжные, дешёвые транзакции для каждого в мире. Изначально Bitcoin XT представлял из себя простой набор патчей поверх Bitcoin Core, сейчас же Bitcoin XT - независимый форк с множеством новых <a href="/ru/patches.html">возможностей</a>. Для того, чтобы каждый мог проверить, что загружаемые файлы согласуются с <a href="https://github.com/bitcoinxt/bitcoinxt">исходным кодом</a>, используется метод <a href="https://github.com/bitcoinxt/gitian.sigs">Deterministic Builds</a>.
Bitcoin XT - это воплощение полной ноды Bitcoin Cash (BCH) и Bitcoin (BTC). Bitcoin XP соответствует первоначальному видению Биткоина: простые, надёжные, дешёвые транзакции для каждого в мире. Изначально Bitcoin XT представлял собой простой набор патчей поверх Bitcoin Core, сейчас же Bitcoin XT - это независимо разрабатываемый форк. Для того, чтобы каждый мог проверить, что загружаемые файлы согласуются с <a href="https://github.com/bitcoinxt/bitcoinxt">исходным кодом</a>, используется метод <a href="https://github.com/bitcoinxt/gitian.sigs">Deterministic Builds</a>.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace Bitcoin XP with Bitcoin XT

Copy link
Contributor Author

@bchtrue bchtrue Feb 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.".

@bchtrue
Copy link
Contributor Author

bchtrue commented Feb 27, 2018

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 :(

Sync with English version and translate. Updates to previous
translation.
@dagurval
Copy link
Member

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
Copy link
Contributor Author

bchtrue commented Feb 28, 2018

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

@dagurval dagurval merged commit 76fde26 into bitcoinxt:master Mar 1, 2018
@chaintip
Copy link

chaintip commented Mar 1, 2018

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
Copy link
Member

dagurval commented Mar 1, 2018

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update the russian translation
3 participants