]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'lilypond/translation'
authorJohn Mandereau <john.mandereau@gmail.com>
Tue, 30 Mar 2010 21:44:21 +0000 (23:44 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Tue, 30 Mar 2010 21:44:21 +0000 (23:44 +0200)
16 files changed:
1  2 
Documentation/de/essay.tely
Documentation/de/essay/engraving.itely
Documentation/de/essay/literature.itely
Documentation/de/extending.tely
Documentation/de/learning.tely
Documentation/de/learning/common-notation.itely
Documentation/de/learning/fundamental.itely
Documentation/de/learning/tutorial.itely
Documentation/de/learning/tweaks.itely
Documentation/de/web.texi
Documentation/de/web/community.itexi
Documentation/de/web/download.itexi
Documentation/de/web/introduction.itexi
Documentation/de/web/manuals.itexi
Documentation/es/essay/engraving.itely
Documentation/fr/notation/world.itely

Simple merge
Simple merge
Simple merge
index fd283b454cee17647152bfd0b1179daa9ebb2e88,b1ff419420a67efa047b024ce7dce1417a1b4111..f4ab3832dc562369fcfa47eb0b39286be9dcc328
@@@ -1,11 -1,14 +1,14 @@@
  \input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
  @ignore
 -    Translation of GIT committish:  0bbabe9eef32b46216a722cc0d49df759227b7be
 +    Translation of GIT committish:  e9bfcb4ffbd7eab2aa453c8b8d4ddd4c43f99ac2
  
      When revising a translation, copy the HEAD committish of the
-     version that you are working on.  See TRANSLATION for details.
+     version that you are working on.  For details, see the Contributors'
+     Guide, node Updating translation committishes.
  @end ignore
  
+ @c Translators: Till Paala
  @setfilename web.info
  @settitle LilyPond -- Notation für Jedermann
  @documentencoding UTF-8
index 18224cfe73fa0cd043687d496a42eaa7248f98d0,d2b3f6b01762a5bbcf150c4ce8af78be2d65a1b7..7858018d398d8e94f6294fc3d79eafddfeafdafb
@@@ -1,12 -1,16 +1,16 @@@
  @c -*- coding: utf-8; mode: texinfo; -*-
  @ignore
 -    Translation of GIT committish:  0bbabe9eef32b46216a722cc0d49df759227b7be
 +    Translation of GIT committish:  e9bfcb4ffbd7eab2aa453c8b8d4ddd4c43f99ac2
  
      When revising a translation, copy the HEAD committish of the
-     version that you are working on.  See TRANSLATION for details.
+     version that you are working on.  For details, see the Contributors'
+     Guide, node Updating translation committishes.
  @end ignore
  
+ @c Translators: Till Paala
  @include included/authors.itexi
+ @include included/helpus.itexi
  
  @node Gemeinschaft
  @unnumbered Gemeinschaft
index 1322ec93bcfb5cfdf3133bdd3b704ae1e77d4e03,624bf1743658d607d46e9cf3baef7cc7739da80f..163780d1bf57ac63cf25fc8fe09a6dc7543c2105
@@@ -1,11 -1,14 +1,14 @@@
  @c -*- coding: utf-8; mode: texinfo; -*-
  @ignore
 -    Translation of GIT committish:  0bbabe9eef32b46216a722cc0d49df759227b7be
 +    Translation of GIT committish:  e9bfcb4ffbd7eab2aa453c8b8d4ddd4c43f99ac2
  
      When revising a translation, copy the HEAD committish of the
-     version that you are working on.  See TRANSLATION for details.
+     version that you are working on.  For details, see the Contributors'
+     Guide, node Updating translation committishes.
  @end ignore
  
+ @c Translators: Till Paala
  @macro warningTextBased
  @warning{LilyPond ist ein @strong{textbasiertes} Notationsprogramm,
  es ähnelt eher einer Programmiersprache als einem graphischen
index 3944536723f121e9f7dce952a35c3b88cb97b088,dcc5703e8950b1062f22e71a503ff749f08346b9..323b94612959e4690294206b6018d6f8a41513f5
@@@ -1,11 -1,14 +1,14 @@@
  @c -*- coding: utf-8; mode: texinfo; -*-
  @ignore
 -    Translation of GIT committish:  0bbabe9eef32b46216a722cc0d49df759227b7be
 +    Translation of GIT committish:  e9bfcb4ffbd7eab2aa453c8b8d4ddd4c43f99ac2
  
      When revising a translation, copy the HEAD committish of the
-     version that you are working on.  See TRANSLATION for details.
+     version that you are working on.  For details, see the Contributors'
+     Guide, node Updating translation committishes.
  @end ignore
  
+ @c Translators: Till Paala
  @node Einleitung
  @unnumbered Einleitung
  @translationof Introduction
index d825121c1f6fb21d177c4d7eeb115a9f28ee2482,46daaa210f42c438b4176c464c2c0e6d2ce7a615..4503e0fe689909625ea1af971c03c5e28426370c
@@@ -1,9 -1,10 +1,10 @@@
  @c -*- coding: utf-8; mode: texinfo; -*-
  @ignore
 -    Translation of GIT committish:  0bbabe9eef32b46216a722cc0d49df759227b7be
 +    Translation of GIT committish:  e9bfcb4ffbd7eab2aa453c8b8d4ddd4c43f99ac2
  
      When revising a translation, copy the HEAD committish of the
-     version that you are working on.  See TRANSLATION for details.
+     version that you are working on.  For details, see the Contributors'
+     Guide, node Updating translation committishes.
  @end ignore
  
  @node Handbücher
Simple merge