Merge branch 'master' into translation

[lilypond.git] / Documentation / snippets / printing-bar-numbers-inside-boxes-or-circles.ly

diff --git a/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly b/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
index 39e3b2ae3317d3db424614fe9ba3ab0040efe003..ff1653c3fe246d61e5eda8a1f173269ba368d017 100644 (file)
--- a/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
+++ b/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
@@ -4,12 +4,12 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms"
 
-%% Translation of GIT committish: 2d548a99cb9dba80f2ff035582009477cd37eceb
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 
 Los números de compás también se pueden imprimir dentro de rectángulos o de circunferencias.
@@ -28,9 +28,9 @@ Taktnummern können auch in Boxen oder Kreisen gesetzt werden.
 
 
 
-%% Translation of GIT committish: 374d57cf9b68ddf32a95409ce08ba75816900f6b
+%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   texidocfr = "
-Les numéros de mesures peuvent être encadrés ou entourés d'un cercle.
+Les numéros de mesure peuvent être encadrés ou entourés d'un cercle.
 
 "
   doctitlefr = "Inscrire le numéro de mesure dans un cadre ou un cercle"
@@ -42,6 +42,7 @@ Bar numbers can also be printed inside boxes or circles.
   doctitle = "Printing bar numbers inside boxes or circles"
 } % begin verbatim
 
+
 \relative c' {
   % Prevent bar numbers at the end of a line and permit them elsewhere
   \override Score.BarNumber #'break-visibility = #end-of-line-invisible