[freeplane] 02/04: Merge tag 'upstream/1.5.13'

[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 67517b07c69832130029146a0bb429f0f1f8f29e
Merge: 87535a3 0b94366
Author: Felix Natter <fnatter at gmx.net>
Date:   Sun Jul 31 18:49:21 2016 +0200

    Merge tag 'upstream/1.5.13'
    
    Upstream version 1.5.13

 freeplane/build.gradle                             |   2 +-
 freeplane/doc/history_en.txt                       |  15 +
 freeplane/external-resources/xml/preferences.xml   |   1 +
 .../resources/translations/Resources_da.properties |  57 ++-
 .../resources/translations/Resources_de.properties |  10 +-
 .../resources/translations/Resources_es.properties |   2 +-
 .../resources/translations/Resources_eu.properties | 400 +++++++++++++++++++++
 .../resources/translations/Resources_fr.properties |  10 +
 .../resources/translations/Resources_hr.properties |  10 +
 .../resources/translations/Resources_ja.properties |  14 +-
 .../resources/translations/Resources_nl.properties |  29 +-
 .../translations/Resources_pt_PT.properties        |  10 +
 .../resources/translations/Resources_sv.properties |   2 +-
 .../translations/Resources_uk_UA.properties        |  11 +
 .../org/freeplane/core/ui/components/UITools.java  |   6 +
 .../features/attribute/AttributeRegistry.java      |  37 +-
 .../mindmapmode/MClipboardController.java          |  91 +++--
 .../java/org/freeplane/features/link/MapLinks.java |  10 +
 .../org/freeplane/features/map/MapController.java  |  24 +-
 .../features/map/mindmapmode/MMapController.java   |  56 +--
 .../org/freeplane/features/mode/Controller.java    |  50 ++-
 .../text/mindmapmode/SHTMLEditLinkAction.java      |   4 +-
 .../org/freeplane/features/ui/CloseAction.java     |   2 +-
 .../org/freeplane/features/ui/FrameController.java |  41 ++-
 .../org/freeplane/features/ui/IMapViewManager.java |  10 +-
 .../url/mindmapmode/FileRevisionsDialog.java       |  12 +-
 .../freeplane/main/addons/AddOnsController.java    |   4 +-
 .../org/freeplane/main/applet/FreeplaneApplet.java |   2 +-
 .../main/application/FreeplaneGUIStarter.java      |   7 +-
 .../main/application/MapViewDockingWindows.java    |   5 +-
 .../headlessmode/HeadlessMapViewController.java    |  24 +-
 .../mindmapmode/stylemode/EditStylesAction.java    |   2 +-
 .../swing/features/filepreview/ImageAdder.java     |  76 ++++
 .../filepreview/ImageObserverCallback.java         |  49 +++
 .../time/mindmapmode/nodelist/NodeList.java        |  15 +-
 .../java/org/freeplane/view/swing/map/MapView.java |  19 +-
 .../view/swing/map/MapViewController.java          |  88 +++--
 .../org/freeplane/view/swing/map/NodeView.java     |  26 +-
 .../swing/map/mindmapmode/EditNodeTextField.java   |  23 +-
 freeplane/viewer-resources/freeplane.properties    |  29 +-
 .../translations/Resources_en.properties           |  10 +
 freeplane/viewer-resources/version.properties      |   2 +-
 .../mac-appbundler/mac_info_plist.xslt             |   4 -
 .../windows-installer/Freeplane_without_Java.iss   |   2 +-
 .../windows-portable/App/AppInfo/appinfo.ini       |   4 +-
 .../org/freeplane/plugin/script/GroovyScript.java  |  25 +-
 .../freeplane/plugin/script/proxy/MapProxy.java    |   7 +-
 .../org/freeplane/plugin/script/proxy/Proxy.java   |  33 +-
 freeplane_plugin_script/src/overview.html          |   2 +-
 gitinfo.properties                                 |   2 +-
 gitinfo.txt                                        |   2 +-
 mac.dist.gradle                                    |  15 +-
 52 files changed, 1145 insertions(+), 248 deletions(-)

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