[vdr] 01/02: Merge branch 'upstream' into e-tobi

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch e-tobi
in repository vdr.

commit cc79ac35a95e533550f970491cd0bd285d6d87f4
Merge: 9c07990 06f5496
Author: etobi <git at e-tobi.net>
Date:   Mon Feb 9 18:52:29 2015 +0100

    Merge branch 'upstream' into e-tobi

 CONTRIBUTORS                                      |  25 ++
 HISTORY                                           |  73 +++-
 MANUAL                                            |  66 ++--
 Make.config.template                              |  12 +-
 Makefile                                          |   4 +-
 PLUGINS/src/dvbhddevice/po/{fi_FI.po => et_EE.po} |  72 ++--
 PLUGINS/src/dvbhddevice/po/fi_FI.po               |   2 +-
 PLUGINS/src/dvbhddevice/po/uk_UA.po               | 129 +++++++
 PLUGINS/src/hello/po/et_EE.po                     |  18 +-
 PLUGINS/src/pictures/po/et_EE.po                  |  33 ++
 PLUGINS/src/skincurses/HISTORY                    |   4 +
 PLUGINS/src/skincurses/po/de_DE.po                |   5 +-
 PLUGINS/src/skincurses/po/{fi_FI.po => et_EE.po}  |  19 +-
 PLUGINS/src/skincurses/po/fi_FI.po                |   3 +-
 PLUGINS/src/skincurses/po/it_IT.po                |   3 +-
 PLUGINS/src/skincurses/po/lt_LT.po                |   3 +-
 PLUGINS/src/skincurses/po/ru_RU.po                |   5 +-
 PLUGINS/src/skincurses/po/sk_SK.po                |   5 +-
 PLUGINS/src/skincurses/skincurses.c               |   5 +-
 UPDATE-2.2.0                                      | 388 ++++++++++++++++++++++
 ci.c                                              |   4 +-
 config.c                                          |  17 +-
 config.h                                          |  16 +-
 dvbplayer.c                                       |  44 ++-
 dvbplayer.h                                       |   4 +-
 eit.c                                             |   6 +-
 libsi/si.c                                        |   9 +-
 libsi/si.h                                        |   4 +-
 menu.c                                            | 176 +++++++---
 menu.h                                            |   8 +-
 nit.c                                             |  60 ++--
 po/ar.po                                          |  12 +-
 po/ca_ES.po                                       |  12 +-
 po/cs_CZ.po                                       |  12 +-
 po/da_DK.po                                       |  12 +-
 po/de_DE.po                                       |  24 +-
 po/el_GR.po                                       |  12 +-
 po/es_ES.po                                       |  12 +-
 po/et_EE.po                                       |  34 +-
 po/fi_FI.po                                       |  16 +-
 po/fr_FR.po                                       |  12 +-
 po/hr_HR.po                                       |  12 +-
 po/hu_HU.po                                       | 258 +++++++-------
 po/it_IT.po                                       |  41 ++-
 po/lt_LT.po                                       | 106 +++---
 po/mk_MK.po                                       |  12 +-
 po/nl_NL.po                                       |  12 +-
 po/nn_NO.po                                       |  12 +-
 po/pl_PL.po                                       |  12 +-
 po/pt_PT.po                                       |  12 +-
 po/ro_RO.po                                       |  36 +-
 po/ru_RU.po                                       |  12 +-
 po/sk_SK.po                                       |  12 +-
 po/sl_SI.po                                       |  12 +-
 po/sr_RS.po                                       |  12 +-
 po/sv_SE.po                                       |  12 +-
 po/tr_TR.po                                       |  12 +-
 po/uk_UA.po                                       | 132 ++++----
 po/zh_CN.po                                       |  12 +-
 recording.c                                       |  17 +-
 recording.h                                       |   9 +-
 runvdr.template                                   |  10 +-
 sources.conf                                      |   3 +-
 tools.c                                           |   4 +-
 tools.h                                           |   5 +-
 65 files changed, 1576 insertions(+), 581 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git