[merkaartor] branch master updated (f0b481d -> 15898db)

[Bas Couwenberg]

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

sebastic pushed a change to branch master
in repository merkaartor.

      from  f0b481d   Set distribution to unstable.
       new  40b211d   Fix filenamemangle in watch file.
       new  c26ebcb   Imported Upstream version 0.18.3+ds
       new  8ab03e7   Merge tag 'upstream/0.18.3+ds'
       new  595918c   New upstream release (from modified release tag).
       new  75d3e3c   Move filenamemangle change to proper changelog section.
       new  1051baa   Refresh patches.
       new  15898db   Set distribution to unstable.

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 COMPILE.md                                         |    2 +
 debian/changelog                                   |    8 +
 debian/patches/no-git-version.patch                |    7 +-
 debian/watch                                       |    2 +-
 src/Config.pri                                     |    2 +-
 src/MainWindow.ui                                  |    2 +-
 src/Preferences/PreferencesDialog.cpp              |   17 +-
 src/src.pro                                        |    9 +
 translations/README.md                             |    7 +-
 .../{merkaartor_et.ts => merkaartor_de_AT.ts}      | 2619 ++++++++++----------
 translations/merkaartor_id_ID.ts                   | 2503 +++++++++----------
 .../{merkaartor_et.ts => merkaartor_vi.ts}         | 2619 ++++++++++----------
 .../{merkaartor_et.ts => merkaartor_zh_CN.ts}      | 2619 ++++++++++----------
 .../{merkaartor_cs.ts => merkaartor_zh_TW.ts}      | 2610 +++++++++----------
 windows/msys-build                                 |   10 +
 windows/msys-init                                  |   24 +
 16 files changed, 6435 insertions(+), 6625 deletions(-)
 copy translations/{merkaartor_et.ts => merkaartor_de_AT.ts} (75%)
 copy translations/{merkaartor_et.ts => merkaartor_vi.ts} (75%)
 copy translations/{merkaartor_et.ts => merkaartor_zh_CN.ts} (75%)
 copy translations/{merkaartor_cs.ts => merkaartor_zh_TW.ts} (75%)
 create mode 100755 windows/msys-build
 create mode 100755 windows/msys-init

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