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

[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 b17f9f427770a769545cfd3ed871da867c156993
Merge: e3bb7ec 83217fe
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Dec 10 17:02:24 2016 +0100

    Merge tag 'upstream/1.5.18'
    
    Upstream version 1.5.18

 build.gradle                                       |   3 +-
 freeplane/build.gradle                             |   4 +-
 freeplane/doc/freeplaneTutorial.mm                 | 157 ++--
 freeplane/doc/history_en.txt                       |  11 +
 freeplane/external-resources/xml/filemodemenu.xml  |   7 +-
 freeplane/external-resources/xml/preferences.xml   |   3 +
 freeplane/external-resources/xml/stylemodemenu.xml |   3 +
 ...ropertyAction.png => ShowPreferencesAction.png} | Bin
 .../resources/translations/Resources_cs.properties |   7 +-
 .../resources/translations/Resources_da.properties |   1 -
 .../resources/translations/Resources_de.properties | 114 ++-
 .../resources/translations/Resources_el.properties |   1 -
 .../resources/translations/Resources_es.properties |   1 -
 .../resources/translations/Resources_fr.properties |  14 +-
 .../resources/translations/Resources_hr.properties |   4 +-
 .../resources/translations/Resources_hu.properties |  69 +-
 .../resources/translations/Resources_id.properties |  12 +-
 .../resources/translations/Resources_it.properties |   1 -
 .../resources/translations/Resources_ja.properties |   5 +-
 .../resources/translations/Resources_ko.properties |  13 +-
 .../resources/translations/Resources_nl.properties |  48 +-
 .../resources/translations/Resources_pl.properties |   1 -
 .../translations/Resources_pt_BR.properties        | 231 ++---
 .../translations/Resources_pt_PT.properties        | 956 +++++++++++----------
 .../resources/translations/Resources_ru.properties | 122 ++-
 .../resources/translations/Resources_sr.properties |   1 -
 .../resources/translations/Resources_sv.properties |  52 +-
 .../translations/Resources_uk_UA.properties        |   4 +-
 .../translations/Resources_zh_CN.properties        |  41 +-
 .../translations/Resources_zh_TW.properties        |   1 -
 .../core/resources/ResourceController.java         |   6 +-
 .../core/resources/components/OptionPanel.java     |   3 +-
 ...pertyAction.java => ShowPreferencesAction.java} |  24 +-
 .../freeplane/core/ui/AccelerateableAction.java    |   2 +-
 .../core/ui/ActionAcceleratorManager.java          |  59 +-
 .../core/ui/components/html/CssRuleBuilder.java    |  50 +-
 .../core/ui/components/html/ScaledEditorKit.java   |   2 +-
 .../java/org/freeplane/core/util/MenuUtils.java    |   4 +-
 .../features/attribute/AttributeController.java    |   2 +-
 .../features/clipboard/MindMapHTMLWriter.java      |  69 +-
 .../mindmapmode/MClipboardController.java          |   8 +-
 .../freeplane/features/link/LinkController.java    | 120 +--
 .../features/link/mindmapmode/MLinkController.java |   5 +-
 .../link/mindmapmode/MakeLinkFromAnchorAction.java |  25 +-
 .../link/mindmapmode/MakeLinkToAnchorAction.java   |   2 +-
 .../org/freeplane/features/map/MapController.java  |   2 +-
 .../freeplane/features/map/MapNavigationUtils.java |   6 +-
 .../freeplane/features/map/ToggleFoldedAction.java |   3 +-
 .../features/map/filemode/CenterAction.java        |   9 +-
 .../features/map/filemode/FMapController.java      |   9 +-
 .../freeplane/features/map/filemode/FMapModel.java |   7 +-
 .../features/map/filemode/FNodeModel.java          |  25 +-
 .../features/map/mindmapmode/MMapController.java   |   2 +-
 .../org/freeplane/features/mode/Controller.java    |  19 +-
 .../features/mode/filemode/FModeController.java    |   2 +-
 .../features/mode/mindmapmode/MModeController.java |   8 +-
 .../freeplane/features/note/NoteController.java    |  13 +-
 .../features/styles/mindmapmode/MUIFactory.java    |   8 +-
 .../styles/mindmapmode/StyleEditorPanel.java       |   4 +-
 .../freeplane/features/text/TextController.java    |   4 +-
 .../features/text/mindmapmode/EditNodeDialog.java  |   2 +-
 .../features/text/mindmapmode/EditNodeWYSIWYG.java |   2 +-
 .../org/freeplane/main/applet/FreeplaneApplet.java |  12 +-
 .../application/ApplicationLifecycleListener.java  |   1 +
 .../application/ApplicationResourceController.java |  98 +--
 .../application/ApplicationViewController.java     |   6 +-
 .../main/application/FreeplaneGUIStarter.java      |  14 +-
 .../freeplane/main/application/LastOpenedList.java |  37 +-
 .../main/application/MapViewDockingWindows.java    |   4 +
 .../survey/FreeplaneSurveyProperties.java          |  94 ++
 .../main/application/survey/SurveyRunner.java      | 136 +++
 .../main/application/survey/SurveyStarter.java     |  81 ++
 .../main/mindmapmode/MModeControllerFactory.java   |   3 -
 .../stylemode/SModeControllerFactory.java          |   2 +
 .../org/freeplane/main/osgi/ActivatorImpl.java     |   3 +
 .../filepreview/BitmapViewerComponent.java         |  13 +-
 .../time/mindmapmode/nodelist/NodeList.java        |  10 +-
 .../view/swing/map/attribute/AttributeTable.java   |   4 +-
 .../swing/map/mindmapmode/EditNodeTextField.java   |   4 +-
 .../swing/ui/DefaultNodeMouseMotionListener.java   |   7 +-
 .../view/swing/ui/UserInputListenerFactory.java    |  21 +-
 .../ui/mindmapmode/MNodeMouseWheelListener.java    |   2 +-
 .../ui/components/html/CssRuleBuilderShould.java   |  21 +-
 .../application/survey/SurveyStarterShould.java    | 186 ++++
 freeplane/viewer-resources/freeplane.properties    |   6 +-
 .../translations/Resources_en.properties           |   4 +-
 freeplane/viewer-resources/version.properties      |   2 +-
 freeplane/viewer-resources/xml/appletmenu.xml      |  13 +-
 .../src/test/resources/unsorted/Test_en.properties |   2 +-
 freeplane_framework/script/freeplane.policy        |   4 +
 freeplane_framework/script/freeplane.sh            |   5 +
 .../main/java/org/freeplane/launcher/Launcher.java |  14 +-
 .../windows-installer/Freeplane_without_Java.iss   |   2 +-
 .../windows-portable/App/AppInfo/appinfo.ini       |   4 +-
 freeplane_plugin_latex/build.gradle                |   3 +-
 .../org/freeplane/plugin/script/GroovyScript.java  |   2 +
 .../script/InternationalizedSecurityManager.java   |   9 +-
 .../freeplane/plugin/script/ScriptingPolicy.java   |   1 +
 .../plugin/script/ScriptingRegistration.java       |   4 +
 .../plugin/script/addons/ManageAddOnsPanel.java    |   2 +-
 .../freeplane/plugin/script/proxy/Convertible.java |  83 +-
 .../org/freeplane/plugin/script/proxy/Proxy.java   |  56 +-
 gitinfo.properties                                 |   2 +-
 gitinfo.txt                                        |   2 +-
 104 files changed, 2114 insertions(+), 1258 deletions(-)

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