Follow up to 4240807
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into ja_ts_20
execute update_ts_file.sh