Merge remote-tracking branch 'origin/translation'

[lilypond.git] / Documentation / ja / notation / fretted-strings.itely

diff --git a/Documentation/ja/notation/fretted-strings.itely b/Documentation/ja/notation/fretted-strings.itely
index 41f0dab45c738c959870a2ee343b7d1228c24fa7..b4df2c0fa7f1ffce628c0afc572bb70232f5a6da 100644 (file)
--- a/Documentation/ja/notation/fretted-strings.itely
+++ b/Documentation/ja/notation/fretted-strings.itely
@@ -1,13 +1,13 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
 @ignore
-    Translation of GIT committish: d5647c5fd1c38d4124d2374725b923f4901f3661
+    Translation of GIT committish: c1b0482f63f881bd3f67845e5f76a3e04675ef2a
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  For details, see the Contributors'
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.11"
+@c \version "2.19.2"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -184,7 +184,7 @@ symbols = {
   c4-.^"Allegro" d( e)
   f4-.\f g a^\fermata
   \mark \default
-  c8_.\<\( c16 c~ c2\!
+  c8_.\<\( c16 c~ 2\!
   c'2.\prall\)
 }
 
@@ -210,7 +210,7 @@ symbols = {
   c4-.^"Allegro" d( e)
   f4-.\f g a^\fermata
   \mark \default
-  c8_.\<\( c16 c~ c2\!
+  c8_.\<\( c16 c~ 2\!
   c'2.\prall\)
 }
 
@@ -243,7 +243,7 @@ symbols = {
 変更することができます。
 
 @lilypond[quote,ragged-right,verbatim]
-\layout { \override Voice.StringNumber.stencil = ##f }
+\layout { \omit Voice.StringNumber }
 \new StaffGroup <<
    \new Staff \relative c {
      \clef "treble_8"
@@ -279,7 +279,7 @@ symbols = {
 
 @lilypond[quote,verbatim]
 guitar = \relative c' {
-  r8 <gis-2 cis-3 b-0>~ q4 q8~ q q4
+  r8 <gis-2 cis-3 b-0>~ q4 q8~ 8 q4
 }
 
 \new StaffGroup <<
@@ -300,7 +300,7 @@ guitar = \relative c' {
 ties = \relative c' {
   \repeat volta 2 {
     e2. f4~
-    f2 g2~
+    2 g2~
   }
   \alternative {
      { g4 f2. }
@@ -340,7 +340,7 @@ ties = \relative c' {
 ties = \relative c' {
   \repeat volta 2 {
     e2. f4~
-    f2 g2~ }
+    2 g2~ }
   \alternative {
     { g4 f2. }
     { g4\repeatTie c,2. }
@@ -373,9 +373,6 @@ ties = \relative c' {
 
 @cindex harmonic indications in tablature notation (タブ譜の記譜法でのハーモニック指示)
 @cindex tablature and harmonic indications (タブ譜とハーモニック指示)
-@cindex slides in tablature notation (タブ譜の記譜法でのスライド)
-@cindex tablature and slides (タブ譜とスライド)
-@cindex chord glissandi (和音のグリッサンド)
 @funindex \harmonic
 @funindex \harmonicByFret
 @funindex \harmonicByRatio
@@ -383,7 +380,7 @@ ties = \relative c' {
 ハーモニック指示を演奏するピッチとしてタブ譜に付け加えることができます:
 
 @lilypond[verbatim,quote]
-\layout { \override Voice.StringNumber.stencil = ##f }
+\layout { \omit Voice.StringNumber }
 firstHarmonic = {
   d'4\4\harmonic
   g'4\3\harmonic
@@ -461,9 +458,14 @@ ratioHarmonics = {
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {fretted-string-harmonics-in-tablature.ly}
 
+@cindex slides in tablature notation (タブ譜の記譜法でのスライド)
+@cindex tablature and slides (タブ譜とスライド)
+
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {slides-in-tablature.ly}
 
+@cindex chord glissandi (和音のグリッサンド)
+
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {chord-glissando-in-tablature.ly}
 
@@ -545,7 +547,7 @@ LilyPond は、あらかじめ定義されたチューニングに対して、@c
 @lilypond[quote,ragged-right,verbatim]
 <<
   \new Voice \with {
-    \override StringNumber.stencil = ##f
+    \omit StringNumber
   } {
     \clef "bass_8"
     \relative c, {
@@ -661,7 +663,7 @@ LilyPond は、@code{TabStaff} の行数と自動的に算出される @code{Fre
 \layout @{
   \context @{
     \TabStaff
-    stringTunings = \stringTuning \notemode @{ <c' g' d'' a''> @}
+    stringTunings = \stringTuning <c' g' d'' a''>
   @}
 @}
 @end example
@@ -1026,7 +1028,7 @@ fret-diagram-verbose インターフェイスに特有なこととして、
         (place-fret 1 3 3)
       )
     }
-    <c e g c' e'>1^\markup {
+    <c g c' e' g'>1^\markup {
       \fret-diagram-verbose #'(
         (capo 3)
         (mute 6)