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

Russian Translation of React Projects. #6809

Merged
merged 1 commit into from Feb 10, 2016
Merged

Russian Translation of React Projects. #6809

merged 1 commit into from Feb 10, 2016

Conversation

rfprod
Copy link
Contributor

@rfprod rfprod commented Feb 7, 2016

Closes #6808

@bugron bugron self-assigned this Feb 7, 2016
"nameRu": "Создайте предпросмотрщик облегченного языка разметки Markdown",
"descriptionRu": [
"<strong>Задание:</strong> Создайте приложение <a href='http://codepen.io' target='_blank'>CodePen.io</a>, функционал которого схож с этим: <a href='http://codepen.io/FreeCodeCamp/full/obYYqW' target='_blank'>http://codepen.io/FreeCodeCamp/full/obYYqW</a>.",
"<strong>Правило #1:</strong> Не подсматривайте в код приложения-примера. Разберитесь самостоятельно.",

This comment was marked as off-topic.

@bugron
Copy link
Contributor

bugron commented Feb 9, 2016

@rfprod thanks for the translation. When you finish editing, squash commits into one and we'll be ready to merge.

@rfprod
Copy link
Contributor Author

rfprod commented Feb 10, 2016

@bugron All changes are done, now I'm not sure what to do with this:

(add/RU-translation-react-projects) $ git rebase -i HEAD~n
fatal: Needed a single revision
invalid upstream HEAD~n

After making a final commit and preparing to squash commits before push, I discovered that I did not do git pull --rebase upstream staging before making changes.

Provide further instructions, please.

@bugron
Copy link
Contributor

bugron commented Feb 10, 2016

HEAD~n n should be a number of commits you want to edit.
@rfprod we can pair by Screenhero if you want.

@rfprod
Copy link
Contributor Author

rfprod commented Feb 10, 2016

@bugron Screenhero does not accept new signups according to statement on the login page. I created slack.com account, but they are offering Screenhero to paid accounts only. And I'm not really comfortable with anyone gaining control over my computer in general. If you provide any helpful links, it will be enough, I think.

PS: figured it out.

Russian Translation of React Projects. Edited some typos. Closes #6808

Russian Translation of React Projects. Final edits.
@rfprod
Copy link
Contributor Author

rfprod commented Feb 10, 2016

Ok, it seems commits are squashed:

[detached HEAD 26dd3d9] Russian Translation of React Projects. Closes #6808
 1 file changed, 82 insertions(+)
Successfully rebased and updated refs/heads/add/RU-translation-react-projects.

@bugron
Copy link
Contributor

bugron commented Feb 10, 2016

@rfprod OK, now just force push your branch to your fork. git push -f YOUR_FORK YOUR_BRANCH.

"<strong>Заметка:</strong> Если вы хотите использовать синтаксис React JSX, вам понадобится задействовать 'Babel' в качестве препроцессора.",
"Если что-то не получается, не забывайте пользоваться методом <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Читай-Ищи-Спрашивай</a>.",
"Когда закончите, нажмите кнопку \"I've completed this challenge\" и укажите ссылку на вашу работу на CodePen.",
"Вы можете получить отзыв о вашем проекте от коллег, поделившись ссылкой на него в нашем <a href='//gitter.im/freecodecamp/codereview' target='_blank'>чате для рассмотрения кода</a>. Также вы можете поделиться ею через Twitter и на странице Free Code Camp вашего города на Facebook."

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

@bugron
Copy link
Contributor

bugron commented Feb 10, 2016

@rfprod thank you for this awesome translation. It's really great. Would love to QA more translation PRs from you. And thank you for your patience :)
Verified and merged!

bugron added a commit that referenced this pull request Feb 10, 2016
@bugron bugron merged commit c7b1ca2 into freeCodeCamp:staging Feb 10, 2016
@rfprod
Copy link
Contributor Author

rfprod commented Feb 10, 2016

@bugron I will make another translation after current backend challenge is finished. This will happen soon. Thank you for your assistance.

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.

None yet

2 participants