diff options
Diffstat (limited to 'po/fi_FI.po')
| -rw-r--r-- | po/fi_FI.po | 11 |
1 files changed, 0 insertions, 11 deletions
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ä" |