Translated title of content

[masamiy]

There are conflicts and Joel and Masami hope Tom can fix them!!

[TomKellyGenetics]

Regarding this conflict.

+15490 po/r-novice-gapminder.ja.po
<<<<<<< HEAD
"title: データの出力\n"
"講義: 10\n"
"練習: 10\n"
"質問:\n"
"- \"Rで作った図を保存するにはどうしますか？\"\n"
"目標:\n"
"- \"R から図やデータを 出力出来るようになりましょう。\"\n"
"要点:\n"
"- \"RStudio のエクスポートボタンを使って図を保存しましょう。\"\n"
"- \"`write.table` を使って表形式のデータを保存しましょう。\"\n"
=======
"title: データの書き込み\n"
"講義: 10 分\n"
"演習: 10 分\n"
"質問:\n"
"- \"R で作成したプロットやデータを保存するにはどうすればよいですか?\"\n"
"目標:\n"
"- \"R からプロットやデータを書き出せるようになりましょう。\"\n"
"キーポイント:\n"
"- \"'Export' ボタンを使って RStudio からプロットの保存が出来る。\"\n"
"- \"`write.table` を使って表形式のデータの保存が出来る。\"\n"
>>>>>>> cc00d4d8e985e1fc2c0d6303037f8a982a98e70a

Conflict appears to have been merged here:

Previous commit doesn't have this so it seems to have merged from another branch.

Related PR: #50

@atusy seems to have translated this part while doing R lesson 11 - writing data (his copy is the 1st one -- I'll leave it here to consider it in review). I'm going to merge conflicts with @masamiy's version for consistency with other lessons. We have discussed some of these terms before here.

[TomKellyGenetics]

@masamiy if you "merge" this pull request, it will resolved conflicts in your branch: masamiy#1

[TomKellyGenetics]

As mentioned before, I think we don't need to change repeated words teaching:, exercises:, objectives: in the lesson template. Doing this once in lang.md allows po4gitbook to do this automatically. Please change this file instead.

@masamiy I've done this for you: masamiy#1
masamiy@9cd9432

This also updates lang.md to be consistent with Masami's translations. We can discuss this changes in this PR once they're merged into Masami's branch, they should appear here. https://github.com/swcarpentry-ja/i18n/pull/114/files

[TomKellyGenetics]

See the preview for @atusy's translations.

https://swcarpentry-ja.github.io/r-novice-gapminder/ja/_episodes/10-functions/index.html
https://swcarpentry-ja.github.io/r-novice-gapminder/ja/_episodes/11-writing-data/index.html

If you change this template terms in English, the lesson won't display correctly. This commit should correct this: masamiy@9cd9432

[joelnitta]

Thanks!
You don't need to add 分 after the minutes (e.g., 45 not 45分), since it will get added automatically when the website is rendered. @TomKellyGenetics will take those out from this PR though, so don't worry about it.
I noticed you often included a space after Roma-ji (for example, "R は" vs. "Rは"). I think we need to decide as a group what the appropriate style should be, so I didn't suggest to remove them in most cases.

[TomKellyGenetics]

This removes 分 for minutes as discussed above (and undoes some mistakes I made in the process of doing that).

[TomKellyGenetics]

Looks like this is almost done! 👍

[joelnitta]

I think we've reviewed this thoroughly enough. Great job team!

[joelnitta]

forgot to mention... this resolves issue #111

[TomKellyGenetics]

PR #115 seems to have been merged at the same time 👍

[TomKellyGenetics]

Lessons updated: https://swcarpentry-ja.github.io/r-novice-gapminder/ja/index/

@joelnitta or @rikutakei should be able to do this by running this in future.

sh wrapper.sh --repo r-novice-gapminder --account swcarpentry-ja --webpages