merge, update & continue russian translation

[11111000000]

No description provided.

[zoepage]

Wow! This is great progress!
<3

[pepelsbey]

There’s no & in Russian, use и (and) instead

[janl]

Amazing work, thank you everyone! <3

@11111000000 can you rebase this against the latest gh-pages branch? We had some structural changes since (for accessibility). I’ll merge this right after that :)

[varya]

"Данный метод" -> "Этот метод"

Иначе звучит "по-канцелярски"

[janl]

also, there are a few outstanding notes here, can we wrap this up, we’d love to get this online <3

[11111000000]

done

[11111000000]

@janl: this adds 'ru' link to footer

[11111000000]

can we merge now?

[janl]

I’m confused!

Since commits and merges to the gh-pages branch go live on the website, I’d like to check this locally first.

So I run this, as per GitHub instructions:

git checkout -b 11111000000-gh-pages gh-pages
git pull https://github.com/11111000000/hoodie-documentation.git gh-pages

But then I get these merge conflicts:

> git pull https://github.com/11111000000/hoodie-documentation.git gh-pages
From https://github.com/11111000000/hoodie-documentation
 * branch            gh-pages   -> FETCH_HEAD
Auto-merging _layouts/layout-get-help.html
CONFLICT (add/add): Merge conflict in _layouts/layout-get-help.html
Auto-merging _layouts/layout-community.html
CONFLICT (add/add): Merge conflict in _layouts/layout-community.html
Auto-merging _includes/header-get-help.html
CONFLICT (add/add): Merge conflict in _includes/header-get-help.html
Auto-merging _includes/head.html
CONFLICT (add/add): Merge conflict in _includes/head.html
Auto-merging _includes/footer.html
CONFLICT (add/add): Merge conflict in _includes/footer.html
Auto-merging _config.yml
CONFLICT (add/add): Merge conflict in _config.yml
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging CNAME
CONFLICT (add/add): Merge conflict in CNAME
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.

[janl]

Well it works on a fresh clone, ignore me :) Gonna merge in a bit!

[janl]

Running this locally, I found a few more things:

On http://127.0.0.1:4000/ru/ clicking on “Концепция Hoodie” in the sidebar, I get linked to http://127.0.0.1:4000/ru/hoodieverse/hoodie-concepts.html but that’s a 404:

Same with “Как это работает” linking to http://127.0.0.1:4000/ru/hoodieverse/how-hoodie-works.html

I’m not sure what your plans there, are, do the pages have new titles (then we need new links in that sidebar), or do you keep the english file-names (then they are missing somehow).

Thanks so much for your work! <3

[11111000000]

@janl : it's ok ) thanks you too! fixed.

[janl]

Perfect, thank you everyone! <3 :)