summaryrefslogtreecommitdiff
path: root/po/nn_NO.po
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger (at) gmx (dot) de>2009-04-09 20:05:08 +0200
committerChristian Wieninger <cwieninger (at) gmx (dot) de>2009-04-09 20:05:08 +0200
commit38564525ae5eafd180fda5ebc400d5db01df5515 (patch)
treebfb7f18354ef1df647b72b66927c2316d93d58a4 /po/nn_NO.po
parent6b2f2f995d712b1793dd1a24ce2d64df616d4b30 (diff)
downloadvdr-plugin-epgsearch-38564525ae5eafd180fda5ebc400d5db01df5515.tar.gz
vdr-plugin-epgsearch-38564525ae5eafd180fda5ebc400d5db01df5515.tar.bz2
translation fixes
Diffstat (limited to 'po/nn_NO.po')
-rw-r--r--po/nn_NO.po4
1 files changed, 0 insertions, 4 deletions
diff --git a/po/nn_NO.po b/po/nn_NO.po
index dce9409..08cd814 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,11 +8,7 @@ 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"