diff options
Diffstat (limited to 'po/nl_NL.po')
| -rw-r--r-- | po/nl_NL.po | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/po/nl_NL.po b/po/nl_NL.po index 7689491..d2dd02a 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/nl_NL.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/nl_NL.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -812,9 +816,6 @@ msgstr "Timercontrole" msgid "recording with device" msgstr "neemt op met kaart" -msgid "File" -msgstr "Bestand" - msgid "Button$With subtitle" msgstr "Met ondertitel" @@ -1216,6 +1217,12 @@ msgstr "in %02ldh" msgid "in %02ldm" msgstr "in %02ldm" +<<<<<<< HEAD:po/nl_NL.po +#~ msgid "File" +#~ msgstr "Bestand" + +======= +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/nl_NL.po #~ msgid "Day" #~ msgstr "Dag" |