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