Merge branch 'lilypond/translation' into staging

[lilypond.git] / Documentation / translations.itexi

diff --git a/Documentation/translations.itexi b/Documentation/translations.itexi
index 937a88bd4b9104261989967ebce80856cb552b34..58f80293ef73218f9eeac930f678aabdab8a1126 100644 (file)
--- a/Documentation/translations.itexi
+++ b/Documentation/translations.itexi
@@ -108,11 +108,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -588,11 +588,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -876,11 +876,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -1632,11 +1632,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -1908,11 +1908,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -2158,11 +2158,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -2868,11 +2868,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -3411,11 +3411,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Yoshiki Sawada
 @*
@@ -3517,6 +3517,7 @@ Jean-Charles Malahieude
 @end ifnothtml
 @*
 
+@end ifnothtml
 @ifhtml
 
 @html
@@ -3551,11 +3552,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #68ff28">partially up to date</span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+partially up to date
 @end ifnothtml
 @tab Federico Bruni
 @*
@@ -3569,6 +3570,54 @@ up to date
 @ifnothtml
 Luca Rossetto Casel
 @end ifnothtml
+@tab Francisco Vila
+@*
+
+@ifhtml
+
+@html
+<span style="background-color: #1fff1f">translated</span>
+@end html
+@end ifhtml
+@ifnothtml
+translated
+@end ifnothtml
+@*
+
+@ifhtml
+
+@html
+<span style="background-color: #1fff1f">up to date</span>
+@end html
+@end ifhtml
+@ifnothtml
+up to date
+@end ifnothtml
+@tab Valentin Villenave
+@*
+Jean-Charles Malahieude
+@*
+
+@ifhtml
+
+@html
+<small>Jean-Charles Malahieude</small>
+@end html
+@end ifhtml
+@ifnothtml
+Jean-Charles Malahieude
+@end ifnothtml
+@*
+
+@ifhtml
+
+@html
+<small>John Mandereau</small>
+@end html
+@end ifhtml
+@ifnothtml
+John Mandereau
+@end ifnothtml
 @*
 
 @ifhtml
@@ -3617,11 +3666,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #68ff28">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
 @end html
 @end ifhtml
 @ifnothtml
-partially up to date
+up to date
 @end ifnothtml
 @item
 1.3 Expressive marks
@@ -3872,6 +3921,7 @@ John Mandereau
 @end ifnothtml
 @*
 
+@end ifnothtml
 @ifhtml
 
 @html
@@ -3888,7 +3938,7 @@ John Mandereau
 @end html
 @end ifhtml
 @ifnothtml
-translated
+not translated
 @end ifnothtml
 @*
 
@@ -3938,13 +3988,13 @@ not translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
-@tab Yoshiki Sawada
+@tab Francisco Vila
 @*
 
 @ifhtml
@@ -3977,11 +4027,11 @@ up to date
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">translated</span>
+<small>Jean-Charles Malahieude</small>
 @end html
 @end ifhtml
 @ifnothtml
-translated
+Jean-Charles Malahieude
 @end ifnothtml
 @*
 
@@ -3997,6 +4047,7 @@ up to date
 @tab Francisco Vila
 @*
 
+@end ifnothtml
 @ifhtml
 
 @html
@@ -4038,11 +4089,11 @@ Jean-Charles Malahieude
 @ifhtml
 
 @html
-<small>John Mandereau</small>
+<small>Luca Rossetto Casel</small>
 @end html
 @end ifhtml
 @ifnothtml
-John Mandereau
+Luca Rossetto Casel
 @end ifnothtml
 @*
 
@@ -4058,11 +4109,11 @@ John Mandereau
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">translated</span>
+<span style="background-color: #d0f0f8">not translated</span>
 @end html
 @end ifhtml
 @ifnothtml
-translated
+not translated
 @end ifnothtml
 @*
 
@@ -4151,18 +4202,18 @@ partially up to date
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">translated</span>
+<small>John Mandereau</small>
 @end html
 @end ifhtml
 @ifnothtml
-translated
+John Mandereau
 @end ifnothtml
 @*
 
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<small></small>
 @end html
 @end ifhtml
 @ifnothtml
@@ -4171,6 +4222,7 @@ up to date
 @tab Francisco Vila
 @*
 
+@end ifnothtml
 @ifhtml
 
 @html
@@ -4219,11 +4271,11 @@ John Mandereau
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">translated</span>
+<span style="background-color: #d0f0f8">not translated</span>
 @end html
 @end ifhtml
 @ifnothtml
-translated
+not translated
 @end ifnothtml
 @*
 
@@ -4248,6 +4300,11 @@ up to date
 @ifnothtml
 Luca Rossetto Casel
 @end ifnothtml
+@item
+2.6 Wind instruments
+@*
+(319)
+@tab Till Paala
 @*
 
 @ifhtml
@@ -4273,13 +4330,13 @@ not translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
-@tab Yoshiki Sawada
+@tab Francisco Vila
 @*
 
 @ifhtml
@@ -4312,11 +4369,11 @@ up to date
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">translated</span>
+<small>Jean-Charles Malahieude</small>
 @end html
 @end ifhtml
 @ifnothtml
-translated
+Jean-Charles Malahieude
 @end ifnothtml
 @*
 
@@ -4329,28 +4386,25 @@ translated
 @ifnothtml
 up to date
 @end ifnothtml
-@tab Francisco Vila
 @*
 
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">translated</span>
+<small></small>
 @end html
 @end ifhtml
 @ifnothtml
-translated
-@end ifnothtml
-@*
 
+@end ifnothtml
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #1fff1f">translated</span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+translated
 @end ifnothtml
 @tab Jean-Charles Malahieude
 @*
@@ -4435,11 +4489,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #25fe1f">partially up to date</span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+partially up to date
 @end ifnothtml
 @item
 1.8 Text
@@ -5774,22 +5828,8 @@ partially up to date
 @end html
 @end ifhtml
 @ifnothtml
-translated
-@end ifnothtml
-@*
 
-@ifhtml
-
-@html
-<span style="background-color: #1fff1f">up to date</span>
-@end html
-@end ifhtml
-@ifnothtml
-up to date
 @end ifnothtml
-@tab Francisco Vila
-@*
-
 @ifhtml
 
 @html
@@ -6251,11 +6291,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -6412,11 +6452,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -6553,11 +6593,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -9581,11 +9621,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*
@@ -9854,11 +9894,11 @@ translated
 @ifhtml
 
 @html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #d587ff"></span>
 @end html
 @end ifhtml
 @ifnothtml
-up to date
+
 @end ifnothtml
 @tab Francisco Vila
 @*