[gpsprune] 10/15: Merge tag 'upstream/17.2'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository gpsprune.

commit f77f0bcdcb3f2207520b23ffa0b598ddec71e608
Merge: f08fa6a 2aedbf4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 22 13:19:21 2015 +0100

    Merge tag 'upstream/17.2'
    
    Upstream version 17.2

 build.sh                                 |   2 +-
 tim/prune/GpsPrune.java                  |   6 +-
 tim/prune/function/AboutScreen.java      |   2 +-
 tim/prune/function/AsyncMediaLoader.java |  25 +-
 tim/prune/function/cache/TileSet.java    |   5 -
 tim/prune/lang/prune-texts_af.properties | 688 +++++++++++++++++++++++++------
 tim/prune/lang/prune-texts_es.properties |   7 +-
 tim/prune/lang/prune-texts_fr.properties |   5 +
 tim/prune/lang/prune-texts_hu.properties |  48 ++-
 tim/prune/lang/prune-texts_it.properties |   9 +-
 tim/prune/lang/prune-texts_nl.properties |   3 +-
 tim/prune/lang/prune-texts_pl.properties |   3 +-
 tim/prune/readme.txt                     |  14 +-
 13 files changed, 672 insertions(+), 145 deletions(-)

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