Merge branch 'ja' into ja

.gitignore

@@ -0,0 +1 @@
+locale/

Translators.md

@@ -7,50 +7,59 @@ Team lead (co-ordinator)
 Members
 
 * [Riku Takei][takei_riku]: Assistant Research Fellow (University of Otago, Dunedin, New Zealand)
-  * Lesson organiser and reviewer (Git)
+  * Lesson organiser and moderator (Git)
   * GitHub: [@rikutakei](https://github.com/rikutakei)
   * Twitter: [@rikutakei](http://twitter.com/rikutakei)
 
-* [Joel Nitta][nitta_joel]: Postdoctoral Researcher (National Museum of Nature and Science, Tsukuba, Japan)
-  * Reviewer and technical support
+* [Joel Nitta][nitta_joel]: Postdoctoral Researcher (Smithsonian National Museum of Natural History, Washington DC, USA)
+  * Reveiwer and technical support
   * GitHub: [@joelnitta](https://github.com/joelnitta)
   * Twitter: [@joel_nitta](http://twitter.com/joel_nitta)  
   * [Homepage](https://joelnitta.com)  
 
-* [Maki Arakaki][arakaki_maki]
-  * Lesson organiser (R gapminder)
+* [Maki Arakaki][arakaki_maki] (Tokyo, Japan)
+  * Lesson organiser and moderator (R gapminder)
   * GitHub: [@rkkmk](https://github.com/rkkmk)
 
-* [Daichi Saito][arakaki_maki]
+* [Daichi Saito][saito_daichi] (Tokyo, Japan)
   * Lesson contributor (R gapminder)
-  * GitHub: [@rkkmk](https://github.com/DaichiSaitoAF)
-  * Twitter: [@daichibaa](http://githut.com/daichibaa)
+  * GitHub: [@DaichiSaitoAF](https://github.com/DaichiSaitoAF)
+  * Twitter: [@daichibaa](http://github.com/daichibaa)
 
-* [Tomohiro Egawa][egawa_tomohiro]
+* [Atsushi Yamamoto][yamamoto_atsushi] (Okayama, Japan)
   * Lesson contributor (R gapminder)
-  * GitHub: [@](https://github.com/)
-  * Twitter: [@bakamyudatri](http://twitter.com/bakamyudatri)
+  * GitHub: [@atusy](https://github.com/atusy)
+  * Twitter: [@Atsushi776](http://github.com/Atsushi776)
 
-* [Kyoko Matsumura][matsumura_kyoko]
-  * Lesson organiser (Shell)
+* [Kyoko Matsumura][matsumura_kyoko] (Tokyo, Japan)
+  * Lesson organiser and moderator (Shell)
   * GitHub: [@kyyonko](https://github.com/kyyonko)
   * Twitter: [@kyyonko](http://twitter.com/kyyonko)
 
 * [Kozo Nishida][nishida_kozo]: Technical Scientist (RIKEN BDR, Osaka, Japan) 
-  * Lesson organiser (Python)
+  * Lesson organiser and moderator (Python)
   * GitHub: [@kozo2](https://github.com/kozo2)
   * Twitter: [@kozo2](http://twitter.com/kozo2)
 
 * [Manabu Ishii][ishii_manabu]: Technical Scientist (RIKEN BDR, Wako, Japan)
   * Translation contributor and reviewer
   * GitHub: [@manabuishii](https://github.com/manabuishii)
   * Twitter: [@manabuishiirb](http://twitter.com/manabuishiirb)
-
-* [Koki Mimura][mimura_koki]: Postdoctoral Researcher (Tokyo University of Agriculture and Technology, Tokyo, Japan)
+  
+* [Satoshi Yokota][yokota_sotashi]: Postdoctoral Scholar (Stanford University, School of Medicine, California, USA)
   * Translation contributor and reviewer
+  * GitHub: [@megane0-0](https://github.com/megane0-0)
+  * Twitter: [@megane0-0](http://twitter.com/megane0-0)
+
+* [Koki Mimura][mimura_koki]: Postdoctoral Researcher (Tokyo University of Agriculture and Technology, Tokyo, Japan)
+  * Advisor on organising events
+  * GitHub: [@kilometer0101](https://github.com/kilometer0101)
   * Twitter: [@kilometer00](http://twitter.com/kilometer00)
 
 Please include your GitHub account and any other detail that you wish to be public.
 
 * [GivenName FamilyName][family_given]: Job title (Affiliation, location)
-  [@GitHubUser](https://github.com/GitHubUser)
+  * Role
+  * GitHub: [@GitHubUser](https://github.com/GitHubUser)
+  * Twitter: [@handle](http://twitter.com/handle)
+

admin.md

@@ -0,0 +1,74 @@
+## Information for Maintainers and Administrators
+
+### To update the GitHub pages lessons with Jekyll
+
+This assumes a high level of familiarity with Git, GitHub, and how these lessons have been configured. These tools can be used to
+  update the webpages hosted on the organisation repository or create a hosted webpage on your personal fork.
+
+Updates to the files can be managed by tracking changes to the PO files and translated lessons
+can be viewed on the GitHub repository as Markdown files in the `_episodes` directory
+of the respectve lesson repo. It is not necessary to update the webpages for every update to
+the translations. This will be managed by lesson maintainers and organisers of the Japanese
+language team.
+
+1. Run `po4gitbook/compile.sh` on updated PO files (commit and push changes to PO files to i18n)
+
+Note that in order for the lessons to compile the Credit line in the PO files HEADER
+ "# FULL NAME <EMAIL@ADDRESS>, YEAR." must match the contact details of the "Last-Translator".
+Please fill in your details or keep these consistent in order to build the new translated lessons.
+
+
+```
+git add -u po/*ja.po
+git commit -m "update PO files"
+git push origin ja
+```
+
+2. Clone the translated lesson repo (to a directory outside the i18n repository)
+```
+git clone https://github.com/swcarpentry-ja/git-novice-ja.git
+```
+Or pull to your copy of this repo
+```
+git pull origin master
+```
+
+3. Move updated translated files to the cloned translated lesson
+```
+rsync -ru i18n/locale/ja/git-novice/* git-novice-ja
+```
+
+4. Commit and push changes to the translated lesson
+```
+git add -u *
+git commit -m "update lesson files"
+git push origin master
+```
+
+6. Clone or pull a copy of the original lesson repo (again outside any existing git repos)
+```
+git clone https://github.com/swcarpentry-ja/git-novice.git
+```
+
+Or pull to your copy of this repo
+```
+git pull origin gh-pages
+```
+
+6. Sync changes to (master branch of) the pushed submodule files to the original lesson repository
+```
+git submodule foreach git pull origin master
+```
+
+7. Commit changes to the submodule to the original lesson
+```
+git add -u
+git commit -m "update Japanese lessons"
+```
+
+8. Push to the lesson repo (or send a pull request)
+```
+git push origin gh-pages
+```
+
+Jekyll will update the "github.io" webpages once a new commit is pushed (but it will not see new commits to submodules unless these are pulled and committed)

git.md

@@ -0,0 +1,68 @@
+### Using git
+
+This repository uses the tool `git` via the command line. On Linux and Mas OS, the `bash` terminal should come pre-installed. `git` may be installed but if not it can be installed as follows:
+
+- Linux Ubuntu-based distros
+
+```
+sudo apt-get install git
+```
+
+- Linux Fedora
+
+```
+yum install git
+```
+
+or
+
+```
+sudo dnf install git-all
+```
+
+- Linux Install from Debian file
+
+Download the `.deb` file for your OS from here:
+
+https://pkgs.org/download/git
+
+```
+dpkg -i git_2.11.0-3+deb9u4_amd64.deb
+```
+
+- Linux Build from source
+
+Download the latest version of git:
+
+https://github.com/git/git/releases
+
+or
+
+https://mirrors.edge.kernel.org/pub/software/scm/git/
+
+```
+tar -zxf git-2.0.0.tar.gz
+cd git-2.0.0
+make configure
+./configure --prefix=/usr
+make all doc info
+sudo make install install-doc install-html install-info
+```
+
+- Windows
+
+Download Git for Windows (Git-Bash) by following the instructions here:
+
+https://gitforwindows.org/
+
+or
+
+https://git-scm.com/
+
+- Mac OS
+
+Install usiing homebrew (requires Xcode): https://docs.brew.sh/Installation
+
+```
+brew install git
+```

importing.md

@@ -0,0 +1,69 @@
+## Importing a lesson for the first time
+
+If you wish to start a translation of a lesson that has not been translated in your language before,
+please follow these instructions. See the instructions below for if your lesson has an exisiting
+translation and you wish to submit changes or an update.
+
+1. Create a "Fork" for this repository on your personal GitHub account. (Click "Fork" in the top right
+  corner of the `https://github.com/swcarpentry-ja/i18n` webpage)
+
+2. Clone this repository from your personal account (e.g., GitHubUser). This is your local copy to manage your version of
+ the translation files.
+
+```
+cd directory
+git clone [email protected]:GitHubUser/i18n.git
+cd i18n
+```
+
+If you already have a fork of translation repository, please pull changes for the current
+   version from the organisation repository:
+
+```
+git checkout ja
+git remote add swc-ja [email protected]:swcarpentry-ja/i18n.git
+git pull swc-ja ja
+```
+
+
+3. Add a submodule for the lessons that you want to translate
+
+```
+git submodule add https://github.com/swcarpentry/git-novice.git
+```
+
+4. Run `po4gitbook/update.sh` - That creates/updates the `po` directory with the `.pot` files to use in translations.
+
+5. Create a `po` file and start translating!
+ - copy `<file>.pot` to `<file>.<lang>.po`. e.g.,
+ ```bash
+ cd po
+ cp shell-novice.pot shell-novice.es.po
+ ```
+ - Edit the file with your favourite po editor ([PoEdit](http://www.poedit.net),
+ [GTranslator](https://wiki.gnome.org/Apps/Gtranslator), [Lokalize](https://userbase.kde.org/Lokalize), ...)
+   Note:
+    - "`Language`" field is needed to add to the header (at least with gtranslator), the rest is put by the tool.
+    - "`Language-Team:`" needs the first letter in upper case (e.g., `Es` or `Ja`)
+ - Create `po/LINGUAS`
+ - run `po4gitbook/compile.sh` - This creates a `locale/<lang>/<lesson>` tree directory
+
+This generates a translated version of the lessons. Please do not create a git repository within
+  this repository. You can copy these files to another repository as described in the
+  "Guide for Translators" and submit changes to the PO files via Pull Request to GitHub.
+
+Please note that there are files shared between lesson repositories:
+```
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+LICENSE.md
+README.md
+```
+These will be hosted on the translated Git repository but will not be included in the
+  webpages once they are generated. Apart from the `README`, these are the same files
+  between each lesson. Please check that these files have not been already translated
+  for another lesson. If so you can copy these to ensure they are consistent.
+
+While these files appear at the beginning of the PO files (since files are sorted alphabetically),
+  they are not a priority to translate. Please skip to the beginning of the lesson,
+  following the README.

lang.md

@@ -15,18 +15,18 @@ contribute: "貢献します"
 source: "ソース"
 cite: "引用します"
 contact: "連絡します"
-keypoints: "キーポイント"
+keypoints: "要点"
 overview: "概要"
 break: "休止"
-previous: "前に"
+previous: "戻る"
 next: "次へ"
 episode: "エピソード"
 lessonHome: "レッスンのホーム"
-teaching: "教えります"
+teaching: "講義"
 exercises: "練習"
 min: "分"
 questions: "質問"
-objectives: "目的"
+objectives: "目標"
 downloadLesson: "レッスンの必要なファイルをダウンロードします"
 finish: "仕上がり"
 scheduleDisclaimer: "実際のスケジュールは、インストラクターが選択したトピックや演習によって若干異なる場合があります."

po/git-novice.es.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# David Perez-Suarez <[email protected]>, 2018.
+# David Perez-Suarez <[email protected]>, 2019.
 #
 msgid ""
 msgstr ""

po/git-novice.ja.po

@@ -1,7 +1,7 @@
 # Japanese translation of the Software Carpentry Git Lesson
-# Copyright (C) 2018 Software Carpentry Foundation; Japanese Translation Team
+# Copyright (C) 2019 Software Carpentry Foundation; Japanese Translation Team
 # This file is distributed under the same license as the gitbook package.
-# Riku Takei <[email protected]>, 2018.
+# Riku Takei <[email protected]>, 2019.
 #
 msgid ""
 msgstr ""

po/python-novice-gapminder.ja.po

@@ -1,7 +1,7 @@
 # Japanese translation of the Software Carpentry Plotting and Programming in Python Lesson
-# Copyright (C) 2018 Software Carpentry Foundation; Japanese Translation Team
+# Copyright (C) 2019 Software Carpentry Foundation; Japanese Translation Team
 # This file is distributed under the same license as the PACKAGE package.
-# Software-Carpentry Japanese-Team <[email protected]>, 2018.
+# Software-Carpentry Japanese-Team <[email protected]>, 2019.
 #
 msgid ""
 msgstr ""

po/python-novice-inflammation.ja.po

@@ -1,7 +1,7 @@
 # Japanese translation of the Software Carpentry Programming with Python Lesson
-# Copyright (C) 2018 Software Carpentry Foundation; Japanese Translation Team
+# Copyright (C) 2019 Software Carpentry Foundation; Japanese Translation Team
 # This file is distributed under the same license as the PACKAGE package.
-# Software-Carpentry Japanese-Team <[email protected]>, 2018.
+# Software-Carpentry Japanese-Team <[email protected]>, 2019.
 #
 msgid ""
 msgstr ""