[merkaartor] 02/06: Merge tag 'upstream/0.18.3'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository merkaartor.

commit 48748535255d7ace49951b9f26edf6d48766cffc
Merge: 7654bee 177d7ff
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 23 21:57:41 2016 +0200

    Merge tag 'upstream/0.18.3'
    
    Upstream version 0.18.3

 CHANGELOG                        |   24 +-
 HACKING.md                       |   19 +-
 src/Backend/MemoryBackend.cpp    |   14 -
 src/Commands/Command.cpp         |    2 +-
 src/MainWindow.cpp               |   80 +-
 src/MainWindow.h                 |    5 +-
 src/MainWindow.ui                |   16 +
 src/Sync/SyncListDialog.ui       |    2 +-
 src/common/AboutDialog.ui        |    2 +-
 src/src.pro                      |   14 +-
 translations/README.md           |    2 +-
 translations/merkaartor_ar.ts    | 2985 ++++++++++++++--------------
 translations/merkaartor_cs.ts    | 2548 +++++++++++-------------
 translations/merkaartor_de.ts    | 1907 ++++++++----------
 translations/merkaartor_en.ts    | 1751 ++++++++---------
 translations/merkaartor_es.ts    | 2332 ++++++++++------------
 translations/merkaartor_et.ts    | 4014 ++++++++++++++++++--------------------
 translations/merkaartor_fr.ts    | 2408 +++++++++++------------
 translations/merkaartor_hr.ts    | 2516 +++++++++++-------------
 translations/merkaartor_hu.ts    | 3803 +++++++++++++++++-------------------
 translations/merkaartor_it.ts    | 2078 +++++++++-----------
 translations/merkaartor_ja.ts    | 2095 +++++++++-----------
 translations/merkaartor_nl.ts    | 2270 ++++++++++-----------
 translations/merkaartor_pl.ts    | 2005 +++++++++----------
 translations/merkaartor_pt.ts    | 3197 ++++++++++++++----------------
 translations/merkaartor_pt_BR.ts | 2090 +++++++++-----------
 translations/merkaartor_ru.ts    | 2112 +++++++++-----------
 translations/merkaartor_sk.ts    | 3205 +++++++++++++++---------------
 translations/merkaartor_sv.ts    | 2345 +++++++++++-----------
 translations/merkaartor_uk.ts    | 2630 ++++++++++++-------------
 windows/upload-to-bintray.pl     |    2 +-
 31 files changed, 22520 insertions(+), 25953 deletions(-)

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