diff options
Diffstat (limited to 'po/de_DE.po')
| -rw-r--r-- | po/de_DE.po | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/po/de_DE.po b/po/de_DE.po index f2f03ab..cba93dd 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/de_DE.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/de_DE.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -814,9 +818,6 @@ msgstr "Überwachung" msgid "recording with device" msgstr "Aufnahme mit Gerät" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "Mit Untertitel" |