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

[lilypond.git] / Documentation / ja / notation / vocal.itely

diff --git a/Documentation/ja/notation/vocal.itely b/Documentation/ja/notation/vocal.itely
index 5c676b92f2642820dd0653e9837dfc67d87e185f..77e286af4232ca3bab2f80a05f8c95ecdac38790 100644 (file)
--- a/Documentation/ja/notation/vocal.itely
+++ b/Documentation/ja/notation/vocal.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.11"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -1904,7 +1904,7 @@ text = {
     <<
       \new Voice = "alternative" {
         \voiceOne
-        \times 2/3 {
+        \tuplet 3/2 {
           % show associations clearly.
           \override NoteColumn.force-hshift = #-3
           f8 f g
@@ -3098,7 +3098,7 @@ global = {
       \layout {
         \context {
           \Score
-          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 2)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2)
         }
         \context {
           \Staff