From: Till Paala <till.rettig@gmx.de>
Date: Sun, 15 Feb 2009 13:36:08 +0000 (+0200)
Subject: Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond... 
X-Git-Tag: release/2.13.0-0~25^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=abf9db5c7c83efb41712ab3dd8bb7ca3f601059b;p=lilypond.git

Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond into lilypond/translation

Conflicts:
	Documentation/po/de.po
---

abf9db5c7c83efb41712ab3dd8bb7ca3f601059b
diff --cc Documentation/po/de.po
index 1ee3230c80,a578634f29..a7d43c0ec3
--- a/Documentation/po/de.po
+++ b/Documentation/po/de.po
@@@ -9,8 -9,8 +9,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: de\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-01-29 09:50+0100\n"
+ "POT-Creation-Date: 2009-02-14 02:23+0100\n"
 -"PO-Revision-Date: 2008-12-27 17:09+0200\n"
 +"PO-Revision-Date: 2009-02-14 14:59+0200\n"
  "Last-Translator: Till Rettig <till.rettig@gmx.de>\n"
  "Language-Team: German <de>\n"
  "MIME-Version: 1.0\n"