[freeplane] 02/05: Merge tag 'upstream/1.3.12'

[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 60e3e597efc40fb786204057c5efaefe393a36c8
Merge: 1062aa1 ae6e154
Author: Felix Natter <fnatter at gmx.net>
Date:   Sun Sep 21 08:42:07 2014 +0200

    Merge tag 'upstream/1.3.12'
    
    Upstream version 1.3.12

 freeplane/ant/build.xml                            |    5 +
 freeplane/ant/signjar-example.properties           |    2 +
 .../doc/Freeplane_LaTeX.mm                         |    0
 freeplane/doc/freeplane.mm                         |    2 +-
 freeplane/doc/history_en.txt                       |   12 +
 .../xslt/mm2latexbeamer_richcontent_1.3.x.xsl      |  707 +++++
 .../resources/translations/Resources_ca.properties |   39 +-
 .../resources/translations/Resources_cs.properties |   43 +-
 .../resources/translations/Resources_da.properties | 1551 +++++++++--
 .../resources/translations/Resources_de.properties |    2 +-
 .../resources/translations/Resources_hr.properties |    1 -
 .../resources/translations/Resources_hu.properties |  407 ++-
 .../resources/translations/Resources_it.properties |    1 -
 .../resources/translations/Resources_ja.properties |    1 -
 .../resources/translations/Resources_ko.properties |  168 +-
 .../resources/translations/Resources_nb.properties |  182 +-
 .../resources/translations/Resources_nl.properties |    2 +-
 .../translations/Resources_pt_BR.properties        |   48 +-
 .../translations/Resources_pt_PT.properties        |    1 -
 .../resources/translations/Resources_sr.properties |    1 -
 .../translations/Resources_zh_TW.properties        | 2809 ++++++++++----------
 .../features/format/FormatController.java          |    2 +-
 .../org/freeplane/features/link/LinkBuilder.java   |    5 +-
 .../src/org/freeplane/features/url/UrlManager.java |   19 +-
 .../org/freeplane/main/addons/AddOnProperties.java |    4 +-
 .../main/application/ConnectedToMenuView.java      |   15 +
 .../main/application/FreeplaneSplashModern.java    |    7 +-
 .../main/application/MapViewDockingWindows.java    |   39 +-
 .../swing/map/attribute/AttributePanelManager.java |   13 +-
 .../view/swing/map/attribute/AttributeTable.java   |   25 +-
 .../swing/map/mindmapmode/EditNodeTextField.java   |   37 +-
 freeplane/viewer-resources/freeplane.properties    |    8 +-
 .../translations/Resources_en.properties           |    2 +-
 freeplane/viewer-resources/version.properties      |    2 +-
 .../eclipse/freeplane-osgi-mac.launch              |    4 +-
 freeplane_framework/ant/build.xml                  |    8 +-
 .../windows-installer/Freeplane_without_Java.iss   |    2 +-
 .../windows-portable/App/AppInfo/appinfo.ini       |    4 +-
 .../script/addons/ScriptAddOnProperties.java       |    3 +-
 39 files changed, 4256 insertions(+), 1927 deletions(-)

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