[freeplane] 02/06: Merge tag 'upstream/1.5.14'

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 2e40474b831bdd3c896608e71193a76097e37b32
Merge: 396e7c8 5ab56a3
Author: Felix Natter <fnatter at gmx.net>
Date:   Sun Aug 14 14:07:20 2016 +0200

    Merge tag 'upstream/1.5.14'
    
    Upstream version 1.5.14

 freeplane/doc/history_en.txt                       |   9 ++
 .../resources/default_accelerators.properties      |  10 ++
 .../resources/default_accelerators_mac.properties  |   5 +
 freeplane/resources/freeplane_mac.properties       |   4 -
 .../resources/translations/Resources_da.properties |  10 +-
 .../resources/translations/Resources_eu.properties | 101 ++++++++++++++++
 .../resources/translations/Resources_nl.properties |  43 ++++++-
 .../core/ui/ActionAcceleratorManager.java          |  19 ++-
 .../java/org/freeplane/core/util/Quantity.java     |   5 +
 .../export/mindmapmode/XsltExportEngine.java       |  30 +++++
 .../features/help/DocumentationAction.java         |   3 +-
 .../mindmapmode/MLocationController.java           |   1 +
 .../features/nodestyle/NodeSizeModel.java          |   2 -
 .../mindmapmode/MNodeStyleController.java          |   2 +
 .../ImportLinkedBranchWithoutRootAction.java       |   1 +
 .../application/ApplicationResourceController.java |   4 -
 .../main/application/CommandLineParser.java        |  15 ++-
 .../mindmapmode/stylemode/ExtensionInstaller.java  |   7 ++
 .../mindmapmode/stylemode/SModeController.java     |   2 +-
 .../stylemode/SModeControllerFactory.java          |   9 +-
 .../org/freeplane/main/osgi/ActivatorImpl.java     |  97 ++++++++++------
 .../org/freeplane/view/swing/map/MainView.java     |   4 +-
 .../swing/ui/mindmapmode/MNodeMotionListener.java  |   4 +-
 .../org/freeplane/core/util/QuantityShould.java    |  12 ++
 freeplane/viewer-resources/freeplane.properties    |  10 --
 freeplane/viewer-resources/version.properties      |   2 +-
 .../windows-installer/Freeplane_without_Java.iss   |   2 +-
 .../windows-portable/App/AppInfo/appinfo.ini       |   4 +-
 .../plugin/bugreport/ReportGenerator.java          | 128 ++++++++++-----------
 .../java/org/freeplane/plugin/latex/Activator.java |  32 +++---
 .../freeplane/plugin/latex/LatexRegistration.java  |  50 --------
 .../org/freeplane/plugin/script/proxy/Proxy.java   |   4 +-
 gitinfo.properties                                 |   2 +-
 gitinfo.txt                                        |   2 +-
 34 files changed, 421 insertions(+), 214 deletions(-)

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