diff options
Diffstat (limited to 'po/nn_NO.po')
| -rw-r--r-- | po/nn_NO.po | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/po/nn_NO.po b/po/nn_NO.po index 08cd814..dce9409 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/nn_NO.po "POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= +"POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/nn_NO.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Language-Team: <vdr@linuxtv.org>\n" |