Resolve conflict

[lilypond.git] / Documentation / de / translations.html.in
diff --git a/Documentation/de/translations.html.in b/Documentation/de/translations.html.in

index de55282f07963340cbf824e43d5b08222b831cef..9cb0b43cc00c71fb13742fa15a25001b979a40ef 100644 (file)
--- a/Documentation/de/translations.html.in
+++ b/Documentation/de/translations.html.in
@@ -1,4 +1,4 @@
-·<p><i>Zuletzt aktualisiert am·Wed Oct  1 00:31:07 UTC 2008
+·<p><i>Zuletzt aktualisiert am·Fri Oct  3 12:17:48 UTC 2008
  </i></p>
  <html>
  <!-- This page is automatically generated by translation-status.py from
@@ -62,7 +62,7 @@ translations.template.html.in; DO NOT EDIT !-->
    <td>Till Rettig</td>
    <td></td>
    <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #25fe1f">teilweise</span></td>
+  <td><span style="background-color: #39ff22">teilweise</span></td>
    <td>vor-GDP</td>
   </tr>
   <tr align="left">
@@ -147,7 +147,7 @@ translations.template.html.in; DO NOT EDIT !-->
    <td>Till Rettig</td>
    <td></td>
    <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #33ff21">teilweise</span></td>
+  <td><span style="background-color: #47ff24">teilweise</span></td>
    <td>vor-GDP</td>
   </tr>
   <tr align="left">
@@ -208,7 +208,7 @@ translations.template.html.in; DO NOT EDIT !-->
    <td>Till Rettig</td>
    <td></td>
    <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #2cff20">teilweise</span></td>
+  <td><span style="background-color: #39ff22">teilweise</span></td>
    <td>vor-GDP</td>
   </tr>
   <tr align="left">
@@ -260,11 +260,11 @@ translations.template.html.in; DO NOT EDIT !-->
    <td>vor-GDP</td>
   </tr>
   <tr align="left">
-  <td>1.6 Notation innerhalb eines Systems<br>(1704)</td>
+  <td>1.6 Notation innerhalb eines Systems<br>(1767)</td>
    <td>Till Rettig</td>
    <td></td>
    <td><span style="background-color: #1fff1f">ja</span></td>
-  <td><span style="background-color: #ff6f57">teilweise</span></td>
+  <td><span style="background-color: #ff7456">teilweise</span></td>
    <td>vor-GDP</td>
   </tr>
   <tr align="left">