Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

diff --cc Documentation/es/notation/ancient.itely
Simple merge

diff --cc Documentation/es/notation/rhythms.itely
Simple merge

diff --cc Documentation/fr/notation/ancient.itely
Simple merge

diff --cc Documentation/fr/notation/rhythms.itely
Simple merge

diff --cc Documentation/ja/learning/common-notation.itely
Simple merge

diff --cc Documentation/ja/learning/fundamental.itely
Simple merge

diff --cc Documentation/ja/learning/tweaks.itely
index 7f0c0dbd17bfe1b8419e226a79133a233dc110ee,b688efff09a354cc57131004e02ee5706ec9a206..682c438c5b01fa3e3825ec82c99f7dc81f174065
--- 1/Documentation/ja/learning/tweaks.itely
--- 2/Documentation/ja/learning/tweaks.itely
+++ b/Documentation/ja/learning/tweaks.itely
@@@ -518,10 -475,12 +518,10 @@@ a4^"Black
  @cindex transparent property, example (transparent プロパティの例)
  @cindex TupletNumber, example of overriding (TupletNumber をオーバライドする例)
  
 -@c NOTE Tuplet brackets collide if notes are high on staff
 -@c See issue 509
  @lilypond[quote,ragged-right,verbatim,fragment,relative=1]
- \times 2/3 { c8[ c c] }
+ \tuplet 3/2 { c8[ c c] }
  \once \override TupletNumber.text = #tuplet-number::calc-fraction-text
- \times 2/3 {
+ \tuplet 3/2 {
    c8[ c]
    c8[ c]
    \once \override TupletNumber.transparent = ##t

diff --cc Documentation/ja/notation/vocal.itely
Simple merge

diff --cc Documentation/ja/usage/lilypond-book.itely
Simple merge