Translate README.asc
progit2-ja独自の内容をREADMEに追加
Remove dead notes content
Translate "1-git-server.asc"
Rewrite "TRANSLATION_NOTES.asc"
Translate CONTRIBUTING.md
Rewrap long command line

Closes #165
Fix broken xref
Merge pull request #166 from progit/scrub-xrefs

Fix broken xref
Merge pull request #163 from progit/remove-notes

Remove dead notes content
Merge remote-tracking branch 'upstream/master'

Conflicts:
	book/02-git-basics/sections/recording-changes.asc
Fix 'dummy ours merge strategy' display

Display the text as text and the command as console source.
Merge pull request #170 from zigarn/fix

Fix 'dummy ours merge strategy' display
Fix two grammatical errors

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Expand undefined alias

"lga" is not defined anywhere in the text; all other examples use explicit "git log ..."

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Merge pull request #171 from tacker66/some_more_fixes

Some more fixes
Fix #13
Fix not-translated titles
add layout for epub metadata
Always use `repo` as reference to JGit repo

Was simplified to `r`