summaryrefslogtreecommitdiff
path: root/po/hu_HU.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/hu_HU.po')
-rw-r--r--po/hu_HU.po4
1 files changed, 4 insertions, 0 deletions
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 0ee4077..1df2167 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.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/hu_HU.po
"POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/hu_HU.po
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"