-commit 3785463ca131ac1ce05421db446a408edd38d2f6
-Author: John Mandereau <john.mandereau@gmail.com>
-Date: Tue Jan 12 01:38:59 2010 +0100
+commit 753d6200e9ae51f0a98186478beff2d00d63a62b
+Merge: fc5b145 2e0077b
+Author: Phil Holmes <mail@philholmes.net>
+Date: Tue Aug 30 11:23:53 2016 +0100
- Docs-ja: adds missing translation bits
-
- Copied ja.po and translation in lilypond-texi2html.init from current
- master branch and *.html.in files from release/2.13.1-1.
+ Update release/unstable with recent changes
-diff --git a/Documentation/ja/index.html.in b/Documentation/ja/index.html.in
-index 9836f53..5ec032d 100644
---- a/Documentation/ja/index.html.in
-+++ b/Documentation/ja/index.html.in
-@@ -1,6 +1,6 @@
- <html>
- <!--
-- Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
-+ Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
-
- When revising a translation, copy the HEAD committish of the
- version that you are working on. See TRANSLATION for details.
-@@ -16,7 +16,7 @@
-
- <body>
- <div class="header">
-- <h1>LilyPond documentation</h1>
-+ <h1>LilyPond ドキュメント</h1>
- </div>
-
- <div class="subheader">
-@@ -34,27 +34,27 @@
- <ul>
- <li>
- <a class="title"
--href="user/lilypond-learning/index.html">Learning Manual</a>
--(in <a class="title" href="user/lilypond-learning-big-page.html">one big page</a> ~ 1.5 MB,
--in <a class="title" href="user/lilypond-learning.pdf">PDF</a>)
-- <br>(start here)</li>
-+href="user/lilypond-learning/index.ja.html">学習マニュアル</a>
-+(<a class="title" href="user/lilypond-learning-big-page.ja.html">大きな 1 ページ</a> 形式 ~ 1.5 MB)<!--,
-+<a class="title" href="user/lilypond-learning.ja.pdf">PDF</a> 形式)
-+-->
-+ <br>(ここから始めてください)</li>
-
- <li><a class="title"
--href="user/music-glossary/index.html">Music Glossary</a>
--(in <a class="title" href="user/music-glossary-big-page.html">one big page</a> ~ 500 kB,
--in <a class="title" href="user/music-glossary.pdf">PDF</a>)
--
-- <br>(for non-English users)</li>
-+href="user/music-glossary/index.html">音楽用語集</a>
-+(<a class="title" href="user/music-glossary-big-page.html">大きな 1 ページ</a> 形式 ~ 500 kB),
-+<a class="title" href="user/music-glossary.pdf">PDF</a> 形式)
-+ <br>(非英語圏のユーザ向け)</li>
- </ul>
- </td>
- <td class="right-column">
- <ul>
- <li>
- <a class="title" href="topdocs/NEWS.html">News</a>
-- <br>(changes since the previous major release)</li>
-+ <br>(前回のメジャー リリースからの変更点)</li>
-
- <li><a class="title" href="../examples.html">Examples</a>
-- <br>(see some examples)</li>
-+ <br>(参照用の例)</li>
-
- </ul>
- </td>
-@@ -63,18 +63,19 @@ in <a class="title" href="user/music-glossary.pdf">PDF</a>)
- <td valign="baseline" class="left-column">
- <ul>
- <li>
--<a class="title" href="user/lilypond/index.html">Notation
--Reference</a>
--(in <a class="title" href="user/lilypond-big-page.html">one big page</a> ~ 4 MB,
--in <a class="title" href="user/lilypond.pdf">PDF</a>)
-- <br>(writing music in LilyPond)</li>
-+<a class="title" href="user/lilypond/index.ja.html">表記リファレンス</a>
-+(<a class="title" href="user/lilypond-big-page.ja.html">大きな 1 ページ</a> 形式 ~ 4 MB)<!--,
-+<a class="title" href="user/lilypond.ja.pdf">PDF</a> 形式)
-+-->
-+ <br>(音楽を LilyPond で記述する)</li>
-
- <li>
- <a class="title"
--href="user/lilypond-internals/index.html">Internals Reference</a>
-- (in <a class="title" href="user/lilypond-internals-big-page.html">one big page</a> ~ 1 MB,
-- in <a class="title" href="user/lilypond-internals.pdf">PDF</a>)
-- <br>(definitions for tweaking)</li>
-+href="user/lilypond-internals/index.ja.html">内部リファレンス</a>
-+ (<a class="title" href="user/lilypond-internals-big-page.ja.html">大きな 1 ページ</a> 形式 ~ 1 MB)<!--,
-+ <a class="title" href="user/lilypond-internals.ja.pdf">PDF</a> 形式)
-+-->
-+ <br>(調整のための定義)</li>
-
- </ul>
- </td>
-@@ -82,14 +83,16 @@ href="user/lilypond-internals/index.html">Internals Reference</a>
- <ul>