From 38564525ae5eafd180fda5ebc400d5db01df5515 Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Thu, 9 Apr 2009 20:05:08 +0200
Subject: translation fixes

---
 po/it_IT.po | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'po/it_IT.po')

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?"
-- 
cgit v1.2.3