From: John Mandereau Date: Sun, 9 Nov 2008 15:07:33 +0000 (+0100) Subject: Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond X-Git-Tag: release/2.11.64-1~61 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=96e14d746b102f223acf6b6f4cdb8b0f0a11cd24;hp=67b765a12ecede62b2089e9289ecc39e0c108289;p=lilypond.git Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond --- diff --git a/Documentation/de/user/editorial.itely b/Documentation/de/user/editorial.itely index 8b2cdf5180..0a2b65caaf 100644 --- a/Documentation/de/user/editorial.itely +++ b/Documentation/de/user/editorial.itely @@ -162,7 +162,7 @@ c4-1 d-2 f-4 e-3 Für Fingerwechsel muss eine Textbeschriftung (markup) benutzt werden: -@lilypond[quote,verbatim,relative=2] +@lilypond[verbatim,quote,relative=2] c4-1 d-2 f-4 c^\markup { \finger "2 - 3" } @end lilypond diff --git a/Documentation/de/user/expressive.itely b/Documentation/de/user/expressive.itely index d2a1de519d..95a3598bd2 100644 --- a/Documentation/de/user/expressive.itely +++ b/Documentation/de/user/expressive.itely @@ -259,7 +259,7 @@ c4\< c\! d\> e\! In manchen Situationen kann auch der @code{\espressivo}-Befehl geeignet sein, ein An- und Abschwellen einer Note anzuzeigen. -@lilypond[quote,verbatim,relative=2] +@lilypond[verbatim,quote,relative=2] c2 b4 a g1\espressivo @end lilypond @@ -506,8 +506,8 @@ Ein Legatobogen (engl. slur) zeigt an, dass die Noten @emph{legato} gespielt werden sollen. Er wird mit Klammern hinter den Notenwerten notiert. -@lilypond[quote,relative=2,verbatim] -f( g a) a8 b( +@lilypond[verbatim,quote,relative=2] +f4( g a) a8 b( a4 g2 f4) 2( 2) @end lilypond @@ -695,7 +695,7 @@ Referenz der Interna: Atemzeichen werden mit dem Befehl @code{\breathe} eingegeben. -@lilypond[quote,relative=2,verbatim] +@lilypond[verbatim,quote,relative=2] c2. \breathe d4 @end lilypond @@ -853,7 +853,7 @@ Ein @notation{Arpeggio} als Zeichen, dass ein Akkord gebrochen gespielt werden s kann mit dem Befehl @code{\arpeggio} hinter der Akkord-Konstruktion erzeugt werden. -@lilypond[quote,relative=1,verbatim] +@lilypond[verbatim,quote,relative=1] 1\arpeggio @end lilypond @@ -881,7 +881,7 @@ her: Besondere Arpeggios mit Klammern können erstellt werden: -@lilypond[quote,relative=1,verbatim] +@lilypond[verbatim,quote,relative=1] 2 \arpeggioBracket 2\arpeggio @@ -996,7 +996,7 @@ mit dem Befehl @code{pitchedTrill} notiert werden. Das erste Argument ist die Hauptnote, das zweite die Note, auf der getrillert wird. Sie wird als Note ohne Hals in Klammern ausgegeben. -@lilypond[verbatim,relative=1,quote] +@lilypond[verbatim,quote,relative=1] \pitchedTrill e2\startTrillSpan fis d\stopTrillSpan @end lilypond diff --git a/Documentation/de/user/introduction.itely b/Documentation/de/user/introduction.itely index 49425f9b43..103f6fb09f 100644 --- a/Documentation/de/user/introduction.itely +++ b/Documentation/de/user/introduction.itely @@ -306,7 +306,7 @@ Beim ersten Akkord sind alle Objekte nach unten (oder links) \new Score \with { \override SpacingSpanner #'spacing-increment = #3 \override TimeSignature #'transparent = ##t -} \relative { +} \relative c' { \stemDown 4_>-\arpeggio \override Arpeggio #'direction = #RIGHT \stemUp 4^>-\arpeggio @@ -429,9 +429,9 @@ dem @code{Note_heads_engraver} (@qq{Notenkopfstecher}) der Satz begonnen wird. \include "engraver-example.ily" \score { - \topVoice - \layout { - \context { + \topVoice + \layout { + \context { \Voice \remove "Stem_engraver" \remove "Phrasing_slur_engraver" @@ -439,8 +439,8 @@ dem @code{Note_heads_engraver} (@qq{Notenkopfstecher}) der Satz begonnen wird. \remove "Script_engraver" \remove "Beam_engraver" \remove "Auto_beam_engraver" - } - \context { + } + \context { \Staff \remove "Accidental_engraver" \remove "Key_engraver" @@ -449,8 +449,8 @@ dem @code{Note_heads_engraver} (@qq{Notenkopfstecher}) der Satz begonnen wird. \remove "Time_signature_engraver" \remove "Staff_symbol_engraver" \consists "Pitch_squash_engraver" - } -} + } + } } @end lilypond @@ -629,7 +629,7 @@ kleine Teile zu größeren kombiniert werden, kann komplexere Musik dargestellt werden. So etwa hier: @lilypond[quote,verbatim,fragment,relative=1] -c4 +f4 @end lilypond @noindent @@ -708,15 +708,88 @@ ein Lead Sheet. @lilypond[quote,ragged-right] << \chords { c2 c f2 c } - \new Staff \relative c' { \time 2/4 c4 c g'4 g a4 a g2 } - \new Lyrics \lyricmode { twin4 kle twin kle lit tle star2 } + \new Staff + \relative c' { + \time 2/4 + c4 c g' g a a g2 + } + \addlyrics { twin kle twin kle lit tle star } >> @end lilypond Mehrstimmige Notation und Klaviermusik kann auch gesetzt werden. Das nächste Beispiel zeigt einige etwas exotischere Konstruktionen: -@lilypondfile[quote,ragged-right]{screech-boink.ly} +@lilypond[quote] +\header { + title = "Screech and boink" + subtitle = "Random complex notation" + composer = "Han-Wen Nienhuys" +} + +\score { + \context PianoStaff << + \new Staff = "up" { + \time 4/8 + \key c \minor + << { + \revert Stem #'direction + \change Staff = down + \set subdivideBeams = ##t + g16.[ + \change Staff = up + c'''32 + \change Staff = down + g32 + \change Staff = up + c'''32 + \change Staff = down + g16] + \change Staff = up + \stemUp + \set followVoice = ##t + c'''32([ b''16 a''16 gis''16 g''32)] + } \\ { + s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] + } \\ { + s4 \autoBeamOff d''8.. f''32 + } \\ { + s4 es''4 + } >> + } + + \new Staff = "down" { + \clef bass + \key c \minor + \set subdivideBeams = ##f + \override Stem #'french-beaming = ##t + \override Beam #'thickness = #0.3 + \override Stem #'thickness = #4.0 + g'16[ b16 fis16 g16] + << \makeClusters { + as16 + + + } \\ { + \override Staff.Arpeggio #'arpeggio-direction =#down + 4\arpeggio + } + >> } + >> + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 60 8) + } + } + \layout { + \context { + \Staff + \consists Horizontal_bracket_engraver + } + } +} +@end lilypond Die obenstehenden Beispiele wurde manuell erstellt, aber das ist nicht die einzige Möglichkeit. Da der Satz fast vollständig automatisch abläuft, diff --git a/Documentation/de/user/lilypond-learning.tely b/Documentation/de/user/lilypond-learning.tely index fa1af70906..9de2e5ed5d 100644 --- a/Documentation/de/user/lilypond-learning.tely +++ b/Documentation/de/user/lilypond-learning.tely @@ -12,15 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex - @c don't remove this comment. @ignore diff --git a/Documentation/de/user/lilypond-program.tely b/Documentation/de/user/lilypond-program.tely index c886f89b37..0561f0ee02 100644 --- a/Documentation/de/user/lilypond-program.tely +++ b/Documentation/de/user/lilypond-program.tely @@ -12,15 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex - @c don't remove this comment. @ignore diff --git a/Documentation/de/user/lilypond.tely b/Documentation/de/user/lilypond.tely index da49d9b94d..c964b2bc7d 100644 --- a/Documentation/de/user/lilypond.tely +++ b/Documentation/de/user/lilypond.tely @@ -12,14 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex @c Keep this here, since it pertains to the direntry below. @ignore diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi index 333775a2cc..4715fe1264 100644 --- a/Documentation/de/user/macros.itexi +++ b/Documentation/de/user/macros.itexi @@ -9,6 +9,9 @@ @include version.itexi +@c don't replace quotes with directed quotes +@set txicodequoteundirected +@set txicodequotebacktick @c ***** Displaying text ***** diff --git a/Documentation/de/user/pitches.itely b/Documentation/de/user/pitches.itely index 43383f4be5..16b23d0e52 100644 --- a/Documentation/de/user/pitches.itely +++ b/Documentation/de/user/pitches.itely @@ -60,7 +60,7 @@ werden in der Oktave unter dem zweigestrichenen C gesetzt. @c don't use c' here. -@lilypond[quote,fragment,verbatim] +@lilypond[verbatim,quote,fragment] \clef bass c d e f g a b c @@ -162,7 +162,7 @@ So funktioniert der relative Modus: Oktavversetzungen müssen für alle Intervalle angezeigt werden, die größer als eine Quarte sind. -@lilypond[quote,verbatim] +@lilypond[verbatim,quote] \relative c'' { c g c f, c' a, e'' c @@ -185,7 +185,7 @@ bestimmen. Innerhalb von Akkorden ist die nächste Note immer relativ zur vorherigen. Betrachten Sie das folgende Beispiel aufmerksam, insbesondere die @code{c}-Noten. -@lilypond[quote,verbatim] +@lilypond[verbatim,quote] \relative c' { c @@ -290,7 +290,7 @@ Syntax leitet sich von den holländischen Notenbezeichnungen ab. Um andere Bezeichnungen für Versetzungszeichen zu benutzung, siehe @ref{Note names in other languages}. -@lilypond[quote,verbatim,relative=2] +@lilypond[verbatim,quote,relative=2] ais1 aes aisis aeses @end lilypond diff --git a/Documentation/de/user/rhythms.itely b/Documentation/de/user/rhythms.itely index e7f4ef4015..29f9968474 100644 --- a/Documentation/de/user/rhythms.itely +++ b/Documentation/de/user/rhythms.itely @@ -689,7 +689,7 @@ Dauer von Noten. Die Dauer einer Ganztaktpause muss immer eine ganze Anzahl an Taktlängen sein, weshalb Punktierungen und Brüche recht häufig eingesetzt werden müssen. -@lilypond[quote,verbatim] +@lilypond[quote,fragment,verbatim] \compressFullBarRests \time 2/4 R1 | R2 | @@ -704,7 +704,7 @@ R4*5*4 | Eine Ganztaktpause wird abhängig von der Taktart entweder als Ganze oder Brevis-Pause gesetzt, zentriert im Takt. -@lilypond[quote,verbatim] +@lilypond[quote,verbatim,fragment] \time 4/4 R1 | \time 6/4 @@ -726,7 +726,7 @@ aber auch nur in einem Takt angezeigt werden, der ein Mehrtaktpausensymbol geinhaltet, wobei die Anzahl der Takte der Pausendauer über dem Pausenzeichen ausgegeben wird: -@lilypond[quote,verbatim] +@lilypond[quote,fragment,verbatim] % Default behavior \time 3/4 r2. | R2.*2 | \time 2/4 R2 | @@ -888,7 +888,7 @@ berücksichtigt. Taktangaben könne wie folgt erstellt werden. -@lilypond[quote,verbatim] +@lilypond[quote,verbatim,relative=2] \time 2/4 c'2 \time 3/4 c'2. @end lilypond diff --git a/Documentation/de/user/tutorial.itely b/Documentation/de/user/tutorial.itely index 341b4cbbab..35b86f4d48 100644 --- a/Documentation/de/user/tutorial.itely +++ b/Documentation/de/user/tutorial.itely @@ -744,7 +744,7 @@ deutsche Benutzer kein Problem. Es ist aber möglich, die Namen für die @notation{Versetzungszeichen} in anderen Sprachen zu benutzen, siehe @ruser{Note names in other languages}. -@lilypond[verbatim,quote,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] cis1 ees fisis, aeses @end lilypond @@ -774,7 +774,7 @@ Befehl @code{\key}, gefolgt von einer Notenbezeichnung und @code{\major} (für Dur) oder @code{\minor} (für Moll). -@lilypond[verbatim,quote,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] \key d \major a1 \key c \minor @@ -811,7 +811,7 @@ den Ton eingeben, den man @emph{hören} will. In diesem Beispiel -@lilypond[verbatim,quote,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] \key d \major d cis fis @end lilypond @@ -826,7 +826,7 @@ auf die erste Linie des Systems.} Im Gegenteil, er heißt vielmehr: In der Tonart As-Dur @emph{bekommt} sie ein Versetzungszeichen: -@lilypond[verbatim,quote,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] \key aes \major e @end lilypond @@ -869,7 +869,7 @@ Glossar: @rglos{tie}. Ein @notation{Bindebogen} wird geschrieben, indem man eine Tilde @code{~} an die erste der zu verbindenden Noten hängt. -@lilypond[verbatim,quote,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] g4~ g c2~ c4 ~ c8 a8 ~ a2 @end lilypond @@ -883,7 +883,7 @@ Ein @notation{Legatobogen} ist ein Bogen, der sich über mehrere Noten erstreckt. Seine Beginn- und Endnote werden mit @q{(} beziehungsweise @q{)} markiert. -@lilypond[verbatim,quote,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] d4( c16) cis( d e c cis d) e( d4) @end lilypond @@ -898,7 +898,7 @@ Phrasierungsbögen gleichzeitig vorkommen, aber es kann nicht mehr als jeweils einen Legato- und einen Phrasierungsbogen gleichzeitig geben. -@lilypond[verbatim,quote,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] a8(\( ais b c) cis2 b'2 a4 cis,\) @end lilypond @@ -1665,7 +1665,7 @@ notiert aus: \relative c'' { \key g \major \time 6/8 - d4 b8 c4 a8 d4 b8 g4 + d4 b8 c4 a8 d4 b8 g4 g8 a4 b8 c b a d4 b8 g4. } \addlyrics { @@ -1690,14 +1690,14 @@ betroffenen Noten zu notieren, zu Einzelheiten siehe \relative c'' { \key g \major \time 6/8 - d4 b8 c4 a8 d4 b8 g4 + d4 b8 c4 a8 d4 b8 g4 g8 a4 b8 c( b) a d4 b8 g4. } \addlyrics { Girls and boys come out to play, The moon doth shine as bright as day; } ->> +>> @end lilypond Die Wörter orientieren sich jetzt richtig an den Noten, @@ -1732,7 +1732,7 @@ für jede Note, die übersprungen werden soll, ein Unterstrich \relative c'' { \key g \major \time 6/8 - d4 b8 c4 a8 d4 b8 g4 + d4 b8 c4 a8 d4 b8 g4 g8 a4 b8 c[ b] a d4 b8 g4. } \addlyrics { @@ -1755,11 +1755,11 @@ aus Purcells @notation{Dido and Æneas}: \relative c'' { \key g \minor \time 3/2 - g2 a bes bes( a) + g2 a bes bes( a) b c4.( bes8 a4. g8 fis4.) g8 fis1 } \addlyrics { - When I am laid, + When I am laid, am laid __ in earth, } >> @@ -1775,17 +1775,17 @@ zeigt, mit denen Text an den Noten ausgerichtet werden kann: @c no ragged-right here because otherwise the hyphens get lost, @c but the example is long enough to avoid looking strange. -@lilypond[verbatim,quote] +@lilypond[verbatim,quote,noragged-right] << \relative c' { \key g \major \time 3/4 \partial 4 - d4 g4 g a8( b) g4 g4 + d4 g4 g a8( b) g4 g4 b8( c) d4 d e4 c2 } \addlyrics { - A -- way in a __ man -- ger, + A -- way in a __ man -- ger, no __ crib for a bed, __ } >> @@ -1803,13 +1803,13 @@ in Figaros Arie @notation{Largo al factotum} gesungen werden mus. @c no ragged-right here because otherwise the hyphens get lost, @c but the example is long enough to avoid looking strange. -@lilypond[verbatim,quote] +@lilypond[verbatim,quote,noragged-right] << \relative c' { \clef bass \key c \major \time 6/8 - c4.~ c8 d b c([ d)] b c d b c + c4.~ c8 d b c([ d]) b c d b c } \addlyrics { Lar -- go_al fac -- to -- tum del -- la cit -- tà @@ -1838,7 +1838,7 @@ aus Händels @notation{Judas Maccabäus}: \key f \major \time 6/8 \partial 8 - c8 c([ bes)] a a([ g)] f f'4. b, c4.~ c4 + c8 c([ bes]) a a([ g]) f f'4. b, c4.~ c4 } \addlyrics { Let flee -- cy flocks the hills a -- dorn, __ @@ -1847,7 +1847,7 @@ aus Händels @notation{Judas Maccabäus}: \key f \major \time 6/8 \partial 8 - r8 r4. r4 c8 a'([ g)] f f([ e)] d e([ d)] c bes'4 + r8 r4. r4 c8 a'([ g]) f f([ e]) d e([ d]) c bes'4 } \addlyrics { Let flee -- cy flocks the hills a -- dorn, diff --git a/Documentation/de/user/working.itely b/Documentation/de/user/working.itely index 3803169ee8..e6d14b358d 100644 --- a/Documentation/de/user/working.itely +++ b/Documentation/de/user/working.itely @@ -218,9 +218,9 @@ hornNotes = \relative c'' { c4 b dis c } Das könnte auch nützlich in Minimal-Music sein: @lilypond[quote,verbatim,ragged-right] -fragA = \relative c'' { a4 a8. b16 } -fragB = \relative c'' { a8. gis16 ees4 } -violin = \new Staff { \fragA \fragA \fragB \fragA } +fragmentA = \relative c'' { a4 a8. b16 } +fragmentB = \relative c'' { a8. gis16 ees4 } +violin = \new Staff { \fragmentA \fragmentA \fragmentB \fragmentA } \score { { \violin diff --git a/Documentation/es/user/lilypond-learning.tely b/Documentation/es/user/lilypond-learning.tely index 9ea81c3c9c..9ec1a0cdf5 100644 --- a/Documentation/es/user/lilypond-learning.tely +++ b/Documentation/es/user/lilypond-learning.tely @@ -12,15 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex - @c don't remove this comment. @ignore diff --git a/Documentation/es/user/lilypond-program.tely b/Documentation/es/user/lilypond-program.tely index 7488716504..40c6b48a4c 100644 --- a/Documentation/es/user/lilypond-program.tely +++ b/Documentation/es/user/lilypond-program.tely @@ -12,15 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex - @c don't remove this comment. @ignore diff --git a/Documentation/es/user/lilypond.tely b/Documentation/es/user/lilypond.tely index 686f36cbcd..34aa0d67b1 100644 --- a/Documentation/es/user/lilypond.tely +++ b/Documentation/es/user/lilypond.tely @@ -12,14 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex @c Keep this here, since it pertains to the direntry below. @ignore diff --git a/Documentation/es/user/macros.itexi b/Documentation/es/user/macros.itexi index 6989af7b15..4d1e7776f0 100644 --- a/Documentation/es/user/macros.itexi +++ b/Documentation/es/user/macros.itexi @@ -8,6 +8,10 @@ @include version.itexi +@c don't replace quotes with directed quotes +@set txicodequoteundirected +@set txicodequotebacktick + @c ***** Displaying text ***** @c we need this since @q{\} doesn't work with makeinfo 4.11 -- diff --git a/Documentation/fr/user/lilypond-learning.tely b/Documentation/fr/user/lilypond-learning.tely index 241fe9df81..c74ae320be 100644 --- a/Documentation/fr/user/lilypond-learning.tely +++ b/Documentation/fr/user/lilypond-learning.tely @@ -12,15 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex - @c don't remove this comment. @ignore diff --git a/Documentation/fr/user/lilypond-program.tely b/Documentation/fr/user/lilypond-program.tely index 2a9c92dd09..861e8ba72a 100644 --- a/Documentation/fr/user/lilypond-program.tely +++ b/Documentation/fr/user/lilypond-program.tely @@ -12,14 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex @c don't remove this comment. @ignore diff --git a/Documentation/fr/user/lilypond.tely b/Documentation/fr/user/lilypond.tely index 3f907cd5c8..1a8bc532ef 100644 --- a/Documentation/fr/user/lilypond.tely +++ b/Documentation/fr/user/lilypond.tely @@ -12,14 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex @c @direntry has not been added yet, as Emacs and standalone Info have @c no i18n support -JM diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi index 6b86871839..16860ee093 100644 --- a/Documentation/fr/user/macros.itexi +++ b/Documentation/fr/user/macros.itexi @@ -8,6 +8,10 @@ @include version.itexi +@c don't replace quotes with directed quotes +@set txicodequoteundirected +@set txicodequotebacktick + @c ***** Displaying text ***** @c we need this since @q{\} doesn't work with makeinfo 4.11 -- diff --git a/Documentation/po/GNUmakefile b/Documentation/po/GNUmakefile index 685d2bab5f..3f8fc3ce4a 100644 --- a/Documentation/po/GNUmakefile +++ b/Documentation/po/GNUmakefile @@ -11,6 +11,7 @@ DOMAIN=lilypond-doc DOC_PO_SOURCES = postprocess_html.py texi-gettext.py translations-status.py TELY_FILES = $(shell ls $(depth)/Documentation/user/lilypond*.tely) TELY_FILES += $(foreach l, $(LANGS), $(shell ls $(depth)/Documentation/$(l)/user/lilypond*.tely)) +TELY_FILES += $(shell ls $(depth)/input/lsr/*.ly) messages: $(outdir)/messages diff --git a/Documentation/po/de.po b/Documentation/po/de.po index f396c1e5e9..183a24a75d 100644 --- a/Documentation/po/de.po +++ b/Documentation/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-27 12:40+0100\n" +"POT-Creation-Date: 2008-11-09 01:15+0100\n" "PO-Revision-Date: 2008-10-19 10:10+0300\n" "Last-Translator: Till Rettig \n" "Language-Team: de\n" @@ -420,6 +420,7 @@ msgstr "f ist 4 aufwärts oder 3 runter, also f unter dem b" #. Documentation/user/tutorial.itely:1796 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) +#. Documentation/user/pitches.itely:1041 (context id) msgid "violin" msgstr "Geige" @@ -660,6 +661,7 @@ msgstr "Taktangabe" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "time signature" msgstr "Taktangabe" @@ -887,6 +889,7 @@ msgstr "Bindebögen" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "tie" msgstr "Bindebogen" @@ -1081,6 +1084,7 @@ msgstr "Auftakt" #. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "anacrusis" msgstr "Auftakt" @@ -1105,6 +1109,7 @@ msgstr "Andere rhythmische Aufteilungen" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "note value" msgstr "Notenwert" @@ -1114,6 +1119,7 @@ msgstr "Notenwert" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "triplet" msgstr "Triole" @@ -1138,6 +1144,7 @@ msgstr "Verzierungen" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "grace notes" msgstr "Verzierungen" @@ -1147,6 +1154,7 @@ msgstr "Verzierungen" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "acciaccatura" msgstr "Vorschlag" @@ -1156,6 +1164,7 @@ msgstr "Vorschlag" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "appoggiatura" msgstr "Vorhalt" @@ -1424,7 +1433,45 @@ msgstr "Absolute Notenbezeichnungen" msgid "After the tutorial" msgstr "Nach der Übung" +#. Documentation/user/fundamental.itely:325 (context id) +#. Documentation/user/fundamental.itely:368 (context id) +#, fuzzy +msgid "singer" +msgstr "Fingersatz" + +#. Documentation/user/fundamental.itely:326 (context id) +#. Documentation/user/fundamental.itely:369 (context id) +#, fuzzy +msgid "vocal" +msgstr "Tonleiter" + +#. Documentation/user/fundamental.itely:329 (context id) +#. Documentation/user/fundamental.itely:372 (context id) +#, fuzzy +msgid "piano" +msgstr "Klavier" + +#. Documentation/user/fundamental.itely:330 (context id) +#. Documentation/user/fundamental.itely:363 (variable) +#. Documentation/user/fundamental.itely:373 (context id) +#. Documentation/user/fundamental.itely:2669 (variable) +#. Documentation/user/fundamental.itely:2711 (context id) +msgid "upper" +msgstr "oben" + +#. Documentation/user/fundamental.itely:331 (context id) +#. Documentation/user/fundamental.itely:364 (variable) +#. Documentation/user/fundamental.itely:374 (context id) +#. Documentation/user/fundamental.itely:2676 (variable) +#. Documentation/user/fundamental.itely:2712 (context id) +msgid "lower" +msgstr "unten" + #. Documentation/user/fundamental.itely:361 (variable) +#. Documentation/user/simultaneous.itely:239 (context id) +#. Documentation/user/vocal.itely:568 (context id) +#. Documentation/user/vocal.itely:797 (context id) +#. Documentation/user/vocal.itely:818 (context id) #. Documentation/user/vocal.itely:1222 (variable) #. Documentation/user/vocal.itely:1264 (variable) msgid "melody" @@ -1437,15 +1484,11 @@ msgstr "Melodie" msgid "text" msgstr "Text" -#. Documentation/user/fundamental.itely:363 (variable) -#. Documentation/user/fundamental.itely:2669 (variable) -msgid "upper" -msgstr "oben" - -#. Documentation/user/fundamental.itely:364 (variable) -#. Documentation/user/fundamental.itely:2676 (variable) -msgid "lower" -msgstr "unten" +#. Documentation/user/fundamental.itely:443 (context id) +#. Documentation/user/staff.itely:535 (context id) +#, fuzzy +msgid "main" +msgstr "Moll" #. Documentation/user/fundamental.itely:632 (comment) msgid "Voice \\\"1\\\" Voice \\\"2\\\"" @@ -1551,6 +1594,16 @@ msgstr "Hälse usw. nach oben ausrichten" msgid "Initiate first voice" msgstr "Erste Stimme einrichten" +#. Documentation/user/fundamental.itely:1199 (context id) +#. Documentation/user/fundamental.itely:2441 (context id) +#. Documentation/user/vocal.itely:503 (context id) +#. Documentation/user/vocal.itely:1233 (context id) +#. Documentation/user/vocal.itely:1274 (context id) +#. Documentation/user/keyboards.itely:327 (context id) +#. Documentation/user/fretted-strings.itely:241 (context id) +msgid "one" +msgstr "" + #. Documentation/user/fundamental.itely:1242 (variable) #. Documentation/user/fundamental.itely:2646 (variable) #. Documentation/user/tweaks.itely:3268 (variable) @@ -1575,6 +1628,16 @@ msgstr "SopEinsText" msgid "SopTwoLyrics" msgstr "SoprZweiText" +#. Documentation/user/fundamental.itely:1255 (context id) +#, fuzzy +msgid "SopOne" +msgstr "SoprEinsNoten" + +#. Documentation/user/fundamental.itely:1264 (context id) +#, fuzzy +msgid "SopTwo" +msgstr "SoprZweiNoten" + #. Documentation/user/fundamental.itely:1296 (variable) #. Documentation/user/fundamental.itely:2864 (variable) msgid "TimeKey" @@ -1619,6 +1682,32 @@ msgstr "StropheDrei" msgid "VerseFour" msgstr "StropheVier" +#. Documentation/user/fundamental.itely:1314 (context id) +#, fuzzy +msgid "Sop" +msgstr "Top" + +#. Documentation/user/fundamental.itely:1315 (context id) +#. Documentation/user/tweaks.itely:3283 (context id) +#. Documentation/user/input.itely:915 (context id) +#, fuzzy +msgid "Alto" +msgstr "AltOn" + +#. Documentation/user/fundamental.itely:1323 (context id) +#. Documentation/user/tweaks.itely:3291 (context id) +#. Documentation/user/input.itely:917 (context id) +#, fuzzy +msgid "Tenor" +msgstr "TenorNoten" + +#. Documentation/user/fundamental.itely:1324 (context id) +#. Documentation/user/tweaks.itely:3292 (context id) +#. Documentation/user/input.itely:922 (context id) +#, fuzzy +msgid "Bass" +msgstr "Takte" + #. Documentation/user/fundamental.itely:1350 (variable) #. Documentation/user/fundamental.itely:1402 (variable) #. Documentation/user/fundamental.itely:1464 (variable) @@ -1631,6 +1720,14 @@ msgstr "StrophenNoten" msgid "versewords" msgstr "StrophenText" +#. Documentation/user/fundamental.itely:1361 (context id) +#. Documentation/user/fundamental.itely:1428 (context id) +#. Documentation/user/fundamental.itely:1489 (context id) +#. Documentation/user/vocal.itely:820 (context id) +#, fuzzy +msgid "verse" +msgstr "StrophenNoten" + #. Documentation/user/fundamental.itely:1407 (variable) #. Documentation/user/fundamental.itely:1469 (variable) msgid "refrainnotesA" @@ -1651,6 +1748,17 @@ msgstr "RefrainTextA" msgid "refrainwordsB" msgstr "RefrainTextB" +#. Documentation/user/fundamental.itely:1436 (context id) +#. Documentation/user/fundamental.itely:1509 (context id) +#, fuzzy +msgid "refrainB" +msgstr "RefrainNotenB" + +#. Documentation/user/fundamental.itely:1501 (context id) +#, fuzzy +msgid "refrainA" +msgstr "RefrainNotenA" + #. Documentation/user/fundamental.itely:1655 (comment) msgid "start of single compound music expression" msgstr "Beginn des einen musikalischen Ausdrucks" @@ -1799,6 +1907,30 @@ msgstr "BassText" msgid "combine ChoirStaff and PianoStaff in parallel" msgstr "ChoirStaff und PianoStaff parallel kombinieren" +#. Documentation/user/fundamental.itely:2687 (context id) +#. Documentation/user/fundamental.itely:2689 (context id) +#, fuzzy +msgid "sopranos" +msgstr "SopranNoten" + +#. Documentation/user/fundamental.itely:2692 (context id) +#. Documentation/user/fundamental.itely:2694 (context id) +#, fuzzy +msgid "altos" +msgstr "AltNoten" + +#. Documentation/user/fundamental.itely:2697 (context id) +#. Documentation/user/fundamental.itely:2699 (context id) +#, fuzzy +msgid "tenors" +msgstr "TenorNoten" + +#. Documentation/user/fundamental.itely:2702 (context id) +#. Documentation/user/fundamental.itely:2704 (context id) +#, fuzzy +msgid "basses" +msgstr "BassNoten" + #. Documentation/user/fundamental.itely:2707 (comment) msgid "end ChoirStaff" msgstr "Ende ChoirStaff" @@ -1823,6 +1955,11 @@ msgstr "PedalOrgelNoten" msgid "PianoStaff and Pedal Staff must be simultaneous" msgstr "PianoStaff und Pedal-System müssen gleichzeitig sein" +#. Documentation/user/fundamental.itely:2884 (context id) +#, fuzzy +msgid "ManualOne" +msgstr "Manuelle Balken" + #. Documentation/user/fundamental.itely:2885 (comment) msgid "set time signature and key" msgstr "Taktangabe und Tonart setzen" @@ -1831,6 +1968,11 @@ msgstr "Taktangabe und Tonart setzen" msgid "end ManualOne Staff context" msgstr "Ende ManualEins Staff-Kontext" +#. Documentation/user/fundamental.itely:2890 (context id) +#, fuzzy +msgid "ManualTwo" +msgstr "ManualZweiNoten" + #. Documentation/user/fundamental.itely:2894 (comment) msgid "end ManualTwo Staff context" msgstr "Ende ManualZwei Staff-Kontext" @@ -1839,6 +1981,11 @@ msgstr "Ende ManualZwei Staff-Kontext" msgid "end PianoStaff context" msgstr "Klaviersystem beenden" +#. Documentation/user/fundamental.itely:2896 (context id) +#, fuzzy +msgid "PedalOrgan" +msgstr "PedalOrgelNoten" + #. Documentation/user/fundamental.itely:2900 (comment) msgid "end PedalOrgan Staff context" msgstr "Orgelsystem beenden" @@ -1902,6 +2049,11 @@ msgstr "Musikalische Ausdrücke ineinander verschachteln" #. @rglos in Documentation/user/fundamental.itely #. @rglos in Documentation/user/tweaks.itely +#. Documentation/user/staff.itely:564 (context id) +#. Documentation/user/staff.itely:577 (context id) +#. Documentation/user/staff.itely:585 (context id) +#. Documentation/user/staff.itely:604 (context id) +#. Documentation/user/staff.itely:617 (context id) #. @rglos in Documentation/user/staff.itely #. @rglos in Documentation/fr/user/fundamental.itely #. @rglos in Documentation/es/user/fundamental.itely @@ -2284,6 +2436,26 @@ msgstr "Beginn des polyphonen Abschnitts mit vier Stimmen" msgid "lhMusic" msgstr "lhNoten" +#. Documentation/user/tweaks.itely:2772 (context id) +#. Documentation/user/tweaks.itely:2821 (context id) +#. Documentation/user/tweaks.itely:2884 (context id) +#. Documentation/user/tweaks.itely:2958 (context id) +#. Documentation/user/tweaks.itely:3022 (context id) +#. Documentation/user/tweaks.itely:3079 (context id) +#. Documentation/user/input.itely:928 (context id) +msgid "RH" +msgstr "" + +#. Documentation/user/tweaks.itely:2776 (context id) +#. Documentation/user/tweaks.itely:2825 (context id) +#. Documentation/user/tweaks.itely:2888 (context id) +#. Documentation/user/tweaks.itely:2962 (context id) +#. Documentation/user/tweaks.itely:3026 (context id) +#. Documentation/user/tweaks.itely:3083 (context id) +#. Documentation/user/input.itely:934 (context id) +msgid "LH" +msgstr "" + #. Documentation/user/tweaks.itely:3000 (comment) #. Documentation/user/tweaks.itely:3057 (comment) msgid "Move the c2 out of the main note column so the merge will work" @@ -2326,7 +2498,13 @@ msgstr "normal" msgid "SopranoMusic" msgstr "SopranNoten" -#. Documentation/user/tweaks.itely:3485 (comment) +#. Documentation/user/tweaks.itely:3282 (context id) +#. Documentation/user/input.itely:913 (context id) +#, fuzzy +msgid "Soprano" +msgstr "SopranNoten" + +#. Documentation/user/tweaks.itely:3487 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "Anordngen um Farbe von der color-notehead-Prozedur zu erhalten" @@ -3894,7 +4072,7 @@ msgstr "Index der LilyPond-Befehle" msgid "Musical notation" msgstr "Musikalische Notation" -#. Documentation/user/pitches.itely:654 (variable) +#. Documentation/user/pitches.itely:668 (variable) #. Documentation/user/input.itely:997 (variable) #. Documentation/user/input.itely:1016 (variable) #. Documentation/user/input.itely:1053 (variable) @@ -3902,18 +4080,39 @@ msgstr "Musikalische Notation" msgid "music" msgstr "Noten" -#. Documentation/user/pitches.itely:1031 (comment) +#. Documentation/user/pitches.itely:1045 (comment) msgid "not strictly necessary, but a good reminder" msgstr "nicht unbdingt nötig, aber gut zu erinnern" -#. Documentation/user/pitches.itely:1123 (variable) +#. Documentation/user/pitches.itely:1052 (context id) +#. Documentation/user/staff.itely:1100 (variable) +msgid "clarinet" +msgstr "Klarinette" + +#. Documentation/user/pitches.itely:1137 (variable) msgid "musicA" msgstr "NotenA" -#. Documentation/user/pitches.itely:1137 (variable) +#. Documentation/user/pitches.itely:1151 (variable) msgid "musicB" msgstr "NotenB" +#. Documentation/user/pitches.itely:1170 (context id) +#. Documentation/user/keyboards.itely:170 (context id) +#. Documentation/user/keyboards.itely:264 (context id) +#. Documentation/user/percussion.itely:175 (variable) +#. Documentation/user/percussion.itely:365 (variable) +msgid "up" +msgstr "oben" + +#. Documentation/user/pitches.itely:1174 (context id) +#. Documentation/user/keyboards.itely:180 (context id) +#. Documentation/user/keyboards.itely:273 (context id) +#. Documentation/user/percussion.itely:178 (variable) +#. Documentation/user/percussion.itely:366 (variable) +msgid "down" +msgstr "unten" + #. @node in Documentation/user/pitches.itely #. @subsection in Documentation/user/pitches.itely #. @node in Documentation/fr/user/pitches.itely @@ -4153,245 +4352,200 @@ msgstr "Notenköpfe mit besonderen Formen" msgid "Improvisation" msgstr "Improvisation" -#. Documentation/user/rhythms.itely:294 (comment) +#. Documentation/user/rhythms.itely:285 (comment) msgid "Alter durations to triplets" msgstr "Dauern zu Triolen verändern" -#. Documentation/user/rhythms.itely:296 (comment) -#. Documentation/user/rhythms.itely:321 (comment) +#. Documentation/user/rhythms.itely:287 (comment) +#. Documentation/user/rhythms.itely:312 (comment) msgid "Normal durations" msgstr "Normale Tondauern" -#. Documentation/user/rhythms.itely:298 (comment) +#. Documentation/user/rhythms.itely:289 (comment) msgid "Double the duration of chord" msgstr "Dauer der Akkorde verdoppeln" -#. Documentation/user/rhythms.itely:300 (comment) +#. Documentation/user/rhythms.itely:291 (comment) msgid "Duration of quarter, appears like sixteenth" msgstr "Dauer einer Vietel, erscheint vie eine Sechszehntel" -#. Documentation/user/rhythms.itely:323 (comment) +#. Documentation/user/rhythms.itely:314 (comment) msgid "Scale music by *2/3" msgstr "Noten mit 2/3 skalieren" -#. Documentation/user/rhythms.itely:327 (comment) +#. Documentation/user/rhythms.itely:318 (comment) msgid "Scale music by *2" msgstr "Noten *2 skalieren" -#. Documentation/user/rhythms.itely:412 (comment) +#. Documentation/user/rhythms.itely:403 (comment) msgid "First alternative: following note is tied normally" msgstr "Erste Weiche: nächste Note ist normal gebunden" -#. Documentation/user/rhythms.itely:414 (comment) +#. Documentation/user/rhythms.itely:405 (comment) msgid "Second alternative: following note has a repeated tie" msgstr "Zweite Weiche: folgende Note hat einen Wiederholten Bindebogen" -#. Documentation/user/rhythms.itely:531 (comment) +#. Documentation/user/rhythms.itely:522 (comment) msgid "These two lines are just to prettify this example" msgstr "Die zwei Linien sind nur zur Verschönerung" -#. Documentation/user/rhythms.itely:534 (comment) +#. Documentation/user/rhythms.itely:525 (comment) msgid "Print a maxima rest, equal to four breves" msgstr "Setze Maxima-Pause, gleich vier Breven" -#. Documentation/user/rhythms.itely:536 (comment) +#. Documentation/user/rhythms.itely:527 (comment) msgid "Print a longa rest, equal to two breves" msgstr "Setze Longa-Pause, gleich zwei Breven" -#. Documentation/user/rhythms.itely:538 (comment) +#. Documentation/user/rhythms.itely:529 (comment) msgid "Print a breve rest" msgstr "Setze Breve-Pause" -#. Documentation/user/rhythms.itely:640 (comment) +#. Documentation/user/rhythms.itely:631 (comment) msgid "This is valid input, but does nothing" msgstr "Gültiger Eingabecode, aber tut nichts" -#. Documentation/user/rhythms.itely:666 (comment) -#. Documentation/user/rhythms.itely:719 (comment) +#. Documentation/user/rhythms.itely:657 (comment) +#. Documentation/user/rhythms.itely:710 (comment) msgid "Rest measures contracted to single measure" msgstr "Pausentakte zu einem einzelnen Takt zusammegezogen" -#. Documentation/user/rhythms.itely:715 (comment) +#. Documentation/user/rhythms.itely:706 (comment) msgid "Default behavior" msgstr "Standart" -#. Documentation/user/rhythms.itely:722 (comment) +#. Documentation/user/rhythms.itely:713 (comment) msgid "Rest measures expanded" msgstr "Pausentakte \tausklappen" -#. Documentation/user/rhythms.itely:755 (comment) +#. Documentation/user/rhythms.itely:746 (comment) msgid "This fails, as the wrong object name is specified" msgstr "" "Das funktioniert nicht, weil die falsche Objektbezeichnung angegeben ist" -#. Documentation/user/rhythms.itely:758 (comment) +#. Documentation/user/rhythms.itely:749 (comment) msgid "This is correct and works" msgstr "Das stimmt und funktioniert" -#. Documentation/user/rhythms.itely:880 (comment) +#. Documentation/user/rhythms.itely:871 (comment) msgid "Default style" msgstr "Standardstil" -#. Documentation/user/rhythms.itely:883 (comment) +#. Documentation/user/rhythms.itely:874 (comment) msgid "Change to numeric style" msgstr "Wechsel zum nummerierten Stil" -#. Documentation/user/rhythms.itely:887 (comment) +#. Documentation/user/rhythms.itely:878 (comment) msgid "Revert to default style" msgstr "Zurück zum Standard" -#. Documentation/user/rhythms.itely:916 (comment) -msgid "Change time signature but keep 3/4 beaming" -msgstr "" - -#. Documentation/user/rhythms.itely:917 (comment) -#, fuzzy -msgid "due to unchanged beatLength" -msgstr "aufgrund von beatLength" - -#. Documentation/user/rhythms.itely:921 (comment) -msgid "Lose 3/4 beaming now beatLength has changed to 16" -msgstr "" - -#. Documentation/user/rhythms.itely:1044 (comment) +#. Documentation/user/rhythms.itely:1017 (comment) msgid "Show all bar numbers" msgstr "Alle Taknummern anzeigen" -#. Documentation/user/rhythms.itely:1154 (comment) +#. Documentation/user/rhythms.itely:1134 (comment) msgid "Now each staff has its own time signature." msgstr "Jetzt hat jedes System eine eigene Taktart" -#. Documentation/user/rhythms.itely:1571 (comment) -#, fuzzy -msgid "auto beam on 1/4 note groups" -msgstr "autom. Balken für 1/4-Notengruppen\t" - -#. Documentation/user/rhythms.itely:1573 (comment) -msgid "no defined auto-beaming for this time sig" -msgstr "für diese Taktart keine autom. Balken definiert" - -#. Documentation/user/rhythms.itely:1577 (comment) +#. Documentation/user/rhythms.itely:1256 (context id) #, fuzzy -msgid "keep 3/4 beaming" -msgstr "3/4-Balken behalten" - -#. Documentation/user/rhythms.itely:1578 (comment) -msgid "due to beatLength" -msgstr "aufgrund von beatLength" - -#. Documentation/user/rhythms.itely:1580 (comment) -msgid "beam on 1/8 notes" -msgstr "Balken für 1/8-Noten" - -#. Documentation/user/rhythms.itely:1583 (comment) -msgid "beam on 3/16, 7/16, 9/16, 12/16" -msgstr "Balken für 3/16, 7/16, 9/16, 12/16" - -#. Documentation/user/rhythms.itely:1612 (comment) -msgid "Set beam sub-group length to an eighth note" -msgstr "Balkenuntergruppenlänge als Achtel definieren" - -#. Documentation/user/rhythms.itely:1615 (comment) -msgid "Set beam sub-group length to a sixteenth note" -msgstr "Balkenuntergruppenlänge als Sechszehntel definieren" +msgid "myRhythm" +msgstr "Rhythmus" -#. Documentation/user/rhythms.itely:1730 (comment) +#. Documentation/user/rhythms.itely:1585 (comment) msgid "end 1/16 beams for all time signatures at the 1/16 moment" msgstr "1/16-Balken für alle Taktarten beim 1/16-Moment beenden" -#. Documentation/user/rhythms.itely:1734 (comment) +#. Documentation/user/rhythms.itely:1589 (comment) msgid "end 1/32 beams for all time signatures at the 1/16 moment" msgstr "1/23-Balken für alle Taktarten beim 1/16-Moment beenden" -#. Documentation/user/rhythms.itely:1744 (comment) +#. Documentation/user/rhythms.itely:1599 (comment) msgid "end beams of all durations in 5/8 time signature at the 2/8 moment" msgstr "Balken aller Längen im 5/8-Takt am 2/8-Moment beenden" -#. Documentation/user/rhythms.itely:1759 (comment) +#. Documentation/user/rhythms.itely:1614 (comment) msgid "rhythm 3-1-1-2" msgstr "" -#. Documentation/user/rhythms.itely:1760 (comment) +#. Documentation/user/rhythms.itely:1615 (comment) msgid "Context not specified - does not work correctly" msgstr "" -#. Documentation/user/rhythms.itely:1766 (comment) +#. Documentation/user/rhythms.itely:1621 (comment) msgid "Works correctly with context specified" msgstr "" -#. Documentation/user/rhythms.itely:1802 (comment) +#. Documentation/user/rhythms.itely:1654 (comment) msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment" msgstr "Regel annullieren, dass 1/16-Balken im 4/4-Takt am 1/4-Moment enden" -#. Documentation/user/rhythms.itely:1815 (comment) +#. Documentation/user/rhythms.itely:1667 (comment) msgid "this won't revert it!" msgstr "Das macht es nicth rückgängig" -#. Documentation/user/rhythms.itely:1817 (comment) +#. Documentation/user/rhythms.itely:1669 (comment) msgid "this will" msgstr "Das schon" -#. Documentation/user/rhythms.itely:1832 (comment) -msgid "rhythm 2-3-2" -msgstr "" - -#. Documentation/user/rhythms.itely:1871 (comment) +#. Documentation/user/rhythms.itely:1689 (comment) #, fuzzy -msgid "Default beaming" -msgstr "Standart" +msgid "Set default beaming for all staves" +msgstr "für diese Taktart keine autom. Balken definiert" -#. Documentation/user/rhythms.itely:1874 (comment) -msgid "Revert default values in scm/auto-beam.scm for 12/8 time" +#. Documentation/user/rhythms.itely:1697 (comment) +msgid "Modify beaming for just this staff" msgstr "" -#. Documentation/user/rhythms.itely:1880 (comment) -msgid "Set new values for beam endings" -msgstr "" +#. Documentation/user/rhythms.itely:1703 (comment) +#, fuzzy +msgid "Inherit beaming from Score context" +msgstr "Partitur-Kontext beenden" -#. Documentation/user/rhythms.itely:2002 (comment) +#. Documentation/user/rhythms.itely:1827 (comment) msgid "revert to non-feathered beams" msgstr "in nichtgespreizte Balken zurückverwandeln" -#. Documentation/user/rhythms.itely:2225 (comment) -#. Documentation/user/rhythms.itely:2241 (comment) +#. Documentation/user/rhythms.itely:2050 (comment) +#. Documentation/user/rhythms.itely:2066 (comment) msgid "Permit first bar number to be printed" msgstr "Erste Taktnummer soll auch gesetzt werden" -#. Documentation/user/rhythms.itely:2242 (comment) -#. Documentation/user/rhythms.itely:2290 (comment) +#. Documentation/user/rhythms.itely:2067 (comment) +#. Documentation/user/rhythms.itely:2115 (comment) msgid "Print a bar number every second measure" msgstr "Jeden zweiten Takt eine Taktnummer setzen" -#. Documentation/user/rhythms.itely:2258 (comment) +#. Documentation/user/rhythms.itely:2083 (comment) msgid "Prevent bar numbers at the end of a line and permit them elsewhere" msgstr "Taktnummern am Zeilenende verbieten und woanders erlauben" -#. Documentation/user/rhythms.itely:2262 (comment) -#. Documentation/user/rhythms.itely:2288 (comment) +#. Documentation/user/rhythms.itely:2087 (comment) +#. Documentation/user/rhythms.itely:2113 (comment) msgid "Increase the size of the bar number by 2" msgstr "Taktnummer um Faktor zwei vergrößern" -#. Documentation/user/rhythms.itely:2266 (comment) +#. Documentation/user/rhythms.itely:2091 (comment) msgid "Draw a box round the following bar number(s)" msgstr "Einen Kasten um die folgenden Taktnummern zeichnen" -#. Documentation/user/rhythms.itely:2271 (comment) +#. Documentation/user/rhythms.itely:2096 (comment) msgid "Draw a circle round the following bar number(s)" msgstr "Einen Kreis um die folgenden Taktnummern zeichnen" -#. Documentation/user/rhythms.itely:2293 (comment) +#. Documentation/user/rhythms.itely:2118 (comment) msgid "Center-align bar numbers" msgstr "Taktnummern zentrieren" -#. Documentation/user/rhythms.itely:2296 (comment) +#. Documentation/user/rhythms.itely:2121 (comment) msgid "Right-align bar numbers" msgstr "Taktnummern rechtsbündig" -#. Documentation/user/rhythms.itely:2399 (variable) +#. Documentation/user/rhythms.itely:2224 (variable) msgid "pipeSymbol" msgstr "pipeSymbol" -#. Documentation/user/rhythms.itely:2786 (variable) +#. Documentation/user/rhythms.itely:2612 (variable) msgid "MyCadenza" msgstr "MeineKadenz" @@ -4430,26 +4584,31 @@ msgstr "Tondauern" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "breve" msgstr "Brevis" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "longa" msgstr "Longa" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "Duration names notes and rests" msgstr "Dauerbezeichnungen für Noten und Pausen" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "tuplet" msgstr "N-tole" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "polymetric" msgstr "Polymetrie" @@ -4467,6 +4626,7 @@ msgstr "Tondauern skalieren" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "laissez vibrer" msgstr "Laissez-vibrer-Bögen" @@ -4505,6 +4665,7 @@ msgstr "Ganztaktige Pausen" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "multi-measure rest" msgstr "Pausen über mehrere Takte" @@ -4543,6 +4704,7 @@ msgstr "Musik ohne Metrum" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "cadenza" msgstr "Kadenz" @@ -4559,11 +4721,13 @@ msgstr "Polymetrische Notation" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "polymetric time signature" msgstr "Polymetrische Taktangabe" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "meter" msgstr "Metrum" @@ -5221,20 +5385,18 @@ msgstr "Musik parallel notieren" msgid "flute" msgstr "Flöte" -#. Documentation/user/staff.itely:1100 (variable) -msgid "clarinet" -msgstr "Klarinette" - #. Documentation/user/staff.itely:1189 (variable) #. Documentation/user/staff.itely:1210 (variable) msgid "oboe" msgstr "Oboe" #. Documentation/user/staff.itely:1259 (variable) +#. Documentation/user/staff.itely:1275 (context id) msgid "piccolo" msgstr "Piccolo" #. Documentation/user/staff.itely:1267 (variable) +#. Documentation/user/staff.itely:1276 (context id) msgid "cbassoon" msgstr "Ktrfgt" @@ -5285,6 +5447,8 @@ msgstr "Systeme" #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely #. @unnumberedsubsubsec in Documentation/es/user/staff.itely +#. @node in Documentation/de/user/staff.itely +#. @unnumberedsubsubsec in Documentation/de/user/staff.itely msgid "Grouping staves" msgstr "Systeme gruppieren" @@ -5771,6 +5935,16 @@ msgstr "Falsch: brache Dauern" msgid "correct" msgstr "richtig" +#. Documentation/user/vocal.itely:664 (context id) +#, fuzzy +msgid "lala" +msgstr "global" + +#. Documentation/user/vocal.itely:802 (context id) +#, fuzzy +msgid "splitpart" +msgstr "Stimme" + #. Documentation/user/vocal.itely:847 (variable) msgid "voice" msgstr "Stimme" @@ -5779,6 +5953,15 @@ msgstr "Stimme" msgid "lyr" msgstr "Text" +#. Documentation/user/vocal.itely:1053 (context id) +#, fuzzy +msgid "tune" +msgstr "N-tole" + +#. Documentation/user/vocal.itely:1101 (context id) +msgid "lahlah" +msgstr "" + #. Documentation/user/vocal.itely:1112 (comment) msgid "applies to \\\"fas\\\"" msgstr "gehört zu \\\"fas\\\"" @@ -6162,6 +6345,16 @@ msgstr "Die Strophen am Ende in mehreren Spalten drucken" msgid "keep staff alive" msgstr "System aufrecht erhalten" +#. Documentation/user/keyboards.itely:265 (context id) +#, fuzzy +msgid "melOne" +msgstr "Linie" + +#. Documentation/user/keyboards.itely:333 (context id) +#. Documentation/user/fretted-strings.itely:242 (context id) +msgid "two" +msgstr "" + #. Documentation/user/keyboards.itely:385 (comment) msgid "stems may overlap the other staff" msgstr "Hals kann das andere System überschneiden" @@ -6372,6 +6565,8 @@ msgstr "Flageolett" #. @node in Documentation/user/unfretted-strings.itely #. @node in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @unnumberedsubsubsec in Documentation/de/user/unfretted-strings.itely msgid "Snap (Bartok) pizzicato" msgstr "Bartók-Pizzicato" @@ -6379,8 +6574,6 @@ msgstr "Bartók-Pizzicato" #. @node in Documentation/fr/user/unfretted-strings.itely #. @unnumberedsubsubsec in Documentation/fr/user/unfretted-strings.itely #. @unnumberedsubsubsec in Documentation/es/user/unfretted-strings.itely -#. @node in Documentation/de/user/unfretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/unfretted-strings.itely msgid "Snap (Bartók) pizzicato" msgstr "Bartók-Pizzicato" @@ -6388,6 +6581,16 @@ msgstr "Bartók-Pizzicato" msgid "melodia" msgstr "Melodie" +#. Documentation/user/fretted-strings.itely:243 (context id) +#, fuzzy +msgid "shared" +msgstr "Kreuz" + +#. Documentation/user/fretted-strings.itely:244 (context id) +#, fuzzy +msgid "solo" +msgstr "color (Farbe)" + #. Documentation/user/fretted-strings.itely:321 (variable) msgid "mynotes" msgstr "meineNoten" @@ -6574,16 +6777,6 @@ msgstr "Banjo" msgid "Banjo tablatures" msgstr "Banjo-Tabulaturen" -#. Documentation/user/percussion.itely:175 (variable) -#. Documentation/user/percussion.itely:365 (variable) -msgid "up" -msgstr "oben" - -#. Documentation/user/percussion.itely:178 (variable) -#. Documentation/user/percussion.itely:366 (variable) -msgid "down" -msgstr "unten" - #. Documentation/user/percussion.itely:385 (comment) msgid "These lines define the position of the woodblocks in the stave;" msgstr "Diese Zeilen definieren die Position der Holzblöcke auf dem System" @@ -6953,10 +7146,19 @@ msgstr "Eingabe des Generalbass'" msgid "Displaying figured bass" msgstr "Generalbass anzeigen" +#. Documentation/user/ancient.itely:355 (context id) +msgid "discantus" +msgstr "" + #. Documentation/user/ancient.itely:821 (variable) msgid "ficta" msgstr "ficta" +#. Documentation/user/ancient.itely:973 (context id) +#, fuzzy +msgid "cantus" +msgstr "Hymnen" + #. @node in Documentation/user/ancient.itely #. @section in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely @@ -8075,59 +8277,59 @@ msgstr "allein keine Wirkung" msgid "effective only when both overrides are present" msgstr "gilt nur, wenn beide \"override\" vorhanden sind" -#. Documentation/user/changing-defaults.itely:2461 (comment) +#. Documentation/user/changing-defaults.itely:2457 (comment) msgid "Remove bar line at the end of the current line" msgstr "Taktlinie am Ende der Zeile entfernen" -#. Documentation/user/changing-defaults.itely:2507 (comment) +#. Documentation/user/changing-defaults.itely:2503 (comment) msgid "Try to remove all key signatures" msgstr "Versuche alle Tonarten zu entfernen" -#. Documentation/user/changing-defaults.itely:2926 (comment) +#. Documentation/user/changing-defaults.itely:2922 (comment) msgid "move horizontally left" msgstr "horizontal nach links verschieben" -#. Documentation/user/changing-defaults.itely:2928 (comment) +#. Documentation/user/changing-defaults.itely:2924 (comment) msgid "move vertically up" msgstr "vertikal hochschieben" -#. Documentation/user/changing-defaults.itely:2929 (comment) +#. Documentation/user/changing-defaults.itely:2925 (comment) msgid "third finger" msgstr "dritter Finger" -#. Documentation/user/changing-defaults.itely:2975 (comment) +#. Documentation/user/changing-defaults.itely:2971 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "RehearsalMark zentrieren über dem Schlüssel" -#. Documentation/user/changing-defaults.itely:2981 (comment) +#. Documentation/user/changing-defaults.itely:2977 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "RehearsalMark zentrieren über der Taktart (TimeSignature)" -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:2991 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "RehearsalMark zentrieren über der Tonart (KeySignature)" -#. Documentation/user/changing-defaults.itely:3002 (comment) -#. Documentation/user/changing-defaults.itely:3018 (comment) -#. Documentation/user/changing-defaults.itely:3025 (comment) +#. Documentation/user/changing-defaults.itely:2998 (comment) +#. Documentation/user/changing-defaults.itely:3014 (comment) +#. Documentation/user/changing-defaults.itely:3021 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "RehearsalMark mit der linken Ecke von KeySignature ausrichten" -#. Documentation/user/changing-defaults.itely:3007 (comment) +#. Documentation/user/changing-defaults.itely:3003 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "RehearsalMark mit der rechten Ecke von KeySignature ausrichten" -#. Documentation/user/changing-defaults.itely:3019 (comment) +#. Documentation/user/changing-defaults.itely:3015 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "nach rechts um 3,5 Linienabstände verschieben" -#. Documentation/user/changing-defaults.itely:3026 (comment) +#. Documentation/user/changing-defaults.itely:3022 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "nach links um 2 Linienabstände verschieben" -#. Documentation/user/changing-defaults.itely:3075 (variable) +#. Documentation/user/changing-defaults.itely:3071 (variable) msgid "XinO" msgstr "XinO" @@ -9524,6 +9726,37 @@ msgstr "Fußnoten" msgid "Table of Contents" msgstr "Inhaltsverzeichnis" +#, fuzzy +#~ msgid "due to unchanged beatLength" +#~ msgstr "aufgrund von beatLength" + +#, fuzzy +#~ msgid "auto beam on 1/4 note groups" +#~ msgstr "autom. Balken für 1/4-Notengruppen\t" + +#, fuzzy +#~ msgid "keep 3/4 beaming" +#~ msgstr "3/4-Balken behalten" + +#~ msgid "due to beatLength" +#~ msgstr "aufgrund von beatLength" + +#~ msgid "beam on 1/8 notes" +#~ msgstr "Balken für 1/8-Noten" + +#~ msgid "beam on 3/16, 7/16, 9/16, 12/16" +#~ msgstr "Balken für 3/16, 7/16, 9/16, 12/16" + +#~ msgid "Set beam sub-group length to an eighth note" +#~ msgstr "Balkenuntergruppenlänge als Achtel definieren" + +#~ msgid "Set beam sub-group length to a sixteenth note" +#~ msgstr "Balkenuntergruppenlänge als Sechszehntel definieren" + +#, fuzzy +#~ msgid "Default beaming" +#~ msgstr "Standart" + #~ msgid "broken" #~ msgstr "broken" diff --git a/Documentation/po/es.po b/Documentation/po/es.po index 44abc5b872..5671f321c9 100644 --- a/Documentation/po/es.po +++ b/Documentation/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-07 09:57+0100\n" +"POT-Creation-Date: 2008-11-09 01:15+0100\n" "PO-Revision-Date: 2008-11-07 10:09+0100\n" "Last-Translator: Francisco Vila \n" "Language-Team: Español\n" @@ -423,6 +423,7 @@ msgstr "el Fa está 4 por encima ó 3 por debajo, es el Fa grave" #. Documentation/user/tutorial.itely:1796 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) +#. Documentation/user/pitches.itely:1041 (context id) msgid "violin" msgstr "violin" @@ -1435,7 +1436,45 @@ msgstr "Nombres de nota absolutos" msgid "After the tutorial" msgstr "Más allá del tutorial" +#. Documentation/user/fundamental.itely:325 (context id) +#. Documentation/user/fundamental.itely:368 (context id) +#, fuzzy +msgid "singer" +msgstr "digitaciones" + +#. Documentation/user/fundamental.itely:326 (context id) +#. Documentation/user/fundamental.itely:369 (context id) +#, fuzzy +msgid "vocal" +msgstr "escala" + +#. Documentation/user/fundamental.itely:329 (context id) +#. Documentation/user/fundamental.itely:372 (context id) +#, fuzzy +msgid "piano" +msgstr "Piano" + +#. Documentation/user/fundamental.itely:330 (context id) +#. Documentation/user/fundamental.itely:363 (variable) +#. Documentation/user/fundamental.itely:373 (context id) +#. Documentation/user/fundamental.itely:2669 (variable) +#. Documentation/user/fundamental.itely:2711 (context id) +msgid "upper" +msgstr "superior" + +#. Documentation/user/fundamental.itely:331 (context id) +#. Documentation/user/fundamental.itely:364 (variable) +#. Documentation/user/fundamental.itely:374 (context id) +#. Documentation/user/fundamental.itely:2676 (variable) +#. Documentation/user/fundamental.itely:2712 (context id) +msgid "lower" +msgstr "inferior" + #. Documentation/user/fundamental.itely:361 (variable) +#. Documentation/user/simultaneous.itely:239 (context id) +#. Documentation/user/vocal.itely:568 (context id) +#. Documentation/user/vocal.itely:797 (context id) +#. Documentation/user/vocal.itely:818 (context id) #. Documentation/user/vocal.itely:1222 (variable) #. Documentation/user/vocal.itely:1264 (variable) msgid "melody" @@ -1448,15 +1487,11 @@ msgstr "melodia" msgid "text" msgstr "texto" -#. Documentation/user/fundamental.itely:363 (variable) -#. Documentation/user/fundamental.itely:2669 (variable) -msgid "upper" -msgstr "superior" - -#. Documentation/user/fundamental.itely:364 (variable) -#. Documentation/user/fundamental.itely:2676 (variable) -msgid "lower" -msgstr "inferior" +#. Documentation/user/fundamental.itely:443 (context id) +#. Documentation/user/staff.itely:535 (context id) +#, fuzzy +msgid "main" +msgstr "menor" #. Documentation/user/fundamental.itely:632 (comment) msgid "Voice \\\"1\\\" Voice \\\"2\\\"" @@ -1562,6 +1597,16 @@ msgstr "Poner las plicas, etc. hacia arriba" msgid "Initiate first voice" msgstr "Iniciar la primera voz" +#. Documentation/user/fundamental.itely:1199 (context id) +#. Documentation/user/fundamental.itely:2441 (context id) +#. Documentation/user/vocal.itely:503 (context id) +#. Documentation/user/vocal.itely:1233 (context id) +#. Documentation/user/vocal.itely:1274 (context id) +#. Documentation/user/keyboards.itely:327 (context id) +#. Documentation/user/fretted-strings.itely:241 (context id) +msgid "one" +msgstr "" + #. Documentation/user/fundamental.itely:1242 (variable) #. Documentation/user/fundamental.itely:2646 (variable) #. Documentation/user/tweaks.itely:3268 (variable) @@ -1586,6 +1631,16 @@ msgstr "LetraSopranoUno" msgid "SopTwoLyrics" msgstr "LetraSopranoDos" +#. Documentation/user/fundamental.itely:1255 (context id) +#, fuzzy +msgid "SopOne" +msgstr "MusicaSopranoUno" + +#. Documentation/user/fundamental.itely:1264 (context id) +#, fuzzy +msgid "SopTwo" +msgstr "MusicaSopranoDos" + #. Documentation/user/fundamental.itely:1296 (variable) #. Documentation/user/fundamental.itely:2864 (variable) msgid "TimeKey" @@ -1630,6 +1685,33 @@ msgstr "EstrofaTres" msgid "VerseFour" msgstr "EstrofaCuatro" +#. Documentation/user/fundamental.itely:1314 (context id) +#, fuzzy +msgid "Sop" +msgstr "Inicio" + +#. Documentation/user/fundamental.itely:1315 (context id) +#. Documentation/user/tweaks.itely:3283 (context id) +#. Documentation/user/input.itely:915 (context id) +#, fuzzy +msgid "Alto" +msgstr "varSi" + +#. Documentation/user/fundamental.itely:1323 (context id) +#. Documentation/user/tweaks.itely:3291 (context id) +#. Documentation/user/input.itely:917 (context id) +#, fuzzy +msgid "Tenor" +msgstr "MusicaTenor" + +# También Líneas divisorias. FVD +#. Documentation/user/fundamental.itely:1324 (context id) +#. Documentation/user/tweaks.itely:3292 (context id) +#. Documentation/user/input.itely:922 (context id) +#, fuzzy +msgid "Bass" +msgstr "Barras de compás" + #. Documentation/user/fundamental.itely:1350 (variable) #. Documentation/user/fundamental.itely:1402 (variable) #. Documentation/user/fundamental.itely:1464 (variable) @@ -1642,6 +1724,14 @@ msgstr "notas_estrofa" msgid "versewords" msgstr "letra_estrofa" +#. Documentation/user/fundamental.itely:1361 (context id) +#. Documentation/user/fundamental.itely:1428 (context id) +#. Documentation/user/fundamental.itely:1489 (context id) +#. Documentation/user/vocal.itely:820 (context id) +#, fuzzy +msgid "verse" +msgstr "notas_estrofa" + #. Documentation/user/fundamental.itely:1407 (variable) #. Documentation/user/fundamental.itely:1469 (variable) msgid "refrainnotesA" @@ -1662,6 +1752,17 @@ msgstr "letra_estribilloA" msgid "refrainwordsB" msgstr "letra_estribilloB" +#. Documentation/user/fundamental.itely:1436 (context id) +#. Documentation/user/fundamental.itely:1509 (context id) +#, fuzzy +msgid "refrainB" +msgstr "notas_estribilloB" + +#. Documentation/user/fundamental.itely:1501 (context id) +#, fuzzy +msgid "refrainA" +msgstr "notas_estribilloA" + #. Documentation/user/fundamental.itely:1655 (comment) msgid "start of single compound music expression" msgstr "inicio de la expresión musical compuesta única" @@ -1812,6 +1913,30 @@ msgstr "letraBajo" msgid "combine ChoirStaff and PianoStaff in parallel" msgstr "combinar ChoirStaff y PianoStaff en paralelo" +#. Documentation/user/fundamental.itely:2687 (context id) +#. Documentation/user/fundamental.itely:2689 (context id) +#, fuzzy +msgid "sopranos" +msgstr "musicaSoprano" + +#. Documentation/user/fundamental.itely:2692 (context id) +#. Documentation/user/fundamental.itely:2694 (context id) +#, fuzzy +msgid "altos" +msgstr "musicaContralto" + +#. Documentation/user/fundamental.itely:2697 (context id) +#. Documentation/user/fundamental.itely:2699 (context id) +#, fuzzy +msgid "tenors" +msgstr "musicaTenor" + +#. Documentation/user/fundamental.itely:2702 (context id) +#. Documentation/user/fundamental.itely:2704 (context id) +#, fuzzy +msgid "basses" +msgstr "musicaBajo" + #. Documentation/user/fundamental.itely:2707 (comment) msgid "end ChoirStaff" msgstr "fin del ChoirStaff" @@ -1836,6 +1961,11 @@ msgstr "MusicaPedales" msgid "PianoStaff and Pedal Staff must be simultaneous" msgstr "El PianoStaff y el pentagrama del Pedal son simultáneos" +#. Documentation/user/fundamental.itely:2884 (context id) +#, fuzzy +msgid "ManualOne" +msgstr "Barras manuales" + #. Documentation/user/fundamental.itely:2885 (comment) msgid "set time signature and key" msgstr "indicación de compás y armadura" @@ -1844,6 +1974,11 @@ msgstr "indicación de compás y armadura" msgid "end ManualOne Staff context" msgstr "fin del contexto de pentagrama del ManualUno" +#. Documentation/user/fundamental.itely:2890 (context id) +#, fuzzy +msgid "ManualTwo" +msgstr "MusicaManualDos" + #. Documentation/user/fundamental.itely:2894 (comment) msgid "end ManualTwo Staff context" msgstr "fin del contexto de pentagrama del ManualDos" @@ -1852,6 +1987,11 @@ msgstr "fin del contexto de pentagrama del ManualDos" msgid "end PianoStaff context" msgstr "fin del contexto PianoStaff" +#. Documentation/user/fundamental.itely:2896 (context id) +#, fuzzy +msgid "PedalOrgan" +msgstr "MusicaPedales" + #. Documentation/user/fundamental.itely:2900 (comment) msgid "end PedalOrgan Staff context" msgstr "fin del contexto de pentagrama del Pedal" @@ -1915,6 +2055,11 @@ msgstr "Anidado de expresiones musicales" #. @rglos in Documentation/user/fundamental.itely #. @rglos in Documentation/user/tweaks.itely +#. Documentation/user/staff.itely:564 (context id) +#. Documentation/user/staff.itely:577 (context id) +#. Documentation/user/staff.itely:585 (context id) +#. Documentation/user/staff.itely:604 (context id) +#. Documentation/user/staff.itely:617 (context id) #. @rglos in Documentation/user/staff.itely #. @rglos in Documentation/fr/user/fundamental.itely #. @rglos in Documentation/es/user/fundamental.itely @@ -2161,7 +2306,8 @@ msgstr "Aumentar solamente el grosor de la ligadura siguiente" #. Documentation/user/tweaks.itely:694 (comment) msgid "Revert thickness of all following slurs to default of 1.2" -msgstr "Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2" +msgstr "" +"Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2" #. Documentation/user/tweaks.itely:1302 (comment) msgid "Don't print clefs in this staff" @@ -2177,7 +2323,8 @@ msgstr "Reducir el tamaño de la fuente en un 24% aprox." #. Documentation/user/tweaks.itely:1418 (comment) msgid "Reduce stem length and line spacing to match" -msgstr "Reducir la longitud de la plica y el espaciado de la línea en coincidencia" +msgstr "" +"Reducir la longitud de la plica y el espaciado de la línea en coincidencia" #. Documentation/user/tweaks.itely:1828 (comment) #. Documentation/user/tweaks.itely:1895 (comment) @@ -2219,7 +2366,8 @@ msgstr "Detener el corchete de octava" #. Documentation/user/tweaks.itely:1900 (comment) msgid "Place following Ottava Bracket below Text Spanners" -msgstr "Situar el corchete de octava ulterior por debajo de los extensores de texto" +msgstr "" +"Situar el corchete de octava ulterior por debajo de los extensores de texto" #. Documentation/user/tweaks.itely:1959 (comment) msgid "Cause notes to space out to accommodate text" @@ -2296,6 +2444,26 @@ msgstr "Inicio de la sección polifónica de cuatro voces" msgid "lhMusic" msgstr "Muslca_m_izq" +#. Documentation/user/tweaks.itely:2772 (context id) +#. Documentation/user/tweaks.itely:2821 (context id) +#. Documentation/user/tweaks.itely:2884 (context id) +#. Documentation/user/tweaks.itely:2958 (context id) +#. Documentation/user/tweaks.itely:3022 (context id) +#. Documentation/user/tweaks.itely:3079 (context id) +#. Documentation/user/input.itely:928 (context id) +msgid "RH" +msgstr "" + +#. Documentation/user/tweaks.itely:2776 (context id) +#. Documentation/user/tweaks.itely:2825 (context id) +#. Documentation/user/tweaks.itely:2888 (context id) +#. Documentation/user/tweaks.itely:2962 (context id) +#. Documentation/user/tweaks.itely:3026 (context id) +#. Documentation/user/tweaks.itely:3083 (context id) +#. Documentation/user/input.itely:934 (context id) +msgid "LH" +msgstr "" + #. Documentation/user/tweaks.itely:3000 (comment) #. Documentation/user/tweaks.itely:3057 (comment) msgid "Move the c2 out of the main note column so the merge will work" @@ -2339,6 +2507,12 @@ msgstr "normal" msgid "SopranoMusic" msgstr "musicaSoprano" +#. Documentation/user/tweaks.itely:3282 (context id) +#. Documentation/user/input.itely:913 (context id) +#, fuzzy +msgid "Soprano" +msgstr "musicaSoprano" + #. Documentation/user/tweaks.itely:3487 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "Truco para obtener color a partir del procedimiento color-notehead" @@ -2645,7 +2819,8 @@ msgstr "la propiedad padding (relleno)" #. @subheading in Documentation/es/user/tweaks.itely #. @subheading in Documentation/de/user/tweaks.itely msgid "left-padding and right-padding" -msgstr "left-padding y right-padding (relleno por la izquierda y por la derecha)" +msgstr "" +"left-padding y right-padding (relleno por la izquierda y por la derecha)" #. @subheading in Documentation/user/tweaks.itely #. @subheading in Documentation/es/user/tweaks.itely @@ -3917,6 +4092,11 @@ msgstr "musica" msgid "not strictly necessary, but a good reminder" msgstr "no es imprescindible pero es bueno recordarlo" +#. Documentation/user/pitches.itely:1052 (context id) +#. Documentation/user/staff.itely:1100 (variable) +msgid "clarinet" +msgstr "clarinete" + #. Documentation/user/pitches.itely:1137 (variable) msgid "musicA" msgstr "musicaA" @@ -3925,6 +4105,22 @@ msgstr "musicaA" msgid "musicB" msgstr "musicaB" +#. Documentation/user/pitches.itely:1170 (context id) +#. Documentation/user/keyboards.itely:170 (context id) +#. Documentation/user/keyboards.itely:264 (context id) +#. Documentation/user/percussion.itely:175 (variable) +#. Documentation/user/percussion.itely:365 (variable) +msgid "up" +msgstr "arriba" + +#. Documentation/user/pitches.itely:1174 (context id) +#. Documentation/user/keyboards.itely:180 (context id) +#. Documentation/user/keyboards.itely:273 (context id) +#. Documentation/user/percussion.itely:178 (variable) +#. Documentation/user/percussion.itely:366 (variable) +msgid "down" +msgstr "abajo" + #. @node in Documentation/user/pitches.itely #. @subsection in Documentation/user/pitches.itely #. @node in Documentation/fr/user/pitches.itely @@ -4261,9 +4457,15 @@ msgstr "Mostrar todos los números de compás" msgid "Now each staff has its own time signature." msgstr "Ahora cada pentagrama tiene un compás distinto" +#. Documentation/user/rhythms.itely:1256 (context id) +#, fuzzy +msgid "myRhythm" +msgstr "Duraciones" + #. Documentation/user/rhythms.itely:1585 (comment) msgid "end 1/16 beams for all time signatures at the 1/16 moment" -msgstr "finalizar barras de semicorchea para todos los compases en el momento 1/16" +msgstr "" +"finalizar barras de semicorchea para todos los compases en el momento 1/16" #. Documentation/user/rhythms.itely:1589 (comment) msgid "end 1/32 beams for all time signatures at the 1/16 moment" @@ -4329,7 +4531,8 @@ msgstr "Imprimir el número de compás cada dos compases" #. Documentation/user/rhythms.itely:2083 (comment) msgid "Prevent bar numbers at the end of a line and permit them elsewhere" -msgstr "No poner números de compás al final de la línea, pero sí en otros lugares" +msgstr "" +"No poner números de compás al final de la línea, pero sí en otros lugares" #. Documentation/user/rhythms.itely:2087 (comment) #. Documentation/user/rhythms.itely:2113 (comment) @@ -5200,20 +5403,18 @@ msgstr "Escribir música en paralelo" msgid "flute" msgstr "flauta" -#. Documentation/user/staff.itely:1100 (variable) -msgid "clarinet" -msgstr "clarinete" - #. Documentation/user/staff.itely:1189 (variable) #. Documentation/user/staff.itely:1210 (variable) msgid "oboe" msgstr "oboe" #. Documentation/user/staff.itely:1259 (variable) +#. Documentation/user/staff.itely:1275 (context id) msgid "piccolo" msgstr "flautin" #. Documentation/user/staff.itely:1267 (variable) +#. Documentation/user/staff.itely:1276 (context id) msgid "cbassoon" msgstr "cfagot" @@ -5424,7 +5625,8 @@ msgstr "Formateo de las notas de aviso" #. Documentation/user/editorial.itely:321 (comment) msgid "this is deliberate nonsense; note that the stems remain black" -msgstr "esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras" +msgstr "" +"esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras" #. @node in Documentation/user/editorial.itely #. @section in Documentation/user/editorial.itely @@ -5754,6 +5956,16 @@ msgstr "incorrecto: se necesitan las duraciones" msgid "correct" msgstr "correcto" +#. Documentation/user/vocal.itely:664 (context id) +#, fuzzy +msgid "lala" +msgstr "global" + +#. Documentation/user/vocal.itely:802 (context id) +#, fuzzy +msgid "splitpart" +msgstr "parte" + #. Documentation/user/vocal.itely:847 (variable) msgid "voice" msgstr "voz" @@ -5762,6 +5974,15 @@ msgstr "voz" msgid "lyr" msgstr "letra" +#. Documentation/user/vocal.itely:1053 (context id) +#, fuzzy +msgid "tune" +msgstr "grupo especial" + +#. Documentation/user/vocal.itely:1101 (context id) +msgid "lahlah" +msgstr "" + #. Documentation/user/vocal.itely:1112 (comment) msgid "applies to \\\"fas\\\"" msgstr "se aplica al \\\"fas\\\"" @@ -6145,6 +6366,16 @@ msgstr "Imprimir los versos al final en varias columnas" msgid "keep staff alive" msgstr "mantener vivo el pentagrama" +#. Documentation/user/keyboards.itely:265 (context id) +#, fuzzy +msgid "melOne" +msgstr "línea" + +#. Documentation/user/keyboards.itely:333 (context id) +#. Documentation/user/fretted-strings.itely:242 (context id) +msgid "two" +msgstr "" + #. Documentation/user/keyboards.itely:385 (comment) msgid "stems may overlap the other staff" msgstr "las plicas pueden superponerse al otro pentagrama" @@ -6372,6 +6603,16 @@ msgstr "Pizzicato de Bartók (Snap)" msgid "melodia" msgstr "melodia" +#. Documentation/user/fretted-strings.itely:243 (context id) +#, fuzzy +msgid "shared" +msgstr "sostenido" + +#. Documentation/user/fretted-strings.itely:244 (context id) +#, fuzzy +msgid "solo" +msgstr "color" + #. Documentation/user/fretted-strings.itely:321 (variable) msgid "mynotes" msgstr "misNotas" @@ -6558,16 +6799,6 @@ msgstr "Banjo" msgid "Banjo tablatures" msgstr "Tablaturas de banjo" -#. Documentation/user/percussion.itely:175 (variable) -#. Documentation/user/percussion.itely:365 (variable) -msgid "up" -msgstr "arriba" - -#. Documentation/user/percussion.itely:178 (variable) -#. Documentation/user/percussion.itely:366 (variable) -msgid "down" -msgstr "abajo" - #. Documentation/user/percussion.itely:385 (comment) msgid "These lines define the position of the woodblocks in the stave;" msgstr "Estas líneas definen la posición de los bloques en la pauta;" @@ -6594,7 +6825,8 @@ msgstr "También define las posiciones de las dos líneas." #. Documentation/user/percussion.itely:396 (comment) msgid "This is neccessary; if not entered, the barline would be too short!" -msgstr "Esto es necesario; si no se pone, la línea divisoria sería demasiado corta." +msgstr "" +"Esto es necesario; si no se pone, la línea divisoria sería demasiado corta." #. Documentation/user/percussion.itely:403 (comment) msgid "with this you load your new drum style table" @@ -6936,10 +7168,19 @@ msgstr "Introducir el bajo cifrado" msgid "Displaying figured bass" msgstr "Imprimir el bajo cifrado" +#. Documentation/user/ancient.itely:355 (context id) +msgid "discantus" +msgstr "" + #. Documentation/user/ancient.itely:821 (variable) msgid "ficta" msgstr "ficta" +#. Documentation/user/ancient.itely:973 (context id) +#, fuzzy +msgid "cantus" +msgstr "Cantos" + #. @node in Documentation/user/ancient.itely #. @section in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely @@ -7668,7 +7909,8 @@ msgstr "esta vez el texto estará más cerca del pentagrama" #. Documentation/user/spacing.itely:1721 (comment) msgid "by setting outside-staff-priority to a non-number," -msgstr "ajustando el valor de outside-staff-priority a algo que no sea un número," +msgstr "" +"ajustando el valor de outside-staff-priority a algo que no sea un número," #. Documentation/user/spacing.itely:1722 (comment) msgid "we disable the automatic collision avoidance" @@ -8061,57 +8303,59 @@ msgstr "no es efectivo por sí solo" msgid "effective only when both overrides are present" msgstr "es efectivo sólo cuando las dos sobreescrituras están presentes" -#. Documentation/user/changing-defaults.itely:2461 (comment) +#. Documentation/user/changing-defaults.itely:2457 (comment) msgid "Remove bar line at the end of the current line" msgstr "Quitar la barra de compás al final de la línea en curso" -#. Documentation/user/changing-defaults.itely:2507 (comment) +#. Documentation/user/changing-defaults.itely:2503 (comment) msgid "Try to remove all key signatures" msgstr "Intentar quitar todas las armaduras" -#. Documentation/user/changing-defaults.itely:2926 (comment) +#. Documentation/user/changing-defaults.itely:2922 (comment) msgid "move horizontally left" msgstr "desplazar a la izquierda" -#. Documentation/user/changing-defaults.itely:2928 (comment) +#. Documentation/user/changing-defaults.itely:2924 (comment) msgid "move vertically up" msgstr "desplazar hacia arriba" -#. Documentation/user/changing-defaults.itely:2929 (comment) +#. Documentation/user/changing-defaults.itely:2925 (comment) msgid "third finger" msgstr "dedo tercero" -#. Documentation/user/changing-defaults.itely:2975 (comment) +#. Documentation/user/changing-defaults.itely:2971 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "la RehearsalMark se centra sobre la clave" -#. Documentation/user/changing-defaults.itely:2981 (comment) +#. Documentation/user/changing-defaults.itely:2977 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "la RehearsalMark se centra sobre el compás" -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:2991 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "la RehearsalMark se centra sobre la armadura" -#. Documentation/user/changing-defaults.itely:3002 (comment) -#. Documentation/user/changing-defaults.itely:3018 (comment) -#. Documentation/user/changing-defaults.itely:3025 (comment) -msgid "The RehearsalMark will be aligned with the left edge of the KeySignature" +#. Documentation/user/changing-defaults.itely:2998 (comment) +#. Documentation/user/changing-defaults.itely:3014 (comment) +#. Documentation/user/changing-defaults.itely:3021 (comment) +msgid "" +"The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "la RehearsalMark se alinea por la izquierda con la armadura" -#. Documentation/user/changing-defaults.itely:3007 (comment) -msgid "The RehearsalMark will be aligned with the right edge of the KeySignature" +#. Documentation/user/changing-defaults.itely:3003 (comment) +msgid "" +"The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "la RehearsalMark se alinea por la derecha con la armadura" -#. Documentation/user/changing-defaults.itely:3019 (comment) +#. Documentation/user/changing-defaults.itely:3015 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "y se desplaza 3.5 espacios a la derecha" -#. Documentation/user/changing-defaults.itely:3026 (comment) +#. Documentation/user/changing-defaults.itely:3022 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "y se desplaza 2 espacios a la izquierda" -#. Documentation/user/changing-defaults.itely:3075 (variable) +#. Documentation/user/changing-defaults.itely:3071 (variable) msgid "XinO" msgstr "X_O" @@ -9515,4 +9759,3 @@ msgstr "Notas al pie" # this is the same translation that babel LaTex package uses . FVD msgid "Table of Contents" msgstr "Índice general" - diff --git a/Documentation/po/fr.po b/Documentation/po/fr.po index 25b4a232d5..43aaf3231b 100644 --- a/Documentation/po/fr.po +++ b/Documentation/po/fr.po @@ -3,13 +3,14 @@ # Copyright (C) 2006 Han-Wen Nienhuys, Jan Nieuwenhuizen # This file is distributed under the same license as the lilypond package. # -# John Mandereau , 2006, 2007. +# John Mandereau , 2006-2008, +# Jean-Charles Malahieude , 2008. msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-27 12:40+0100\n" -"PO-Revision-Date: 2008-11-06 00:17+0100\n" +"POT-Creation-Date: 2008-11-09 01:15+0100\n" +"PO-Revision-Date: 2008-11-09 13:14+0100\n" "Last-Translator: Jean-Charles Malahieude \n" "Language-Team: Français \n" "MIME-Version: 1.0\n" @@ -32,7 +33,11 @@ msgid "" msgstr "" "Vos suggestions à propos de la " "documentation sont les bienvenues ;\n" -"signalez tout bogue à la liste.." +"signalez tout bogue en français à la liste\n" +"francophone des utilisateurs ou en anglais à la liste des\n" +"utilisateurs." #: postprocess_html.py:59 #, python-format @@ -156,7 +161,6 @@ msgid "Top" msgstr "Sommaire" #. @top in Documentation/user/lilypond-learning.tely -#, fuzzy msgid "GNU LilyPond --- Learning Manual" msgstr "GNU LilyPond --- Manuel d'initiation" @@ -397,15 +401,15 @@ msgstr "une octave au dessus du do central" #. Documentation/user/tutorial.itely:298 (comment) msgid "c is 1 staff space up, so is the c above" -msgstr "do est à un cran de plus, il sera donc au dessus" +msgstr "do est à un cran de plus, il sera donc au-dessus" #. Documentation/user/tutorial.itely:299 (comment) msgid "d is 2 up or 5 down, so is the d above" -msgstr "ré est à 2 crans de plus ou 5 de moins, il sera donc au dessus" +msgstr "ré est à 2 crans de plus ou 5 de moins, il sera donc au-dessus" #. Documentation/user/tutorial.itely:300 (comment) msgid "e is 3 up or 4 down, so is the e above" -msgstr "mi est à 3 crans de plus ou 4 de moins, il sera donc au dessus" +msgstr "mi est à 3 crans de plus ou 4 de moins, il sera donc au-dessus" #. Documentation/user/tutorial.itely:301 (comment) msgid "a is 6 up or 1 down, so is the a below" @@ -422,6 +426,7 @@ msgstr "fa est à 4 crans de plus ou 3 de moins, il sera donc en dessous" #. Documentation/user/tutorial.itely:1796 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) +#. Documentation/user/pitches.itely:1041 (context id) msgid "violin" msgstr "violon" @@ -574,7 +579,7 @@ msgstr "octave" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "accidental" -msgstr "altération accidentelle" +msgstr "altération" #. @subheading in Documentation/user/tutorial.itely #. @subheading in Documentation/es/user/tutorial.itely @@ -664,6 +669,7 @@ msgstr "Métrique" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "time signature" msgstr "métrique" @@ -892,6 +898,7 @@ msgstr "Liaisons de prolongation" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "tie" msgstr "liaison de prolongation" @@ -1086,6 +1093,7 @@ msgstr "Mesure incomplète" #. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "anacrusis" msgstr "anacrouse" @@ -1110,6 +1118,7 @@ msgstr "Nolets" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "note value" msgstr "valeur d'une note" @@ -1119,6 +1128,7 @@ msgstr "valeur d'une note" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "triplet" msgstr "triolet" @@ -1143,6 +1153,7 @@ msgstr "Notes d'ornement" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "grace notes" msgstr "notes d'ornement" @@ -1155,6 +1166,7 @@ msgstr "notes d'ornement" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "acciaccatura" msgstr "acciaccature" @@ -1164,6 +1176,7 @@ msgstr "acciaccature" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "appoggiatura" msgstr "appoggiature" @@ -1432,7 +1445,42 @@ msgstr "Noms de note absolus" msgid "After the tutorial" msgstr "Après le tutoriel" +#. Documentation/user/fundamental.itely:325 (context id) +#. Documentation/user/fundamental.itely:368 (context id) +msgid "singer" +msgstr "chanteur" + +#. Documentation/user/fundamental.itely:326 (context id) +#. Documentation/user/fundamental.itely:369 (context id) +msgid "vocal" +msgstr "vocal" + +#. Documentation/user/fundamental.itely:329 (context id) +#. Documentation/user/fundamental.itely:372 (context id) +msgid "piano" +msgstr "piano" + +#. Documentation/user/fundamental.itely:330 (context id) +#. Documentation/user/fundamental.itely:363 (variable) +#. Documentation/user/fundamental.itely:373 (context id) +#. Documentation/user/fundamental.itely:2669 (variable) +#. Documentation/user/fundamental.itely:2711 (context id) +msgid "upper" +msgstr "superieur" + +#. Documentation/user/fundamental.itely:331 (context id) +#. Documentation/user/fundamental.itely:364 (variable) +#. Documentation/user/fundamental.itely:374 (context id) +#. Documentation/user/fundamental.itely:2676 (variable) +#. Documentation/user/fundamental.itely:2712 (context id) +msgid "lower" +msgstr "inferieur" + #. Documentation/user/fundamental.itely:361 (variable) +#. Documentation/user/simultaneous.itely:239 (context id) +#. Documentation/user/vocal.itely:568 (context id) +#. Documentation/user/vocal.itely:797 (context id) +#. Documentation/user/vocal.itely:818 (context id) #. Documentation/user/vocal.itely:1222 (variable) #. Documentation/user/vocal.itely:1264 (variable) msgid "melody" @@ -1445,15 +1493,10 @@ msgstr "melodie" msgid "text" msgstr "texte" -#. Documentation/user/fundamental.itely:363 (variable) -#. Documentation/user/fundamental.itely:2669 (variable) -msgid "upper" -msgstr "superieur" - -#. Documentation/user/fundamental.itely:364 (variable) -#. Documentation/user/fundamental.itely:2676 (variable) -msgid "lower" -msgstr "inferieur" +#. Documentation/user/fundamental.itely:443 (context id) +#. Documentation/user/staff.itely:535 (context id) +msgid "main" +msgstr "principal" #. Documentation/user/fundamental.itely:632 (comment) msgid "Voice \\\"1\\\" Voice \\\"2\\\"" @@ -1496,11 +1539,11 @@ msgstr "Mesure 2" #. Documentation/user/fundamental.itely:723 (comment) msgid "Voice 1 continues" -msgstr "La voix 1 continue" +msgstr "Suite de la voix 1" #. Documentation/user/fundamental.itely:726 (comment) msgid "Voice 2 continues" -msgstr "La voix 2 continue" +msgstr "Suite de la voix 2" #. Documentation/user/fundamental.itely:900 (comment) msgid "Voice one" @@ -1558,6 +1601,16 @@ msgstr "Hampes et autres attributs iront vers le haut" msgid "Initiate first voice" msgstr "Initialisation de la première voix" +#. Documentation/user/fundamental.itely:1199 (context id) +#. Documentation/user/fundamental.itely:2441 (context id) +#. Documentation/user/vocal.itely:503 (context id) +#. Documentation/user/vocal.itely:1233 (context id) +#. Documentation/user/vocal.itely:1274 (context id) +#. Documentation/user/keyboards.itely:327 (context id) +#. Documentation/user/fretted-strings.itely:241 (context id) +msgid "one" +msgstr "un" + #. Documentation/user/fundamental.itely:1242 (variable) #. Documentation/user/fundamental.itely:2646 (variable) #. Documentation/user/tweaks.itely:3268 (variable) @@ -1582,6 +1635,14 @@ msgstr "SopUnParoles" msgid "SopTwoLyrics" msgstr "SopDeuxParoles" +#. Documentation/user/fundamental.itely:1255 (context id) +msgid "SopOne" +msgstr "SopUn" + +#. Documentation/user/fundamental.itely:1264 (context id) +msgid "SopTwo" +msgstr "SopDeux" + #. Documentation/user/fundamental.itely:1296 (variable) #. Documentation/user/fundamental.itely:2864 (variable) msgid "TimeKey" @@ -1626,6 +1687,28 @@ msgstr "CoupletTrois" msgid "VerseFour" msgstr "CoupletQuatre" +#. Documentation/user/fundamental.itely:1314 (context id) +msgid "Sop" +msgstr "Sop" + +#. Documentation/user/fundamental.itely:1315 (context id) +#. Documentation/user/tweaks.itely:3283 (context id) +#. Documentation/user/input.itely:915 (context id) +msgid "Alto" +msgstr "Alto" + +#. Documentation/user/fundamental.itely:1323 (context id) +#. Documentation/user/tweaks.itely:3291 (context id) +#. Documentation/user/input.itely:917 (context id) +msgid "Tenor" +msgstr "Tenor" + +#. Documentation/user/fundamental.itely:1324 (context id) +#. Documentation/user/tweaks.itely:3292 (context id) +#. Documentation/user/input.itely:922 (context id) +msgid "Bass" +msgstr "Basse" + #. Documentation/user/fundamental.itely:1350 (variable) #. Documentation/user/fundamental.itely:1402 (variable) #. Documentation/user/fundamental.itely:1464 (variable) @@ -1638,6 +1721,13 @@ msgstr "coupletnotes" msgid "versewords" msgstr "coupletparoles" +#. Documentation/user/fundamental.itely:1361 (context id) +#. Documentation/user/fundamental.itely:1428 (context id) +#. Documentation/user/fundamental.itely:1489 (context id) +#. Documentation/user/vocal.itely:820 (context id) +msgid "verse" +msgstr "couplet" + #. Documentation/user/fundamental.itely:1407 (variable) #. Documentation/user/fundamental.itely:1469 (variable) msgid "refrainnotesA" @@ -1658,6 +1748,15 @@ msgstr "refrainparolesA" msgid "refrainwordsB" msgstr "refrainparolesB" +#. Documentation/user/fundamental.itely:1436 (context id) +#. Documentation/user/fundamental.itely:1509 (context id) +msgid "refrainB" +msgstr "refrainB" + +#. Documentation/user/fundamental.itely:1501 (context id) +msgid "refrainA" +msgstr "refrainA" + #. Documentation/user/fundamental.itely:1655 (comment) msgid "start of single compound music expression" msgstr "début de l'unique expression musicale composée" @@ -1806,29 +1905,53 @@ msgstr "basseParoles" msgid "combine ChoirStaff and PianoStaff in parallel" msgstr "combinaison en parallèle du ChoirStaff et du PianoStaff" +#. Documentation/user/fundamental.itely:2687 (context id) +#. Documentation/user/fundamental.itely:2689 (context id) +msgid "sopranos" +msgstr "soprani" + +#. Documentation/user/fundamental.itely:2692 (context id) +#. Documentation/user/fundamental.itely:2694 (context id) +msgid "altos" +msgstr "alti" + +#. Documentation/user/fundamental.itely:2697 (context id) +#. Documentation/user/fundamental.itely:2699 (context id) +msgid "tenors" +msgstr "tenors" + +#. Documentation/user/fundamental.itely:2702 (context id) +#. Documentation/user/fundamental.itely:2704 (context id) +msgid "basses" +msgstr "basses" + #. Documentation/user/fundamental.itely:2707 (comment) msgid "end ChoirStaff" msgstr "fin du ChoirStaff (système pour chœur)" #. Documentation/user/fundamental.itely:2865 (variable) msgid "ManualOneVoiceOneMusic" -msgstr "ManuelUnVoixUnMusique" +msgstr "MusiqueManuelUnVoixUn" #. Documentation/user/fundamental.itely:2868 (variable) msgid "ManualOneVoiceTwoMusic" -msgstr "ManuelUnVoixDeuxMusique" +msgstr "MusiqueManuelUnVoixDeux" #. Documentation/user/fundamental.itely:2872 (variable) msgid "ManualTwoMusic" -msgstr "ManuelDeuxMusique" +msgstr "MusiqueManuelDeux" #. Documentation/user/fundamental.itely:2876 (variable) msgid "PedalOrganMusic" -msgstr "PedalierOrgueMusique" +msgstr "MusiquePedalierOrgue" #. Documentation/user/fundamental.itely:2882 (comment) msgid "PianoStaff and Pedal Staff must be simultaneous" -msgstr "Système pianistique et portée de pédalier sont synchrones" +msgstr "système pianistique et portée de pédalier simultanés" + +#. Documentation/user/fundamental.itely:2884 (context id) +msgid "ManualOne" +msgstr "ManuelUn" #. Documentation/user/fundamental.itely:2885 (comment) msgid "set time signature and key" @@ -1836,19 +1959,27 @@ msgstr "définition de la métrique et de l'armure" #. Documentation/user/fundamental.itely:2889 (comment) msgid "end ManualOne Staff context" -msgstr "fin du contexte de la portée ManuelUn" +msgstr "fin du contexte de portée ManuelUn" + +#. Documentation/user/fundamental.itely:2890 (context id) +msgid "ManualTwo" +msgstr "ManuelDeux" #. Documentation/user/fundamental.itely:2894 (comment) msgid "end ManualTwo Staff context" -msgstr "fin du contexte de la portée ManuelDeux" +msgstr "fin du contexte de portée ManuelDeux" #. Documentation/user/fundamental.itely:2895 (comment) msgid "end PianoStaff context" msgstr "fin du contexte PianoStaff" +#. Documentation/user/fundamental.itely:2896 (context id) +msgid "PedalOrgan" +msgstr "PedalierOrgue" + #. Documentation/user/fundamental.itely:2900 (comment) msgid "end PedalOrgan Staff context" -msgstr "fin du contexte de la portée PedalOrgan" +msgstr "fin du contexte de portée PedalierOrgue" #. Documentation/user/fundamental.itely:2902 (comment) msgid "end Score context" @@ -1909,6 +2040,11 @@ msgstr "Expressions musicales imbriquées" #. @rglos in Documentation/user/fundamental.itely #. @rglos in Documentation/user/tweaks.itely +#. Documentation/user/staff.itely:564 (context id) +#. Documentation/user/staff.itely:577 (context id) +#. Documentation/user/staff.itely:585 (context id) +#. Documentation/user/staff.itely:604 (context id) +#. Documentation/user/staff.itely:617 (context id) #. @rglos in Documentation/user/staff.itely #. @rglos in Documentation/fr/user/fundamental.itely #. @rglos in Documentation/es/user/fundamental.itely @@ -2182,7 +2318,7 @@ msgstr "Réglage des détails du texte avec extension" #. Documentation/user/tweaks.itely:1831 (comment) #. Documentation/user/tweaks.itely:1898 (comment) msgid "Place dynamics above staff" -msgstr "Positionnement des nuances au dessus de la portée" +msgstr "Positionnement des nuances au-dessus de la portée" #. Documentation/user/tweaks.itely:1833 (comment) #. Documentation/user/tweaks.itely:1902 (comment) @@ -2221,11 +2357,11 @@ msgstr "Force les notes à s'espacer selon le texte" #. Documentation/user/tweaks.itely:1979 (comment) msgid "This markup is short enough to fit without collision" -msgstr "Cette étiquette est assez courte pour ne pas risquer de chevauchement" +msgstr "Ce morceau de texte est assez court pour ne pas faire de collision" #. Documentation/user/tweaks.itely:1983 (comment) msgid "This is too long to fit, so it is displaced upwards" -msgstr "Celle-ci est trop longue pour tenir, elle est déplacée plus haut" +msgstr "Celui-ci est trop long pour tenir, il est déplacé vers le haut" #. Documentation/user/tweaks.itely:1987 (comment) #. Documentation/user/tweaks.itely:1992 (comment) @@ -2263,7 +2399,7 @@ msgstr "Élargissement d'une unité" #. Documentation/user/tweaks.itely:2460 (comment) msgid "Align dynamics to a base line 2 units above staff" msgstr "" -"Alignement des nuances sur une ligne de base à 2 unités au dessus de la " +"Alignement des nuances sur une ligne de base à 2 unités au-dessus de la " "portée" #. Documentation/user/tweaks.itely:2745 (variable) @@ -2281,7 +2417,7 @@ msgstr "mdMusique" #. Documentation/user/tweaks.itely:2934 (comment) #. Documentation/user/tweaks.itely:2996 (comment) msgid "Start polyphonic section of four voices" -msgstr "Début d'un section polyphonique de quatre voix" +msgstr "Début d'une section polyphonique de quatre voix" #. Documentation/user/tweaks.itely:2763 (variable) #. Documentation/user/tweaks.itely:2812 (variable) @@ -2292,6 +2428,26 @@ msgstr "Début d'un section polyphonique de quatre voix" msgid "lhMusic" msgstr "mgMusique" +#. Documentation/user/tweaks.itely:2772 (context id) +#. Documentation/user/tweaks.itely:2821 (context id) +#. Documentation/user/tweaks.itely:2884 (context id) +#. Documentation/user/tweaks.itely:2958 (context id) +#. Documentation/user/tweaks.itely:3022 (context id) +#. Documentation/user/tweaks.itely:3079 (context id) +#. Documentation/user/input.itely:928 (context id) +msgid "RH" +msgstr "MD" + +#. Documentation/user/tweaks.itely:2776 (context id) +#. Documentation/user/tweaks.itely:2825 (context id) +#. Documentation/user/tweaks.itely:2888 (context id) +#. Documentation/user/tweaks.itely:2962 (context id) +#. Documentation/user/tweaks.itely:3026 (context id) +#. Documentation/user/tweaks.itely:3083 (context id) +#. Documentation/user/input.itely:934 (context id) +msgid "LH" +msgstr "MG" + #. Documentation/user/tweaks.itely:3000 (comment) #. Documentation/user/tweaks.itely:3057 (comment) msgid "Move the c2 out of the main note column so the merge will work" @@ -2333,7 +2489,12 @@ msgstr "normal" msgid "SopranoMusic" msgstr "sopranoMusique" -#. Documentation/user/tweaks.itely:3485 (comment) +#. Documentation/user/tweaks.itely:3282 (context id) +#. Documentation/user/input.itely:913 (context id) +msgid "Soprano" +msgstr "Soprano" + +#. Documentation/user/tweaks.itely:3487 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "Arranger pour obtenir une couleur par la procédure color-notehead" @@ -2458,7 +2619,7 @@ msgstr "Propriétés listées par interface" #. @subheading in Documentation/es/user/tweaks.itely #. @subheading in Documentation/de/user/tweaks.itely msgid "Specifying the context in lyric mode" -msgstr "Specification du contexte en mode lyrique" +msgstr "Spécification du contexte en mode lyrique" #. @node in Documentation/user/tweaks.itely #. @subsection in Documentation/user/tweaks.itely @@ -2580,7 +2741,6 @@ msgstr "Doigtés" #. @subsection in Documentation/user/tweaks.itely #. @node in Documentation/es/user/tweaks.itely #. @subsection in Documentation/es/user/tweaks.itely -#, fuzzy msgid "Outside-staff objects" msgstr "Objets hors de la portée" @@ -3192,7 +3352,6 @@ msgid "ADDENDUM: How to use this License for your documents" msgstr "SUPPLÉMENT : comment utiliser cette licence pour vos documents" #. @top in Documentation/user/lilypond-program.tely -#, fuzzy msgid "GNU LilyPond --- Application Usage" msgstr "GNU LilyPond --- Utilisation du programme" @@ -3900,7 +4059,7 @@ msgstr "Index des commandes LilyPond" msgid "Musical notation" msgstr "Notation musicale générale" -#. Documentation/user/pitches.itely:654 (variable) +#. Documentation/user/pitches.itely:668 (variable) #. Documentation/user/input.itely:997 (variable) #. Documentation/user/input.itely:1016 (variable) #. Documentation/user/input.itely:1053 (variable) @@ -3908,18 +4067,39 @@ msgstr "Notation musicale générale" msgid "music" msgstr "musique" -#. Documentation/user/pitches.itely:1031 (comment) +#. Documentation/user/pitches.itely:1045 (comment) msgid "not strictly necessary, but a good reminder" msgstr "pas strictement nécessaire, mais en pense-bête" -#. Documentation/user/pitches.itely:1123 (variable) +#. Documentation/user/pitches.itely:1052 (context id) +#. Documentation/user/staff.itely:1100 (variable) +msgid "clarinet" +msgstr "clarinette" + +#. Documentation/user/pitches.itely:1137 (variable) msgid "musicA" msgstr "musiqueA" -#. Documentation/user/pitches.itely:1137 (variable) +#. Documentation/user/pitches.itely:1151 (variable) msgid "musicB" msgstr "musiqueB" +#. Documentation/user/pitches.itely:1170 (context id) +#. Documentation/user/keyboards.itely:170 (context id) +#. Documentation/user/keyboards.itely:264 (context id) +#. Documentation/user/percussion.itely:175 (variable) +#. Documentation/user/percussion.itely:365 (variable) +msgid "up" +msgstr "haut" + +#. Documentation/user/pitches.itely:1174 (context id) +#. Documentation/user/keyboards.itely:180 (context id) +#. Documentation/user/keyboards.itely:273 (context id) +#. Documentation/user/percussion.itely:178 (variable) +#. Documentation/user/percussion.itely:366 (variable) +msgid "down" +msgstr "bas" + #. @node in Documentation/user/pitches.itely #. @subsection in Documentation/user/pitches.itely #. @node in Documentation/fr/user/pitches.itely @@ -4159,252 +4339,203 @@ msgstr "Têtes de note à forme variable" msgid "Improvisation" msgstr "Improvisation" -#. Documentation/user/rhythms.itely:294 (comment) +#. Documentation/user/rhythms.itely:285 (comment) msgid "Alter durations to triplets" msgstr "Modification des durées pour obtenir un triolet" -#. Documentation/user/rhythms.itely:296 (comment) -#. Documentation/user/rhythms.itely:321 (comment) +#. Documentation/user/rhythms.itely:287 (comment) +#. Documentation/user/rhythms.itely:312 (comment) msgid "Normal durations" msgstr "Durées normales" -#. Documentation/user/rhythms.itely:298 (comment) +#. Documentation/user/rhythms.itely:289 (comment) msgid "Double the duration of chord" msgstr "Doublement de la durée de l'accord" -#. Documentation/user/rhythms.itely:300 (comment) +#. Documentation/user/rhythms.itely:291 (comment) msgid "Duration of quarter, appears like sixteenth" msgstr "Bien que durant une noire, apparaît comme une double croche" -#. Documentation/user/rhythms.itely:323 (comment) +#. Documentation/user/rhythms.itely:314 (comment) msgid "Scale music by *2/3" msgstr "Échelonnement de la musique par 2/3" -#. Documentation/user/rhythms.itely:327 (comment) +#. Documentation/user/rhythms.itely:318 (comment) msgid "Scale music by *2" msgstr "Échelonnement de la musique par 2" -#. Documentation/user/rhythms.itely:412 (comment) +#. Documentation/user/rhythms.itely:403 (comment) msgid "First alternative: following note is tied normally" msgstr "Première alternative : la note qui suit est liée normalement" -#. Documentation/user/rhythms.itely:414 (comment) +#. Documentation/user/rhythms.itely:405 (comment) msgid "Second alternative: following note has a repeated tie" msgstr "Seconde alternative : la liaison est rappelée" -#. Documentation/user/rhythms.itely:531 (comment) +#. Documentation/user/rhythms.itely:522 (comment) msgid "These two lines are just to prettify this example" msgstr "Les deux lignes qui suivent ne sont là que pourillustrer le propos" -#. Documentation/user/rhythms.itely:534 (comment) +#. Documentation/user/rhythms.itely:525 (comment) msgid "Print a maxima rest, equal to four breves" msgstr "Affiche une maxima, équivalant à quatre double-pauses" -#. Documentation/user/rhythms.itely:536 (comment) +#. Documentation/user/rhythms.itely:527 (comment) msgid "Print a longa rest, equal to two breves" msgstr "Affiche une longa, équivalant à deux double-pauses" -#. Documentation/user/rhythms.itely:538 (comment) +#. Documentation/user/rhythms.itely:529 (comment) msgid "Print a breve rest" msgstr "Affiche une double-pause" -#. Documentation/user/rhythms.itely:640 (comment) +#. Documentation/user/rhythms.itely:631 (comment) msgid "This is valid input, but does nothing" msgstr "Cette entrée est tout à fait valide, mais ne fait rien" -#. Documentation/user/rhythms.itely:666 (comment) -#. Documentation/user/rhythms.itely:719 (comment) +#. Documentation/user/rhythms.itely:657 (comment) +#. Documentation/user/rhythms.itely:710 (comment) msgid "Rest measures contracted to single measure" msgstr "Contraction des mesures de silence consécutives en une seule" -#. Documentation/user/rhythms.itely:715 (comment) +#. Documentation/user/rhythms.itely:706 (comment) msgid "Default behavior" msgstr "Comportement par défaut" -#. Documentation/user/rhythms.itely:722 (comment) +#. Documentation/user/rhythms.itely:713 (comment) msgid "Rest measures expanded" msgstr "Expansion des mesures de silence" -#. Documentation/user/rhythms.itely:755 (comment) +#. Documentation/user/rhythms.itely:746 (comment) msgid "This fails, as the wrong object name is specified" msgstr "Ceci échouera, il y a erreur sur l'objet spécifié" -#. Documentation/user/rhythms.itely:758 (comment) +#. Documentation/user/rhythms.itely:749 (comment) msgid "This is correct and works" msgstr "Formulation correcte, qui fonctionnera" -#. Documentation/user/rhythms.itely:880 (comment) +#. Documentation/user/rhythms.itely:871 (comment) msgid "Default style" msgstr "Style par défaut" -#. Documentation/user/rhythms.itely:883 (comment) +#. Documentation/user/rhythms.itely:874 (comment) msgid "Change to numeric style" msgstr "Adoption du style numérique" -#. Documentation/user/rhythms.itely:887 (comment) +#. Documentation/user/rhythms.itely:878 (comment) msgid "Revert to default style" msgstr "Retour au style par défaut" -#. Documentation/user/rhythms.itely:916 (comment) -msgid "Change time signature but keep 3/4 beaming" -msgstr "" - -#. Documentation/user/rhythms.itely:917 (comment) -#, fuzzy -msgid "due to unchanged beatLength" -msgstr "en raison de la battue" - -#. Documentation/user/rhythms.itely:921 (comment) -msgid "Lose 3/4 beaming now beatLength has changed to 16" -msgstr "" - -#. Documentation/user/rhythms.itely:1044 (comment) +#. Documentation/user/rhythms.itely:1017 (comment) msgid "Show all bar numbers" msgstr "Affichage de tous les numéros de mesure" -#. Documentation/user/rhythms.itely:1154 (comment) +#. Documentation/user/rhythms.itely:1134 (comment) msgid "Now each staff has its own time signature." msgstr "Chaque portée dispose désormais de sa propre métrique." -#. Documentation/user/rhythms.itely:1571 (comment) -#, fuzzy -msgid "auto beam on 1/4 note groups" -msgstr "ligature automatique basée sur une noire\t" - -#. Documentation/user/rhythms.itely:1573 (comment) -msgid "no defined auto-beaming for this time sig" -msgstr "pas de ligature automatique définie pour cette métrique" - -#. Documentation/user/rhythms.itely:1577 (comment) -#, fuzzy -msgid "keep 3/4 beaming" -msgstr "maintien d'une règle de ligature sur trois noires" - -#. Documentation/user/rhythms.itely:1578 (comment) -msgid "due to beatLength" -msgstr "en raison de la battue" - -#. Documentation/user/rhythms.itely:1580 (comment) -msgid "beam on 1/8 notes" -msgstr "ligature basée sur la croche" - -#. Documentation/user/rhythms.itely:1583 (comment) -msgid "beam on 3/16, 7/16, 9/16, 12/16" -msgstr "ligature sur les 3ème, 7ème, 9ème et 12ème double croche" +#. Documentation/user/rhythms.itely:1256 (context id) +msgid "myRhythm" +msgstr "monRythme" -#. Documentation/user/rhythms.itely:1612 (comment) -msgid "Set beam sub-group length to an eighth note" -msgstr "Subdivision des ligatures à la croche" - -#. Documentation/user/rhythms.itely:1615 (comment) -msgid "Set beam sub-group length to a sixteenth note" -msgstr "Subdivision des ligatures à la double-croche" - -# je ne comprends pas la différence entre les 2 mesures -JCM -#. Documentation/user/rhythms.itely:1730 (comment) +#. Documentation/user/rhythms.itely:1585 (comment) msgid "end 1/16 beams for all time signatures at the 1/16 moment" msgstr "" -"fin de ligature des doubles croches, quelle que soit la métrique, sur la " -"base d'une double croche" +"fin des ligatures de doubles croches, quelle que soit la métrique, au moment " +"1/16" -#. Documentation/user/rhythms.itely:1734 (comment) +#. Documentation/user/rhythms.itely:1589 (comment) msgid "end 1/32 beams for all time signatures at the 1/16 moment" msgstr "" -"ligature les triples croches, quelle que soit la métrique, sur la base d'une " -"double croche" +"fin des ligatures de triples croches, quelle que soit la métrique, au moment " +"1/16" -#. Documentation/user/rhythms.itely:1744 (comment) +#. Documentation/user/rhythms.itely:1599 (comment) msgid "end beams of all durations in 5/8 time signature at the 2/8 moment" msgstr "" "fin de ligature, pour une métrique à 5/8, sur la deuxième croche de la mesure" -#. Documentation/user/rhythms.itely:1759 (comment) +#. Documentation/user/rhythms.itely:1614 (comment) msgid "rhythm 3-1-1-2" -msgstr "" +msgstr "subdivision 3-1-1-2" -#. Documentation/user/rhythms.itely:1760 (comment) +#. Documentation/user/rhythms.itely:1615 (comment) msgid "Context not specified - does not work correctly" -msgstr "" +msgstr "Contexte non spécifié -- cela ne fonctionne pas" -#. Documentation/user/rhythms.itely:1766 (comment) +#. Documentation/user/rhythms.itely:1621 (comment) msgid "Works correctly with context specified" -msgstr "" +msgstr "Fonctionne car le contexte est spécifié" -#. Documentation/user/rhythms.itely:1802 (comment) +#. Documentation/user/rhythms.itely:1654 (comment) msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment" msgstr "" "annulation de la règle de fin de ligature des doubles croches, dans une " -"mesure à 4/4, sur la base de la première noire" +"mesure à 4/4, au moment de la première noire" -#. Documentation/user/rhythms.itely:1815 (comment) +#. Documentation/user/rhythms.itely:1667 (comment) msgid "this won't revert it!" msgstr "ceci n'est pas en concordance" -#. Documentation/user/rhythms.itely:1817 (comment) +#. Documentation/user/rhythms.itely:1669 (comment) msgid "this will" msgstr "ceci est conforme" -#. Documentation/user/rhythms.itely:1832 (comment) -msgid "rhythm 2-3-2" -msgstr "" +#. Documentation/user/rhythms.itely:1689 (comment) +msgid "Set default beaming for all staves" +msgstr "définition des règles de ligature pour toutes les portées" -#. Documentation/user/rhythms.itely:1871 (comment) -#, fuzzy -msgid "Default beaming" -msgstr "Comportement par défaut" +#. Documentation/user/rhythms.itely:1697 (comment) +msgid "Modify beaming for just this staff" +msgstr "changement des règles de ligature seulement pour cette portée" -#. Documentation/user/rhythms.itely:1874 (comment) -msgid "Revert default values in scm/auto-beam.scm for 12/8 time" -msgstr "" - -#. Documentation/user/rhythms.itely:1880 (comment) -msgid "Set new values for beam endings" -msgstr "" +#. Documentation/user/rhythms.itely:1703 (comment) +msgid "Inherit beaming from Score context" +msgstr "héritage des règles de ligature du contexte Score" -#. Documentation/user/rhythms.itely:2002 (comment) +#. Documentation/user/rhythms.itely:1827 (comment) msgid "revert to non-feathered beams" msgstr "retour à des liens de croches rectilignes" -#. Documentation/user/rhythms.itely:2225 (comment) -#. Documentation/user/rhythms.itely:2241 (comment) +#. Documentation/user/rhythms.itely:2050 (comment) +#. Documentation/user/rhythms.itely:2066 (comment) msgid "Permit first bar number to be printed" -msgstr "Le numéro de la première mesure sera affiché" +msgstr "Le numéro de la première mesure est imprimé" -#. Documentation/user/rhythms.itely:2242 (comment) -#. Documentation/user/rhythms.itely:2290 (comment) +#. Documentation/user/rhythms.itely:2067 (comment) +#. Documentation/user/rhythms.itely:2115 (comment) msgid "Print a bar number every second measure" msgstr "Affichage du numéro toutes les deux mesures" -#. Documentation/user/rhythms.itely:2258 (comment) +#. Documentation/user/rhythms.itely:2083 (comment) msgid "Prevent bar numbers at the end of a line and permit them elsewhere" msgstr "Affichage du numéro à chaque mesure, hormis en fin de ligne" -#. Documentation/user/rhythms.itely:2262 (comment) -#. Documentation/user/rhythms.itely:2288 (comment) +#. Documentation/user/rhythms.itely:2087 (comment) +#. Documentation/user/rhythms.itely:2113 (comment) msgid "Increase the size of the bar number by 2" msgstr "Augmentation de la taille des numéros de mesure au double" -#. Documentation/user/rhythms.itely:2266 (comment) +#. Documentation/user/rhythms.itely:2091 (comment) msgid "Draw a box round the following bar number(s)" msgstr "Numéros de mesure encadrés dans un rectangle" -#. Documentation/user/rhythms.itely:2271 (comment) +#. Documentation/user/rhythms.itely:2096 (comment) msgid "Draw a circle round the following bar number(s)" msgstr "Numéros de mesure encadrés dans un cercle" -#. Documentation/user/rhythms.itely:2293 (comment) +#. Documentation/user/rhythms.itely:2118 (comment) msgid "Center-align bar numbers" msgstr "Alignement au centre des numéros de mesure" -#. Documentation/user/rhythms.itely:2296 (comment) +#. Documentation/user/rhythms.itely:2121 (comment) msgid "Right-align bar numbers" msgstr "Alignement à droite des numéros de mesure" -#. Documentation/user/rhythms.itely:2399 (variable) +#. Documentation/user/rhythms.itely:2224 (variable) msgid "pipeSymbol" msgstr "pipeSymbole" -#. Documentation/user/rhythms.itely:2786 (variable) +#. Documentation/user/rhythms.itely:2612 (variable) msgid "MyCadenza" msgstr "MaCadence" @@ -4443,26 +4574,31 @@ msgstr "Durées" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "breve" msgstr "brève" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "longa" msgstr "longue" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "Duration names notes and rests" msgstr "Noms des notes et silences selon leur durée" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "tuplet" msgstr "nolet" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "polymetric" msgstr "polymétrique" @@ -4480,6 +4616,7 @@ msgstr "Changement d'échelle des durées" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "laissez vibrer" msgstr "laissez vibrer" @@ -4518,6 +4655,7 @@ msgstr "Silences valant une mesure" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "multi-measure rest" msgstr "silence multi-mesures" @@ -4556,6 +4694,7 @@ msgstr "Musique sans métrique" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "cadenza" msgstr "cadence" @@ -4572,11 +4711,13 @@ msgstr "Notation polymétrique" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "polymetric time signature" msgstr "métrique composite" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "meter" msgstr "métrique" @@ -5234,20 +5375,18 @@ msgstr "Saisie la musique en parallèle" msgid "flute" msgstr "flute" -#. Documentation/user/staff.itely:1100 (variable) -msgid "clarinet" -msgstr "clarinette" - #. Documentation/user/staff.itely:1189 (variable) #. Documentation/user/staff.itely:1210 (variable) msgid "oboe" msgstr "hautbois" #. Documentation/user/staff.itely:1259 (variable) +#. Documentation/user/staff.itely:1275 (context id) msgid "piccolo" msgstr "piccolo" #. Documentation/user/staff.itely:1267 (variable) +#. Documentation/user/staff.itely:1276 (context id) msgid "cbassoon" msgstr "cbasson" @@ -5298,6 +5437,8 @@ msgstr "portées" #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely #. @unnumberedsubsubsec in Documentation/es/user/staff.itely +#. @node in Documentation/de/user/staff.itely +#. @unnumberedsubsubsec in Documentation/de/user/staff.itely msgid "Grouping staves" msgstr "Regroupement de portées" @@ -5678,7 +5819,7 @@ msgstr "Mise en forme du texte" #. @node in Documentation/de/user/text.itely #. @unnumberedsubsubsec in Documentation/de/user/text.itely msgid "Text markup introduction" -msgstr "Introduction aux étiquettes de texte" +msgstr "Introduction au formatage de texte" #. @node in Documentation/user/text.itely #. @unnumberedsubsubsec in Documentation/user/text.itely @@ -5782,7 +5923,15 @@ msgstr "mauvais : il manque les durées" #. Documentation/user/vocal.itely:515 (comment) msgid "correct" -msgstr "excellent" +msgstr "correct" + +#. Documentation/user/vocal.itely:664 (context id) +msgid "lala" +msgstr "global" + +#. Documentation/user/vocal.itely:802 (context id) +msgid "splitpart" +msgstr "partieSeparee" #. Documentation/user/vocal.itely:847 (variable) msgid "voice" @@ -5792,6 +5941,14 @@ msgstr "voix" msgid "lyr" msgstr "paroles" +#. Documentation/user/vocal.itely:1053 (context id) +msgid "tune" +msgstr "melodie" + +#. Documentation/user/vocal.itely:1101 (context id) +msgid "lahlah" +msgstr "lala" + #. Documentation/user/vocal.itely:1112 (comment) msgid "applies to \\\"fas\\\"" msgstr "s'applique à \\\"fas\\\"" @@ -5916,7 +6073,7 @@ msgstr "Chants" #. @node in Documentation/de/user/vocal.itely #. @unnumberedsubsubsec in Documentation/de/user/vocal.itely msgid "Ancient vocal music" -msgstr "Musique vocale anciennes" +msgstr "Musique vocale ancienne" #. @node in Documentation/user/vocal.itely #. @subsection in Documentation/user/vocal.itely @@ -6174,7 +6331,16 @@ msgstr "Paroles sur plusieurs colonnes en fin de partition" #. Documentation/user/keyboards.itely:182 (comment) msgid "keep staff alive" -msgstr "maintien la portée active" +msgstr "maintient la portée active" + +#. Documentation/user/keyboards.itely:265 (context id) +msgid "melOne" +msgstr "melodieUn" + +#. Documentation/user/keyboards.itely:333 (context id) +#. Documentation/user/fretted-strings.itely:242 (context id) +msgid "two" +msgstr "deux" #. Documentation/user/keyboards.itely:385 (comment) msgid "stems may overlap the other staff" @@ -6190,7 +6356,7 @@ msgstr "pas de crochet superflu" #. Documentation/user/keyboards.itely:391 (comment) msgid "prevent beaming as needed" -msgstr "évite la ligature telle que devrait intervenir" +msgstr "on empêche la formation de la ligature automatique" #. @node in Documentation/user/keyboards.itely #. @section in Documentation/user/keyboards.itely @@ -6200,7 +6366,6 @@ msgstr "évite la ligature telle que devrait intervenir" #. @section in Documentation/es/user/keyboards.itely #. @node in Documentation/de/user/keyboards.itely #. @section in Documentation/de/user/keyboards.itely -#, fuzzy msgid "Keyboard and other multi-staff instruments" msgstr "Instruments utilisant des portées multiples" @@ -6387,6 +6552,8 @@ msgstr "harmoniques" #. @node in Documentation/user/unfretted-strings.itely #. @node in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @unnumberedsubsubsec in Documentation/de/user/unfretted-strings.itely msgid "Snap (Bartok) pizzicato" msgstr "Pizzicato Bartok" @@ -6394,8 +6561,6 @@ msgstr "Pizzicato Bartok" #. @node in Documentation/fr/user/unfretted-strings.itely #. @unnumberedsubsubsec in Documentation/fr/user/unfretted-strings.itely #. @unnumberedsubsubsec in Documentation/es/user/unfretted-strings.itely -#. @node in Documentation/de/user/unfretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/unfretted-strings.itely msgid "Snap (Bartók) pizzicato" msgstr "Pizzicato Bartók" @@ -6403,6 +6568,14 @@ msgstr "Pizzicato Bartók" msgid "melodia" msgstr "melodie" +#. Documentation/user/fretted-strings.itely:243 (context id) +msgid "shared" +msgstr "partage" + +#. Documentation/user/fretted-strings.itely:244 (context id) +msgid "solo" +msgstr "solo" + #. Documentation/user/fretted-strings.itely:321 (variable) msgid "mynotes" msgstr "mesnotes" @@ -6589,16 +6762,6 @@ msgstr "Banjo" msgid "Banjo tablatures" msgstr "Tablatures pour banjo" -#. Documentation/user/percussion.itely:175 (variable) -#. Documentation/user/percussion.itely:365 (variable) -msgid "up" -msgstr "haut" - -#. Documentation/user/percussion.itely:178 (variable) -#. Documentation/user/percussion.itely:366 (variable) -msgid "down" -msgstr "bas" - #. Documentation/user/percussion.itely:385 (comment) msgid "These lines define the position of the woodblocks in the stave;" msgstr "" @@ -6627,11 +6790,8 @@ msgid "It also defines the positions of the two lines." msgstr "Nous définissons aussi la position de ces deux lignes." #. Documentation/user/percussion.itely:396 (comment) -#, fuzzy msgid "This is neccessary; if not entered, the barline would be too short!" -msgstr "" -"Mention rendue nécessaire, afin d'obtenir des barres de mesure de hauteur " -"suffisante." +msgstr "nécessaire afin d'obtenir des barres de mesure assez longues" #. Documentation/user/percussion.itely:403 (comment) msgid "with this you load your new drum style table" @@ -6739,7 +6899,7 @@ msgstr "Portée de percussion" #. @node in Documentation/es/user/percussion.itely #. @unnumberedsubsubsec in Documentation/es/user/percussion.itely msgid "Custom percussion staves" -msgstr "Portéec de percussion personnalisées" +msgstr "Portées de percussion personnalisées" #. @node in Documentation/user/percussion.itely #. @unnumberedsubsubsec in Documentation/user/percussion.itely @@ -6973,10 +7133,18 @@ msgstr "Saisie de la basse chiffrée" msgid "Displaying figured bass" msgstr "Gravure de la basse chiffrée" +#. Documentation/user/ancient.itely:355 (context id) +msgid "discantus" +msgstr "discantus" + #. Documentation/user/ancient.itely:821 (variable) msgid "ficta" msgstr "ficta" +#. Documentation/user/ancient.itely:973 (context id) +msgid "cantus" +msgstr "cantus" + #. @node in Documentation/user/ancient.itely #. @section in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely @@ -7694,7 +7862,7 @@ msgstr "à l'instar de celle-ci" #. Documentation/user/spacing.itely:886 (comment) msgid "now the break is allowed" -msgstr "la rupture est maintenant autorisée" +msgstr "le saut de ligne est maintenant autorisé" #. Documentation/user/spacing.itely:1719 (comment) msgid "this time the text will be closer to the staff" @@ -7714,7 +7882,7 @@ msgstr "il y a maintenant chevauchement" #. Documentation/user/spacing.itely:1750 (comment) msgid "the markup is too close to the following note" -msgstr "l'étiquette est trop proche de la note qui suit" +msgstr "le texte est trop proche de la note qui suit" #. Documentation/user/spacing.itely:1753 (comment) msgid "setting outside-staff-horizontal-padding fixes this" @@ -8071,15 +8239,15 @@ msgstr "Modification de l'espacement" #. Documentation/user/changing-defaults.itely:2015 (comment) msgid "increase the length of the tie" -msgstr "Augmentation de la longueur de la liaison" +msgstr "augmentation de la longueur de la liaison" #. Documentation/user/changing-defaults.itely:2024 (comment) msgid "increase the length of the rest bar" -msgstr "Augmentation de la longueur de la mesure se silence multi-mesures" +msgstr "augmentation de la longueur de la mesure de silence" #. Documentation/user/changing-defaults.itely:2032 (comment) msgid "increase the length of the hairpin" -msgstr "Augmentation de la longueur du soufflet" +msgstr "augmentation de la longueur du soufflet" #. Documentation/user/changing-defaults.itely:2060 (comment) msgid "default" @@ -8095,59 +8263,59 @@ msgstr "ne fonctionne pas tout seul" msgid "effective only when both overrides are present" msgstr "effectivité si les deux modifications sont explicitées" -#. Documentation/user/changing-defaults.itely:2461 (comment) +#. Documentation/user/changing-defaults.itely:2457 (comment) msgid "Remove bar line at the end of the current line" msgstr "Suppression de la barre de mesure à la fin de la ligne en cours" -#. Documentation/user/changing-defaults.itely:2507 (comment) +#. Documentation/user/changing-defaults.itely:2503 (comment) msgid "Try to remove all key signatures" msgstr "Tentative de suppression de toutes les armures" -#. Documentation/user/changing-defaults.itely:2926 (comment) +#. Documentation/user/changing-defaults.itely:2922 (comment) msgid "move horizontally left" msgstr "déplacement vers la droite" -#. Documentation/user/changing-defaults.itely:2928 (comment) +#. Documentation/user/changing-defaults.itely:2924 (comment) msgid "move vertically up" msgstr "déplacement vers le haut" -#. Documentation/user/changing-defaults.itely:2929 (comment) +#. Documentation/user/changing-defaults.itely:2925 (comment) msgid "third finger" msgstr "troisième doigt" -#. Documentation/user/changing-defaults.itely:2975 (comment) +#. Documentation/user/changing-defaults.itely:2971 (comment) msgid "the RehearsalMark will be centered above the Clef" -msgstr "Pour centrer le repère au dessus de la clef" +msgstr "Pour centrer le repère au-dessus de la clef" -#. Documentation/user/changing-defaults.itely:2981 (comment) +#. Documentation/user/changing-defaults.itely:2977 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" -msgstr "Pour centrer le repère au dessus de la métrique" +msgstr "Pour centrer le repère au-dessus de la métrique" -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:2991 (comment) msgid "The RehearsalMark will be centered above the KeySignature" -msgstr "Pour centrer le repère au dessus de l'armure" +msgstr "Pour centrer le repère au-dessus de l'armure" -#. Documentation/user/changing-defaults.itely:3002 (comment) -#. Documentation/user/changing-defaults.itely:3018 (comment) -#. Documentation/user/changing-defaults.itely:3025 (comment) +#. Documentation/user/changing-defaults.itely:2998 (comment) +#. Documentation/user/changing-defaults.itely:3014 (comment) +#. Documentation/user/changing-defaults.itely:3021 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "Pour aligner le repère sur le coin gauche de l'armure" -#. Documentation/user/changing-defaults.itely:3007 (comment) +#. Documentation/user/changing-defaults.itely:3003 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "Pour aligner le repère sur le coin droit de l'armure" -#. Documentation/user/changing-defaults.itely:3019 (comment) +#. Documentation/user/changing-defaults.itely:3015 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "puis décaler vers la droite de 3,5 espaces" -#. Documentation/user/changing-defaults.itely:3026 (comment) +#. Documentation/user/changing-defaults.itely:3022 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "puis décaler vers la gauche de 2 espaces" -#. Documentation/user/changing-defaults.itely:3075 (variable) +#. Documentation/user/changing-defaults.itely:3071 (variable) msgid "XinO" msgstr "XdansO" @@ -8362,7 +8530,7 @@ msgstr "La commande tweak" #. @subsection in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/de/user/changing-defaults.itely msgid "The @code{\\tweak} command" -msgstr "La commande @code{\\set}" +msgstr "La commande @code{\\tweak}" #. @node in Documentation/user/changing-defaults.itely #. @node in Documentation/fr/user/changing-defaults.itely @@ -8418,9 +8586,8 @@ msgstr "Distances et unités de mesure" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely -#, fuzzy msgid "Staff symbol properties" -msgstr "Propriétés de mise en forme" +msgstr "Propriétés des lignes de portée" #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely @@ -8455,7 +8622,7 @@ msgstr "Visibilité des objets" #. @node in Documentation/de/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely msgid "Removing the stencil" -msgstr "Supression des stencils" +msgstr "Suppression des stencils" #. @node in Documentation/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely @@ -9387,7 +9554,7 @@ msgstr "Transcription de musique mensurale" #. @node in Documentation/de/user/ancient.itely #. @unnumberedsubsubsec in Documentation/de/user/ancient.itely msgid "Annotational accidentals" -msgstr "Altérations accidentelles" +msgstr "Altérations accidentelles suggérées" #. @node in Documentation/fr/user/ancient.itely #. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely @@ -9458,18 +9625,16 @@ msgid "GNU LilyPond: Manual de utilización del programa" msgstr "GNU LilyPond --- utilisation du programme" #. @top in Documentation/es/user/lilypond.tely -#, fuzzy msgid "GNU LilyPond: Manual de referencia de la notación" -msgstr "GNU LilyPond --- manuel d'initiation" +msgstr "" #. @chapheading in Documentation/es/user/lilypond.tely -#, fuzzy msgid "El tipografiador de música" -msgstr "GNU LilyPond --- utilisation du programme" +msgstr "" #. @rglos in Documentation/es/user/pitches.itely msgid "semitone" -msgstr "" +msgstr "demi-ton" #. @top in Documentation/de/user/lilypond-learning.tely msgid "GNU LilyPond -- Handbuch zum Lernen" @@ -9546,6 +9711,50 @@ msgstr "Notes de bas de page" msgid "Table of Contents" msgstr "Table des matières" +#~ msgid "Change time signature but keep 3/4 beaming" +#~ msgstr "la métrique change mais on garde les règles de ligatures en 3/4" + +#~ msgid "due to unchanged beatLength" +#~ msgstr "car la durée de pulsation n'a pas changée" + +#~ msgid "Lose 3/4 beaming now beatLength has changed to 16" +#~ msgstr "" +#~ "la durée de pulsation est maintenant 16, on perd les règles de ligature " +#~ "en 3/4" + +#~ msgid "auto beam on 1/4 note groups" +#~ msgstr "ligature automatique par noire" + +#~ msgid "keep 3/4 beaming" +#~ msgstr "maintien des règles de ligature pour 3/4" + +#~ msgid "due to beatLength" +#~ msgstr "en raison de la battue" + +#~ msgid "beam on 1/8 notes" +#~ msgstr "ligature basée sur la croche" + +#~ msgid "beam on 3/16, 7/16, 9/16, 12/16" +#~ msgstr "ligature sur les 3ème, 7ème, 9ème et 12ème double croche" + +#~ msgid "Set beam sub-group length to an eighth note" +#~ msgstr "Subdivision des ligatures à la croche" + +#~ msgid "Set beam sub-group length to a sixteenth note" +#~ msgstr "Subdivision des ligatures à la double-croche" + +#~ msgid "rhythm 2-3-2" +#~ msgstr "subdivision 2-3-2" + +#~ msgid "Default beaming" +#~ msgstr "Ligatures par défaut" + +#~ msgid "Revert default values in scm/auto-beam.scm for 12/8 time" +#~ msgstr "On annule les réglages par défaut de scm/autobeam.scm pour 12/8" + +#~ msgid "Set new values for beam endings" +#~ msgstr "puis on ajoute des règles de fin de ligature" + #~ msgid "force-hshift-Eigenschaft" #~ msgstr "la propriété force-hshift" diff --git a/Documentation/po/lilypond-doc.pot b/Documentation/po/lilypond-doc.pot index 5c4f3c734e..6079bc6e5e 100644 --- a/Documentation/po/lilypond-doc.pot +++ b/Documentation/po/lilypond-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-27 12:40+0100\n" +"POT-Creation-Date: 2008-11-09 01:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -414,6 +414,7 @@ msgstr "" #. Documentation/user/tutorial.itely:1796 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) +#. Documentation/user/pitches.itely:1041 (context id) msgid "violin" msgstr "" @@ -654,6 +655,7 @@ msgstr "" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "time signature" msgstr "" @@ -881,6 +883,7 @@ msgstr "" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "tie" msgstr "" @@ -1075,6 +1078,7 @@ msgstr "" #. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "anacrusis" msgstr "" @@ -1099,6 +1103,7 @@ msgstr "" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "note value" msgstr "" @@ -1108,6 +1113,7 @@ msgstr "" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "triplet" msgstr "" @@ -1132,6 +1138,7 @@ msgstr "" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "grace notes" msgstr "" @@ -1141,6 +1148,7 @@ msgstr "" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "acciaccatura" msgstr "" @@ -1150,6 +1158,7 @@ msgstr "" #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "appoggiatura" msgstr "" @@ -1418,7 +1427,42 @@ msgstr "" msgid "After the tutorial" msgstr "" +#. Documentation/user/fundamental.itely:325 (context id) +#. Documentation/user/fundamental.itely:368 (context id) +msgid "singer" +msgstr "" + +#. Documentation/user/fundamental.itely:326 (context id) +#. Documentation/user/fundamental.itely:369 (context id) +msgid "vocal" +msgstr "" + +#. Documentation/user/fundamental.itely:329 (context id) +#. Documentation/user/fundamental.itely:372 (context id) +msgid "piano" +msgstr "" + +#. Documentation/user/fundamental.itely:330 (context id) +#. Documentation/user/fundamental.itely:363 (variable) +#. Documentation/user/fundamental.itely:373 (context id) +#. Documentation/user/fundamental.itely:2669 (variable) +#. Documentation/user/fundamental.itely:2711 (context id) +msgid "upper" +msgstr "" + +#. Documentation/user/fundamental.itely:331 (context id) +#. Documentation/user/fundamental.itely:364 (variable) +#. Documentation/user/fundamental.itely:374 (context id) +#. Documentation/user/fundamental.itely:2676 (variable) +#. Documentation/user/fundamental.itely:2712 (context id) +msgid "lower" +msgstr "" + #. Documentation/user/fundamental.itely:361 (variable) +#. Documentation/user/simultaneous.itely:239 (context id) +#. Documentation/user/vocal.itely:568 (context id) +#. Documentation/user/vocal.itely:797 (context id) +#. Documentation/user/vocal.itely:818 (context id) #. Documentation/user/vocal.itely:1222 (variable) #. Documentation/user/vocal.itely:1264 (variable) msgid "melody" @@ -1431,14 +1475,9 @@ msgstr "" msgid "text" msgstr "" -#. Documentation/user/fundamental.itely:363 (variable) -#. Documentation/user/fundamental.itely:2669 (variable) -msgid "upper" -msgstr "" - -#. Documentation/user/fundamental.itely:364 (variable) -#. Documentation/user/fundamental.itely:2676 (variable) -msgid "lower" +#. Documentation/user/fundamental.itely:443 (context id) +#. Documentation/user/staff.itely:535 (context id) +msgid "main" msgstr "" #. Documentation/user/fundamental.itely:632 (comment) @@ -1544,6 +1583,16 @@ msgstr "" msgid "Initiate first voice" msgstr "" +#. Documentation/user/fundamental.itely:1199 (context id) +#. Documentation/user/fundamental.itely:2441 (context id) +#. Documentation/user/vocal.itely:503 (context id) +#. Documentation/user/vocal.itely:1233 (context id) +#. Documentation/user/vocal.itely:1274 (context id) +#. Documentation/user/keyboards.itely:327 (context id) +#. Documentation/user/fretted-strings.itely:241 (context id) +msgid "one" +msgstr "" + #. Documentation/user/fundamental.itely:1242 (variable) #. Documentation/user/fundamental.itely:2646 (variable) #. Documentation/user/tweaks.itely:3268 (variable) @@ -1568,6 +1617,14 @@ msgstr "" msgid "SopTwoLyrics" msgstr "" +#. Documentation/user/fundamental.itely:1255 (context id) +msgid "SopOne" +msgstr "" + +#. Documentation/user/fundamental.itely:1264 (context id) +msgid "SopTwo" +msgstr "" + #. Documentation/user/fundamental.itely:1296 (variable) #. Documentation/user/fundamental.itely:2864 (variable) msgid "TimeKey" @@ -1612,6 +1669,28 @@ msgstr "" msgid "VerseFour" msgstr "" +#. Documentation/user/fundamental.itely:1314 (context id) +msgid "Sop" +msgstr "" + +#. Documentation/user/fundamental.itely:1315 (context id) +#. Documentation/user/tweaks.itely:3283 (context id) +#. Documentation/user/input.itely:915 (context id) +msgid "Alto" +msgstr "" + +#. Documentation/user/fundamental.itely:1323 (context id) +#. Documentation/user/tweaks.itely:3291 (context id) +#. Documentation/user/input.itely:917 (context id) +msgid "Tenor" +msgstr "" + +#. Documentation/user/fundamental.itely:1324 (context id) +#. Documentation/user/tweaks.itely:3292 (context id) +#. Documentation/user/input.itely:922 (context id) +msgid "Bass" +msgstr "" + #. Documentation/user/fundamental.itely:1350 (variable) #. Documentation/user/fundamental.itely:1402 (variable) #. Documentation/user/fundamental.itely:1464 (variable) @@ -1624,6 +1703,13 @@ msgstr "" msgid "versewords" msgstr "" +#. Documentation/user/fundamental.itely:1361 (context id) +#. Documentation/user/fundamental.itely:1428 (context id) +#. Documentation/user/fundamental.itely:1489 (context id) +#. Documentation/user/vocal.itely:820 (context id) +msgid "verse" +msgstr "" + #. Documentation/user/fundamental.itely:1407 (variable) #. Documentation/user/fundamental.itely:1469 (variable) msgid "refrainnotesA" @@ -1644,6 +1730,15 @@ msgstr "" msgid "refrainwordsB" msgstr "" +#. Documentation/user/fundamental.itely:1436 (context id) +#. Documentation/user/fundamental.itely:1509 (context id) +msgid "refrainB" +msgstr "" + +#. Documentation/user/fundamental.itely:1501 (context id) +msgid "refrainA" +msgstr "" + #. Documentation/user/fundamental.itely:1655 (comment) msgid "start of single compound music expression" msgstr "" @@ -1792,6 +1887,26 @@ msgstr "" msgid "combine ChoirStaff and PianoStaff in parallel" msgstr "" +#. Documentation/user/fundamental.itely:2687 (context id) +#. Documentation/user/fundamental.itely:2689 (context id) +msgid "sopranos" +msgstr "" + +#. Documentation/user/fundamental.itely:2692 (context id) +#. Documentation/user/fundamental.itely:2694 (context id) +msgid "altos" +msgstr "" + +#. Documentation/user/fundamental.itely:2697 (context id) +#. Documentation/user/fundamental.itely:2699 (context id) +msgid "tenors" +msgstr "" + +#. Documentation/user/fundamental.itely:2702 (context id) +#. Documentation/user/fundamental.itely:2704 (context id) +msgid "basses" +msgstr "" + #. Documentation/user/fundamental.itely:2707 (comment) msgid "end ChoirStaff" msgstr "" @@ -1816,6 +1931,10 @@ msgstr "" msgid "PianoStaff and Pedal Staff must be simultaneous" msgstr "" +#. Documentation/user/fundamental.itely:2884 (context id) +msgid "ManualOne" +msgstr "" + #. Documentation/user/fundamental.itely:2885 (comment) msgid "set time signature and key" msgstr "" @@ -1824,6 +1943,10 @@ msgstr "" msgid "end ManualOne Staff context" msgstr "" +#. Documentation/user/fundamental.itely:2890 (context id) +msgid "ManualTwo" +msgstr "" + #. Documentation/user/fundamental.itely:2894 (comment) msgid "end ManualTwo Staff context" msgstr "" @@ -1832,6 +1955,10 @@ msgstr "" msgid "end PianoStaff context" msgstr "" +#. Documentation/user/fundamental.itely:2896 (context id) +msgid "PedalOrgan" +msgstr "" + #. Documentation/user/fundamental.itely:2900 (comment) msgid "end PedalOrgan Staff context" msgstr "" @@ -1895,6 +2022,11 @@ msgstr "" #. @rglos in Documentation/user/fundamental.itely #. @rglos in Documentation/user/tweaks.itely +#. Documentation/user/staff.itely:564 (context id) +#. Documentation/user/staff.itely:577 (context id) +#. Documentation/user/staff.itely:585 (context id) +#. Documentation/user/staff.itely:604 (context id) +#. Documentation/user/staff.itely:617 (context id) #. @rglos in Documentation/user/staff.itely #. @rglos in Documentation/fr/user/fundamental.itely #. @rglos in Documentation/es/user/fundamental.itely @@ -2275,6 +2407,26 @@ msgstr "" msgid "lhMusic" msgstr "" +#. Documentation/user/tweaks.itely:2772 (context id) +#. Documentation/user/tweaks.itely:2821 (context id) +#. Documentation/user/tweaks.itely:2884 (context id) +#. Documentation/user/tweaks.itely:2958 (context id) +#. Documentation/user/tweaks.itely:3022 (context id) +#. Documentation/user/tweaks.itely:3079 (context id) +#. Documentation/user/input.itely:928 (context id) +msgid "RH" +msgstr "" + +#. Documentation/user/tweaks.itely:2776 (context id) +#. Documentation/user/tweaks.itely:2825 (context id) +#. Documentation/user/tweaks.itely:2888 (context id) +#. Documentation/user/tweaks.itely:2962 (context id) +#. Documentation/user/tweaks.itely:3026 (context id) +#. Documentation/user/tweaks.itely:3083 (context id) +#. Documentation/user/input.itely:934 (context id) +msgid "LH" +msgstr "" + #. Documentation/user/tweaks.itely:3000 (comment) #. Documentation/user/tweaks.itely:3057 (comment) msgid "Move the c2 out of the main note column so the merge will work" @@ -2316,7 +2468,12 @@ msgstr "" msgid "SopranoMusic" msgstr "" -#. Documentation/user/tweaks.itely:3485 (comment) +#. Documentation/user/tweaks.itely:3282 (context id) +#. Documentation/user/input.itely:913 (context id) +msgid "Soprano" +msgstr "" + +#. Documentation/user/tweaks.itely:3487 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "" @@ -3881,7 +4038,7 @@ msgstr "" msgid "Musical notation" msgstr "" -#. Documentation/user/pitches.itely:654 (variable) +#. Documentation/user/pitches.itely:668 (variable) #. Documentation/user/input.itely:997 (variable) #. Documentation/user/input.itely:1016 (variable) #. Documentation/user/input.itely:1053 (variable) @@ -3889,18 +4046,39 @@ msgstr "" msgid "music" msgstr "" -#. Documentation/user/pitches.itely:1031 (comment) +#. Documentation/user/pitches.itely:1045 (comment) msgid "not strictly necessary, but a good reminder" msgstr "" -#. Documentation/user/pitches.itely:1123 (variable) -msgid "musicA" +#. Documentation/user/pitches.itely:1052 (context id) +#. Documentation/user/staff.itely:1100 (variable) +msgid "clarinet" msgstr "" #. Documentation/user/pitches.itely:1137 (variable) +msgid "musicA" +msgstr "" + +#. Documentation/user/pitches.itely:1151 (variable) msgid "musicB" msgstr "" +#. Documentation/user/pitches.itely:1170 (context id) +#. Documentation/user/keyboards.itely:170 (context id) +#. Documentation/user/keyboards.itely:264 (context id) +#. Documentation/user/percussion.itely:175 (variable) +#. Documentation/user/percussion.itely:365 (variable) +msgid "up" +msgstr "" + +#. Documentation/user/pitches.itely:1174 (context id) +#. Documentation/user/keyboards.itely:180 (context id) +#. Documentation/user/keyboards.itely:273 (context id) +#. Documentation/user/percussion.itely:178 (variable) +#. Documentation/user/percussion.itely:366 (variable) +msgid "down" +msgstr "" + #. @node in Documentation/user/pitches.itely #. @subsection in Documentation/user/pitches.itely #. @node in Documentation/fr/user/pitches.itely @@ -4140,240 +4318,196 @@ msgstr "" msgid "Improvisation" msgstr "" -#. Documentation/user/rhythms.itely:294 (comment) +#. Documentation/user/rhythms.itely:285 (comment) msgid "Alter durations to triplets" msgstr "" -#. Documentation/user/rhythms.itely:296 (comment) -#. Documentation/user/rhythms.itely:321 (comment) +#. Documentation/user/rhythms.itely:287 (comment) +#. Documentation/user/rhythms.itely:312 (comment) msgid "Normal durations" msgstr "" -#. Documentation/user/rhythms.itely:298 (comment) +#. Documentation/user/rhythms.itely:289 (comment) msgid "Double the duration of chord" msgstr "" -#. Documentation/user/rhythms.itely:300 (comment) +#. Documentation/user/rhythms.itely:291 (comment) msgid "Duration of quarter, appears like sixteenth" msgstr "" -#. Documentation/user/rhythms.itely:323 (comment) +#. Documentation/user/rhythms.itely:314 (comment) msgid "Scale music by *2/3" msgstr "" -#. Documentation/user/rhythms.itely:327 (comment) +#. Documentation/user/rhythms.itely:318 (comment) msgid "Scale music by *2" msgstr "" -#. Documentation/user/rhythms.itely:412 (comment) +#. Documentation/user/rhythms.itely:403 (comment) msgid "First alternative: following note is tied normally" msgstr "" -#. Documentation/user/rhythms.itely:414 (comment) +#. Documentation/user/rhythms.itely:405 (comment) msgid "Second alternative: following note has a repeated tie" msgstr "" -#. Documentation/user/rhythms.itely:531 (comment) +#. Documentation/user/rhythms.itely:522 (comment) msgid "These two lines are just to prettify this example" msgstr "" -#. Documentation/user/rhythms.itely:534 (comment) +#. Documentation/user/rhythms.itely:525 (comment) msgid "Print a maxima rest, equal to four breves" msgstr "" -#. Documentation/user/rhythms.itely:536 (comment) +#. Documentation/user/rhythms.itely:527 (comment) msgid "Print a longa rest, equal to two breves" msgstr "" -#. Documentation/user/rhythms.itely:538 (comment) +#. Documentation/user/rhythms.itely:529 (comment) msgid "Print a breve rest" msgstr "" -#. Documentation/user/rhythms.itely:640 (comment) +#. Documentation/user/rhythms.itely:631 (comment) msgid "This is valid input, but does nothing" msgstr "" -#. Documentation/user/rhythms.itely:666 (comment) -#. Documentation/user/rhythms.itely:719 (comment) +#. Documentation/user/rhythms.itely:657 (comment) +#. Documentation/user/rhythms.itely:710 (comment) msgid "Rest measures contracted to single measure" msgstr "" -#. Documentation/user/rhythms.itely:715 (comment) +#. Documentation/user/rhythms.itely:706 (comment) msgid "Default behavior" msgstr "" -#. Documentation/user/rhythms.itely:722 (comment) +#. Documentation/user/rhythms.itely:713 (comment) msgid "Rest measures expanded" msgstr "" -#. Documentation/user/rhythms.itely:755 (comment) +#. Documentation/user/rhythms.itely:746 (comment) msgid "This fails, as the wrong object name is specified" msgstr "" -#. Documentation/user/rhythms.itely:758 (comment) +#. Documentation/user/rhythms.itely:749 (comment) msgid "This is correct and works" msgstr "" -#. Documentation/user/rhythms.itely:880 (comment) +#. Documentation/user/rhythms.itely:871 (comment) msgid "Default style" msgstr "" -#. Documentation/user/rhythms.itely:883 (comment) +#. Documentation/user/rhythms.itely:874 (comment) msgid "Change to numeric style" msgstr "" -#. Documentation/user/rhythms.itely:887 (comment) +#. Documentation/user/rhythms.itely:878 (comment) msgid "Revert to default style" msgstr "" -#. Documentation/user/rhythms.itely:916 (comment) -msgid "Change time signature but keep 3/4 beaming" -msgstr "" - -#. Documentation/user/rhythms.itely:917 (comment) -msgid "due to unchanged beatLength" -msgstr "" - -#. Documentation/user/rhythms.itely:921 (comment) -msgid "Lose 3/4 beaming now beatLength has changed to 16" -msgstr "" - -#. Documentation/user/rhythms.itely:1044 (comment) +#. Documentation/user/rhythms.itely:1017 (comment) msgid "Show all bar numbers" msgstr "" -#. Documentation/user/rhythms.itely:1154 (comment) +#. Documentation/user/rhythms.itely:1134 (comment) msgid "Now each staff has its own time signature." msgstr "" -#. Documentation/user/rhythms.itely:1571 (comment) -msgid "auto beam on 1/4 note groups" -msgstr "" - -#. Documentation/user/rhythms.itely:1573 (comment) -msgid "no defined auto-beaming for this time sig" -msgstr "" - -#. Documentation/user/rhythms.itely:1577 (comment) -msgid "keep 3/4 beaming" +#. Documentation/user/rhythms.itely:1256 (context id) +msgid "myRhythm" msgstr "" -#. Documentation/user/rhythms.itely:1578 (comment) -msgid "due to beatLength" -msgstr "" - -#. Documentation/user/rhythms.itely:1580 (comment) -msgid "beam on 1/8 notes" -msgstr "" - -#. Documentation/user/rhythms.itely:1583 (comment) -msgid "beam on 3/16, 7/16, 9/16, 12/16" -msgstr "" - -#. Documentation/user/rhythms.itely:1612 (comment) -msgid "Set beam sub-group length to an eighth note" -msgstr "" - -#. Documentation/user/rhythms.itely:1615 (comment) -msgid "Set beam sub-group length to a sixteenth note" -msgstr "" - -#. Documentation/user/rhythms.itely:1730 (comment) +#. Documentation/user/rhythms.itely:1585 (comment) msgid "end 1/16 beams for all time signatures at the 1/16 moment" msgstr "" -#. Documentation/user/rhythms.itely:1734 (comment) +#. Documentation/user/rhythms.itely:1589 (comment) msgid "end 1/32 beams for all time signatures at the 1/16 moment" msgstr "" -#. Documentation/user/rhythms.itely:1744 (comment) +#. Documentation/user/rhythms.itely:1599 (comment) msgid "end beams of all durations in 5/8 time signature at the 2/8 moment" msgstr "" -#. Documentation/user/rhythms.itely:1759 (comment) +#. Documentation/user/rhythms.itely:1614 (comment) msgid "rhythm 3-1-1-2" msgstr "" -#. Documentation/user/rhythms.itely:1760 (comment) +#. Documentation/user/rhythms.itely:1615 (comment) msgid "Context not specified - does not work correctly" msgstr "" -#. Documentation/user/rhythms.itely:1766 (comment) +#. Documentation/user/rhythms.itely:1621 (comment) msgid "Works correctly with context specified" msgstr "" -#. Documentation/user/rhythms.itely:1802 (comment) +#. Documentation/user/rhythms.itely:1654 (comment) msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment" msgstr "" -#. Documentation/user/rhythms.itely:1815 (comment) +#. Documentation/user/rhythms.itely:1667 (comment) msgid "this won't revert it!" msgstr "" -#. Documentation/user/rhythms.itely:1817 (comment) +#. Documentation/user/rhythms.itely:1669 (comment) msgid "this will" msgstr "" -#. Documentation/user/rhythms.itely:1832 (comment) -msgid "rhythm 2-3-2" -msgstr "" - -#. Documentation/user/rhythms.itely:1871 (comment) -msgid "Default beaming" +#. Documentation/user/rhythms.itely:1689 (comment) +msgid "Set default beaming for all staves" msgstr "" -#. Documentation/user/rhythms.itely:1874 (comment) -msgid "Revert default values in scm/auto-beam.scm for 12/8 time" +#. Documentation/user/rhythms.itely:1697 (comment) +msgid "Modify beaming for just this staff" msgstr "" -#. Documentation/user/rhythms.itely:1880 (comment) -msgid "Set new values for beam endings" +#. Documentation/user/rhythms.itely:1703 (comment) +msgid "Inherit beaming from Score context" msgstr "" -#. Documentation/user/rhythms.itely:2002 (comment) +#. Documentation/user/rhythms.itely:1827 (comment) msgid "revert to non-feathered beams" msgstr "" -#. Documentation/user/rhythms.itely:2225 (comment) -#. Documentation/user/rhythms.itely:2241 (comment) +#. Documentation/user/rhythms.itely:2050 (comment) +#. Documentation/user/rhythms.itely:2066 (comment) msgid "Permit first bar number to be printed" msgstr "" -#. Documentation/user/rhythms.itely:2242 (comment) -#. Documentation/user/rhythms.itely:2290 (comment) +#. Documentation/user/rhythms.itely:2067 (comment) +#. Documentation/user/rhythms.itely:2115 (comment) msgid "Print a bar number every second measure" msgstr "" -#. Documentation/user/rhythms.itely:2258 (comment) +#. Documentation/user/rhythms.itely:2083 (comment) msgid "Prevent bar numbers at the end of a line and permit them elsewhere" msgstr "" -#. Documentation/user/rhythms.itely:2262 (comment) -#. Documentation/user/rhythms.itely:2288 (comment) +#. Documentation/user/rhythms.itely:2087 (comment) +#. Documentation/user/rhythms.itely:2113 (comment) msgid "Increase the size of the bar number by 2" msgstr "" -#. Documentation/user/rhythms.itely:2266 (comment) +#. Documentation/user/rhythms.itely:2091 (comment) msgid "Draw a box round the following bar number(s)" msgstr "" -#. Documentation/user/rhythms.itely:2271 (comment) +#. Documentation/user/rhythms.itely:2096 (comment) msgid "Draw a circle round the following bar number(s)" msgstr "" -#. Documentation/user/rhythms.itely:2293 (comment) +#. Documentation/user/rhythms.itely:2118 (comment) msgid "Center-align bar numbers" msgstr "" -#. Documentation/user/rhythms.itely:2296 (comment) +#. Documentation/user/rhythms.itely:2121 (comment) msgid "Right-align bar numbers" msgstr "" -#. Documentation/user/rhythms.itely:2399 (variable) +#. Documentation/user/rhythms.itely:2224 (variable) msgid "pipeSymbol" msgstr "" -#. Documentation/user/rhythms.itely:2786 (variable) +#. Documentation/user/rhythms.itely:2612 (variable) msgid "MyCadenza" msgstr "" @@ -4412,26 +4546,31 @@ msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "breve" msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "longa" msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "Duration names notes and rests" msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "tuplet" msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "polymetric" msgstr "" @@ -4449,6 +4588,7 @@ msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "laissez vibrer" msgstr "" @@ -4487,6 +4627,7 @@ msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "multi-measure rest" msgstr "" @@ -4525,6 +4666,7 @@ msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "cadenza" msgstr "" @@ -4541,11 +4683,13 @@ msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "polymetric time signature" msgstr "" #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely +#. @rglos in Documentation/de/user/rhythms.itely msgid "meter" msgstr "" @@ -5203,20 +5347,18 @@ msgstr "" msgid "flute" msgstr "" -#. Documentation/user/staff.itely:1100 (variable) -msgid "clarinet" -msgstr "" - #. Documentation/user/staff.itely:1189 (variable) #. Documentation/user/staff.itely:1210 (variable) msgid "oboe" msgstr "" #. Documentation/user/staff.itely:1259 (variable) +#. Documentation/user/staff.itely:1275 (context id) msgid "piccolo" msgstr "" #. Documentation/user/staff.itely:1267 (variable) +#. Documentation/user/staff.itely:1276 (context id) msgid "cbassoon" msgstr "" @@ -5267,6 +5409,8 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely #. @unnumberedsubsubsec in Documentation/es/user/staff.itely +#. @node in Documentation/de/user/staff.itely +#. @unnumberedsubsubsec in Documentation/de/user/staff.itely msgid "Grouping staves" msgstr "" @@ -5753,6 +5897,14 @@ msgstr "" msgid "correct" msgstr "" +#. Documentation/user/vocal.itely:664 (context id) +msgid "lala" +msgstr "" + +#. Documentation/user/vocal.itely:802 (context id) +msgid "splitpart" +msgstr "" + #. Documentation/user/vocal.itely:847 (variable) msgid "voice" msgstr "" @@ -5761,6 +5913,14 @@ msgstr "" msgid "lyr" msgstr "" +#. Documentation/user/vocal.itely:1053 (context id) +msgid "tune" +msgstr "" + +#. Documentation/user/vocal.itely:1101 (context id) +msgid "lahlah" +msgstr "" + #. Documentation/user/vocal.itely:1112 (comment) msgid "applies to \\\"fas\\\"" msgstr "" @@ -6144,6 +6304,15 @@ msgstr "" msgid "keep staff alive" msgstr "" +#. Documentation/user/keyboards.itely:265 (context id) +msgid "melOne" +msgstr "" + +#. Documentation/user/keyboards.itely:333 (context id) +#. Documentation/user/fretted-strings.itely:242 (context id) +msgid "two" +msgstr "" + #. Documentation/user/keyboards.itely:385 (comment) msgid "stems may overlap the other staff" msgstr "" @@ -6354,6 +6523,8 @@ msgstr "" #. @node in Documentation/user/unfretted-strings.itely #. @node in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @unnumberedsubsubsec in Documentation/de/user/unfretted-strings.itely msgid "Snap (Bartok) pizzicato" msgstr "" @@ -6361,8 +6532,6 @@ msgstr "" #. @node in Documentation/fr/user/unfretted-strings.itely #. @unnumberedsubsubsec in Documentation/fr/user/unfretted-strings.itely #. @unnumberedsubsubsec in Documentation/es/user/unfretted-strings.itely -#. @node in Documentation/de/user/unfretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/unfretted-strings.itely msgid "Snap (Bartók) pizzicato" msgstr "" @@ -6370,6 +6539,14 @@ msgstr "" msgid "melodia" msgstr "" +#. Documentation/user/fretted-strings.itely:243 (context id) +msgid "shared" +msgstr "" + +#. Documentation/user/fretted-strings.itely:244 (context id) +msgid "solo" +msgstr "" + #. Documentation/user/fretted-strings.itely:321 (variable) msgid "mynotes" msgstr "" @@ -6556,16 +6733,6 @@ msgstr "" msgid "Banjo tablatures" msgstr "" -#. Documentation/user/percussion.itely:175 (variable) -#. Documentation/user/percussion.itely:365 (variable) -msgid "up" -msgstr "" - -#. Documentation/user/percussion.itely:178 (variable) -#. Documentation/user/percussion.itely:366 (variable) -msgid "down" -msgstr "" - #. Documentation/user/percussion.itely:385 (comment) msgid "These lines define the position of the woodblocks in the stave;" msgstr "" @@ -6933,10 +7100,18 @@ msgstr "" msgid "Displaying figured bass" msgstr "" +#. Documentation/user/ancient.itely:355 (context id) +msgid "discantus" +msgstr "" + #. Documentation/user/ancient.itely:821 (variable) msgid "ficta" msgstr "" +#. Documentation/user/ancient.itely:973 (context id) +msgid "cantus" +msgstr "" + #. @node in Documentation/user/ancient.itely #. @section in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely @@ -8055,59 +8230,59 @@ msgstr "" msgid "effective only when both overrides are present" msgstr "" -#. Documentation/user/changing-defaults.itely:2461 (comment) +#. Documentation/user/changing-defaults.itely:2457 (comment) msgid "Remove bar line at the end of the current line" msgstr "" -#. Documentation/user/changing-defaults.itely:2507 (comment) +#. Documentation/user/changing-defaults.itely:2503 (comment) msgid "Try to remove all key signatures" msgstr "" -#. Documentation/user/changing-defaults.itely:2926 (comment) +#. Documentation/user/changing-defaults.itely:2922 (comment) msgid "move horizontally left" msgstr "" -#. Documentation/user/changing-defaults.itely:2928 (comment) +#. Documentation/user/changing-defaults.itely:2924 (comment) msgid "move vertically up" msgstr "" -#. Documentation/user/changing-defaults.itely:2929 (comment) +#. Documentation/user/changing-defaults.itely:2925 (comment) msgid "third finger" msgstr "" -#. Documentation/user/changing-defaults.itely:2975 (comment) +#. Documentation/user/changing-defaults.itely:2971 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "" -#. Documentation/user/changing-defaults.itely:2981 (comment) +#. Documentation/user/changing-defaults.itely:2977 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "" -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:2991 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "" -#. Documentation/user/changing-defaults.itely:3002 (comment) -#. Documentation/user/changing-defaults.itely:3018 (comment) -#. Documentation/user/changing-defaults.itely:3025 (comment) +#. Documentation/user/changing-defaults.itely:2998 (comment) +#. Documentation/user/changing-defaults.itely:3014 (comment) +#. Documentation/user/changing-defaults.itely:3021 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "" -#. Documentation/user/changing-defaults.itely:3007 (comment) +#. Documentation/user/changing-defaults.itely:3003 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "" -#. Documentation/user/changing-defaults.itely:3019 (comment) +#. Documentation/user/changing-defaults.itely:3015 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "" -#. Documentation/user/changing-defaults.itely:3026 (comment) +#. Documentation/user/changing-defaults.itely:3022 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "" -#. Documentation/user/changing-defaults.itely:3075 (variable) +#. Documentation/user/changing-defaults.itely:3071 (variable) msgid "XinO" msgstr "" diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index eacbf70f24..656526318a 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -14,12 +14,10 @@ OUT_PDF_IMAGES=$(IMAGES:%.png=$(outdir)/%.pdf) $(addprefix $(outdir)/,$(PDF_ILLU OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png) +OUT_MASTER_TEXI_FILES = $(outdir)/lilypond-internals.texi OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\ $(ITELY_FILES:%.itely=$(outdir)/%.texi) -MASTER_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi)\ - $(outdir)/lilypond-internals.texi - HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)\ $(outdir)/lilypond-internals-big-page.html @@ -31,6 +29,8 @@ MAIN_INFO_DOC = lilypond INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program lilypond-learning INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info) +TEXI2PDF_FLAGS = -I $(top-src-dir)/Documentation/user + ifeq ($(out),www) INFO_IMAGES_DIR = lilypond DEST_INFO_IMAGES_SUBDIR = Documentation/user @@ -63,8 +63,6 @@ extra-local-help: xml update Docbook xml documentation\n\ " -$(outdir)/lilypond.texi: $(outdir)/lilypond-internals.texi - # # Split manuals in HTML # diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index da6caa23ac..3e57280c0f 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -540,51 +540,38 @@ with ordering dependencies. @node Changing context default settings @subsection Changing context default settings -The adjustments of the previous subsections ( -@ref{The set command}, @ref{Modifying context plug-ins}, and -@ref{Overview of modifying properties}) can also be entered -separately from the music in the @code{\layout} block, - -@example -\layout @{ - @dots{} - \context @{ - \Staff - - \set fontSize = #-2 - \override Stem #'thickness = #4.0 - \remove "Time_signature_engraver" - @} -@} -@end example - -The @code{\Staff} command brings in the existing definition of the -staff context so that it can be modified. - -The statements -@example -\set fontSize = #-2 -\override Stem #'thickness = #4.0 -\remove "Time_signature_engraver" -@end example - -@noindent -affect all staves in the score. Other contexts can be modified -analogously. - -The @code{\set} keyword is optional within the @code{\layout} block, so - -@example -\context @{ - @dots{} - fontSize = #-2 -@} -@end example - -@noindent -will also work. +The context settings which are to be used by default in +@code{Score}, @code{Staff} and @code{Voice} contexts may be specified +in a @code{\layout} block, as illustrated in the following example. +The @code{\layout} block should be placed within the @code{\score} +block to which it is to apply, but outside any music. + +Note that the @code{\set} command itself and the context must be +omitted when the context default values are specified in this way: + +@lilypond[quote,verbatim] +\score { + \relative c'' { + a4^"Really small, thicker stems, no time signature" a a a + a a a a + } + \layout { + \context { + \Staff + fontSize = #-4 + \override Stem #'thickness = #4.0 + \remove "Time_signature_engraver" + } + } +} +@end lilypond +In this example, the @code{\Staff} command specifies that the +subsequent specifications are to be applied to all staves within +this score block. +Modifications can be made to the @code{Score} context or all +@code{Voice} contexts in a similar way. @knownissues @@ -2399,29 +2386,25 @@ object is printed at the end of, within the body of, or at the beginning of a line. Or to be more precise, before a line break, where there is no line break, or after a line break. -Alternatively, seven of the eight combinations may be specified +Alternatively, these eight combinations may be specified by pre-defined functions, defined in @file{scm/output-lib.scm}, where the last three columns indicate whether the layout objects will be visible in the positions shown at the head of the columns: -@multitable @columnfractions .40 .15 .1 .1 .1 -@c TODO check these more carefully +@multitable {@code{begin-of-line-invisible}} {@code{'#(#t #t #t)}} {yes} {yes} {yes} @headitem Function @tab Vector @tab Before @tab At no @tab After @headitem form @tab form @tab break @tab break @tab break -@item @code{all-invisible} @tab @code{'#(#f #f #f)} @ @ @tab no @tab no @tab no +@item @code{all-visible} @tab @code{'#(#t #t #t)} @tab yes @tab yes @tab yes @item @code{begin-of-line-visible} @tab @code{'#(#f #f #t)} @tab no @tab no @tab yes +@item @code{center-visible} @tab @code{'#(#f #t #f)} @tab no @tab yes @tab no @item @code{end-of-line-visible} @tab @code{'#(#t #f #f)} @tab yes @tab no @tab no -@item @code{all-visible} @tab @code{'#(#t #t #t)} @tab yes @tab yes @tab yes -@c The center-visible function is not defined -@c @item @code{center-visible} @tab @code{'#(#f #t #f)} @tab no @tab yes @tab no @item @code{begin-of-line-invisible} @tab @code{'#(#t #t #f)} @tab yes @tab yes @tab no -@item @code{end-of-line-invisible} @tab @code{'#(#f #t #t)} @tab no @tab yes @tab yes @item @code{center-invisible} @tab @code{'#(#t #f #t)} @tab yes @tab no @tab yes +@item @code{end-of-line-invisible} @tab @code{'#(#f #t #t)} @tab no @tab yes @tab yes +@item @code{all-invisible} @tab @code{'#(#f #f #f)} @tab no @tab no @tab no @end multitable -The @code{center-visible} function is not pre-defined. - The default settings of @code{break-visibility} depend on the layout object. The following table shows all the layout objects of interest which are affected by @code{break-visibility} and the diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely index ebedb7cb65..2ba5205539 100644 --- a/Documentation/user/fretted-strings.itely +++ b/Documentation/user/fretted-strings.itely @@ -166,7 +166,7 @@ The notes are printed as tablature, by using @code{TabStaff} and When no string is specified for a note, the note is assigned to -the lowest string that can generate the note with a fret number +the highest string that can generate the note with a fret number greater than or equal to the value of @code{minimumFret}. The default value for @code{minimumFret} is 0. diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely index e203291674..cb16e07e05 100644 --- a/Documentation/user/install.itely +++ b/Documentation/user/install.itely @@ -359,17 +359,25 @@ less verbose build output, just like for building the programs. @knownissues -@code{-j} command-line option of @command{make} is unsupported for -building the documentation. As the most time consuming task is -running LilyPond to build images of music, the makefile variable -@code{CPU_COUNT} may be set in @file{local.make} or on the command line -to the number of @code{.ly} files that LilyPond should process -simultaneously, e.g. on a bi-processor or dual core machine +The most time consuming task for building the documentation is running +LilyPond to build images of music, and there cannot be several +simultaneously running @command{lilypond-book} instances, so @code{-j} +@command{make} option does not significantly speed up the build process. +To help speed it up, the makefile variable @var{CPU_COUNT} may be set +in @file{local.make} or on the command line to the number of +@code{.ly} files that LilyPond should process simultaneously, e.g. on +a bi-processor or dual core machine @example -make CPU_COUNT=2 web +make -j3 CPU_COUNT=3 web @end example +@noindent +The recommended value of @var{CPU_COUNT} is one plus the number of +cores or processors, but it is advisable to set it to a smaller value +if your system has not enough RAM to run that many simultaneous +LilyPond instances. + If source files have changed since last documentation build, output files that need to be rebuilt are normally rebuilt, even if you do not run @code{make web-clean} first. However, building dependencies in the diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index befcdd5a4d..ee08dacf7c 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -716,8 +716,12 @@ By adding chord names and lyrics we obtain a lead sheet. @lilypond[quote,ragged-right] << \chords { c2 c f2 c } - \new Staff \relative c' { \time 2/4 c4 c g'4 g a4 a g2 } - \new Lyrics \lyricmode { twin4 kle twin kle lit tle star2 } + \new Staff + \relative c' { + \time 2/4 + c4 c g' g a a g2 + } + \addlyrics { twin -- kle twin -- kle lit -- tle star } >> @end lilypond diff --git a/Documentation/user/lilypond-learning.tely b/Documentation/user/lilypond-learning.tely index 6bdff0541c..70e5fe3a96 100644 --- a/Documentation/user/lilypond-learning.tely +++ b/Documentation/user/lilypond-learning.tely @@ -12,14 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex @c don't remove this comment. diff --git a/Documentation/user/lilypond-program.tely b/Documentation/user/lilypond-program.tely index 5f6c3cf351..918e0b7b1c 100644 --- a/Documentation/user/lilypond-program.tely +++ b/Documentation/user/lilypond-program.tely @@ -12,14 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex @c don't remove this comment. diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index e5680ee7d5..850e2a8152 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -12,14 +12,7 @@ @include macros.itexi -@iftex @afourpaper -@c don't replace quotes with directed quotes -@tex -\gdef\SETtxicodequoteundirected{Foo} -\gdef\SETtxicodequotebacktick{Bla} -@end tex -@end iftex @c Keep this here, since it pertains to the direntry below. @ignore diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index a00f9c07ff..4302b1e7a9 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -8,6 +8,10 @@ @include version.itexi +@c don't replace quotes with directed quotes +@set txicodequoteundirected +@set txicodequotebacktick + @c ***** Displaying text ***** @c we need this since @q{\} doesn't work with makeinfo 4.11 -- diff --git a/THANKS b/THANKS index 8b80411c33..571d525001 100644 --- a/THANKS +++ b/THANKS @@ -65,6 +65,7 @@ Trevor Bača BUG HUNTERS/SUGGESTIONS +Adam James Wilson Alard de Boer Alex Rolex Andy Haupt @@ -77,6 +78,7 @@ Christian Hitz Christian Herzberg David Bobroff David Griffel +Damien Heurtebise Daniel Johnson Dominic Neumann Eduardo Vieira @@ -90,12 +92,14 @@ Jay Anderson James Kilfinger Jean-Marie Mouchel Jean-Yves Baudais +Jesús Guillermo Andrade Jonathan Henkelman Kazuhiro Suzuki Laura Conrad Luc Wehli Maarten Hijzelendoorn Marc Lanoiselée +Mark Polesky Matthijs Frankeno Martijn Vromans Marnen Laibow-Koser @@ -112,6 +116,8 @@ Pierre-Emmanuel Brame Ralph Palmer Renaud Flavigny Rick Hansen +Risto Vääräniemi +Robin Bannister Roland Goretzki Rune Zedeler Ruud van Silfhout diff --git a/buildscripts/texi-langutils.py b/buildscripts/texi-langutils.py index 7486ebee01..37de5cc419 100644 --- a/buildscripts/texi-langutils.py +++ b/buildscripts/texi-langutils.py @@ -61,7 +61,7 @@ texinfo_with_menus_re = re.compile (r"^(\*) +([^:\n]+)::.*?$|^@(include|menu|end texinfo_re = re.compile (r"^@(include|node|(?:unnumbered|appendix)(?:(?:sub){0,2}sec)?|top|chapter|(?:sub){0,2}section|(?:major|chap|(?:sub){0,2})heading) *(.+?)$|@(rglos){(.+?)}", re.M) -ly_string_re = re.compile (r'^([a-zA-Z]+)[\t ]*=|%+[\t ]*(.*)$') +ly_string_re = re.compile (r'^([a-zA-Z]+)[\t ]*=|%+[\t ]*(.*)$|\\(?:new|context)\s+(?:[a-zA-Z]*?(?:Staff(?:Group)?|Voice|FiguredBass|FretBoards|Names|Devnull))\s+=\s+"?([a-zA-Z]+)"?\s+') verbatim_ly_re = re.compile (r'@lilypond\[.*?verbatim') def process_texi (texifilename, i_blurb, n_blurb, write_skeleton, topfile, output_file=None, scan_ly=False): @@ -83,7 +83,7 @@ def process_texi (texifilename, i_blurb, n_blurb, write_skeleton, topfile, outpu elif lines[i].startswith ('@end lilypond'): in_verb_ly_block = False elif in_verb_ly_block: - for (var, comment) in ly_string_re.findall (lines[i]): + for (var, comment, context_id) in ly_string_re.findall (lines[i]): if var: output_file.write ('# ' + printedfilename + ':' + \ str (i + 1) + ' (variable)\n_(r"' + var + '")\n') @@ -91,6 +91,10 @@ def process_texi (texifilename, i_blurb, n_blurb, write_skeleton, topfile, outpu output_file.write ('# ' + printedfilename + ':' + \ str (i + 1) + ' (comment)\n_(r"' + \ comment.replace ('"', '\\"') + '")\n') + elif context_id: + output_file.write ('# ' + printedfilename + ':' + \ + str (i + 1) + ' (context id)\n_(r"' + \ + context_id + '")\n') # process Texinfo node names and section titles if write_skeleton: diff --git a/configure.in b/configure.in index ffd787f4c9..f9f5c622ea 100644 --- a/configure.in +++ b/configure.in @@ -44,6 +44,11 @@ AC_ARG_ENABLE(relocation, [ --enable-relocation compile with dynamic relocation. Default: off], [reloc_b=$enableval]) +rpath_b=no +AC_ARG_ENABLE(rpath, + [ --enable-rpath hardcode runtime library path. Default: off], + [rpath_b=$enableval]) + LINK_GXX_STATICALLY=no AC_ARG_ENABLE(static-gxx, [ --enable-static-gxx link libstdc++.a statically. Default: off], @@ -60,7 +65,7 @@ if test "$NCSB_DIR" != "" ; then NCSB_SOURCE_FILES="" for f in c059013l c059016l c059033l c059036l; do if test ! -f "$NCSB_DIR/$f.pfb"; then - AC_MSG_WARN($NCSB_DIR does not contain $f.pfb.) + STEPMAKE_WARN($NCSB_DIR does not contain $f.pfb.) else NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $NCSB_SOURCE_FILES" fi @@ -151,10 +156,19 @@ if test "$gui_b" = "yes"; then STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0) fi +AC_MSG_CHECKING(whether to enable dynamic relocation) if test "$reloc_b" = "yes"; then AC_DEFINE(ARGV0_RELOCATION) fi +AC_MSG_RESULT($reloc_b) +AC_MSG_CHECKING(for rpath linkage) +if test "$rpath_b" = "yes"; then + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,\\\$\$ORIGIN/../lib" +elif test "$rpath_b" != "no"; then + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,$rpath_b" +fi +AC_MSG_RESULT($rpath_b) HOST_ARCH=`$CC -dumpmachine` AC_SUBST(HOST_ARCH) @@ -179,10 +193,13 @@ STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.79) AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") - # must also have local.make if configure fails. touch local.make +if test "$reloc_b$rpath_b" = "yesno"; then + STEPMAKE_WARN([Using --enable-relocation without --enable-rpath. LilyPond may have trouble finding libraries.]) +fi + # Gather requirements and generate output. STEPMAKE_END diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly index 353c015b8c..e999c93a4d 100644 --- a/ly/predefined-fretboards-init.ly +++ b/ly/predefined-fretboards-init.ly @@ -23,6 +23,8 @@ addChordShape = #(define-music-function (parser location key-symbol shape-string) (symbol? string?) + "Add chord shape @code{shape-string} to the @code{base-chord-shapes} +alist with the key @code{key-symbol}." (set! base-chord-shapes (acons key-symbol shape-string base-chord-shapes)) (make-music 'SequentialMusic 'void #t)) @@ -38,6 +40,9 @@ addChordShape = storePredefinedDiagram = #(define-music-function (parser location chord tuning terse-definition) (ly:music? list? string?) + "Add predefined fret diagram defined by fret-diagram-terse definition +string @code{terse-definition} for the chord pitches @code{chord} and +the stringTuning @code{tuning}." (let* ((pitches (event-chord-pitches (car (extract-named-music chord 'EventChord)))) (hash-key (cons tuning pitches))) diff --git a/make/doc-i18n-user-rules.make b/make/doc-i18n-user-rules.make index 41a05390bc..9734641f23 100644 --- a/make/doc-i18n-user-rules.make +++ b/make/doc-i18n-user-rules.make @@ -1,25 +1,25 @@ ifeq (,$(findstring texi2html,$(MISSING_OPTIONAL))) -$(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) $(outdir)/version.itexi +$(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) mkdir -p $(dir $@) - $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< + $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) -$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) $(outdir)/version.itexi - $(TEXI2HTML) --I=$(outdir) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $< +$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) + $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) else # Rules using makeinfo follow -$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi +$(outdir)/%/index.html: $(outdir)/%.texi mkdir -p $(dir $@) $(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< -$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.itexi +$(outdir)/%-big-page.html: $(outdir)/%.texi $(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< endif -$(outdir)/%.pdftexi: $(outdir)/%.texi $(outdir)/version.itexi +$(outdir)/%.pdftexi: $(outdir)/%.texi $(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $< -$(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.itexi +$(outdir)/%.pdf: $(outdir)/%.pdftexi cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi $(outdir)/version.%: $(top-src-dir)/VERSION @@ -33,10 +33,6 @@ $(outdir)/%.png: $(top-build-dir)/Documentation/user/$(outdir)/%.png $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map: $(outdir)/%.texi $(PYTHON) $(buildscript-dir)/extract_texi_filenames.py -o $(XREF_MAPS_DIR) $< -# This makes sure lilypond-doc gettext domain has been compiled -# before lilypond-book runs -$(TELY_FILES): doc-po - $(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES) .SECONDARY: diff --git a/make/doc-i18n-user-targets.make b/make/doc-i18n-user-targets.make index 7f8f6799b0..3dd7ea8fa8 100644 --- a/make/doc-i18n-user-targets.make +++ b/make/doc-i18n-user-targets.make @@ -3,12 +3,11 @@ default: local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) $(XREF_MAPS_FILES) # BIG_PAGE_HTML_FILES is defined differently in each language makefile -local-WWW-2: $(DEEP_HTML_FILES) $(BIG_PAGE_HTML_FILES) +local-WWW-2: $(DEEP_HTML_FILES) $(BIG_PAGE_HTML_FILES) $(DOCUMENTATION_LOCALE_TARGET) find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(buildscript-dir)/html-gettext.py $(ISOLANG) find $(outdir) -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(PYTHON) $(buildscript-dir)/mass-link.py --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir) $(TELY_FILES:%.tely=%.pdf) find $(outdir) \( -name 'lily-*.png' -o -name 'lily-*.ly' \) | sed 's!$(outdir)/!!g' | xargs $(PYTHON) $(buildscript-dir)/mass-link.py hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir) -doc-po: +$(DOCUMENTATION_LOCALE_TARGET): $(MAKE) -C $(depth)/Documentation/po out=www messages - -.PHONY: doc-po + touch $@ diff --git a/make/doc-i18n-user-vars.make b/make/doc-i18n-user-vars.make index 193c54245c..87ca4cd4fa 100644 --- a/make/doc-i18n-user-vars.make +++ b/make/doc-i18n-user-vars.make @@ -38,3 +38,5 @@ TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES) ifdef QUIET_BUILD TEXI2PDF_FLAGS += -q endif + +DOCUMENTATION_LOCALE_TARGET = $(outdir)/doc-po diff --git a/make/ly-rules.make b/make/ly-rules.make index fe849db405..4908997f9d 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -8,16 +8,25 @@ $(outdir)/%.latex: %.doc $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) $< +# This allows -j make option while making sure only one lilypond-book instance +# is running at the same time +define CHAIN_RULE +$(i) +$(i): +endef + +$(eval $(firstword $(MASTER_TEXI_FILES)): $(foreach i, $(wordlist 2, $(words $(MASTER_TEXI_FILES)), $(MASTER_TEXI_FILES)),$(CHAIN_RULE))) # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir. # it is not, for --srcdir builds -$(outdir)/%.texi: %.tely $(outdir)/version.itexi +$(outdir)/%.texi: %.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $< -$(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi +$(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $< + $(outdir)/%.html.omf: %.tely $(call GENERATE_OMF,html) diff --git a/make/ly-vars.make b/make/ly-vars.make index 61b61ef13b..498ad1ffa5 100644 --- a/make/ly-vars.make +++ b/make/ly-vars.make @@ -4,6 +4,8 @@ # huh ? these are for documentation?! TELY_FILES := $(call src-wildcard,*.tely) +MASTER_TEXI_FILES := $(sort $(TELY_FILES:%.tely=$(outdir)/%.texi))\ + $(OUT_MASTER_TEXI_FILES) OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf)) diff --git a/mf/GNUmakefile b/mf/GNUmakefile index eb37ee3093..898a4c245b 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -165,7 +165,7 @@ default: $(ALL_GEN_FILES) \ .PHONY: tree-regen # FIXME: temporary hack: must regenerate after building fonts -tree-regen: +tree-regen: $(ALL_GEN_FILES) ${MAKE} -C $(top-build-dir) link-mf-tree ## diff --git a/python/musicxml.py b/python/musicxml.py index 496b82b405..a7cf59730f 100644 --- a/python/musicxml.py +++ b/python/musicxml.py @@ -613,12 +613,17 @@ class Part (Music_xml_node): # modify attributes so that only those applying to the given staff remain def extract_attributes_for_staff (part, attr, staff): attributes = copy.copy (attr) - attributes._children = copy.copy (attr._children) + attributes._children = []; attributes._dict = attr._dict.copy () - for c in attributes._children: - if hasattr (c, 'number') and c.number != staff: - attributes._children.remove (c) - return attributes + # copy only the relevant children over for the given staff + for c in attr._children: + if (not (hasattr (c, 'number') and (c.number != staff)) and + not (isinstance (c, Hash_text))): + attributes._children.append (c) + if not attributes._children: + return None + else: + return attributes def extract_voices (part): voices = {} @@ -680,8 +685,9 @@ class Part (Music_xml_node): # assign these only to the voices they really belongs to! for (s, vids) in staff_to_voice_dict.items (): staff_attributes = part.extract_attributes_for_staff (n, s) - for v in vids: - voices[v].add_element (staff_attributes) + if staff_attributes: + for v in vids: + voices[v].add_element (staff_attributes) continue if isinstance (n, Partial) or isinstance (n, Barline): diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 7fcf8538cf..ed1837c8c6 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -236,7 +236,6 @@ Fractional values are allowed.") (force-hshift ,number? "This specifies a manual shift for notes in collisions. The unit is the note head width of the first voice note. This is used by @rinternals{note-collision-interface}.") - (forced ,boolean? "Manually forced accidental.") (fraction ,number-pair? "Numerator and denominator of a time signature object.") (french-beaming ,boolean? "Use French beaming style for this @@ -729,6 +728,7 @@ the grob where this is set in.") in addition to notes and stems.") (figures ,ly:grob-array? "Figured bass objects for continuation line.") + (forced ,boolean? "Manually forced accidental.") (glyph-name ,string? "The glyph name within the font.") (grace-spacing ,ly:grob? "A run of grace notes.") diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm index 6158fbb21c..23f60cc246 100644 --- a/scm/documentation-generate.scm +++ b/scm/documentation-generate.scm @@ -70,7 +70,7 @@ "(lilypond/lilypond-internals.info)") " -@include macros.texi +@include macros.itexi @ignore @omftitle LilyPond internals diff --git a/scm/output-lib.scm b/scm/output-lib.scm index eb6d98db06..22e4377046 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -205,19 +205,17 @@ centered, X==1 is at the right, X == -1 is at the left." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; break visibility -(define-public begin-of-line-visible - #(#f #f #t)) -(define-public end-of-line-visible - #(#t #f #f)) -(define-public end-of-line-invisible - #(#f #t #t)) +(define-public all-visible #(#t #t #t)) +(define-public begin-of-line-invisible #(#t #t #f)) +(define-public center-invisible #(#t #f #t)) +(define-public end-of-line-invisible #(#f #t #t)) +(define-public begin-of-line-visible #(#f #f #t)) +(define-public center-visible #(#f #t #f)) +(define-public end-of-line-visible #(#t #f #f)) +(define-public all-invisible #(#f #f #f)) + (define-public spanbar-begin-of-line-invisible #(#t #f #f)) -(define-public all-visible #(#t #t #t)) -(define-public all-invisible #(#f #f #f)) -(define-public begin-of-line-invisible - #(#t #t #f)) -(define-public center-invisible #(#t #f #t)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Bar lines. diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index be9fef694a..b8c765d3fb 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -840,6 +840,8 @@ def verbatim_html (s): ly_var_def_re = re.compile (r'^([a-zA-Z]+)[\t ]*=', re.M) ly_comment_re = re.compile (r'(%+[\t ]*)(.*)$', re.M) +ly_context_id_re = re.compile ('\\\\(?:new|context)\\s+(?:[a-zA-Z]*?(?:Staff\ +(?:Group)?|Voice|FiguredBass|FretBoards|Names|Devnull))\\s+=\\s+"?([a-zA-Z]+)"?\\s+') def ly_comment_gettext (t, m): return m.group (1) + t (m.group (2)) @@ -858,6 +860,10 @@ def verb_ly_gettext (s): s = re.sub (r"(?m)(^|[' \\#])%s([^a-zA-Z])" % v, "\\1" + t (v) + "\\2", s) + for id in ly_context_id_re.findall (s): + s = re.sub (r'(\s+|")%s(\s+|")' % id, + "\\1" + t (id) + "\\2", + s) return s texinfo_lang_re = re.compile ('(?m)^@documentlanguage (.*?)( |$)') diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index 113552939c..2a48cd12c1 100644 --- a/scripts/musicxml2ly.py +++ b/scripts/musicxml2ly.py @@ -1623,7 +1623,8 @@ class LilyPondVoiceBuilder: diff = moment - current_end if diff < Rational (0): - error_message (_ ('Negative skip %s') % diff) + error_message (_ ('Negative skip %s (from position %s to %s)') % + (diff, current_end, moment)) diff = Rational (0) if diff > Rational (0) and not (self.ignore_skips and moment == 0): diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index e556dae0e1..b2e27613a4 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1032,7 +1032,9 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ AC_CHECK_PROGS(PYTHON_CONFIG, python-config, no) if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then - PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags` + # Clean out junk: http://bugs.python.org/issue3290 + # Python headers may need some -f* flags, leave them in. + PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\)\(\w\|-\)\+//g'` PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` fi diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 4d1f06283f..41f06925fb 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -28,16 +28,16 @@ $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir- ifeq (,$(findstring texi2html,$(MISSING_OPTIONAL))) $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi - $(TEXI2HTML) --I=$(outdir) -D bigpage --output=$@ $(TEXI2HTML_INIT) $< + $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage --output=$@ $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) $(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi - $(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $< + $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi mkdir -p $(dir $@) - $(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< + $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) else # Rules using makeinfo follow diff --git a/tex/texinfo.tex b/tex/texinfo.tex index 1db5426d25..434a90f5ae 100644 --- a/tex/texinfo.tex +++ b/tex/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2008-10-16.09} +\def\texinfoversion{2008-11-07.12} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -926,6 +926,7 @@ where each line of input produces a line of output.} {% \makevalueexpandable % we want to expand any @value in FILE. \turnoffactive % and allow special characters in the expansion + \indexnofonts % Allow `@@' and other weird things in file names. \edef\temp{\noexpand\input #1 }% % % This trickery is to read FILE outside of a group, in case it makes @@ -2489,6 +2490,7 @@ end { \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active \catcode`\`=\active + \global\let'=\rq \global\let`=\lq % default definitions % \global\def\code{\begingroup \catcode\rquoteChar=\active \catcode\lquoteChar=\active @@ -2749,8 +2751,20 @@ end \def\quotedblbase{{\ecfont \char"12}} \def\quotesinglbase{{\ecfont \char"0D}} % +% This positioning is not perfect (see the ogonek LaTeX package), but +% we have the precomposed glyphs for the most common cases. +% ogonek is also used with other letters in Lithuanian (IOU), but using +% the precomposed glyphs for those is not so easy since they aren't in +% the same EC font. +\def\ogonek#1{{\ecfont \setbox0=\hbox{#1}\ifdim\ht0=1ex\accent"0C #1% + \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}\fi}} +\def\Aogonek{{\ecfont \char"81}} +\def\Eogonek{{\ecfont \char"86}} +\def\aogonek{{\ecfont \char"A1}} +\def\eogonek{{\ecfont \char"A6}} +% \def\ecfont{% - % We can't distinguish serif/sanserif and italic/slanted, but this + % We can't distinguish serif/sans and italic/slanted, but this % is used for crude hacks anyway (like adding French and German % quotes to documents typeset with CM, where we lose kerning), so % hopefully nobody will notice/care. @@ -5970,7 +5984,7 @@ end % we're doing normal filling. So, when using \aboveenvbreak and % \afterenvbreak, temporarily make \parskip 0. % -\envdef\quotation{% +\def\quotationstart{% {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip \parindent=0pt % @@ -5985,6 +5999,17 @@ end \parsearg\quotationlabel } +\envdef\quotation{% + \setnormaldispenv + \quotationstart +} + +\envdef\smallquotation{% + \setsmalldispenv + \quotationstart +} +\let\Esmallquotation = \Equotation + % We have retained a nonzero parskip for the environment, since we're % doing normal filling. % @@ -6026,12 +6051,6 @@ end \def\uncatcodespecials{% \def\do##1{\catcode`##1=\other}\dospecials} % -% [Knuth] pp. 380,381,391 -% Disable Spanish ligatures ?` and !` of \tt font -\begingroup - \catcode`\`=\active\gdef`{\relax\lq} -\endgroup -% % Setup for the @verb command. % % Eight spaces for a tab @@ -6081,7 +6100,7 @@ end \def\codequoteleft{% \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax - `% + \relax`% the \relax disables the `! and `? ligatures \else \char'22 \fi \else \char'22 \fi } @@ -6175,8 +6194,8 @@ end \def\doverbatiminclude#1{% {% \makevalueexpandable - \def\@{@}% we want to use \indexnofonts, but then verbatim ends prematurely \setupverbatim + \indexnofonts % Allow `@@' and other weird things in file names. \input #1 \afterenvbreak }% @@ -8016,7 +8035,7 @@ directory should work if nowhere else does.} % Latin2 (ISO-8859-2) character definitions. \def\lattwochardefs{% \gdef^^a0{~} - \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}} + \gdef^^a1{\Aogonek} \gdef^^a2{\u{}} \gdef^^a3{\L} \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} @@ -8033,8 +8052,8 @@ directory should work if nowhere else does.} \gdef^^af{\dotaccent Z} % \gdef^^b0{\textdegree} - \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}} - \gdef^^b2{\missingcharmsg{OGONEK}} + \gdef^^b1{\aogonek} + \gdef^^b2{\ogonek{ }} \gdef^^b3{\l} \gdef^^b4{\'{}} \gdef^^b5{\v l} @@ -8059,7 +8078,7 @@ directory should work if nowhere else does.} \gdef^^c7{\cedilla C} \gdef^^c8{\v C} \gdef^^c9{\'E} - \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}} + \gdef^^ca{\Eogonek} \gdef^^cb{\"E} \gdef^^cc{\v E} \gdef^^cd{\'I} @@ -8093,7 +8112,7 @@ directory should work if nowhere else does.} \gdef^^e7{\cedilla c} \gdef^^e8{\v c} \gdef^^e9{\'e} - \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}} + \gdef^^ea{\eogonek} \gdef^^eb{\"e} \gdef^^ec{\v e} \gdef^^ed{\'\i} @@ -8322,10 +8341,14 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0101}{\=a} \DeclareUnicodeCharacter{0102}{\u{A}} \DeclareUnicodeCharacter{0103}{\u{a}} + \DeclareUnicodeCharacter{0104}{\Aogonek} + \DeclareUnicodeCharacter{0105}{\aogonek} \DeclareUnicodeCharacter{0106}{\'C} \DeclareUnicodeCharacter{0107}{\'c} \DeclareUnicodeCharacter{0108}{\^C} \DeclareUnicodeCharacter{0109}{\^c} + \DeclareUnicodeCharacter{0118}{\Eogonek} + \DeclareUnicodeCharacter{0119}{\eogonek} \DeclareUnicodeCharacter{010A}{\dotaccent{C}} \DeclareUnicodeCharacter{010B}{\dotaccent{c}} \DeclareUnicodeCharacter{010C}{\v{C}} @@ -8473,6 +8496,8 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0233}{\=y} \DeclareUnicodeCharacter{0237}{\dotless{j}} + \DeclareUnicodeCharacter{02DB}{\ogonek{ }} + \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} @@ -9009,7 +9034,14 @@ directory should work if nowhere else does.} @catcode`@# = @other @catcode`@% = @other - +@c Finally, make ` and ' active, so that txicodequoteundirected and +@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we +@c don't make ` and ' active, @code will not get them as active chars. +@c Do this last of all since we use ` in the previous @catcode assignments. +@c (not ready yet, sigh) +@c atcode`@'=@active @let'@rq +@c atcode`@`=@active @let`@lq + @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp) @c page-delimiter: "^\\\\message" diff --git a/tex/txi-fr.tex b/tex/txi-fr.tex index 4915eaef81..4badeddcb8 100644 --- a/tex/txi-fr.tex +++ b/tex/txi-fr.tex @@ -1,4 +1,4 @@ -% $Id: txi-fr.tex,v 1.7 2008/10/16 17:13:10 karl Exp $ +% $Id: txi-fr.tex,v 1.8 2008/10/21 23:51:37 karl Exp $ % txi-fr.tex -- French translations for texinfo.tex. % % Copyright (C) 1999, 2007, 2008 Free Software Foundation. @@ -21,7 +21,7 @@ % Translation date: le 10 décembre 1999. % Transmitted to: Karl Berry -\txisetlanguage{french}{2}{2} +\txisetlanguage{french}{2}{3} \plainfrenchspacing