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

Translation done:Lesson 8 #35

Merged
merged 5 commits into from
Dec 6, 2019
Merged

Translation done:Lesson 8 #35

merged 5 commits into from
Dec 6, 2019

Conversation

DaichiSaitoAF
Copy link
Collaborator

I attempted to translate Lesson 8.

@TomKellyGenetics TomKellyGenetics mentioned this pull request Dec 11, 2018
@TomKellyGenetics
Copy link
Member

I've resolved the "conflicts" mentioned.

To add further changes, either "review" PR #36 or pull the changes there and push to this repo.

git remote add origin [email protected]:DaichiSaitoAF/i18n.git
git remote add swc-ja [email protected]:swcarpentry-ja/i18n.git
git pull swc-ja DaichiSaitoAF-ja
#commit changes
git push origin master

@DaichiSaitoAF
Copy link
Collaborator Author

Thank you for resolving the conflict!
I ran the code that you taught me.

Copy link
Member

@joelnitta joelnitta left a comment

Choose a reason for hiding this comment

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

Sorry that took so long! Better late than never, I hope. Please see my comments and suggested changes.

po/r-novice-gapminder.ja.po Show resolved Hide resolved
po/r-novice-gapminder.ja.po Show resolved Hide resolved
po/r-novice-gapminder.ja.po Show resolved Hide resolved
po/r-novice-gapminder.ja.po Show resolved Hide resolved
po/r-novice-gapminder.ja.po Show resolved Hide resolved
po/r-novice-gapminder.ja.po Show resolved Hide resolved
Copy link
Collaborator

@rikutakei rikutakei left a comment

Choose a reason for hiding this comment

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

うまく翻訳できてます。

あとはレビューコメントの変更点を加えれば、マージできると思います。

po/r-novice-gapminder.ja.po Show resolved Hide resolved
po/r-novice-gapminder.ja.po Show resolved Hide resolved
po/r-novice-gapminder.ja.po Show resolved Hide resolved
po/r-novice-gapminder.ja.po Show resolved Hide resolved
@rikutakei rikutakei dismissed their stale review November 17, 2019 07:54

Changes requested have been reflected in a separate PR to DaichiSaitoAF's repo

@rikutakei
Copy link
Collaborator

I have requested a PR to @DaichiSaitoAF 's repo that reflects all of the changes from the reviews.

If you could merge the this PR, the changes should automatically appear here, and then I can merge it in

@TomKellyGenetics
Copy link
Member

Not entirely sure how but I managed to push changes to this PR before. Note that #36 was closed not merged. Let’s give Dai a chance to see it but if he’s not available to respond it should be possible to update the PR by pushing the right branch.

Copy link
Member

@TomKellyGenetics TomKellyGenetics left a comment

Choose a reason for hiding this comment

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

I think this just merges changes from the organisation branch into Dai's PR (can be merged without conflicts now)

@joelnitta joelnitta merged commit b322537 into swcarpentry-ja:ja Dec 6, 2019
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.

4 participants