[performous] 04/09: Merge tag 'upstream/1.1'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository performous.

commit 17443c63490f069fb2abcbda8dfb6adc7897b63a
Merge: ae136e2 a829419
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jan 27 20:20:19 2016 +0100

    Merge tag 'upstream/1.1'
    
    Upstream version 1.1
    
    # gpg: Signature made Wed 27 Jan 2016 20:20:13 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 CMakeLists.txt                           |    2 +-
 cmake/Modules/FindLibEpoxy.cmake         |    1 +
 data/config/controllers.xml              |   27 +-
 game/CMakeLists.txt                      |    8 +-
 game/controllers-keyboard.cc             |   64 +-
 game/dialog.cc                           |   16 +
 game/dialog.hh                           |   15 +-
 game/ffmpeg.cc                           |    2 +-
 game/main.cc                             |   11 +-
 game/screen_sing.cc                      |   14 +-
 game/songparser-ini.cc                   |    2 +-
 game/songparser-sm.cc                    |    2 +-
 game/songparser-txt.cc                   |    2 +-
 game/songparser-xml.cc                   |   21 +-
 game/songparser.cc                       |   21 +-
 game/songparser.hh                       |   10 +-
 game/unicode.cc                          |   29 +-
 game/video_driver.cc                     |   15 +-
 lang/ast.po                              |  949 +++++++++---------
 lang/da.po                               | 1109 +++++++++++++-------
 lang/de.po                               |  176 ++--
 lang/es.po                               | 1559 ++++++++++++++++-------------
 lang/fa.po                               |  984 +++++++++---------
 lang/fi.po                               |  705 ++++++-------
 lang/fr.po                               | 1011 ++++++++++---------
 lang/hu.po                               | 1247 +++++++++++++++--------
 lang/it.po                               | 1553 +++++++++++++++-------------
 lang/ja.po                               |  893 +++++++++--------
 lang/nl.po                               |  719 ++++++-------
 lang/performous.pot                      |  158 +--
 lang/pl.po                               |  152 +--
 lang/pt_BR.po                            | 1573 ++++++++++++++++-------------
 lang/sv.po                               |  974 +++++++++---------
 lang/zh.po                               | 1611 +++++++++++++++++-------------
 tools/scripts/translation_wiki_helper.sh |   10 +-
 35 files changed, 8751 insertions(+), 6894 deletions(-)

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