diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-04-09 19:54:08 +0200 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-04-09 19:54:08 +0200 |
| commit | 6b2f2f995d712b1793dd1a24ce2d64df616d4b30 (patch) | |
| tree | ad8e6150689847c3b417b6e40345de3f5d8c112e /po/cs_CZ.po | |
| parent | 6f4d6719b0366054f1c3e52c1244bde112de3e36 (diff) | |
| parent | 47f9a76b9e8c6611c218f24361b5afcac4ab3052 (diff) | |
| download | vdr-plugin-epgsearch-6b2f2f995d712b1793dd1a24ce2d64df616d4b30.tar.gz vdr-plugin-epgsearch-6b2f2f995d712b1793dd1a24ce2d64df616d4b30.tar.bz2 | |
Merge branch 'master' of git+ssh://gandalf/srv/git/epgsearch
Conflicts:
po/ca_ES.po
po/cs_CZ.po
po/da_DK.po
po/de_DE.po
po/el_GR.po
po/es_ES.po
po/et_EE.po
po/fi_FI.po
po/fr_FR.po
po/hr_HR.po
po/hu_HU.po
po/it_IT.po
po/nl_NL.po
po/nn_NO.po
po/pl_PL.po
po/pt_PT.po
po/ro_RO.po
po/ru_RU.po
po/sl_SI.po
po/sv_SE.po
po/tr_TR.po
Diffstat (limited to 'po/cs_CZ.po')
| -rw-r--r-- | po/cs_CZ.po | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/po/cs_CZ.po b/po/cs_CZ.po index a646658..5cf6494 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.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/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" |