[vdradmin-am] 02/05: Merge tag 'upstream/3.6.10'

[Tobias Grimm]

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

tiber-guest pushed a commit to branch master
in repository vdradmin-am.

commit 15467743b1cea2bea42fcdd9f9d1e3ae2e99371c
Merge: e869fb1 96881df
Author: etobi <git at e-tobi.net>
Date:   Sun Oct 19 09:27:47 2014 +0200

    Merge tag 'upstream/3.6.10'
    
    Upstream version 3.6.10

 CREDITS                                            |  19 +-
 ChangeLog                                          |  81 ++
 HISTORY                                            |   9 +
 INSTALL                                            |   2 +-
 install.sh                                         |   2 +-
 locale/cs/LC_MESSAGES/vdradmin.mo                  | Bin 30292 -> 30292 bytes
 locale/de/LC_MESSAGES/vdradmin.mo                  | Bin 74883 -> 74991 bytes
 locale/es/LC_MESSAGES/vdradmin.mo                  | Bin 71875 -> 71875 bytes
 locale/fi/LC_MESSAGES/vdradmin.mo                  | Bin 42736 -> 42839 bytes
 locale/fr/LC_MESSAGES/vdradmin.mo                  | Bin 72427 -> 72427 bytes
 locale/hu/LC_MESSAGES/vdradmin.mo                  | Bin 0 -> 27063 bytes
 locale/it/LC_MESSAGES/vdradmin.mo                  | Bin 72669 -> 73701 bytes
 locale/nl/LC_MESSAGES/vdradmin.mo                  | Bin 71106 -> 71106 bytes
 locale/ru/LC_MESSAGES/vdradmin.mo                  | Bin 77909 -> 77909 bytes
 make.sh                                            |   2 +-
 po/cs.po                                           |   8 +-
 po/de.po                                           |  10 +-
 po/es.po                                           |   8 +-
 po/fi.po                                           |  10 +-
 po/fr.po                                           |   8 +-
 po/{vdradmin.pot => hu.po}                         | 839 +++++++++++----------
 po/it.po                                           |  21 +-
 po/nl.po                                           |   8 +-
 po/ru.po                                           |   8 +-
 po/vdradmin.pot                                    |  10 +-
 template/default/about.html                        |   6 +-
 template/default/default/aktion.png                | Bin 784 -> 685 bytes
 template/default/default/fern_back.jpg             | Bin 17190 -> 1656 bytes
 template/default/default/fern_mute.jpg             | Bin 1381 -> 1357 bytes
 template/default/default/info_button_disabled.png  | Bin 522 -> 501 bytes
 template/default/default/logo.png                  | Bin 4122 -> 3585 bytes
 template/default/default/pfeile_nachlinks.png      | Bin 862 -> 751 bytes
 template/default/default/pfeile_nachlinks_soft.png | Bin 488 -> 426 bytes
 template/default/default/pfeile_nachrechts.png     | Bin 841 -> 762 bytes
 .../default/default/pfeile_nachrechts_soft.png     | Bin 477 -> 427 bytes
 template/default/default/poempl_grau.png           | Bin 607 -> 403 bytes
 template/default/default/stream.png                | Bin 957 -> 582 bytes
 template/default/default/udef_search.png           | Bin 299 -> 297 bytes
 template/default/rec_list.html                     |  12 +
 vdradmind.pl                                       | 100 ++-
 40 files changed, 705 insertions(+), 458 deletions(-)

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