From: Jean-Charles Malahieude <lilyfan@orange.fr>
Date: Sun, 7 Jul 2013 09:43:34 +0000 (+0200)
Subject: Merge branch 'master' into translation
X-Git-Tag: release/2.17.22-1~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e6e64de1da49ff8c6005daa5fd81adc8387b2668;hp=-c;p=lilypond.git

Merge branch 'master' into translation
---

e6e64de1da49ff8c6005daa5fd81adc8387b2668
diff --combined Documentation/fr/notation/rhythms.itely
index 0b91efb570,43484e2a1f..73be699089
--- a/Documentation/fr/notation/rhythms.itely
+++ b/Documentation/fr/notation/rhythms.itely
@@@ -1,7 -1,7 +1,7 @@@
  @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
  
  @ignore
 -    Translation of GIT committish: 47c20999a49c7c77167089761a4dd964884e53fe
 +    Translation of GIT committish: bd751630011a6fbfcf069ec1fc41a8eaed8a6b87
  
      When revising a translation, copy the HEAD committish of the
      version that you are working on.  For details, see the Contributors'
@@@ -154,7 -154,7 +154,7 @@@ chapitre @ref{Direction et positionneme
  
  @snippets
  @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
- {alternative-breve-note.ly}
+ {alternative-breve-notes.ly}
  
  @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
  {changing-the-number-of-augmentation-dots-per-note.ly}
diff --combined Documentation/it/notation/rhythms.itely
index 119c4cf5bb,4e6cc9ab37..bb2f8fec1e
--- a/Documentation/it/notation/rhythms.itely
+++ b/Documentation/it/notation/rhythms.itely
@@@ -9,9 -9,6 +9,9 @@@
  
  @c \version "2.17.6"
  
 +@c Translators: Federico Bruni
 +@c Translation checkers:
 +
  @node Ritmi
  @section Ritmi
  @translationof Rhythms
@@@ -148,7 -145,7 +148,7 @@@ o sotto il rigo; si veda @ref{Directio
  @snippets
  
  @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
- {alternative-breve-note.ly}
+ {alternative-breve-notes.ly}
  
  @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
  {changing-the-number-of-augmentation-dots-per-note.ly}