21 files changed, 99 insertions, 0 deletions

diff --git a/po/ca_ES.po b/po/ca_ES.po
index 8264e3b..cd41cd0 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.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/ca_ES.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/ca_ES.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index a646658..5cf6494 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.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/cs_CZ.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/cs_CZ.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/da_DK.po b/po/da_DK.po
index 6511608..9382216 100644
--- a/po/da_DK.po
+++ b/po/da_DK.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/da_DK.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/da_DK.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index c5bdd24..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"
diff --git a/po/el_GR.po b/po/el_GR.po
index 9c65f1b..63f7900 100644
--- a/po/el_GR.po
+++ b/po/el_GR.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/el_GR.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/el_GR.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 775310e..d0dc486 100644
--- a/po/es_ES.po
+++ b/po/es_ES.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/es_ES.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/es_ES.po
 "PO-Revision-Date: 2007-11-18 20:09+0200\n"
 "Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -1218,9 +1222,12 @@ msgstr "en %02ldh"
 msgid "in %02ldm"
 msgstr "en %02ldm"
 
+<<<<<<< HEAD:po/es_ES.po
 #~ msgid "File"
 #~ msgstr "Archivo"
 
+=======
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/es_ES.po
 #~ msgid "Day"
 #~ msgstr "Día"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 42781ea..c08fc02 100644
--- a/po/et_EE.po
+++ b/po/et_EE.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/et_EE.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/et_EE.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 6c5fc1c..19093b8 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
+<<<<<<< HEAD:po/fi_FI.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fi_FI.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -1217,8 +1221,11 @@ msgstr "%02ldh"
 msgid "in %02ldm"
 msgstr "%02ldm"
 
+<<<<<<< HEAD:po/fi_FI.po
 #~ msgid "File"
 #~ msgstr "Tiedosto"
 
+=======
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fi_FI.po
 #~ msgid "Day"
 #~ msgstr "Päivä"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 154dbc7..fa3d514 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
+<<<<<<< HEAD:po/fr_FR.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fr_FR.po
 "PO-Revision-Date: 2008-04-30 08:36+0200\n"
 "Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -1209,9 +1213,12 @@ msgstr "en %02ldh"
 msgid "in %02ldm"
 msgstr "en %02ldm"
 
+<<<<<<< HEAD:po/fr_FR.po
 #~ msgid "File"
 #~ msgstr "Fichier"
 
+=======
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fr_FR.po
 #~ msgid "Day"
 #~ msgstr "Jour"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index e5be7b0..5dcddca 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.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/hr_HR.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/hr_HR.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
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"
diff --git a/po/it_IT.po b/po/it_IT.po
index bc491f8..91edc77 100644
--- a/po/it_IT.po
+++ b/po/it_IT.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/it_IT.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/it_IT.po
 "PO-Revision-Date: 2008-06-29 03:25+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -1220,9 +1224,12 @@ msgstr "in %02ldh"
 msgid "in %02ldm"
 msgstr "in %02ldm"
 
+<<<<<<< HEAD:po/it_IT.po
 #~ msgid "File"
 #~ msgstr "File"
 
+=======
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/it_IT.po
 #~ msgid "Day"
 #~ msgstr "Giorno"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index ebd0d5e..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"
@@ -1213,9 +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"
 
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"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index e027851..2c0d4c4 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.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/pl_PL.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/pl_PL.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 0419ceb..cbc3b73 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.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/pt_PT.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/pt_PT.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 0544ff5..846f733 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.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/ro_RO.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/ro_RO.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 576106a..a4aa872 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.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/ru_RU.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/ru_RU.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 0a117c5..f1f38f6 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.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/sl_SI.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/sl_SI.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 154751d..75a43ca 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.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/sv_SE.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/sv_SE.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 7f53eca..a5d994f 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.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/tr_TR.po
 "POT-Creation-Date: 2009-04-09 19:51+0200\n"
+=======
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/tr_TR.po
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"