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

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

commit f60c83962a89b5d4911f9833da37423fad5642e4
Merge: 120ba6e 47b1660
Author: Felix Natter <fnat...@gmx.net>
Date:   Sun Sep 18 15:47:31 2016 +0200

    Merge tag 'upstream/1.5.16'
    
    Upstream version 1.5.16

 freeplane/build.gradle                             |   1 +
 freeplane/doc/history_en.txt                       |   8 +
 .../external-resources/xml/mindmapmodemenu.xml     |   4 +
 freeplane/external-resources/xml/preferences.xml   |   4 +-
 .../external-resources/xslt/mm2wordml_utf8.xsl     |  17 +-
 freeplane/resources/images/weblate-32.png          | Bin 0 -> 1092 bytes
 .../resources/translations/Resources_cs.properties | 570 +++++++++++++++++++--
 .../resources/translations/Resources_da.properties |   1 -
 .../resources/translations/Resources_de.properties |   1 -
 .../resources/translations/Resources_el.properties |   1 -
 .../resources/translations/Resources_es.properties |   1 -
 .../resources/translations/Resources_eu.properties | 102 +++-
 .../resources/translations/Resources_fr.properties |  11 +-
 .../resources/translations/Resources_hr.properties |  15 +-
 .../resources/translations/Resources_hu.properties |   1 -
 .../resources/translations/Resources_it.properties |   1 -
 .../resources/translations/Resources_ja.properties |   9 +-
 .../resources/translations/Resources_ko.properties | 272 ++++++----
 .../resources/translations/Resources_nl.properties | 161 ++++--
 .../translations/Resources_pt_BR.properties        |   1 -
 .../translations/Resources_pt_PT.properties        |  17 +-
 .../resources/translations/Resources_ru.properties |   1 -
 .../resources/translations/Resources_sr.properties |   1 -
 .../resources/translations/Resources_sv.properties |  34 +-
 .../translations/Resources_uk_UA.properties        |  13 +-
 .../translations/Resources_zh_CN.properties        |   1 -
 .../translations/Resources_zh_TW.properties        |   1 -
 .../freeplane/core/resources/ResourceBundles.java  |  95 +++-
 .../core/resources/ResourceController.java         |  24 +-
 .../core/resources/SetBooleanPropertyAction.java   |   7 +
 .../core/resources/WindowConfigurationStorage.java |   4 -
 .../resources/components/OptionPanelBuilder.java   |   2 -
 .../core/resources/components/PropertyAdapter.java |  16 +-
 .../resources/components/SeparatorProperty.java    |  17 +-
 .../org/freeplane/core/ui/AFreeplaneAction.java    |  15 +-
 .../freeplane/core/ui/AccelerateableAction.java    |   3 +-
 .../core/ui/ActionAcceleratorManager.java          |  14 +-
 .../core/ui/IUserInputListenerFactory.java         |   2 -
 .../java/org/freeplane/core/ui/LengthUnits.java    |   8 +-
 .../org/freeplane/core/ui/components/UITools.java  |  72 ++-
 .../core/ui/menubuilders/generic/Entry.java        |   2 -
 .../ui/menubuilders/generic/EntryAccessor.java     |  30 ++
 .../menu/ConditionalActionBuilder.java             |  49 ++
 .../ui/menubuilders/menu/JMenuItemBuilder.java     |  17 +-
 .../menubuilders/menu/MenuBuildProcessFactory.java |   1 +
 .../ui/textchanger/TextChangeHotKeyAction.java     |  44 ++
 .../core/ui/textchanger/TranslatedElement.java     |  18 +
 .../core/ui/textchanger/UITextChanger.java         | 285 +++++++++++
 .../java/org/freeplane/core/util/ColorUtils.java   |  24 +-
 .../java/org/freeplane/core/util/MenuUtils.java    |   2 +-
 .../java/org/freeplane/core/util/TextUtils.java    |  22 +-
 .../features/attribute/AttributeRegistry.java      |   2 -
 .../mindmapmode/MClipboardController.java          |   3 -
 .../features/export/mindmapmode/ExportDialog.java  |  25 +-
 .../export/mindmapmode/ExportWithXSLT.java         |   2 +-
 .../features/filter/AFilterComposerDialog.java     |   4 +-
 .../freeplane/features/filter/QuickFindAction.java |   1 -
 .../filter/condition/ConditionFactory.java         |  16 +-
 .../condition/ConditionNotSatisfiedDecorator.java  |   4 +-
 .../filter/condition/ConjunctConditions.java       |   4 +-
 .../filter/condition/DisjunctConditions.java       |   4 +-
 .../features/filter/condition/JCondition.java      |   2 +
 .../features/help/OnlineDocumentationAction.java   |   1 -
 .../features/icon/IconContainedCondition.java      |   5 +-
 .../org/freeplane/features/icon/IconGroup.java     |   6 +-
 .../features/icon/PriorityCompareCondition.java    |   3 +-
 .../features/icon/mindmapmode/IconAction.java      |   5 +
 .../features/icon/mindmapmode/MIconController.java |   2 +-
 .../freeplane/features/link/LinkController.java    |   2 -
 .../freeplane/features/map/AlwaysUnfoldedNode.java |   3 -
 .../org/freeplane/features/map/MapController.java  |  14 +-
 .../freeplane/features/map/NodeAbsolutePath.java   |   6 +-
 .../freeplane/features/map/NodeRelativePath.java   |  48 +-
 .../org/freeplane/features/map/SharedNodeData.java |   4 +-
 .../org/freeplane/features/map/SummaryNode.java    |   1 -
 .../ConvertCloneToIndependentNodeAction.java       |   7 +-
 .../features/map/mindmapmode/MMapController.java   |   1 -
 .../freeplane/features/mode/ModeController.java    |   1 -
 .../mindmapmode/LoadAcceleratorPresetsAction.java  |   4 +-
 .../mindmapmode/SaveAcceleratorPresetsAction.java  |   3 +-
 .../features/note/mindmapmode/MNoteController.java |   2 +
 .../features/note/mindmapmode/NoteManager.java     |  18 +-
 .../freeplane/features/print/PreviewDialog.java    |   4 +-
 .../org/freeplane/features/styles/MapStyle.java    |   7 +-
 .../styles/SetBooleanMapPropertyAction.java        |  12 +
 .../styles/mindmapmode/StyleEditorPanel.java       |  25 +-
 .../features/text/mindmapmode/EditNodeWYSIWYG.java |   5 +-
 .../org/freeplane/features/ui/FrameController.java |  15 +
 .../org/freeplane/features/ui/ViewController.java  |   2 +-
 .../org/freeplane/features/url/UrlManager.java     |   6 +-
 .../features/url/mindmapmode/MFileManager.java     |  71 ++-
 .../org/freeplane/main/applet/FreeplaneApplet.java |   3 +
 .../application/ApplicationResourceController.java |   1 +
 .../main/application/FreeplaneGUIStarter.java      |   7 +-
 .../main/mindmapmode/MModeControllerFactory.java   |   4 +-
 .../swing/features/filepreview/ImagePreview.java   |   2 -
 .../features/filepreview/ViewerController.java     |   1 -
 .../time/mindmapmode/nodelist/NodeList.java        |   3 -
 .../org/freeplane/view/swing/map/MapScroller.java  |   1 -
 .../java/org/freeplane/view/swing/map/MapView.java |  53 +-
 .../view/swing/map/MapViewController.java          |   2 +-
 .../view/swing/map/MapViewScrollPane.java          |   2 +-
 .../org/freeplane/view/swing/map/NodeView.java     |   1 -
 .../swing/map/VerticalNodeViewLayoutStrategy.java  |   4 +
 .../swing/map/mindmapmode/EditNodeTextField.java   |   3 +-
 .../view/swing/ui/DefaultMapMouseListener.java     |  13 +-
 .../view/swing/ui/DefaultNodeKeyListener.java      |   2 +-
 .../view/swing/ui/UserInputListenerFactory.java    |  13 +-
 .../swing/ui/mindmapmode/MNodeMotionListener.java  |  29 +-
 .../ui/menubuilders/MenuBuilderAcceptanceTest.java |   1 -
 .../features/map/NodeRelativePathTest.java         |  48 ++
 freeplane/viewer-resources/freeplane.properties    |   2 +-
 .../translations/Resources_en.properties           |  15 +-
 freeplane/viewer-resources/version.properties      |   2 +-
 .../main/java/org/freeplane/launcher/Launcher.java |   7 +
 .../windows-installer/Freeplane_without_Java.iss   |   2 +-
 .../windows-portable/App/AppInfo/appinfo.ini       |   4 +-
 .../scripts/installScriptAddOn.groovy              |   2 +-
 .../plugin/script/addons/AddOnDetailsPanel.java    |   3 +-
 gitinfo.properties                                 |   2 +-
 gitinfo.txt                                        |   2 +-
 121 files changed, 2124 insertions(+), 482 deletions(-)

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

_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to