translation fixes

21 files changed, 0 insertions, 153 deletions

diff --git a/po/ca_ES.po b/po/ca_ES.po
index cd41cd0..8264e3b 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,11 +9,7 @@ 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 5cf6494..a646658 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,11 +7,7 @@ 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 9382216..6511608 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,11 +7,7 @@ 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 cba93dd..c5bdd24 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,11 +7,7 @@ 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 63f7900..9c65f1b 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,11 +7,7 @@ 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 d0dc486..60a9309 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,11 +7,7 @@ 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"
@@ -1222,19 +1218,4 @@ 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"
-
-#, fuzzy
-#~ msgid "%s starts: switch to?"
-#~ msgstr "¿Añadir a la lista de cambio?"
-
-#, fuzzy
-#~ msgid "Ask for switching"
-#~ msgstr "¿Añadir a la lista de cambio?"
diff --git a/po/et_EE.po b/po/et_EE.po
index c08fc02..42781ea 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,11 +7,7 @@ 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 19093b8..a0799c2 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,11 +10,7 @@ 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"
@@ -1221,11 +1217,4 @@ 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 fa3d514..35b65d1 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,11 +10,7 @@ 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"
@@ -1213,19 +1209,3 @@ 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"
-
-#, fuzzy
-#~ msgid "%s starts: switch to?"
-#~ msgstr "Ajouter à la liste de changement de chaine?"
-
-#, fuzzy
-#~ msgid "Ask for switching"
-#~ msgstr "Ajouter à la liste de changement de chaine?"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 5dcddca..e5be7b0 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.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/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 1df2167..0ee4077 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.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/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 91edc77..ca49ddd 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,11 +9,7 @@ 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"
@@ -1224,19 +1220,4 @@ 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"
-
-#, fuzzy
-#~ msgid "%s starts: switch to?"
-#~ msgstr "Aggiungere alla lista modifiche?"
-
-#, fuzzy
-#~ msgid "Ask for switching"
-#~ msgstr "Aggiungere alla lista modifiche?"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index d2dd02a..68205f8 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,11 +9,7 @@ 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"
@@ -1217,19 +1213,3 @@ 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"
-
-#, fuzzy
-#~ msgid "%s starts: switch to?"
-#~ msgstr "Voeg toe aan schakellijst?"
-
-#, fuzzy
-#~ msgid "Ask for switching"
-#~ msgstr "Voeg toe aan schakellijst?"
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"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 2c0d4c4..e027851 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,11 +7,7 @@ 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 cbc3b73..0419ceb 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,11 +7,7 @@ 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 846f733..0544ff5 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.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/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 a4aa872..576106a 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,11 +7,7 @@ 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 f1f38f6..0a117c5 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.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/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 75a43ca..154751d 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.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/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 a5d994f..7f53eca 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,11 +7,7 @@ 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"