summaryrefslogtreecommitdiff
path: root/po/it_IT.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/it_IT.po
parent6b2f2f995d712b1793dd1a24ce2d64df616d4b30 (diff)
downloadvdr-plugin-epgsearch-38564525ae5eafd180fda5ebc400d5db01df5515.tar.gz
vdr-plugin-epgsearch-38564525ae5eafd180fda5ebc400d5db01df5515.tar.bz2
translation fixes
Diffstat (limited to 'po/it_IT.po')
-rw-r--r--po/it_IT.po19
1 files changed, 0 insertions, 19 deletions
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?"