[freeplane] 01/07: New upstream version 1.6.10

Felix Natter fnatter-guest at moszumanska.debian.org
Sat Nov 4 09:44:20 UTC 2017


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

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

commit 95aeb2e69a7cba77e22b41a871fe30d7873bbcd8
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Nov 4 09:24:45 2017 +0100

    New upstream version 1.6.10
---
 build.gradle                                       |    4 +-
 dist.gradle                                        |    5 +-
 freeplane/build.gradle                             |    2 +-
 freeplane/doc/history_en.txt                       |   22 +
 freeplane/external-resources/templates/BuzanMap.mm |  156 ++
 .../external-resources/xslt/mm2latexartcl.xsl      |    2 +-
 freeplane/external-resources/xslt/mm2markdown.xsl  |    2 +-
 freeplane/external-resources/xslt/mm2opml.xsl      |    2 +-
 .../resources/default_accelerators.properties      |    5 -
 .../resources/default_accelerators_mac.properties  |    4 +
 .../resources/images/AssignAttributesAction.svg    |  338 ++--
 .../resources/images/EditAttributesAction.svg      |  252 ++-
 freeplane/resources/images/arrow-mode-none.svg     |   72 +-
 freeplane/resources/images/edit12.svg              |  297 ++--
 .../resources/translations/Resources_af.properties |  227 +++
 .../resources/translations/Resources_ca.properties |    2 +-
 .../resources/translations/Resources_cs.properties |   56 +-
 .../resources/translations/Resources_de.properties |  110 +-
 .../resources/translations/Resources_es.properties |    8 +-
 .../resources/translations/Resources_et.properties |   28 +-
 .../resources/translations/Resources_fr.properties |   18 +-
 .../resources/translations/Resources_hr.properties |    8 +-
 .../resources/translations/Resources_it.properties |  440 +++++-
 .../resources/translations/Resources_ja.properties |    6 +-
 .../resources/translations/Resources_kn.properties |    0
 .../resources/translations/Resources_ko.properties |    8 +-
 .../resources/translations/Resources_nl.properties |   48 +-
 .../resources/translations/Resources_oc.properties |  Bin 0 -> 104925 bytes
 .../resources/translations/Resources_pl.properties |  210 +--
 .../translations/Resources_pt_PT.properties        |    6 +-
 .../resources/translations/Resources_ru.properties |    2 +
 .../resources/translations/Resources_sk.properties | 1642 ++++++++++++++++----
 .../resources/translations/Resources_sl.properties | 1315 ++++++++++++++--
 .../resources/translations/Resources_sv.properties |    4 +-
 .../resources/translations/Resources_tr.properties |   88 +-
 .../translations/Resources_uk_UA.properties        |   28 +-
 freeplane/resources/xslt/opml2mm.xsl               |    2 +-
 freeplane/resources/xslt/xml2mm.xsl                |    2 +-
 freeplane/signjar.gradle                           |   58 +-
 .../java/com/thebuzzmedia/imgscalr/AsyncScalr.java |    2 +-
 .../main/java/com/thebuzzmedia/imgscalr/Scalr.java |    2 +-
 .../freeplane/core/io/xml/LocalEntityResolver.java |    2 +-
 .../resources/components/OptionPanelBuilder.java   |    9 -
 .../java/org/freeplane/core/ui/ActionEnabler.java  |    2 +-
 .../ButtonModelStateChangeListenerForProperty.java |    2 +-
 .../org/freeplane/core/ui/ColoredIconCreator.java  |    2 +-
 .../core/ui/DelegatingPopupMenuListener.java       |    2 +-
 .../java/org/freeplane/core/ui/LengthUnits.java    |    2 +-
 .../java/org/freeplane/core/ui/MenuSplitter.java   |    2 +-
 .../core/ui/MenuSplitterConfiguration.java         |    2 +-
 .../org/freeplane/core/ui/MouseInsideListener.java |    2 +-
 .../org/freeplane/core/ui/TimePeriodUnits.java     |    2 +-
 .../ui/components/ActionToggleButtonModel.java     |    2 +-
 .../core/ui/components/html/ScaledStyleSheet.java  |    4 +-
 .../freeplane/core/ui/image/BigBufferedImage.java  |   41 +-
 .../ui/menubuilders/FreeplaneResourceAccessor.java |    2 +-
 .../menubuilders/action/ActionSelectListener.java  |    2 +-
 .../ui/menubuilders/action/EntriesForAction.java   |    2 +-
 .../ui/menubuilders/generic/ChildEntryFilter.java  |    2 +-
 .../ui/menubuilders/generic/ChildEntryRemover.java |    2 +-
 .../ui/menubuilders/generic/EmptyEntryVisitor.java |    2 +-
 .../generic/EntryNavigatorFactory.java             |    2 +-
 .../menubuilders/generic/IllegalEntryVisitor.java  |    2 +-
 .../menubuilders/generic/NullResourceAccessor.java |    2 +-
 .../menubuilders/generic/SkippingEntryVisitor.java |    2 +-
 .../ui/menubuilders/generic/SubtreeProcessor.java  |    2 +-
 .../ui/menubuilders/menu/JComponentRemover.java    |    2 +-
 .../core/ui/menubuilders/menu/MenuIconScaling.java |    2 +-
 .../menu/PopupMenuListenerForEntry.java            |    2 +-
 .../core/ui/textchanger/TranslatedElement.java     |    2 +-
 .../freeplane/core/util/ClassLoaderFactory.java    |    2 +-
 .../org/freeplane/core/util/DelayedRunner.java     |    2 +-
 .../main/java/org/freeplane/core/util/Pair.java    |    2 +-
 .../org/freeplane/core/util/TypeReference.java     |    2 +-
 .../java/org/freeplane/features/DashVariant.java   |    2 +-
 .../mindmapmode/MClipboardController.java          |    2 +-
 .../clipboard/mindmapmode/TargetFileCreator.java   |    2 +-
 .../features/edge/AutomaticEdgeColor.java          |    2 +-
 .../features/export/mindmapmode/XmlImporter.java   |    2 +-
 .../org/freeplane/features/filter/FoundNodes.java  |    2 +-
 .../features/format/IdentityPatternFormat.java     |    2 +-
 .../features/format/StandardPatternFormat.java     |    2 +-
 .../freeplane/features/link/ConnectorArrows.java   |    2 +-
 .../features/link/ConnectorProperties.java         |    2 +-
 .../org/freeplane/features/link/NodeLinks.java     |    2 +-
 .../features/map/CloneEncryptedNodeException.java  |    2 +-
 .../org/freeplane/features/map/FirstGroupNode.java |    2 +-
 .../freeplane/features/map/FirstGroupNodeFlag.java |    2 +-
 .../org/freeplane/features/map/SharedNodeData.java |    2 +-
 .../org/freeplane/features/map/SummaryLevels.java  |    2 +-
 .../freeplane/features/map/SummaryNodeFlag.java    |    2 +-
 .../map/mindmapmode/SummaryNodeMapUpdater.java     |    2 +-
 .../mindmapmode/SaveAcceleratorPresetsAction.java  |    2 +-
 .../mindmapmode/ChangeShiftXActor.java             |    2 +-
 .../mindmapmode/ChangeShiftYActor.java             |    2 +-
 .../nodelocation/mindmapmode/ChangeVGapActor.java  |    2 +-
 .../note/mindmapmode/NoteDialogStarter.java        |    2 +-
 .../mindmapmode/CollectionBoxController.java       |    2 +-
 .../mindmapmode/EscapeKeyEventDispatcher.java      |    2 +-
 .../mindmapmode/NamedElementCollection.java        |    6 +-
 .../mindmapmode/NavigationKeyEventDispatcher.java  |    2 +-
 .../PresentationKeyEventDispatcher.java            |    2 +-
 .../mindmapmode/SlideEditorController.java         |    2 +-
 .../features/script/IScriptEditorStarter.java      |    2 +-
 .../freeplane/features/styles/StyleMapModel.java   |    2 +-
 .../mindmapmode/ComboBoxRendererWithTooltip.java   |    2 +-
 .../ChildDistanceControlGroup.java                 |    2 +-
 .../mindmapmode/styleeditorpanel/ControlGroup.java |    2 +-
 .../ControlGroupChangeListener.java                |    2 +-
 .../styleeditorpanel/EdgeColorControlGroup.java    |    2 +-
 .../styleeditorpanel/GroupSeparator.java           |    2 +-
 .../styleeditorpanel/IconSizeControlGroup.java     |    2 +-
 .../styleeditorpanel/MaxNodeWidthControlGroup.java |    2 +-
 .../styleeditorpanel/MinNodeWidthControlGroup.java |    2 +-
 .../styleeditorpanel/NextColumnControlGroup.java   |    2 +-
 .../styleeditorpanel/NextLineControlGroup.java     |    2 +-
 .../styleeditorpanel/NodeColorControlGroup.java    |    2 +-
 .../NodeFontHyperLinkControlGroup.java             |    2 +-
 .../NodeHorizontalTextAlignmentControlGroup.java   |    2 +-
 .../styleeditorpanel/NodeShapeControlGroup.java    |    2 +-
 .../styleeditorpanel/StyleControlGroup.java        |    2 +-
 .../styleeditorpanel/StyleEditorPanel.java         |    2 +-
 .../text/MatchCaseNoteContainsCondition.java       |    2 +-
 .../features/text/mindmapmode/EventBuffer.java     |    2 +-
 .../org/freeplane/features/ui/FrameController.java |   74 +-
 .../features/url/NodeAndMapReference.java          |    2 +-
 .../url/mindmapmode/DroppedMindMapOpener.java      |    2 +-
 .../url/mindmapmode/FileRevisionsDialog.java       |    6 +-
 .../org/freeplane/main/application/Browser.java    |    2 +-
 .../main/application/ConnectedToMenuView.java      |    2 +-
 .../main/application/FreeplaneGUIStarter.java      |    2 +-
 .../main/application/MapViewDockingWindows.java    |    2 +-
 .../main/application/MapViewSerializer.java        |    2 +-
 .../main/application/MenuKeyProcessor.java         |    2 +-
 .../SplitPaneLayoutManagerDecorator.java           |    2 +-
 .../survey/FreeplaneSurveyProperties.java          |    2 +-
 .../main/mindmapmode/HttpVersionClient.java        |   15 +
 .../main/mindmapmode/UpdateCheckAction.java        |   59 +-
 .../filepreview/ImageObserverCallback.java         |    2 +-
 .../swing/features/filepreview/ViewerBorder.java   |    2 +-
 .../features/time/mindmapmode/PeriodUnit.java      |    2 +-
 .../mindmapmode/nodelist/CoreTextAccessor.java     |    2 +-
 .../time/mindmapmode/nodelist/DateRenderer.java    |    2 +-
 .../mindmapmode/nodelist/DetailTextAccessor.java   |    2 +-
 .../time/mindmapmode/nodelist/IconsHolder.java     |    2 +-
 .../time/mindmapmode/nodelist/IconsRenderer.java   |    2 +-
 .../mindmapmode/nodelist/NoteTextAccessor.java     |    2 +-
 .../time/mindmapmode/nodelist/TextHolder.java      |    2 +-
 .../time/mindmapmode/nodelist/TextRenderer.java    |    2 +-
 .../org/freeplane/view/swing/map/ArrowIcon.java    |    2 +-
 .../org/freeplane/view/swing/map/ContentPane.java  |    2 +-
 .../view/swing/map/ContentPaneLayout.java          |    2 +-
 .../org/freeplane/view/swing/map/DetailsView.java  |    2 +-
 .../org/freeplane/view/swing/map/FoldingMark.java  |    2 +-
 .../java/org/freeplane/view/swing/map/MapView.java |    2 +-
 .../org/freeplane/view/swing/map/PaintingMode.java |    2 +-
 .../swing/map/VerticalNodeViewLayoutStrategy.java  |    2 +-
 .../freeplane/view/swing/map/ZoomableLabel.java    |    2 +-
 .../freeplane/view/swing/map/link/TextPainter.java |    2 +-
 .../freeplane/view/swing/ui/AltCodeChecker.java    |    2 +-
 .../view/swing/ui/DetailsViewMouseListener.java    |    2 +-
 .../org/freeplane/view/swing/ui/NodeSelector.java  |    2 +-
 .../swing/ui/mindmapmode/GlassPaneManager.java     |    2 +-
 .../ui/mindmapmode/GlassPaneNodeSelector.java      |    2 +-
 .../java/org/freeplane/features/map/MapFake.java   |    2 +-
 freeplane/viewer-resources/freeplane.properties    |    2 +-
 .../viewer-resources/images/AttributesView.svg     |  226 +--
 .../viewer-resources/images/showAttributes.svg     |  215 ++-
 .../translations/Resources_en.properties           |    6 +-
 freeplane/viewer-resources/version.properties      |    2 +-
 .../eclipse/CodeStyle/codetemplates.xml            |    2 +-
 .../launch4j/freeplaneConsole.lj4.xml              |    2 +-
 freeplane_framework/launch4j/freeplaneGui.lj4.xml  |    2 +-
 .../windows-installer/Freeplane_without_Java.iss   |    2 +-
 .../windows-portable/App/AppInfo/appinfo.ini       |    4 +-
 freeplane_mac/build.properties                     |    1 -
 .../org/freeplane/plugin/macos/MacChanges.java     |   25 +-
 .../client/event/ImmutableGenericNodeUpdated.java  |  334 ----
 .../batch/ImmutableServerUpdatesFinished.java      |  386 -----
 .../event/batch/ImmutableUpdatesFinished.java      |  385 -----
 .../batch/ModifiableUpdateHeaderExtension.java     |  185 ---
 .../event/children/ImmutableChildrenUpdated.java   |  350 -----
 .../children/ImmutableSpecialNodeTypeSet.java      |  276 ----
 .../freeplane/plugin/formula/FormulaEditor.java    |    2 +-
 freeplane_plugin_latex/build.gradle                |    5 +-
 .../org/freeplane/plugin/latex/LatexEditor.java    |    2 +-
 freeplane_plugin_script/build.gradle               |    3 +-
 .../script/IFreeplaneScriptErrorHandler.java       |    2 +-
 .../freeplane/plugin/script/ScriptClassLoader.java |    2 +-
 .../freeplane/plugin/script/ScriptRenderer.java    |    2 +-
 .../freeplane/plugin/script/ScriptingPolicy.java   |    2 +-
 .../script/addons/ButtonsInCellRenderer.java       |    2 +-
 .../freeplane/plugin/script/defaults.properties    |    2 +-
 freeplane_plugin_svg/build.gradle                  |   64 +-
 .../java/org/freeplane/plugin/svg/Activator.java   |    6 +
 .../java/org/freeplane/plugin/svg/ExportPdf.java   |   90 ++
 .../java/org/freeplane/plugin/svg/ExportSvg.java   |   69 +
 .../freeplane/plugin/svg/ExportVectorGraphic.java  |  107 ++
 .../plugin/svg/GradientExtensionHandler.java       |  166 ++
 gitinfo.properties                                 |    2 +-
 gitinfo.txt                                        |    2 +-
 mac.dist.gradle                                    |  136 +-
 src.dist.gradle                                    |   16 +-
 203 files changed, 5474 insertions(+), 3542 deletions(-)

diff --git a/build.gradle b/build.gradle
index 62ff2d5..4cb3a61 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,9 +17,7 @@ allprojects {
         // for local (git) dependencies
         flatDir name: 'localGitDepsRepository',
                 dirs: [rootDir.path + "/freeplane/lib",
-                       rootDir.path + "/freeplane_plugin_jsyntaxpane/lib",
-                       rootDir.path + "/freeplane_plugin_latex/lib",
-                       rootDir.path + "/freeplane_plugin_svg/lib"]
+                       rootDir.path + "/freeplane_plugin_jsyntaxpane/lib"]
     }
 
 }
diff --git a/dist.gradle b/dist.gradle
index ef144a4..80a960e 100644
--- a/dist.gradle
+++ b/dist.gradle
@@ -29,9 +29,9 @@ task historyDist(type:Copy) {
 	into(globalDist)
 }
 
-apply from: './mac.dist.gradle'
-apply from: './win.dist.gradle'
 apply from: './bin.dist.gradle'
+apply from: './win.dist.gradle'
+apply from: './mac.dist.gradle'
 apply from: './src.dist.gradle'
 apply from: './linux-packages.gradle'
 
@@ -42,7 +42,6 @@ task dist {
     dependsOn srcpureTarGz
     dependsOn windowsInstaller
     dependsOn windowsPortableInstaller
-    dependsOn macDist
     dependsOn gitinfoDist
     dependsOn historyDist
     dependsOn freeplaneDeb
diff --git a/freeplane/build.gradle b/freeplane/build.gradle
index a4aee5a..94ec6c4 100644
--- a/freeplane/build.gradle
+++ b/freeplane/build.gradle
@@ -6,7 +6,7 @@ configurations{
 dependencies {
 	
 	mergedViewerDependencies 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
-	mergedViewerDependencies ':kitfox-svg-salamander-1.1.1-p1'
+	compile ':kitfox-svg-salamander-1.1.1-p1'
 	
     compile project(':JOrtho_0.4_freeplane')
 
diff --git a/freeplane/doc/history_en.txt b/freeplane/doc/history_en.txt
index fc7a1e1..f2760d5 100644
--- a/freeplane/doc/history_en.txt
+++ b/freeplane/doc/history_en.txt
@@ -1,4 +1,26 @@
 ===============================
+1.6.10
+===============================
+Reenable and fix exports to PDF and SVG
+
+===============================
+1.6.9
+===============================
+Fix restoring connectors on undo
+
+===============================
+1.6.8
+===============================
+Fix opening maps on start for mac os
+Drag and drop of image file holding Ctrl+Shift creates a link without inserting the image into the map
+
+===============================
+1.6.7
+===============================
+Update JLatexMath
+Bug fixes
+
+===============================
 1.6.6
 ===============================
 Bug fixes
diff --git a/freeplane/external-resources/templates/BuzanMap.mm b/freeplane/external-resources/templates/BuzanMap.mm
new file mode 100644
index 0000000..7143fc8
--- /dev/null
+++ b/freeplane/external-resources/templates/BuzanMap.mm
@@ -0,0 +1,156 @@
+<map version="freeplane 1.6.0">
+<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
+<node TEXT="Central&#xa;Idea" FOLDED="false" ID="ID_191153586" ICON_SIZE="36.0 pt" LINK="menuitem:_ExternalImageAddAction" STYLE="oval">
+<font SIZE="22"/>
+<hook NAME="MapStyle">
+    <properties fit_to_viewport="false" edgeColorConfiguration="#808080ff,#ff0000ff,#0000ffff,#00ff00ff,#ff00ffff,#00ffffff,#7c0000ff,#00007cff,#007c00ff,#7c007cff,#007c7cff,#7c7c00ff"/>
+
+<map_styles>
+<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval" UNIFORM_SHAPE="true" VGAP_QUANTITY="24.0 pt">
+<font SIZE="24"/>
+<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="default" ICON_SIZE="12.0 pt" COLOR="#000000" STYLE="fork">
+<font NAME="SansSerif" SIZE="10" BOLD="false" ITALIC="false"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.details"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.attributes">
+<font SIZE="9"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.note" COLOR="#000000" BACKGROUND_COLOR="#ffffff" TEXT_ALIGN="LEFT"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.floating">
+<edge STYLE="hide_edge"/>
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.user-defined" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="styles.topic" COLOR="#18898b" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subtopic" COLOR="#cc3300" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subsubtopic" COLOR="#669900">
+<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.important">
+<icon BUILTIN="yes"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.AutomaticLayout" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level.root" ICON_SIZE="64.0 pt" COLOR="#000000" STYLE="oval" SHAPE_HORIZONTAL_MARGIN="10.0 pt" SHAPE_VERTICAL_MARGIN="10.0 pt">
+<font NAME="Segoe Print" SIZE="22"/>
+<edge COLOR="#ffffff"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1" ICON_SIZE="32.0 px" COLOR="#000000" BACKGROUND_COLOR="#ffffcc" STYLE="bubble" SHAPE_HORIZONTAL_MARGIN="2.6 pt" SHAPE_VERTICAL_MARGIN="2.6 pt" BORDER_WIDTH_LIKE_EDGE="true">
+<font SIZE="18" BOLD="false" ITALIC="true"/>
+<edge STYLE="sharp_bezier" WIDTH="8"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2" ICON_SIZE="28.0 px" COLOR="#000000" BORDER_WIDTH_LIKE_EDGE="true">
+<font SIZE="16"/>
+<edge STYLE="bezier" WIDTH="4"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3" ICON_SIZE="24.0 px" COLOR="#000000" BORDER_WIDTH_LIKE_EDGE="true">
+<font SIZE="14"/>
+<edge STYLE="bezier" WIDTH="3"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4" ICON_SIZE="24.0 px" COLOR="#111111" BORDER_WIDTH_LIKE_EDGE="true">
+<font SIZE="13"/>
+<edge STYLE="bezier" WIDTH="2"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,5" ICON_SIZE="24.0 px" BORDER_WIDTH_LIKE_EDGE="true">
+<font SIZE="12"/>
+<edge STYLE="bezier" WIDTH="1"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,6" ICON_SIZE="24.0 px">
+<edge STYLE="bezier"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,7" ICON_SIZE="16.0 px">
+<font SIZE="10"/>
+<edge STYLE="bezier"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,8" ICON_SIZE="16.0 px">
+<edge STYLE="bezier"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,9" ICON_SIZE="16.0 px">
+<edge STYLE="bezier"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,10" ICON_SIZE="16.0 px">
+<edge STYLE="bezier"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,11" ICON_SIZE="16.0 px">
+<edge STYLE="bezier"/>
+</stylenode>
+</stylenode>
+</stylenode>
+</map_styles>
+</hook>
+<hook NAME="AutomaticEdgeColor" COUNTER="15" RULE="ON_BRANCH_CREATION"/>
+<hook NAME="accessories/plugins/AutomaticLayout.properties" VALUE="ALL"/>
+<edge COLOR="#ffffff"/>
+<richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      1. Write the central idea
+    </p>
+    <p>
+      2. Save the map
+    </p>
+    <p>
+      3. Select central node,
+    </p>
+    <p>
+          click on icon to add picture
+    </p>
+    <p>
+      4. Delete menu links Add image..
+    </p>
+    <p>
+          with CTRL+K and delete field with link
+    </p>
+    <p>
+      5. Delete node details with right click on mouse
+    </p>
+    <p>
+          on central node - Remove node details
+    </p>
+  </body>
+</html>
+
+</richcontent>
+<node TEXT="IDEA 1" POSITION="right" ID="ID_273436263" HGAP_QUANTITY="91.26829627750192 pt" VSHIFT_QUANTITY="-30.731708746733723 pt">
+<edge COLOR="#007c7c"/>
+<node TEXT="IDEA 1.1" ID="ID_588194298" HGAP_QUANTITY="15.756097642670499 pt" VSHIFT_QUANTITY="-12.292683498693489 pt"/>
+<node TEXT="IDEA 1.2" ID="ID_1104103844"/>
+</node>
+<node TEXT="IDEA 2" POSITION="right" ID="ID_495676614" HGAP_QUANTITY="101.80488213352491 pt" VSHIFT_QUANTITY="-42.14634342409195 pt">
+<edge COLOR="#009900"/>
+<node TEXT="IDEA 2.1" ID="ID_744391648" HGAP_QUANTITY="15.756097642670499 pt" VSHIFT_QUANTITY="-14.926829962699236 pt"/>
+<node TEXT="IDEA 2.2" ID="ID_903669612"/>
+</node>
+<node TEXT="IDEA 3" POSITION="right" ID="ID_90823870" HGAP_QUANTITY="56.146343424091945 pt" VSHIFT_QUANTITY="-61.46341749346744 pt">
+<edge COLOR="#ff0000"/>
+<node TEXT="IDEA 3.1" ID="ID_1201198400" HGAP_QUANTITY="15.756097642670499 pt" VSHIFT_QUANTITY="-15.804878784034486 pt"/>
+<node TEXT="IDEA 3.2" ID="ID_1615683347" HGAP_QUANTITY="17.512195285340997 pt" VSHIFT_QUANTITY="3.512195285340997 pt"/>
+</node>
+<node TEXT="IDEA 6" POSITION="left" ID="ID_25434398" HGAP_QUANTITY="73.70731985079694 pt" VSHIFT_QUANTITY="-37.75609931741573 pt">
+<edge COLOR="#cc00ff"/>
+<node TEXT="IDEA 6.1" ID="ID_352937383" HGAP_QUANTITY="13.121951178664752 pt" VSHIFT_QUANTITY="-9.658537034687741 pt"/>
+<node TEXT="IDEA 6.2" ID="ID_966834988" HGAP_QUANTITY="15.756097642670499 pt" VSHIFT_QUANTITY="-7.902439392017243 pt"/>
+</node>
+<node TEXT="IDEA 5" POSITION="left" ID="ID_1822402846" HGAP_QUANTITY="84.24390570681993 pt" VSHIFT_QUANTITY="-36.00000167474521 pt">
+<edge COLOR="#ff9900"/>
+<node TEXT="IDEA 5.1" ID="ID_1274507163" HGAP_QUANTITY="14.0 pt" VSHIFT_QUANTITY="-21.07317171204598 pt"/>
+<node TEXT="IDEA 5.2" ID="ID_1203076641"/>
+</node>
+<node TEXT="IDEA 4" POSITION="left" ID="ID_575079876" HGAP_QUANTITY="67.56097810145019 pt" VSHIFT_QUANTITY="-42.14634342409195 pt">
+<edge COLOR="#0000ff"/>
+<node TEXT="IDEA 4.1" ID="ID_317662625" HGAP_QUANTITY="14.878048821335248 pt" VSHIFT_QUANTITY="-18.439025248040235 pt"/>
+<node TEXT="IDEA 4.2" ID="ID_1522387997"/>
+</node>
+</node>
+</map>
diff --git a/freeplane/external-resources/xslt/mm2latexartcl.xsl b/freeplane/external-resources/xslt/mm2latexartcl.xsl
index 51de47e..8917201 100644
--- a/freeplane/external-resources/xslt/mm2latexartcl.xsl
+++ b/freeplane/external-resources/xslt/mm2latexartcl.xsl
@@ -59,4 +59,4 @@
 </xsl:text>
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/freeplane/external-resources/xslt/mm2markdown.xsl b/freeplane/external-resources/xslt/mm2markdown.xsl
index d115211..d97b411 100644
--- a/freeplane/external-resources/xslt/mm2markdown.xsl
+++ b/freeplane/external-resources/xslt/mm2markdown.xsl
@@ -192,4 +192,4 @@ ChangeLog: See: http://freeplane.sourceforge.net/
 		<xsl:value-of select="translate(@NAME, $uppercase, $lowercase)" />: '<xsl:value-of select="@VALUE" />'
 		<xsl:text>
</xsl:text>
 	</xsl:template>
-</xsl:stylesheet> 
+</xsl:stylesheet> 
\ No newline at end of file
diff --git a/freeplane/external-resources/xslt/mm2opml.xsl b/freeplane/external-resources/xslt/mm2opml.xsl
index 4088ef0..b738c67 100644
--- a/freeplane/external-resources/xslt/mm2opml.xsl
+++ b/freeplane/external-resources/xslt/mm2opml.xsl
@@ -44,4 +44,4 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/freeplane/resources/default_accelerators.properties b/freeplane/resources/default_accelerators.properties
index 3bef801..85ae7c0 100644
--- a/freeplane/resources/default_accelerators.properties
+++ b/freeplane/resources/default_accelerators.properties
@@ -1,10 +1,5 @@
-acceleratorFor.Browse/ModesMenuAction.Browse=alt 2
-acceleratorFor.Browse/ModesMenuAction.MindMap=alt 1
 acceleratorFor.File/ModesMenuAction.File=alt 3
 acceleratorFor.File/ModesMenuAction.MindMap=alt 1
-acceleratorFor.File/main_menu_modes/ModesMenuAction.Browse=alt 2
-acceleratorFor.MindMap/ModesMenuAction.Browse=alt 2
 acceleratorFor.MindMap/ModesMenuAction.File=alt 3
 acceleratorFor.MindMap/ModesMenuAction.MindMap=alt 1
 acceleratorFor.MindMap/OpenLastOpenedAction_1=control 1
-acceleratorForBrowse/ModesMenuAction.File=alt 3
diff --git a/freeplane/resources/default_accelerators_mac.properties b/freeplane/resources/default_accelerators_mac.properties
index 3d4de57..3e1e57f 100644
--- a/freeplane/resources/default_accelerators_mac.properties
+++ b/freeplane/resources/default_accelerators_mac.properties
@@ -4,3 +4,7 @@ acceleratorFor.MindMap/NewSummaryAction=alt shift TAB
 acceleratorFor.MindMap/SelectNoteAction=meta PERIOD
 acceleratorFor.MindMap/OpenLastOpenedAction_1=meta 1
 acceleratorFor.MindMap/DeleteAction=BACK_SPACE
+acceleratorFor.File/ModesMenuAction.File=control 3
+acceleratorFor.File/ModesMenuAction.MindMap=control 1
+acceleratorFor.MindMap/ModesMenuAction.File=control 3
+acceleratorFor.MindMap/ModesMenuAction.MindMap=control 1
diff --git a/freeplane/resources/images/AssignAttributesAction.svg b/freeplane/resources/images/AssignAttributesAction.svg
index f9a90b1..a914681 100644
--- a/freeplane/resources/images/AssignAttributesAction.svg
+++ b/freeplane/resources/images/AssignAttributesAction.svg
@@ -9,13 +9,15 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
-   viewBox="0 0 15.854 16"
+   viewBox="0 0 32 32"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.1 r15371"
    sodipodi:docname="AssignAttributesAction.svg"
    inkscape:export-filename="F:\Freeplane\freeplane\resources\images\AssignAttributesAction.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   width="32"
+   height="32">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -29,20 +31,24 @@
      inkscape:window-height="1018"
      id="namedview58"
      showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-1.5306271"
-     inkscape:cy="8"
+     inkscape:zoom="10.302632"
+     inkscape:cx="-1.1953994"
+     inkscape:cy="25.845699"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
   <defs
      id="defs4">
     <linearGradient
        id="b"
        y2="124.52"
        gradientUnits="userSpaceOnUse"
-       x2="219.96"
+       x2="219.96001"
        y1="238.03"
        x1="268.63">
       <stop
@@ -56,12 +62,12 @@
          id="stop9" />
     </linearGradient>
     <linearGradient
-       x1="-2585.9"
-       y1="-2128.6"
+       x1="-2585.8999"
+       y1="-2128.6001"
        gradientTransform="matrix(0.3505,0,0,0.34695,931.94607,742.71776)"
-       x2="-2596.4"
+       x2="-2596.3999"
        gradientUnits="userSpaceOnUse"
-       y2="-2104.9"
+       y2="-2104.8999"
        id="l">
       <stop
          id="stop4405"
@@ -73,10 +79,10 @@
          stop-color="#fff" />
     </linearGradient>
     <filter
-       x="-.17407"
-       y="-.16576"
-       width="1.3481"
-       height="1.3315"
+       x="-0.17407"
+       y="-0.16576"
+       width="1.3480999"
+       height="1.3315001"
        style="color-interpolation-filters:sRGB"
        id="n">
       <feGaussianBlur
@@ -84,8 +90,8 @@
          stdDeviation="0.82320991" />
     </filter>
     <linearGradient
-       x1="-2584.4"
-       y1="-2130.1"
+       x1="-2584.3999"
+       y1="-2130.1001"
        gradientTransform="matrix(0.31602,0,0,0.31283,842.79607,670.09776)"
        x2="-2589.3"
        gradientUnits="userSpaceOnUse"
@@ -101,10 +107,10 @@
          stop-color="#dcdcdc" />
     </linearGradient>
     <radialGradient
-       r="61.352"
-       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
-       cx="386.21"
-       cy="866.01"
+       r="61.352001"
+       gradientTransform="matrix(0.07147531,0.09840437,-0.06510107,0.0517216,35.734712,-78.428968)"
+       cx="386.20999"
+       cy="866.01001"
        gradientUnits="userSpaceOnUse"
        id="e">
       <stop
@@ -119,11 +125,11 @@
     </radialGradient>
     <linearGradient
        x1="348.72"
-       y1="863.3"
-       gradientTransform="matrix(0.074862,0,0,0.035378,-776.1,471.94)"
-       x2="318.68"
+       y1="863.29999"
+       gradientTransform="matrix(0.07807109,0,0,0.03689429,-25.02483,-15.360776)"
+       x2="318.67999"
        gradientUnits="userSpaceOnUse"
-       y2="864.59"
+       y2="864.59003"
        id="k">
       <stop
          id="stop4423"
@@ -135,10 +141,10 @@
          stop-color="#fff" />
     </linearGradient>
     <linearGradient
-       x1="333.49"
-       y1="791.28"
-       gradientTransform="matrix(0.056864,-0.055812,0.035022,0.03596,-241.08,860.4)"
-       x2="343.89"
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(0.06590072,-0.05061156,0.03172371,0.04164032,-37.742496,-6.1339926)"
+       x2="343.89001"
        gradientUnits="userSpaceOnUse"
        y2="791.12"
        id="j">
@@ -154,13 +160,13 @@
          stop-color="#b3b3b3" />
     </linearGradient>
     <linearGradient
-       x1="209.71"
+       x1="209.71001"
        y1="440.75"
        gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
        x2="215.36"
        gradientUnits="userSpaceOnUse"
        xlink:href="#f"
-       y2="446.77"
+       y2="446.76999"
        id="d" />
     <linearGradient
        id="f">
@@ -175,12 +181,12 @@
     </linearGradient>
     <linearGradient
        x1="202.53"
-       y1="456.24"
+       y1="456.23999"
        gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
        x2="194.27"
        gradientUnits="userSpaceOnUse"
        xlink:href="#g"
-       y2="449.6"
+       y2="449.60001"
        id="c" />
     <linearGradient
        id="g">
@@ -195,12 +201,12 @@
     </linearGradient>
     <linearGradient
        x1="203.5"
-       y1="457.89"
+       y1="457.89001"
        gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
-       x2="193.04"
+       x2="193.03999"
        gradientUnits="userSpaceOnUse"
        xlink:href="#i"
-       y2="449.64"
+       y2="449.64001"
        id="b-1" />
     <linearGradient
        id="i">
@@ -213,13 +219,13 @@
          stop-color="#7e7e7e" />
     </linearGradient>
     <linearGradient
-       x1="193.01"
+       x1="193.00999"
        y1="458.87"
        gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
        x2="196.75"
        gradientUnits="userSpaceOnUse"
        xlink:href="#h"
-       y2="462.65"
+       y2="462.64999"
        id="a-0" />
     <linearGradient
        id="h">
@@ -231,6 +237,13 @@
          id="stop4454"
          offset="1" />
     </linearGradient>
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
   </defs>
   <metadata
      id="metadata11">
@@ -245,140 +258,175 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="g4706">
+     id="g4780">
+    <rect
+       y="0"
+       x="0"
+       height="32"
+       width="32"
+       id="rect4667"
+       style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.34995812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <g
-       id="g17"
-       transform="matrix(0.9909,0,0,0.9909,-88.710576,-824.44668)">
+       transform="matrix(2.0000836,0,0,1.9818197,-0.00867438,-0.01214266)"
+       id="g4533">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5000034"
+         d="M 0.82313555,0.25612867 H 15.185604 V 15.902902 H 0.82313555 Z"
+         id="rect12" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:#b1b1b1;fill-rule:evenodd;stroke:#000000;stroke-width:0.11799508;stroke-linecap:round;stroke-linejoin:round"
+         d="M 8.0043695,3.581619 H 0.85773145 V 0.27250386 H 8.0043695 m 0,3.30911514 H 15.151008 V 0.27250386 H 8.0043695 L 7.9798625,3.5867026"
+         id="path14" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+         d="M 8.0043695,7.013022 H 0.85773145 V 3.7039069 H 8.0043695 m 0,3.3091151 H 15.151008 V 3.7039069 H 8.0043695 l -0.024507,3.3141987"
+         id="path16" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+         d="M 8.0043695,10.444425 H 0.85773145 V 7.1353099 H 8.0043695 m 0,3.3091151 H 15.151008 V 7.1353099 H 8.0043695 l -0.024507,3.3141991"
+         id="path18" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+         d="M 8.0043695,13.875828 H 0.85773145 V 10.566713 H 8.0043695 m 0,3.309115 H 15.151008 V 10.566713 H 8.0043695 l -0.024507,3.314199"
+         id="path20" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:#cccccc;stroke:#000000;stroke-width:0.03117987;stroke-linecap:round;stroke-linejoin:round"
+         d="m 1.0511891,14.850177 v -0.873031 h 6.9530392 6.9530397 v 0.873031 0.873031 H 8.0042283 1.0511891 Z"
+         id="path22" />
+      <rect
+         id="rect40"
+         x="0.0040026247"
+         y="0.080026858"
+         width="16"
+         height="16"
+         style="color:#000000;fill:none" />
       <g
-         id="g19"
-         transform="matrix(0.70605,0,0,0.70605,63.018,229.25)">
-        <rect
-           id="rect21"
-           x="38.700001"
-           y="854.07001"
-           width="20.341999"
-           height="22.160999"
-           style="color:#000000;opacity:0.93720003;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.70817" />
+         aria-label="AAA"
+         style="font-style:normal;font-weight:normal;font-size:1.93536687px;line-height:125%;font-family:sans-serif;letter-spacing:0.77414674px;fill:#0000ff;stroke-width:0.77414674"
+         id="text4219">
+        <path
+           inkscape:connector-curvature="0"
+           d="M 2.908486,6.2261734 H 2.7090903 L 2.5711198,5.833997 H 1.9625376 L 1.8245672,6.2261734 H 1.6346215 l 0.5121918,-1.40711 H 2.3962942 Z M 2.5134746,5.6733464 2.2668287,4.982549 2.0192378,5.6733464 Z"
+           style="stroke-width:0.77414674"
+           id="path4497" />
         <path
            inkscape:connector-curvature="0"
-           id="path23"
-           d="m 48.871,858.78 -10.122,0 0,-4.6868 10.122,0 m 0,4.6868 10.122,0 0,-4.6868 -10.122,0 -0.03471,4.694"
-           style="color:#000000;opacity:0.93720003;fill:#b1b1b1;fill-rule:evenodd;stroke:#000000;stroke-width:0.16711999;stroke-linecap:round;stroke-linejoin:round" />
+           d="M 5.0056375,6.2261734 H 4.8062418 L 4.6682713,5.833997 H 4.0596892 L 3.9217187,6.2261734 H 3.731773 l 0.5121918,-1.40711 H 4.4934457 Z M 4.6106261,5.6733464 4.3639802,4.982549 4.1163894,5.6733464 Z"
+           style="stroke-width:0.77414674"
+           id="path4499" />
         <path
            inkscape:connector-curvature="0"
-           id="path25"
-           d="m 48.871,863.64 -10.122,0 0,-4.6868 10.122,0 m 0,4.6868 10.122,0 0,-4.6868 -10.122,0 -0.03471,4.694"
-           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.35407999;stroke-linecap:round;stroke-linejoin:round" />
+           d="M 7.102789,6.2261734 H 6.9033933 L 6.7654228,5.833997 H 6.1568407 L 6.0188702,6.2261734 H 5.8289245 l 0.5121918,-1.40711 H 6.5905972 Z M 6.7077776,5.6733464 6.4611318,4.982549 6.2135409,5.6733464 Z"
+           style="stroke-width:0.77414674"
+           id="path4501" />
+      </g>
+      <g
+         aria-label="BBB"
+         style="font-style:normal;font-weight:normal;font-size:1.89617288px;line-height:125%;font-family:sans-serif;letter-spacing:0.75846916px;fill:#008000;stroke-width:0.75846916"
+         id="text4223">
         <path
            inkscape:connector-curvature="0"
-           id="path27"
-           d="m 48.871,868.5 -10.122,0 0,-4.6868 10.122,0 m 0,4.6868 10.122,0 0,-4.6868 -10.122,0 -0.03471,4.694"
-           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.35407999;stroke-linecap:round;stroke-linejoin:round" />
+           d="m 10.041582,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.038887,0.078699 -0.1046231,0.1296212 -0.077773,0.061107 -0.1712851,0.087031 -0.092587,0.025924 -0.2360958,0.025924 H 9.001835 v -1.378614 h 0.4083067 q 0.1509161,0 0.2259112,0.01111 0.074995,0.01111 0.1435092,0.046293 0.075921,0.039812 0.110178,0.1027711 0.034257,0.062033 0.034257,0.1490644 0,0.098142 -0.049997,0.1675816 -0.049997,0.068514 -0.1333246,0.1101781 v 0.00741 q 0.1398057,0.028702 0.220356,0.1231401 0.08055, [...]
+           style="stroke-width:0.75846916"
+           id="path4504" />
         <path
            inkscape:connector-curvature="0"
-           id="path29"
-           d="m 48.871,873.36 -10.122,0 0,-4.6868 10.122,0 m 0,4.6868 10.122,0 0,-4.6868 -10.122,0 -0.03471,4.694"
-           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.35407999;stroke-linecap:round;stroke-linejoin:round" />
+           d="m 12.099967,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104622,0.1296212 -0.07777,0.061107 -0.171286,0.087031 -0.09259,0.025924 -0.236095,0.025924 H 11.06022 v -1.378614 h 0.408306 q 0.150916,0 0.225912,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.23702 [...]
+           style="stroke-width:0.75846916"
+           id="path4506" />
         <path
            inkscape:connector-curvature="0"
-           id="path31"
-           d="m 39.023,874.74 0,-1.2365 9.8478,0 9.8478,0 0,1.2365 0,1.2365 -9.8478,0 -9.8478,0 0,-1.2365 z"
-           style="color:#000000;opacity:0.93720003;fill:#cccccc;stroke:#000000;stroke-width:0.044161;stroke-linecap:round;stroke-linejoin:round" />
-        <text
-           style="font-style:italic;font-size:2.08349991px;fill:#0000ff"
-           id="text33"
-           x="40.057484"
-           y="861.82092"
-           font-style="italic"
-           font-size="2.0835px"
-           xml:space="preserve"><tspan
-             id="tspan35"
-             x="40.057484"
-             y="861.82092">Predrag</tspan></text>
-        <text
-           style="font-style:italic;font-size:2.08349991px;fill:#ff0000"
-           id="text37"
-           x="40.350864"
-           y="866.51904"
-           font-style="italic"
-           font-size="2.0835px"
-           xml:space="preserve"><tspan
-             id="tspan39"
-             x="40.350864"
-             y="866.51904">Romina</tspan></text>
-        <text
-           style="font-style:italic;font-size:2.08349991px;fill:#008000"
-           id="text41"
-           x="51.055748"
-           y="866.53125"
-           font-style="italic"
-           font-size="2.0835px"
-           xml:space="preserve"><tspan
-             id="tspan43"
-             x="51.055748"
-             y="866.53125">Sara</tspan></text>
-        <text
-           style="font-style:italic;font-size:2.08349991px;fill:#ff6600"
-           id="text45"
-           x="51.055748"
-           y="862.04016"
-           font-style="italic"
-           font-size="2.0835px"
-           xml:space="preserve"><tspan
-             id="tspan47"
-             x="51.055748"
-             y="862.04016">Stela</tspan></text>
+           d="m 14.158351,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104623,0.1296212 -0.07777,0.061107 -0.171285,0.087031 -0.09259,0.025924 -0.236096,0.025924 H 13.1186 v -1.378614 h 0.408307 q 0.150916,0 0.225911,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.237021 [...]
+           style="stroke-width:0.75846916"
+           id="path4508" />
+      </g>
+      <g
+         aria-label="CCC"
+         style="font-style:normal;font-weight:normal;font-size:1.91385388px;line-height:125%;font-family:sans-serif;letter-spacing:0.76554155px;fill:#ff0000;stroke-width:0.76554155"
+         id="text4219-4">
+        <path
+           inkscape:connector-curvature="0"
+           d="m 2.8523301,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084018,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513889,0 -0.2756772,-0.042052 Q 1.9804426,9.3960627 1.8888617,9.3054163 1.7991498,9.2166389 1.7486869,9.080202 1.6982239,8.9428307 1.6982239,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261573,-0.047659 0.2794152 [...]
+           style="stroke-width:0.76554155"
+           id="path4502" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 4.9560742,9.3549447 q -0.051398,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 4.0841866,9.3960627 3.9926057,9.3054163 3.9028938,9.2166389 3.8524309,9.080202 3.8019679,8.9428307 3.8019679,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261574,-0.047659 0.2794152 [...]
+           style="stroke-width:0.76554155"
+           id="path4505" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 7.0598182,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242883,0.029904 -0.066349,0.013083 -0.1467164,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 6.1879307,9.3960627 6.0963498,9.3054163 6.0066379,9.2166389 5.9561749,9.080202 5.905712,8.9428307 5.905712,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401749,-0.2289522 0.088777,-0.090646 0.2140002,-0.1383059 0.1261574,-0.047659 0.2794152,- [...]
+           style="stroke-width:0.76554155"
+           id="path4507" />
+      </g>
+      <g
+         aria-label="123"
+         style="font-style:normal;font-weight:normal;font-size:2.13862514px;line-height:125%;font-family:sans-serif;letter-spacing:0.85545003px;fill:#ff6600;stroke-width:0.85545003"
+         id="text4219-8">
+        <path
+           inkscape:connector-curvature="0"
+           d="M 9.9111806,9.5375814 H 9.0695146 V 9.3788554 H 9.3932323 V 8.3366933 H 9.0695146 V 8.1946752 q 0.065788,0 0.1409738,-0.010442 0.075186,-0.011487 0.1138233,-0.032372 0.048036,-0.026106 0.075186,-0.065788 0.028195,-0.040726 0.032372,-0.1086021 h 0.1618588 v 1.4013843 h 0.3174522 z"
+           style="stroke-width:0.85545003"
+           id="path4512" />
+        <path
+           inkscape:connector-curvature="0"
+           d="M 12.217094,9.5375814 H 11.16449 V 9.3193331 q 0.109646,-0.093983 0.219293,-0.1879651 0.11069,-0.093983 0.205717,-0.1869209 0.200496,-0.1942306 0.274638,-0.3080539 0.07414,-0.1148676 0.07414,-0.2474874 0,-0.121133 -0.08041,-0.1890093 -0.07936,-0.068921 -0.222425,-0.068921 -0.09503,0 -0.205717,0.033416 -0.110691,0.033416 -0.21616,0.1023365 h -0.01044 V 8.0474359 q 0.07414,-0.036549 0.197364,-0.066832 0.124265,-0.030283 0.240177,-0.030283 0.239134,0 0.374886,0.1159118 0.13575 [...]
+           style="stroke-width:0.85545003"
+           id="path4514" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 14.29745,8.7888538 q 0.05012,0.044903 0.0825,0.1127791 0.03237,0.067876 0.03237,0.175434 0,0.1065136 -0.03864,0.1952749 -0.03864,0.088761 -0.108603,0.1545491 -0.07832,0.073097 -0.184832,0.108602 -0.105469,0.03446 -0.231824,0.03446 -0.129487,0 -0.254797,-0.031327 -0.12531,-0.030283 -0.205717,-0.066832 V 9.2535453 h 0.01566 q 0.08876,0.058478 0.20885,0.097115 0.120089,0.038637 0.231823,0.038637 0.06579,0 0.13993,-0.021929 0.07414,-0.021929 0.120089,-0.064744 0.04803,-0.0459 [...]
+           style="stroke-width:0.85545003"
+           id="path4516" />
       </g>
-      <rect
-         id="rect49"
-         x="89.523003"
-         y="832.09003"
-         width="16"
-         height="16"
-         style="color:#000000;fill:none" />
     </g>
     <g
-       style="stroke-linejoin:round"
-       transform="matrix(1.0352236,0.126026,-0.126026,1.0352236,320.29132,-866.3917)"
-       id="g4484">
+       transform="matrix(2.0790927,0,0,2.0790927,-0.80494651,-1.856246)"
+       id="g4636">
       <rect
-         style="fill:#ffffff;stroke:#7900aa;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997"
-         ry="0.27803001"
-         rx="0.27803001"
-         transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)"
-         height="4.4428"
-         width="1.7715"
-         y="500.42999"
-         x="-751.59003"
+         style="fill:#ffffff;stroke:#7900aa;stroke-width:0.29801902;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.90697997"
+         ry="0.28994632"
+         rx="0.28994823"
+         transform="matrix(0.80490853,-0.59339891,0.61289856,0.7901616,0,0)"
+         height="4.6332173"
+         width="1.8474383"
+         y="14.869841"
+         x="0.64221245"
          id="rect4486" />
       <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#333333;stroke-width:0.17733943;stroke-linejoin:round;stroke-opacity:0.88372001"
          inkscape:connector-curvature="0"
-         d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z"
+         d="M 9.1078472,9.8270282 9.6314829,11.262394 11.010597,10.210997 9.8215021,9.291594 9.1078409,9.82708 Z"
          id="path4488" />
       <g
-         transform="translate(-0.035609,-0.059735)"
-         id="g4490">
+         id="g938"
+         transform="translate(0.40407994,0.34738516)">
         <path
-           style="fill:url(#e);stroke:#1a1a1a;stroke-width:6.33010006;stroke-linecap:round;stroke-opacity:0.81395"
+           style="fill:url(#e);stroke:#1a1a1a;stroke-width:0.46787417;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.81395"
            inkscape:connector-curvature="0"
-           d="m 451.11,879.75 a 60.261,57.727 0 0 1 -60.247,57.727 60.261,57.727 0 0 1 -60.275,-57.699 60.261,57.727 0 0 1 60.218,-57.754 60.261,57.727 0 0 1 60.304,57.672"
-           transform="matrix(0.06936,0,0,0.072422,-224.82,802.68)"
+           d="M 10.72604,6.0627702 A 4.3588721,4.3599166 6.939515 0 1 5.8732405,9.8641056 4.3588721,4.3599166 6.939515 0 1 2.0719297,5.0113674 4.3588721,4.3599166 6.939515 0 1 6.9228931,1.2077542 4.3588721,4.3599166 6.939515 0 1 10.726533,6.0587217"
            id="path4492" />
         <rect
-           style="fill:url(#k);stroke:#000080;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997"
-           ry="0.27803001"
-           rx="0.27803001"
-           transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)"
-           height="4.4428"
-           width="1.7715"
-           y="500.42999"
-           x="-751.59003"
+           style="fill:url(#k);stroke:#000080;stroke-width:0.29801902;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.90697997"
+           ry="0.28994632"
+           rx="0.28994823"
+           transform="matrix(0.80490853,-0.59339891,0.61289856,0.7901616,0,0)"
+           height="4.6332173"
+           width="1.8474383"
+           y="14.350292"
+           x="0.53580403"
            id="rect4494" />
         <path
-           style="fill:url(#j);fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001"
+           style="fill:url(#j);fill-rule:evenodd;stroke:#333333;stroke-width:0.17733943;stroke-linejoin:round;stroke-opacity:0.88372001"
            inkscape:connector-curvature="0"
-           d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z"
+           d="M 8.7037677,9.4796436 9.2274034,10.915009 10.606517,9.8636124 9.4174226,8.9442094 8.7037614,9.4796954 Z"
            id="path4496" />
       </g>
     </g>
diff --git a/freeplane/resources/images/EditAttributesAction.svg b/freeplane/resources/images/EditAttributesAction.svg
index 450853d..8ef927a 100644
--- a/freeplane/resources/images/EditAttributesAction.svg
+++ b/freeplane/resources/images/EditAttributesAction.svg
@@ -1,42 +1,214 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.854 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<defs>
-<linearGradient id="b" y2="124.52" gradientUnits="userSpaceOnUse" x2="219.96" y1="238.03" x1="268.63">
-<stop stop-color="#fff" offset="0"/>
-<stop stop-color="#fff" stop-opacity=".99225" offset="1"/>
-</linearGradient>
-</defs>
-<metadata>
-<rdf:RDF>
-<cc:Work rdf:about="">
-<dc:format>image/svg+xml</dc:format>
-<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-<dc:title/>
-</cc:Work>
-</rdf:RDF>
-</metadata>
-<g transform="translate(-106.07 -164.72)">
-<g transform="matrix(.99090 0 0 .99090 62.595 98.074)">
-<g transform="translate(-45.651 -764.76)">
-<g transform="matrix(.70605 0 0 .70605 63.018 229.25)">
-<rect opacity=".93720" style="color:#000000" fill-rule="evenodd" height="22.161" width="20.342" stroke="#000" y="854.07" x="38.7" stroke-width=".70817" fill="#fff"/>
-<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m48.871 858.78h-10.122v-4.6868h10.122m0 4.6868h10.122v-4.6868h-10.122l-0.03471 4.694" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".16712" fill="#b1b1b1"/>
-<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m48.871 863.64h-10.122v-4.6868h10.122m0 4.6868h10.122v-4.6868h-10.122l-0.03471 4.694" stroke="#000" stroke-linecap="round" stroke-width=".35408" fill="none"/>
-<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m48.871 868.5h-10.122v-4.6868h10.122m0 4.6868h10.122v-4.6868h-10.122l-0.03471 4.694" stroke="#000" stroke-linecap="round" stroke-width=".35408" fill="none"/>
-<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m48.871 873.36h-10.122v-4.6868h10.122m0 4.6868h10.122v-4.6868h-10.122l-0.03471 4.694" stroke="#000" stroke-linecap="round" stroke-width=".35408" fill="none"/>
-<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m39.023 874.74v-1.2365h9.8478 9.8478v1.2365 1.2365h-9.8478-9.8478v-1.2365z" stroke="#000" stroke-linecap="round" stroke-width=".044161" fill="#ccc"/>
-<text xml:space="preserve" font-size="2.0835px" font-style="italic" y="861.82092" x="40.057484" fill="#0000ff"><tspan y="861.82092" x="40.057484">Predrag</tspan></text>
-<text xml:space="preserve" font-size="2.0835px" font-style="italic" y="866.51904" x="40.350864" fill="#ff0000"><tspan y="866.51904" x="40.350864">Romina</tspan></text>
-<text xml:space="preserve" font-size="2.0835px" font-style="italic" y="866.53125" x="51.055748" fill="#008000"><tspan y="866.53125" x="51.055748">Sara</tspan></text>
-<text xml:space="preserve" font-size="2.0835px" font-style="italic" y="862.04016" x="51.055748" fill="#ff6600"><tspan y="862.04016" x="51.055748">Stela</tspan></text>
-</g>
-<rect style="color:#000000" height="16" width="16" y="832.09" x="89.523" fill="none"/>
-</g>
-<g transform="matrix(1.2007 0 0 1.2007 -9.4542 -14.007)" fill-rule="evenodd">
-<circle cy="219.91" transform="matrix(.082981 0 0 .080136 28.09 54.515)" cx="257.44" r="51.206" fill="url(#b)"/>
-<path style="color:#000000" d="m49.021 69.232a0.32535 0.32535 0 0 0 -0.32617 0.32617v1.8223h-1.8223a0.32535 0.32535 0 0 0 -0.32617 0.32617v0.86133a0.32535 0.32535 0 0 0 0.32617 0.32617h1.8223v1.8223a0.32535 0.32535 0 0 0 0.32617 0.32617h0.86328a0.32535 0.32535 0 0 0 0.32617 -0.32617v-1.8223h1.8223a0.32535 0.32535 0 0 0 0.32617 -0.32617v-0.86133a0.32535 0.32535 0 0 0 -0.32617 -0.32617h-1.8223v-1.8223a0.32535 0.32535 0 0 0 -0.32617 -0.32617h-0.86328z" xlink:href="#a" transform="translate(- [...]
-<path id="a" style="color:#000000" d="m49.022 69.558v2.1488h-2.1488v0.86196h2.1488v2.1488h0.86196v-2.1488h2.1488v-0.86196h-2.1488v-2.1488h-0.86196z" fill-rule="evenodd" stroke="#000" stroke-width=".038849" fill="#00f"/>
-</g>
-</g>
-</g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16.004662"
+   id="svg56"
+   sodipodi:docname="EditAttributesAction.svg"
+   inkscape:version="0.92.1 r15371"
+   width="16"
+   height="16.004662">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview58"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-3.2881352"
+     inkscape:cy="7.999751"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg56"
+     inkscape:snap-global="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs7">
+    <linearGradient
+       id="b"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       x2="219.96001"
+       y1="238.03"
+       x1="268.63"
+       gradientTransform="matrix(0.09133373,0,0,0.0874045,-36.185457,-14.560572)">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4594"
+     transform="matrix(1,0,0,1.0003331,18.57627,0.20312321)">
+    <g
+       transform="matrix(1,0,0,0.99086844,-18.580273,-0.20912659)"
+       id="g4533">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5000034"
+         d="M 0.82313555,0.25612867 H 15.185604 V 15.902902 H 0.82313555 Z"
+         id="rect12" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:#b1b1b1;fill-rule:evenodd;stroke:#000000;stroke-width:0.11799508;stroke-linecap:round;stroke-linejoin:round"
+         d="M 8.0043695,3.581619 H 0.85773145 V 0.27250386 H 8.0043695 m 0,3.30911514 H 15.151008 V 0.27250386 H 8.0043695 L 7.9798625,3.5867026"
+         id="path14" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+         d="M 8.0043695,7.013022 H 0.85773145 V 3.7039069 H 8.0043695 m 0,3.3091151 H 15.151008 V 3.7039069 H 8.0043695 l -0.024507,3.3141987"
+         id="path16" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+         d="M 8.0043695,10.444425 H 0.85773145 V 7.1353099 H 8.0043695 m 0,3.3091151 H 15.151008 V 7.1353099 H 8.0043695 l -0.024507,3.3141991"
+         id="path18" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+         d="M 8.0043695,13.875828 H 0.85773145 V 10.566713 H 8.0043695 m 0,3.309115 H 15.151008 V 10.566713 H 8.0043695 l -0.024507,3.314199"
+         id="path20" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;opacity:0.93720003;fill:#cccccc;stroke:#000000;stroke-width:0.03117987;stroke-linecap:round;stroke-linejoin:round"
+         d="m 1.0511891,14.850177 v -0.873031 h 6.9530392 6.9530397 v 0.873031 0.873031 H 8.0042283 1.0511891 Z"
+         id="path22" />
+      <rect
+         id="rect40"
+         x="0.0040026247"
+         y="0.080026858"
+         width="16"
+         height="16"
+         style="color:#000000;fill:none" />
+      <g
+         aria-label="AAA"
+         style="font-style:normal;font-weight:normal;font-size:1.93536687px;line-height:125%;font-family:sans-serif;letter-spacing:0.77414674px;fill:#0000ff;stroke-width:0.77414674"
+         id="text4219">
+        <path
+           inkscape:connector-curvature="0"
+           d="M 2.908486,6.2261734 H 2.7090903 L 2.5711198,5.833997 H 1.9625376 L 1.8245672,6.2261734 H 1.6346215 l 0.5121918,-1.40711 H 2.3962942 Z M 2.5134746,5.6733464 2.2668287,4.982549 2.0192378,5.6733464 Z"
+           style="stroke-width:0.77414674"
+           id="path4497" />
+        <path
+           inkscape:connector-curvature="0"
+           d="M 5.0056375,6.2261734 H 4.8062418 L 4.6682713,5.833997 H 4.0596892 L 3.9217187,6.2261734 H 3.731773 l 0.5121918,-1.40711 H 4.4934457 Z M 4.6106261,5.6733464 4.3639802,4.982549 4.1163894,5.6733464 Z"
+           style="stroke-width:0.77414674"
+           id="path4499" />
+        <path
+           inkscape:connector-curvature="0"
+           d="M 7.102789,6.2261734 H 6.9033933 L 6.7654228,5.833997 H 6.1568407 L 6.0188702,6.2261734 H 5.8289245 l 0.5121918,-1.40711 H 6.5905972 Z M 6.7077776,5.6733464 6.4611318,4.982549 6.2135409,5.6733464 Z"
+           style="stroke-width:0.77414674"
+           id="path4501" />
+      </g>
+      <g
+         aria-label="BBB"
+         style="font-style:normal;font-weight:normal;font-size:1.89617288px;line-height:125%;font-family:sans-serif;letter-spacing:0.75846916px;fill:#008000;stroke-width:0.75846916"
+         id="text4223">
+        <path
+           inkscape:connector-curvature="0"
+           d="m 10.041582,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.038887,0.078699 -0.1046231,0.1296212 -0.077773,0.061107 -0.1712851,0.087031 -0.092587,0.025924 -0.2360958,0.025924 H 9.001835 v -1.378614 h 0.4083067 q 0.1509161,0 0.2259112,0.01111 0.074995,0.01111 0.1435092,0.046293 0.075921,0.039812 0.110178,0.1027711 0.034257,0.062033 0.034257,0.1490644 0,0.098142 -0.049997,0.1675816 -0.049997,0.068514 -0.1333246,0.1101781 v 0.00741 q 0.1398057,0.028702 0.220356,0.1231401 0.08055, [...]
+           style="stroke-width:0.75846916"
+           id="path4504" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 12.099967,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104622,0.1296212 -0.07777,0.061107 -0.171286,0.087031 -0.09259,0.025924 -0.236095,0.025924 H 11.06022 v -1.378614 h 0.408306 q 0.150916,0 0.225912,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.23702 [...]
+           style="stroke-width:0.75846916"
+           id="path4506" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 14.158351,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104623,0.1296212 -0.07777,0.061107 -0.171285,0.087031 -0.09259,0.025924 -0.236096,0.025924 H 13.1186 v -1.378614 h 0.408307 q 0.150916,0 0.225911,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.237021 [...]
+           style="stroke-width:0.75846916"
+           id="path4508" />
+      </g>
+      <g
+         aria-label="CCC"
+         style="font-style:normal;font-weight:normal;font-size:1.91385388px;line-height:125%;font-family:sans-serif;letter-spacing:0.76554155px;fill:#ff0000;stroke-width:0.76554155"
+         id="text4219-4">
+        <path
+           inkscape:connector-curvature="0"
+           d="m 2.8523301,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084018,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513889,0 -0.2756772,-0.042052 Q 1.9804426,9.3960627 1.8888617,9.3054163 1.7991498,9.2166389 1.7486869,9.080202 1.6982239,8.9428307 1.6982239,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261573,-0.047659 0.2794152 [...]
+           style="stroke-width:0.76554155"
+           id="path4502" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 4.9560742,9.3549447 q -0.051398,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 4.0841866,9.3960627 3.9926057,9.3054163 3.9028938,9.2166389 3.8524309,9.080202 3.8019679,8.9428307 3.8019679,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261574,-0.047659 0.2794152 [...]
+           style="stroke-width:0.76554155"
+           id="path4505" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 7.0598182,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242883,0.029904 -0.066349,0.013083 -0.1467164,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 6.1879307,9.3960627 6.0963498,9.3054163 6.0066379,9.2166389 5.9561749,9.080202 5.905712,8.9428307 5.905712,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401749,-0.2289522 0.088777,-0.090646 0.2140002,-0.1383059 0.1261574,-0.047659 0.2794152,- [...]
+           style="stroke-width:0.76554155"
+           id="path4507" />
+      </g>
+      <g
+         aria-label="123"
+         style="font-style:normal;font-weight:normal;font-size:2.13862514px;line-height:125%;font-family:sans-serif;letter-spacing:0.85545003px;fill:#ff6600;stroke-width:0.85545003"
+         id="text4219-8">
+        <path
+           inkscape:connector-curvature="0"
+           d="M 9.9111806,9.5375814 H 9.0695146 V 9.3788554 H 9.3932323 V 8.3366933 H 9.0695146 V 8.1946752 q 0.065788,0 0.1409738,-0.010442 0.075186,-0.011487 0.1138233,-0.032372 0.048036,-0.026106 0.075186,-0.065788 0.028195,-0.040726 0.032372,-0.1086021 h 0.1618588 v 1.4013843 h 0.3174522 z"
+           style="stroke-width:0.85545003"
+           id="path4512" />
+        <path
+           inkscape:connector-curvature="0"
+           d="M 12.217094,9.5375814 H 11.16449 V 9.3193331 q 0.109646,-0.093983 0.219293,-0.1879651 0.11069,-0.093983 0.205717,-0.1869209 0.200496,-0.1942306 0.274638,-0.3080539 0.07414,-0.1148676 0.07414,-0.2474874 0,-0.121133 -0.08041,-0.1890093 -0.07936,-0.068921 -0.222425,-0.068921 -0.09503,0 -0.205717,0.033416 -0.110691,0.033416 -0.21616,0.1023365 h -0.01044 V 8.0474359 q 0.07414,-0.036549 0.197364,-0.066832 0.124265,-0.030283 0.240177,-0.030283 0.239134,0 0.374886,0.1159118 0.13575 [...]
+           style="stroke-width:0.85545003"
+           id="path4514" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 14.29745,8.7888538 q 0.05012,0.044903 0.0825,0.1127791 0.03237,0.067876 0.03237,0.175434 0,0.1065136 -0.03864,0.1952749 -0.03864,0.088761 -0.108603,0.1545491 -0.07832,0.073097 -0.184832,0.108602 -0.105469,0.03446 -0.231824,0.03446 -0.129487,0 -0.254797,-0.031327 -0.12531,-0.030283 -0.205717,-0.066832 V 9.2535453 h 0.01566 q 0.08876,0.058478 0.20885,0.097115 0.120089,0.038637 0.231823,0.038637 0.06579,0 0.13993,-0.021929 0.07414,-0.021929 0.120089,-0.064744 0.04803,-0.0459 [...]
+           style="stroke-width:0.85545003"
+           id="path4516" />
+      </g>
+    </g>
+    <ellipse
+       ry="4.4756351"
+       rx="4.6768351"
+       cy="4.660552"
+       cx="-12.672502"
+       id="circle45"
+       style="fill:url(#b);fill-rule:evenodd;stroke-width:0.08934752" />
+    <path
+       style="color:#000000;fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:0.04256564"
+       d="m -13.147836,1.4913129 a 0.35809918,0.3548599 0 0 0 -0.359002,0.3557542 v 1.9875863 h -2.00573 A 0.35809918,0.3548599 0 0 0 -15.87157,4.1904077 V 5.129862 a 0.35809918,0.3548599 0 0 0 0.359002,0.3557543 h 2.00573 v 1.9875862 a 0.35809918,0.3548599 0 0 0 0.359002,0.3557543 h 0.950176 a 0.35809918,0.3548599 0 0 0 0.359002,-0.3557543 V 5.4856163 h 2.0057292 A 0.35809918,0.3548599 0 0 0 -9.4739271,5.129862 V 4.1904077 A 0.35809918,0.3548599 0 0 0 -9.8329288,3.8346534 H -11.838658 V [...]
+       xlink:href="#a"
+       id="path47"
+       inkscape:connector-curvature="0" />
+  </g>
 </svg>
diff --git a/freeplane/resources/images/arrow-mode-none.svg b/freeplane/resources/images/arrow-mode-none.svg
index b98d232..7b7e315 100644
--- a/freeplane/resources/images/arrow-mode-none.svg
+++ b/freeplane/resources/images/arrow-mode-none.svg
@@ -1,15 +1,61 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height=".31457mm" width="6.0162mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 21.317169 1.114634">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(-557.48 -469.05)">
-  <path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m557.6 470.04 21.067-0.0596v-0.80468h-21.067v0.86429z" stroke="#000080" stroke-width=".25" fill="#06f"/>
- </g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="1.2962mm"
+   width="6.1059mm"
+   version="1.1"
+   viewBox="0 0 21.635248 4.5929273"
+   id="svg8"
+   sodipodi:docname="arrow-mode-none.svg"
+   inkscape:version="0.92.1 r15371">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="44.402949"
+     inkscape:cx="10.362789"
+     inkscape:cy="1.763879"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <metadata
+     id="metadata2">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-538.85 -458.23)"
+     id="g6">
+    <path
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0066ff;stroke:#000080;stroke-width:0.25277001"
+       d="m 560.34544,461.0112 -21.36774,-0.0625 v -0.84375 h 21.36774 z"
+       id="path4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
 </svg>
diff --git a/freeplane/resources/images/edit12.svg b/freeplane/resources/images/edit12.svg
index 01cfbb3..cb5b067 100644
--- a/freeplane/resources/images/edit12.svg
+++ b/freeplane/resources/images/edit12.svg
@@ -9,12 +9,13 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
+   width="32"
+   height="31.970366"
    id="svg17645"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   viewBox="0 0 16 16">
+   inkscape:version="0.92.1 r15371"
+   viewBox="0 0 32 31.970366"
+   sodipodi:docname="edit12.svg">
   <svg:defs
      id="defs17647">
     <svg:linearGradient
@@ -222,18 +223,23 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="19.41517"
-     inkscape:cx="10.603036"
-     inkscape:cy="6.7352621"
+     inkscape:zoom="6.5297246"
+     inkscape:cx="-19.86307"
+     inkscape:cy="8.3160078"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      inkscape:window-width="1310"
      inkscape:window-height="912"
-     inkscape:window-x="506"
-     inkscape:window-y="90"
-     inkscape:window-maximized="0" />
+     inkscape:window-x="237"
+     inkscape:window-y="81"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
   <svg:metadata
      id="metadata17650">
     <rdf:RDF>
@@ -250,7 +256,7 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     transform="translate(0,-16)">
+     transform="translate(0,-0.02963702)">
     <svg:rect
        style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
        id="rect234"
@@ -260,142 +266,173 @@
        height="0"
        width="0.9126758" />
     <svg:g
-       id="g23928"
-       inkscape:export-filename="E:\FreePlane_radna_mapa\images\edit12.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       transform="translate(377.85669,-827.55096)">
-      <svg:rect
-         y="843.55096"
-         x="-377.85669"
-         height="16"
-         width="16"
-         id="rect6193-0-23-7-8-2-89-0-36-0"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+       id="g1050"
+       transform="matrix(1.9981479,0,0,1.9981479,0,-31.940737)">
       <svg:g
-         transform="translate(0.97640887,-14.001863)"
-         id="g23896">
+         transform="translate(-0.46621257,0.0599315)"
+         id="g1017">
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="color:#000000;opacity:0.93720003;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.42721501"
+           d="M 0.67982007,18.418659 H 13.007877 V 31.726461 H 0.67982007 Z"
+           id="rect12" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="color:#000000;opacity:0.93720003;fill:#b1b1b1;fill-rule:evenodd;stroke:#000000;stroke-width:0.10081786;stroke-linecap:round;stroke-linejoin:round"
+           d="M 6.8438485,21.247036 H 0.70951554 v -2.81445 H 6.8438485 m 0,2.81445 h 6.1343335 v -2.81445 H 6.8438485 l -0.021036,2.818773"
+           id="path14" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.21360451;stroke-linecap:round;stroke-linejoin:round"
+           d="M 6.8438485,24.165493 H 0.70951554 v -2.81445 H 6.8438485 m 0,2.81445 h 6.1343335 v -2.81445 H 6.8438485 l -0.021036,2.818773"
+           id="path16" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.21360451;stroke-linecap:round;stroke-linejoin:round"
+           d="M 6.8438485,27.083949 H 0.70951554 V 24.2695 H 6.8438485 m 0,2.814449 H 12.978182 V 24.2695 H 6.8438485 l -0.021036,2.818773"
+           id="path18" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.21360451;stroke-linecap:round;stroke-linejoin:round"
+           d="M 6.8438485,30.002406 H 0.70951554 V 27.187957 H 6.8438485 m 0,2.814449 H 12.978182 V 27.187957 H 6.8438485 l -0.021036,2.818773"
+           id="path20" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="color:#000000;opacity:0.93720003;fill:#cccccc;stroke:#000000;stroke-width:0.02664084;stroke-linecap:round;stroke-linejoin:round"
+           d="M 0.87557035,30.831104 V 30.088579 H 6.8437273 12.811885 v 0.742525 0.742525 H 6.8437273 0.87557035 Z"
+           id="path22" />
         <svg:g
-           id="g10366-8"
-           transform="matrix(0.60290045,0,0,0.63473247,-401.90943,317.12629)">
-          <svg:rect
-             y="854.06769"
-             x="38.699677"
-             height="22.161352"
-             width="20.342138"
-             id="rect10214-3"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.70816725;marker:none;enable-background:accumulate" />
+           aria-label="AAA"
+           style="font-style:normal;font-weight:normal;font-size:1.93536687px;line-height:125%;font-family:sans-serif;letter-spacing:0.77414674px;fill:#0000ff;stroke-width:0.77414674"
+           id="text4219"
+           transform="matrix(0.85835226,0,0,0.85051417,-0.02672019,18.200818)">
           <svg:path
-             sodipodi:nodetypes="cccccccc"
-             id="rect10216-2"
-             d="m 48.870745,858.77559 -10.121756,0 0,-4.68684 10.121756,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#b1b1b1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.16712102;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="M 2.908486,6.2261734 H 2.7090903 L 2.5711198,5.833997 H 1.9625376 L 1.8245672,6.2261734 H 1.6346215 l 0.5121918,-1.40711 H 2.3962942 Z M 2.5134746,5.6733464 2.2668287,4.982549 2.0192378,5.6733464 Z"
+             style="stroke-width:0.77414674"
+             id="path4497" />
           <svg:path
-             sodipodi:nodetypes="cccccccc"
-             id="rect10216-8-4"
-             d="m 48.870745,863.63668 -10.121756,0 0,-4.68684 10.121756,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="M 5.0056375,6.2261734 H 4.8062418 L 4.6682713,5.833997 H 4.0596892 L 3.9217187,6.2261734 H 3.731773 l 0.5121918,-1.40711 H 4.4934457 Z M 4.6106261,5.6733464 4.3639802,4.982549 4.1163894,5.6733464 Z"
+             style="stroke-width:0.77414674"
+             id="path4499" />
           <svg:path
-             sodipodi:nodetypes="cccccccc"
-             id="rect10216-89-1"
-             d="m 48.870746,868.49777 -10.121757,0 0,-4.68684 10.121757,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="M 7.102789,6.2261734 H 6.9033933 L 6.7654228,5.833997 H 6.1568407 L 6.0188702,6.2261734 H 5.8289245 l 0.5121918,-1.40711 H 6.5905972 Z M 6.7077776,5.6733464 6.4611318,4.982549 6.2135409,5.6733464 Z"
+             style="stroke-width:0.77414674"
+             id="path4501" />
+        </svg:g>
+        <svg:g
+           aria-label="BBB"
+           style="font-style:normal;font-weight:normal;font-size:1.89617288px;line-height:125%;font-family:sans-serif;letter-spacing:0.75846916px;fill:#008000;stroke-width:0.75846916"
+           id="text4223"
+           transform="matrix(0.85835226,0,0,0.85051417,-0.02672019,18.200818)">
           <svg:path
-             sodipodi:nodetypes="cccccccc"
-             id="rect10216-7-1"
-             d="m 48.870744,873.35886 -10.121755,0 0,-4.68684 10.121755,0 m 0,4.68684 10.121758,0 0,-4.68684 -10.121758,0 -0.03471,4.69397"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="m 10.041582,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.038887,0.078699 -0.1046231,0.1296212 -0.077773,0.061107 -0.1712851,0.087031 -0.092587,0.025924 -0.2360958,0.025924 H 9.001835 v -1.378614 h 0.4083067 q 0.1509161,0 0.2259112,0.01111 0.074995,0.01111 0.1435092,0.046293 0.075921,0.039812 0.110178,0.1027711 0.034257,0.062033 0.034257,0.1490644 0,0.098142 -0.049997,0.1675816 -0.049997,0.068514 -0.1333246,0.1101781 v 0.00741 q 0.1398057,0.028702 0.220356,0.1231401 0.0805 [...]
+             style="stroke-width:0.75846916"
+             id="path4504" />
           <svg:path
-             id="path10281-5"
-             d="m 39.022949,874.74058 0,-1.23649 9.847796,0 9.847797,0 0,1.23649 0,1.2365 -9.847797,0 -9.847796,0 0,-1.2365 z"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:0.04416052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <svg:text
-             id="text10283-9"
-             y="861.82092"
-             x="40.057484"
-             style="font-style:italic;font-size:2.08346057px;fill:#0000ff;fill-opacity:1;stroke:none"
-             xml:space="preserve"><svg:tspan
-               y="861.82092"
-               x="40.057484"
-               id="tspan10285-5"
-               sodipodi:role="line">Predrag</svg:tspan></svg:text>
-          <svg:text
-             id="text10283-8-1"
-             y="866.51904"
-             x="40.350864"
-             style="font-style:italic;font-size:2.08346057px;fill:#ff0000;fill-opacity:1;stroke:none"
-             xml:space="preserve"><svg:tspan
-               y="866.51904"
-               x="40.350864"
-               id="tspan10285-1-0"
-               sodipodi:role="line">Romina</svg:tspan></svg:text>
-          <svg:text
-             id="text10283-86-6"
-             y="866.53125"
-             x="51.055748"
-             style="font-style:italic;font-size:2.08346057px;fill:#008000;fill-opacity:1;stroke:none"
-             xml:space="preserve"><svg:tspan
-               id="tspan10362-4"
-               y="866.53125"
-               x="51.055748"
-               sodipodi:role="line">Sara</svg:tspan></svg:text>
-          <svg:text
-             id="text10283-86-4-5"
-             y="862.04016"
-             x="51.055748"
-             style="font-style:italic;font-size:2.08346057px;fill:#ff6600;fill-opacity:1;stroke:none"
-             xml:space="preserve"><svg:tspan
-               y="862.04016"
-               x="51.055748"
-               id="tspan10285-12-2-3"
-               sodipodi:role="line">Stela</svg:tspan></svg:text>
+             inkscape:connector-curvature="0"
+             d="m 12.099967,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104622,0.1296212 -0.07777,0.061107 -0.171286,0.087031 -0.09259,0.025924 -0.236095,0.025924 H 11.06022 v -1.378614 h 0.408306 q 0.150916,0 0.225912,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.237 [...]
+             style="stroke-width:0.75846916"
+             id="path4506" />
+          <svg:path
+             inkscape:connector-curvature="0"
+             d="m 14.158351,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104623,0.1296212 -0.07777,0.061107 -0.171285,0.087031 -0.09259,0.025924 -0.236096,0.025924 H 13.1186 v -1.378614 h 0.408307 q 0.150916,0 0.225911,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.2370 [...]
+             style="stroke-width:0.75846916"
+             id="path4508" />
         </svg:g>
         <svg:g
-           id="g6733-5"
-           transform="matrix(0.45468225,0,0,0.45468225,-524.81635,730.43475)"
-           inkscape:export-filename="H:\FreeMind_Ikone\pencil.png"
-           inkscape:export-xdpi="90"
-           inkscape:export-ydpi="90">
+           aria-label="CCC"
+           style="font-style:normal;font-weight:normal;font-size:1.91385388px;line-height:125%;font-family:sans-serif;letter-spacing:0.76554155px;fill:#ff0000;stroke-width:0.76554155"
+           id="text4219-4"
+           transform="matrix(0.85835226,0,0,0.85051417,-0.02672019,18.200818)">
           <svg:path
-             sodipodi:nodetypes="ccccc"
-             id="path6953-5"
-             d="m 340.339,304.70358 15.30124,-14.82536 0.0255,-9.71272 -7.71931,0.11132 -17.09417,15.86926"
-             style="fill:url(#linearGradient23920);fill-opacity:1;fill-rule:evenodd;stroke:#550000;stroke-width:1.01904869;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="m 2.8523301,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084018,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513889,0 -0.2756772,-0.042052 Q 1.9804426,9.3960627 1.8888617,9.3054163 1.7991498,9.2166389 1.7486869,9.080202 1.6982239,8.9428307 1.6982239,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261573,-0.047659 0.27941 [...]
+             style="stroke-width:0.76554155"
+             id="path4502" />
           <svg:path
-             sodipodi:nodetypes="ccccccc"
-             id="path6955-2"
-             d="m 330.9211,296.04293 -3.86795,9.28298 3.57943,3.69043 9.6367,-4.25543 c 0.28336,-1.81451 0.78302,-3.5456 -2.00934,-3.98739 -0.2834,-1.49678 0.0987,-3.19467 -2.94203,-3.27236 -0.96058,-3.32146 -2.94177,-1.80035 -4.39681,-1.45823 z"
-             style="fill:url(#linearGradient23922);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient23924);stroke-width:1.01858938px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="m 4.9560742,9.3549447 q -0.051398,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 4.0841866,9.3960627 3.9926057,9.3054163 3.9028938,9.2166389 3.8524309,9.080202 3.8019679,8.9428307 3.8019679,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261574,-0.047659 0.27941 [...]
+             style="stroke-width:0.76554155"
+             id="path4505" />
           <svg:path
-             sodipodi:nodetypes="cccc"
-             id="path6957-2"
-             d="m 327.03375,305.38316 -2.35379,5.75517 5.98861,-2.13721 c -0.64013,-2.65898 -1.48093,-4.20303 -3.63482,-3.61796 z"
-             style="fill:url(#linearGradient23926);fill-opacity:1;fill-rule:evenodd;stroke:#750000;stroke-width:1.01858938px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.83870963"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="m 7.0598182,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242883,0.029904 -0.066349,0.013083 -0.1467164,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 6.1879307,9.3960627 6.0963498,9.3054163 6.0066379,9.2166389 5.9561749,9.080202 5.905712,8.9428307 5.905712,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401749,-0.2289522 0.088777,-0.090646 0.2140002,-0.1383059 0.1261574,-0.047659 0.2794152 [...]
+             style="stroke-width:0.76554155"
+             id="path4507" />
+        </svg:g>
+        <svg:g
+           aria-label="123"
+           style="font-style:normal;font-weight:normal;font-size:2.13862514px;line-height:125%;font-family:sans-serif;letter-spacing:0.85545003px;fill:#ff6600;stroke-width:0.85545003"
+           id="text4219-8"
+           transform="matrix(0.85835226,0,0,0.85051417,-0.02672019,18.200818)">
           <svg:path
-             id="path6967-1"
-             d="M 355.75487,289.96188 340.70818,304.763"
-             style="fill:none;stroke:#000000;stroke-width:0.39962694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="M 9.9111806,9.5375814 H 9.0695146 V 9.3788554 H 9.3932323 V 8.3366933 H 9.0695146 V 8.1946752 q 0.065788,0 0.1409738,-0.010442 0.075186,-0.011487 0.1138233,-0.032372 0.048036,-0.026106 0.075186,-0.065788 0.028195,-0.040726 0.032372,-0.1086021 h 0.1618588 v 1.4013843 h 0.3174522 z"
+             style="stroke-width:0.85545003"
+             id="path4512" />
           <svg:path
-             id="path7011-7"
-             d="m 335.35391,297.57011 -6.17208,7.70774"
-             style="fill:none;stroke:#000000;stroke-width:0.09990674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="M 12.217094,9.5375814 H 11.16449 V 9.3193331 q 0.109646,-0.093983 0.219293,-0.1879651 0.11069,-0.093983 0.205717,-0.1869209 0.200496,-0.1942306 0.274638,-0.3080539 0.07414,-0.1148676 0.07414,-0.2474874 0,-0.121133 -0.08041,-0.1890093 -0.07936,-0.068921 -0.222425,-0.068921 -0.09503,0 -0.205717,0.033416 -0.110691,0.033416 -0.21616,0.1023365 h -0.01044 V 8.0474359 q 0.07414,-0.036549 0.197364,-0.066832 0.124265,-0.030283 0.240177,-0.030283 0.239134,0 0.374886,0.1159118 0.135 [...]
+             style="stroke-width:0.85545003"
+             id="path4514" />
           <svg:path
-             id="path7013-4"
-             d="m 338.29299,300.97585 c -0.2939,0.11951 -8.17065,5.55674 -8.17065,5.55674"
-             style="fill:none;stroke:#000000;stroke-width:0.09990674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
+             inkscape:connector-curvature="0"
+             d="m 14.29745,8.7888538 q 0.05012,0.044903 0.0825,0.1127791 0.03237,0.067876 0.03237,0.175434 0,0.1065136 -0.03864,0.1952749 -0.03864,0.088761 -0.108603,0.1545491 -0.07832,0.073097 -0.184832,0.108602 -0.105469,0.03446 -0.231824,0.03446 -0.129487,0 -0.254797,-0.031327 -0.12531,-0.030283 -0.205717,-0.066832 V 9.2535453 h 0.01566 q 0.08876,0.058478 0.20885,0.097115 0.120089,0.038637 0.231823,0.038637 0.06579,0 0.13993,-0.021929 0.07414,-0.021929 0.120089,-0.064744 0.04803,-0.04 [...]
+             style="stroke-width:0.85545003"
+             id="path4516" />
         </svg:g>
       </svg:g>
+      <svg:rect
+         y="16.000004"
+         x="5.4687501e-007"
+         height="16"
+         width="16"
+         id="rect6193-0-23-7-8-2-89-0-36-0"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+      <svg:g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="H:\FreeMind_Ikone\pencil.png"
+         transform="matrix(0.45468225,0,0,0.45468225,-145.93174,-111.11807)"
+         id="g6733-5">
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient23920);fill-opacity:1;fill-rule:evenodd;stroke:#550000;stroke-width:1.01904869;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 340.339,304.70358 15.30124,-14.82536 0.0255,-9.71272 -7.71931,0.11132 -17.09417,15.86926"
+           id="path6953-5"
+           sodipodi:nodetypes="ccccc" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient23922);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient23924);stroke-width:1.01858938px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 330.9211,296.04293 -3.86795,9.28298 3.57943,3.69043 9.6367,-4.25543 c 0.28336,-1.81451 0.78302,-3.5456 -2.00934,-3.98739 -0.2834,-1.49678 0.0987,-3.19467 -2.94203,-3.27236 -0.96058,-3.32146 -2.94177,-1.80035 -4.39681,-1.45823 z"
+           id="path6955-2"
+           sodipodi:nodetypes="ccccccc" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient23926);fill-opacity:1;fill-rule:evenodd;stroke:#750000;stroke-width:1.01858938px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.83870963"
+           d="m 327.03375,305.38316 -2.35379,5.75517 5.98861,-2.13721 c -0.64013,-2.65898 -1.48093,-4.20303 -3.63482,-3.61796 z"
+           id="path6957-2"
+           sodipodi:nodetypes="cccc" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:0.39962694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 355.75487,289.96188 340.70818,304.763"
+           id="path6967-1" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:0.09990674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 335.35391,297.57011 -6.17208,7.70774"
+           id="path7011-7" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:0.09990674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 338.29299,300.97585 c -0.2939,0.11951 -8.17065,5.55674 -8.17065,5.55674"
+           id="path7013-4" />
+      </svg:g>
     </svg:g>
   </svg:g>
 </svg:svg>
diff --git a/freeplane/resources/translations/Resources_af.properties b/freeplane/resources/translations/Resources_af.properties
index cdee823..f6fc010 100644
--- a/freeplane/resources/translations/Resources_af.properties
+++ b/freeplane/resources/translations/Resources_af.properties
@@ -260,6 +260,7 @@ EdgeProperties=Rand eienskappe
 EdgeStyleAction.hide_edge.text=Versteek rand
 EdgeStyleAction.horizontal.text=Horisontaal
 EdgeStyleAction.linear.text=Line\u00EAre
+EdgeStyleAsParentAction.text=As ouer
 EdgeWidthAction_width_parent.text=Ouer
 EdgeWidthAction_width_thin.text=Dun
 edit=&Wysig
@@ -289,6 +290,7 @@ enter_node_id=Voeg nodus ID
 enter_zoom=Voeg Zoem
 EnterPassword.text=Sleutel wagwoord in
 error=Fout
+error_applying_template=Kon nie XSL-sjabloon toepas nie.
 error_creating_directory=Kan nie gids vir afvoer skep nie.
 errornumber={0} foute
 ExecuteScript.available_modes_tooltip={0} is beskikbaar vir
@@ -323,6 +325,7 @@ extras=&Gereedskap
 f_button_unassigned=<geen aksie >
 FaqOpenURLAction.text=VGV
 file=&L\u00EAer
+file_already_exists=Die l\u00EAer {0} bestaan reeds. Wil jy dit oor dit skryf?
 file_not_accessible=L\u00EAer {0} is nie toeganklik nie
 file_not_found=L\u00EAer {0} nie gevind nie
 FileListFlavorHandler=Skakels na l\u00EAers
@@ -333,6 +336,7 @@ FileProperties_FileSize=L\u00EAergrootte:
 FileProperties_MainBranchCount=Aantal hooftakke:
 FileProperties_NeverSaved=Nooit gestoor nie
 FileProperties_NodeSelectionCount=Aantal uitgekose nodii:
+FileProperties_TotalLeafCount=Totale aantal blaar nodii:
 FileProperties_TotalNodeCount=Totale aantal nodii:
 FilePropertiesAction.text=Kaartstatistieke...
 FileRevisionsDialog.cancel=&Kanselleer
@@ -371,6 +375,7 @@ filter_node_level=Nodusvlak
 filter_not=&Nie
 filter_note=Nota
 filter_or=&Of
+filter_parent=Ouer teks
 filter_periodic_level=Periodiek
 filter_priority=Prioriteit
 filter_reminder=Herinnering
@@ -406,27 +411,244 @@ FontFamilyAction.text=Lettertipenaam
 FontSizeAction.text=Lettertipegrootte
 format=F&ormaat
 format_invalid_pattern=Nie 'n geldige patroon nie
+format_menu_edge_styles=Rand style
 format_panel=Formatteer
 formats_not_loaded=Formate kan nie gelaai word nie, l\u00EAer beskadig
 formula.EvaluateAllAction.text=Evalueer alles
 formula.menuname=Formules
 formula_editor=Wysig Formule
 ForwardAction.text=Gaan vorentoe
+Freeplane.progress.gettingPreferences=Kry voorkeure...
 Freeplane.progress.loadMaps=Laai kaarte...
+Freeplane.progress.settingPreferences=Instellings Voorkeure...
 FreeplaneHelpStarter.text=Help...
 FreeplaneHelpStarter.tooltip=Freeplane uitgebreide hulp
 GettingStartedAction.text=Oefening
+goto=Gaan na
+goto.noActions=Geen teiken nodii
+GotoLinkNodeAction.text=Gaan na skakel
+GotoNodeAction.text=Gaan na nodus met ID...
+GrabKeyDialog.common.cancel=Kanselleer
+GrabKeyDialog.common.ok=Oukei
+GrabKeyDialog.grab-key.assigned-to=Toegeken aan
+GrabKeyDialog.grab-key.assigned-to.none=Tans nie toegeken nie
+GrabKeyDialog.grab-key.clear=Maak skoon
+GrabKeyDialog.grab-key.remove=Verwyder
+GrabKeyDialog.grab-key.title=Voer nuwe sleutel in
+green=Groen
 help=&Help
+hot_keys=Kortpadsleutels
+hot_keys_table=Kortpadsleutels tabel
+html_export_based_on_headings=HTML afvoer - gebaseer op opskrifte
+html_export_fold_all=HTML Afvoer - Vou alles
+icon_0%=0%
+icon_100%=100%
+icon_25%=25%
+icon_50%=50%
+icon_75%=75%
+icon_addition=Byvoeging
+icon_attach=Kyk hier
+icon_audio=Klank
+icon_back=Terug
+icon_bee=Freeplane
+icon_bell=Onthou
+icon_bookmark=Uitstekend
+icon_broken-line=Gebreek
+icon_button_cancel=Nie Oukei nie
+icon_button_ok=Oukei
+icon_calendar=Datum
+icon_checked=Gemerk
+icon_clanbomber=Gevaarlik
+icon_clock=Tyd
+icon_clock2=Herinnering
+icon_closed=Geen toegang
+icon_decrypted=Ontsluit
+icon_desktop_new=Moenie vergeet nie
+icon_division=Afdeling
+icon_down=Af
+icon_edit=Verfyn
+icon_encrypted=Gesluit
+icon_executable=Uitvoerbaar
+icon_family=Familie
+icon_fema=Manlik & Vroulik
+icon_female1=Vroulik1
+icon_female2=Vroulik2
+icon_females=Vroue
+icon_flag=Rooi vlag
+icon_flag-black=Swart vlag
+icon_flag-blue=Blou vlag
+icon_flag-green=Groen vlag
+icon_flag-orange=Oranje vlag
+icon_flag-pink=Pienk vlag
+icon_flag-yellow=Geel vlag
+icon_folder=Vouer
+icon_forward=Vorentoe
+icon_freemind_butterfly=FreeMind
+icon_full-0=Prioriteit 0
+icon_full-1=Prioriteit 1
+icon_full-2=Prioriteit 2
+icon_full-3=Prioriteit 3
+icon_full-4=Prioriteit 4
+icon_full-5=Prioriteit 5
+icon_full-6=Prioriteit 6
+icon_full-7=Prioriteit 7
+icon_full-8=Prioriteit 8
+icon_full-9=Prioriteit 9
+icon_go=Groen Verkeerslig
 icon_gohome=Tuis
+icon_group=Groep
+icon_help=Vraag
+icon_hourglass=Besig om te wag
+icon_icon_not_found=Ikoon nie gevind nie
+icon_idea=Idee
+icon_image=Beeld
+icon_info=Info
+icon_internet=Internet
+icon_internet_warning=Internet waarskuwing
+icon_kaddressbook=Telefoon
+icon_kmail=E-pos
+icon_knotify=Musiek
+icon_korn=Posbus
+icon_ksmiletris=Ek is gelukkig
+icon_launch=Bekendstelling
+icon_licq=Mooi
+icon_list=Lys
+icon_Mail=Pos
+icon_male1=Man1
+icon_male2=Man2
+icon_males=Manne
+icon_menu=Ikoon
+icon_messagebox_warning=Belangrik
+icon_mindmap=Breinkaart
+icon_multiplication=Vermenigvuldiging
+icon_narrative=Verhaal
+icon_negative=Negatief
+icon_neutral=Neutraal
+icon_password=Sleutel
+icon_pencil=Om verfyn te word
+icon_penguin=Linux
+icon_positive=Positief
+icon_prepare=Geel verkeerslig
+icon_revision=Hersiening
+icon_revision-green=Hersiening groen
+icon_revision-pink=Hersiening pienk
+icon_revision-red=Hersiening rooi
+icon_smiley-angry=Kwaad
+icon_smiley-neutral=Geen gedagte nie
+icon_smiley-oh=Verbasend
+icon_smily_bad=Ek is nie verbaas nie
+icon_stop=Rooi verkeerslig
+icon_stop-sign=Stop
+icon_subtraction=Aftrek
+icon_unchecked=Nie meer gemerk nie
+icon_up=Op
+icon_user_icon=Gebruikersikone
+icon_very_negative=Baie Negatief
+icon_very_positive=Baie positief
+icon_video=Video
+icon_xmag=Om te bespreek
+icon_yes=Belangrik
+IconGroupPopupAction.arrows.text=Pyle
+IconGroupPopupAction.docs_folders.text=Dokumente en Vouers
+IconGroupPopupAction.flags.text=Vlae
+IconGroupPopupAction.math.text=Berekening
+IconGroupPopupAction.media.text=Media
+IconGroupPopupAction.miscellaneous.text=Ander
+IconGroupPopupAction.nature.text=Natuur
+IconGroupPopupAction.numbers.text=Getalle
+IconGroupPopupAction.office.text=Kantoor
+IconGroupPopupAction.people.text=Persone
+IconGroupPopupAction.rating.text=Gradering
+IconGroupPopupAction.signs.text=Tekens
+IconGroupPopupAction.smiley.text=Glimlaggie
+IconGroupPopupAction.time.text=Tyd
+IconGroupPopupAction.user.text=Gebruiker ikone
+IconProgressExtended10Action.text=Uitgebreide vordering 10%
+IconProgressExtended25Action.text=Uitgebreide vordering 25%
+IconProgressRemoveAction.text=Verwyder vordering
+icons=Ikone
+IconSelectionPlugin.text=Ikoon vanuit tabel...
 ImageFlavorHandler=Beeld (gebruik aparte l\u00EAer)
+import=Invoer
+ImportBranchAction.text=Vertakking...
+ImportLinkedBranchAction.text=Gekoppelde vertakkking
+ImportMindmanagerFiles.text=MindManager X5 kaart...
 ImportXmlFile.text=Voer XML-l\u00EAer in
+increase_branch_font_size=Groter lettertipe
+IncreaseNodeFontAction.text=Groter lettertipe
 invalid_export_file=Ongeldige uitvoerl\u00EAernaam
 invalid_file_msg=Kon nie l\u00EAer vir {0} vind nie
+ItalicAction.text=Kursief
+italicise_branch=Kursiveer
+java_version=Java weergawe: {0}
+latex_editor=Redigeer LaTeX Formule
+LatexDeleteLatexAction.text=Verwyder LaTeX formule
+LatexEditLatexAction.text=Redigeer LaTeX formule...
+LatexInsertLatexAction.text=Voeg LaTeX formule...
+latexPatternFormat=LaTeX
+LengthUnits.cm=cm
+LengthUnits.in=duim
+LengthUnits.mm=mm
+LengthUnits.pt=pt
+LengthUnits.px=px
+license=Lisensie: GPL 2 of later
+links=Skakel
+load=&Laai
+load_accelerator_presets=Laai
+main_menu=Kieslys
+ManageAddOnsDialog.activate=Aktiveer
+ManageAddOnsDialog.authored.by=deur {0}
+ManageAddOnsDialog.deactivate=Deaktiveer
+ManageAddOnsDialog.install=&Installeer
+ManageAddOnsDialog.search.file=Soek
 ManageAddOnsDialog.select.tooltip=Kies l\u00EAer
 ManageAddOnsDialog.status.downloading=Laai tans l\u00EAer af...
+map_background=Kaart agtergrond
+map_background_image=Agtergrondbeeld
+MapBackgroundClearAction.text=Maak skoon
+MapBackgroundColorAction.text=Agtergrondkleur
+MapBackgroundImageAction.text=Agtergrondbeeld...
+maps=Kaarte
+menu_clouds=Wolke
+menu_copy=Kopi\u00EBer
+menu_details=Besonderhede
+menu_encryption=Wagwoordbeskerming
+menu_extensions=Nodusuitbreidings
+menu_group=Nodusgroep
+menu_hoverView=Wenke
+menu_iconByCategory=Ikoon per kategorie ...
+menu_iconView=Ikone
+menu_image=Beeld
+menu_insert=Invoeg
+menu_latex_formula=LaTeX formule
+menu_moveNode=Beweeg en sorteer
+menu_newNode=Nuwe nodus
+menu_node=Nodus
+menu_nodes=&Nodii
+menu_nodeView=Noduskern
+menu_noteView=Notas
+menu_openmaps=Kaarte
+menu_remove_icons=Verwyder ikone
+menu_removeAttribute=Vertoon eienskappe
+menu_select=Kies
+menu_time=Tydsbestuur
+menu_title=Noduskern
+mindmap=Kaart
+MindMapNodesFlavorHandler=Nodushi\u00EBrargie
+mindmaps=Kaarte
+mindmaps_desc=Kaarte (*.mm)
+mindmaps_filter_desc=Filters (*.mmfilter)
+MinNodeWidth.text=Stel minimum nodusbreedte
 mode_File=L\u00EAermodus
+mode_title=Freeplane - {0}
+ModesMenuAction.Browse.text=Kaartblaaier
 ModesMenuAction.File.text=L\u00EAersoeker
+most_recent_files=Mees onlangse kaarte
+MoveAction.text=Skuif
 MoveSelectedNodeAction.CENTER.text=Sentreer geselekteerde nodus
+MoveToRootAction.text=Gaan na wortel
+NameConditionAction.text=Stel naam
+navigate=&Navigeer
 NewerFileRevisionsFoundDialog.cancel.tooltip=Moenie hierdie l\u00EAer oopmaak nie
 NewerFileRevisionsFoundDialog.file_name=L\u00EAer
 NewerFileRevisionsFoundDialog.open.tooltip=Maak l\u00EAer oop selfs al is dit verouderd
@@ -458,9 +680,14 @@ undefined_error='n Onverwagse fout het voorgekom. Probeer asseblief die fout aan
 update_failed=Bywerking het misluk met boodskap {0}
 UpdateCheckAction.text=Kontroleer vir bywerkings
 updatecheckdialog=Venster vir bywerkingskontrolering
+updater.version.installed=Ge\u00EFnstalleerde weergawe
+updater.version.latest=Nuutste weergawe
 updater.version.noUpdateUrl=Geen bywerking URL of tuisblad vir hierdie byvoegsel.
+updater.version.unknown=onbekende
+updater.version.unreachable=Onbereikbare bron:
 UsePlainTextAction.text=Gebruik gewone teks
 userScripts=Skripte
+value_format=Waarde formaat
 version_up_to_date=Jy gebruik alreeds die nuutste programweergawe
 view=Besigtig
 web_resources=Webhulpbronne
diff --git a/freeplane/resources/translations/Resources_ca.properties b/freeplane/resources/translations/Resources_ca.properties
index a911a2d..9f5867e 100644
--- a/freeplane/resources/translations/Resources_ca.properties
+++ b/freeplane/resources/translations/Resources_ca.properties
@@ -103,7 +103,7 @@ BoldAction.text=Negreta
 boldify_branch=Ennegreix
 branch=Branca
 cancel=Cancel\u00B7la
-CancelAction.text=&Cancel\u00B7la
+CancelAction.text=Cancel\u00B7la
 cannot_add_parent_diff_parents=Tots els nodes cal que tinguin el mateix node pare per a utilitzar aquesta funci\u00F3.
 cannot_add_parent_to_root=El node arrel no pot afegir-se com un node pare.
 cannot_join_nodes_with_children=No es poden unir els nodes amb els fills
diff --git a/freeplane/resources/translations/Resources_cs.properties b/freeplane/resources/translations/Resources_cs.properties
index 3b85bba..221b36c 100644
--- a/freeplane/resources/translations/Resources_cs.properties
+++ b/freeplane/resources/translations/Resources_cs.properties
@@ -73,7 +73,7 @@ addons.installer.too.old=Aktu\u00E1ln\u00ED verze {0} Freeplane je zastaral\u00E
 addons.installer.unknown.deinstallation.rules=Nezn\u00E1m\u00E1 odinstala\u010Dn\u00ED pravidla {0}
 addons.installer.update=Aktualizace z verze {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">M\u011Bli byste instalovat pouze dopl\u0148ky z d\u016Fv\u011Bryhodn\u00FDch zdroj\u016F. \u0160kodliv\u00FD software m\u016F\u017Ee zp\u016Fsobit po\u0161kozen\u00ED dat nebo naru\u0161it va\u0161e soukrom\u00ED.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Atributy ze stylu
 AddStyleAttributes.tooltip=P\u0159idat atributy ze stylu uzlu
 AllMapsNodeListAction.text=Naj\u00EDt a nahradit ve v\u0161ech map\u00E1ch
@@ -84,7 +84,7 @@ antialias_edges=Vyhlazovat hrany
 antialias_none=Nevyhlazovat nic
 apply=Pou\u017E\u00EDt
 ApplyAction.text=Pou\u017E\u00EDt
-ApplyFormatPlugin.text=Zm\u011Bnit form\u00E1t
+ApplyFormatPlugin.text=Zm\u011Bnit form\u00E1t ...
 ApplyFormatPlugin.tooltip=Dialog, kde atributy uzl\u016F a hran mohou b\u00FDt m\u011Bn\u011Bn\u00E9 najednou.
 ApplyNoFilteringAction.text=Nefiltrov\u00E1no
 ApplySelectedViewConditionAction.text=Filtrovat vybran\u00E9 uzly
@@ -236,7 +236,7 @@ connector_lines=Spojovac\u00ED \u010D\u00E1ry
 connector_shapes=Tvar konektoru
 ConnectorColorAction.text=Barva konektoru...
 controls=Ovl\u00E1d\u00E1n\u00ED
-ConvertCloneToIndependentNodeAction.text=Odklonovat
+ConvertCloneToIndependentNodeAction.text=Zru\u0161it klonov\u00E1n\u00ED
 copy_name={0} (kop\u00EDrovat)
 CopyAction.text=Kop\u00EDrovat
 CopyAction.tooltip=Kop\u00EDrovat vybranou v\u011Btev
@@ -333,14 +333,14 @@ EditLongAction.text=Upravit j\u00E1dro uzlu v dialogu
 EditNoteInDialogAction.text=Upravit pozn\u00E1mku v dialogu
 EditScript=Upravit script...
 EditStylesAction.text=Upravit styly
-EncryptedMap.text=Vytvo\u0159it novou zak\u00F3dovanou mapu
+EncryptedMap.text=Nov\u00E1 chr\u00E1n\u011Bn\u00E1 (\u0161ifrovan\u00E1) mapa ...
 EncryptedMap.tooltip=Vytvo\u0159it novou zak\u00F3dovanou mapu
 encryption=Zaheslov\u00E1n\u00ED
 enter_base_url=Budu vkl\u00E1dat relativn\u00ED odkazy. Pros\u00EDm, vlo\u017Ete z\u00E1kladn\u00ED URL.
 enter_command=Vlo\u017Eit p\u0159\u00EDkaz
 enter_condition_name=Zadejte nov\u00FD n\u00E1zev podm\u00EDnky
 enter_confirms=Potvrdit vlo\u017Een\u00ED
-enter_keyset_name=Zadejte n\u00E1zev sady kl\u00E1vesov\u00FDch zkratek
+enter_keyset_name=Zadat n\u00E1zev sady kl\u00E1vesov\u00FDch zkratek
 enter_map_url=Zadejte URL mapy
 enter_new_style_name=Zadejte n\u00E1zev nov\u00E9ho stylu
 enter_node_id=Zadejte ID uzlu
@@ -363,10 +363,12 @@ ExecuteScripts.noScriptsAvailable=Nen\u00ED k dispozici
 ExecuteScripts.text=Skripty
 ExecuteScriptSecurityError.text=Do\u0161lo k chyb\u011B b\u011Bhem vykon\u00E1n\u00ED skriptu: {0}
 export_failed=Export selhal
+export_pdf_text=Portable Document Format (PDF)
+export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Export z Freeplane
 ExportAction.text=Exportovat...
 ExportAllPresentationsAction.text=Exportuj v\u0161echny prezentace do obr\u00E1zku form\u00E1tu PNG
-ExportBranchAction.text=P\u0159esunout v\u011Btve do nov\u00E9 mapy
+ExportBranchAction.text=P\u0159esunout v\u011Btev do nov\u00E9 mapy...
 ExportBranchToHTMLAction.text=Exportovat v\u011Btev do HTML
 exported_file={0} soubor
 ExportPdf.text=Jako PDF
@@ -477,7 +479,7 @@ filterConditions.noActions=\u017D\u00E1dn\u00E9 pojmenovan\u00E9 filtry
 filters_not_loaded=Nelze na\u010D\u00EDst filtr, soubor po\u0161kozen
 find=Najdi
 find_what=Naj\u00EDt co
-FindAction.text=Hledat
+FindAction.text=Naj\u00EDt...
 FindNextAction.text=Najdi n\u00E1sleduj\u00EDc\u00ED
 FindPreviousAction.text=Najdi p\u0159edchoz\u00ED
 fit_background_to_page=P\u0159izp\u016Fsob obr\u00E1zek na pozad\u00ED na jednu str\u00E1nku
@@ -700,12 +702,12 @@ ImageFlavorHandler=Obr\u00E1zek (samostatn\u00FD soubor)
 import=Importovat
 import_linked_branch_no_link=Vybran\u00FD uzel nem\u00E1 \u017E\u00E1dn\u00FD odkaz, ze kter\u00E9ho se d\u00E1 importovat.
 ImportAction.text=Import mapy
-ImportBranchAction.text=Importovat v\u011Btev
-ImportExplorerFavoritesAction.text=Importovat obl\u00EDben\u00E9 IExploreru
-ImportFolderStructureAction.text=Importovat strukturu slo\u017Eky
+ImportBranchAction.text=V\u011Btev...
+ImportExplorerFavoritesAction.text=Obl\u00EDben\u00E9 polo\u017Eky z Exploreru...
+ImportFolderStructureAction.text=Strukturu slo\u017Eky...
 ImportLinkedBranchAction.text=Importovat odkazovanou v\u011Btev
-ImportLinkedBranchWithoutRootAction.text=Importovat odkazovanou v\u011Btev bez ko\u0159enov\u00E9ho uzlu
-ImportMindmanagerFiles.text=Mapa MindManager X5
+ImportLinkedBranchWithoutRootAction.text=Odkazovanou v\u011Btev bez ko\u0159enov\u00E9ho uzlu...
+ImportMindmanagerFiles.text=Mapa MindManager X5...
 ImportXmlFile.text=Importuj soubor XML
 increase_branch_font_size=V\u011Bt\u0161\u00ED p\u00EDsmo
 IncreaseNodeFontAction.text=V\u011Bt\u0161\u00ED p\u00EDsmo
@@ -865,7 +867,7 @@ navigate=&Navigovat
 NavigationNextMapAction.text=Dal\u0161\u00ED mapa
 NavigationPreviousMapAction.text=P\u0159ede\u0161l\u00E1 mapa
 new=&Nov\u00FD
-new_map_from_user_templates.text=Nov\u00E1 mapa ze \u0161ablony
+new_map_from_user_templates.text=Nov\u00E1 mapa dle \u0161ablony...
 new_mindmap=Nov\u00E1 mapa
 new_node=Nov\u00FD uzel
 new_node_as_sibling_not_possible_for_the_root=Nem\u016F\u017Eete vlo\u017Eit nov\u00FD uzel na stejnou \u00FArove\u0148 jako je ko\u0159en
@@ -916,7 +918,7 @@ node_popup_scripting=Skripty
 node_selector=V\u00FDb\u011Br uzlu
 node_selector_message=Dvojklikem vyberete uzel
 node_styles=Styly uzlu
-NodeBackgroundColorAction.text=Barva pozad\u00ED uzlu
+NodeBackgroundColorAction.text=Barva pozad\u00ED uzlu...
 NodeColorAction.text=Barva uzlu...
 NodeColorBlendAction.text=M\u00EDsit barvu
 NodeDownAction.text=Uzel dol\u016F
@@ -947,7 +949,7 @@ ok=OK
 OKAction.text=V po\u0159\u00E1dku
 OnlineReference.text=Online mapy dokumentace
 open_asMindMap=my\u0161lenkov\u00E1 mapa
-OpenAction.text=Otev\u0159\u00EDt
+OpenAction.text=Otev\u0159\u00EDt ulo\u017Eenou mapu...
 OpenFreeplaneSiteAction.text=Domovsk\u00E9 str\u00E1nky Freeplane
 OpenMapsAddLocation.text=P\u0159idat um\u00EDst\u011Bn\u00ED map k otev\u0159en\u00ED...
 OpenMapsRemoveLocation.text=Odstranit um\u00EDst\u011Bn\u00ED map k otev\u0159en\u00ED
@@ -1141,6 +1143,7 @@ OptionPanel.ja=Japonsky / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Odd\u011Blova\u010D textu
 OptionPanel.key_type_action=P\u0159i stisknut\u00ED kl\u00E1vesy
 OptionPanel.Keystrokes=Kl\u00E1vesov\u00E9 zkratky
+OptionPanel.kn=Kannadsky / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=Korejsky / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Rodina p\u00EDsem
 OptionPanel.label_font_size=Velikost p\u00EDsma
@@ -1212,6 +1215,7 @@ OptionPanel.number_format=Standardn\u00ED \u010D\u00EDseln\u00FD form\u00E1t
 OptionPanel.number_format.tooltip=Vzor obsahuje "#" pro voliteln\u00E1, anebo "0" pro povinn\u00E1 \u010D\u00EDsla. P\u0159\u00EDklady: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=Po\u010Det rozd\u00EDlov\u00FDch soubor\u016F pro automatick\u00E9 ukl\u00E1d\u00E1n\u00ED
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> Po\u010Det r\u016Fzn\u00FDch soubor\u016F, mezi kter\u00FDmi se cykluje p\u0159i automatick\u00E9m ukl\u00E1d\u00E1n\u00ED.</html>
+OptionPanel.oc=Okcit\u00E1nsky
 OptionPanel.OK=Ulo\u017Eit
 OptionPanel.org.freeplane.plugin.bugreport=Pravidla
 OptionPanel.org.freeplane.plugin.bugreport.allowed=V\u017Edy odes\u00EDlat
@@ -1249,7 +1253,7 @@ OptionPanel.presentation.processesEscapeKey=Stisk "Esc" ukon\u010D\u00ED prezent
 OptionPanel.presentation.processesNavigationKeys=Pou\u017E\u00EDt \u0161ipky pro proch\u00E1zen\u00ED prezentac\u00ED
 OptionPanel.presentation.slideDisplaysAllNodes=Automaticky rozlo\u017Eit v\u0161echny uzly na sl\u00EDd\u011B
 OptionPanel.presentation.slowMotion=Pomal\u00FD pohyb
-OptionPanel.presentation.switchToFullScreen=Spus\u0165 celoobrazovkov\u00FD re\u017Eim
+OptionPanel.presentation.switchToFullScreen=Spustit celoobrazovkov\u00FD re\u017Eim
 OptionPanel.presentation.switchToSpotlight=Spus\u0165 bodov\u00E9 osv\u011Btlen\u00ED
 OptionPanel.presentation.zoom=Pou\u017Eij zv\u011Bt\u0161en\u00ED mapy
 OptionPanel.printonwhitebackground=<html>B\u00EDl\u00E9 pozad\u00ED pro tisk</html>
@@ -1526,7 +1530,7 @@ plugins/ScriptEditor.FORBIDDEN_ACTION=Skripty jazyka Groovy pro Freeplane jsou z
 plugins/ScriptEditor.menu_actions=Akce
 plugins/ScriptEditor.new_script=New Script[translate me]
 plugins/ScriptEditor.run=Spustit
-plugins/ScriptEditor.sign=Podepsat skript
+plugins/ScriptEditor.sign=Podepsat skript...
 plugins/ScriptEditor/window.Result=V\u00FDsledek:
 plugins/ScriptEditor/window.title=Editor skriptu
 plugins/ScriptingEngine.illegalAccessToInternalAPI=Nep\u0159\u00EDpustn\u00FD p\u0159\u00EDstup do vnit\u0159n\u00EDho programov\u00E9ho rozhran\u00ED (package {0}). Kontaktuje v\u00FDvojov\u00FD team Freeplanu, m\u00E1te-li dojem, \u017Ee skriptovac\u00ED API je nedostate\u010Dn\u00E9.
@@ -1560,16 +1564,16 @@ plugins/TimeManagement.xml_Replace_All=Nahradit v\u0161e
 plugins/TimeManagement.xml_Replace_Selected=Nahradit vybran\u00E9
 plugins/TimeManagement.xml_Select=Vybrat
 plugins/TimeManagement.xml_todayButton=Dnes
-plugins/TimeManagement.xml_WindowTitle=Kalend\u00E1\u0159
+plugins/TimeManagement.xml_WindowTitle=Spravovat \u010Das
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Naj\u00EDt a nahradit
 preferences=Nastaven\u00ED
 presentation=Prezentace
 presentation.combineAll=Kombinovat v\u0161echny prezentace
 print_preview_title=N\u00E1hled tisku
-PrintAction.text=Tisknout mapu
+PrintAction.text=Tisknout mapu...
 PrintDirectAction.text=Tisk
 printing_settings=Nastaven\u00ED tisku
-PrintPreviewAction.text=N\u00E1hled tisku
+PrintPreviewAction.text=N\u00E1hled tisku...
 program_terminates=Vnit\u0159n\u00ED chyba programu, program se ukon\u010D\u00ED.
 progress=Ikona pr\u016Fb\u011Bhu (%)
 PropertyAction.dialog=Nastaven\u00ED
@@ -1625,7 +1629,7 @@ save=&Ulo\u017Eit
 save_failed=Pokus ulo\u017Eit soubor mapy {0} selhal.
 save_unsaved=Ulo\u017Eit n\u00E1sleduj\u00EDc\u00ED mapu?
 save_unsaved_styles=Ulo\u017Eit styly?
-SaveAcceleratorPresetsAction.text=Ulo\u017Eit seznam kl\u00E1vesov\u00FDch zkratek
+SaveAcceleratorPresetsAction.text=Ulo\u017Eit sadu kl\u00E1vesov\u00FDch zkratek...
 SaveAction.text=Ulo\u017Eit
 SaveAction_readonlyMsg=Tato mapa je pouze ke \u010Dten\u00ED. Pro editaci mapu nejprve ulo\u017Ete.
 SaveAction_readonlyTitle=Pokus o ulo\u017Een\u00ED mapy otev\u0159en\u00E9 v re\u017Eimu pouze ke \u010Dten\u00ED
@@ -1633,13 +1637,13 @@ SaveAll.text=Ulo\u017Eit v\u0161echny mapy
 SaveAll.tooltip=Ulo\u017Eit v\u0161echny otev\u0159en\u00E9 mapy
 SaveAs_toReadonlyMsg={0} je pouze ke \u010Dten\u00ED. Pros\u00EDm, ulo\u017Ete do jin\u00E9ho souboru.
 SaveAs_toReadonlyTitle=Pokus o ulo\u017Een\u00ED souboru otev\u0159en\u00E9ho v re\u017Eimu pouze ke \u010Dten\u00ED
-SaveAsAction.text=Ulo\u017Eit jako
+SaveAsAction.text=Ulo\u017Eit mapu jako...
 saved=Ulo\u017Eeno
 saving_canceled=Ukl\u00E1d\u00E1n\u00ED zru\u0161eno
 scanners_not_loaded=Skenery nemohou b\u00FDt nahr\u00E1ny - soubor je po\u0161kozen
 scheme_evaluate=Vyhodnotit!
 script_execution_disabled=Spou\u0161t\u011Bn\u00ED skript\u016F je vypnuto, viz N\u00E1stroje/Nastaven\u00ED/Pluginy
-ScriptEditor.text=Editor skript\u016F
+ScriptEditor.text=Editor skript\u016F...
 ScriptEditor.tooltip=Umo\u017En\u00ED ps\u00E1t v\u011Bt\u0161\u00ED skripty uvnit\u0159 Freeplaneu.
 ScriptEditorPanel.changed_cancel=Skripty byly zm\u011Bn\u011Bny. Opravdu chcete zahodit zm\u011Bny?
 scripting=Skripty
@@ -1660,7 +1664,7 @@ select_menu_item_root_node=Menu
 select_template=Vyber \u0161ablonu
 SelectAllAction.text=Vybrat v\u0161echny viditeln\u00E9 uzly
 SelectBranchAction.text=Vybrat viditelnou v\u011Btev
-SelectedPasteAction.text=Vlo\u017E jako
+SelectedPasteAction.text=Vlo\u017Eit jako...
 selection_method_by_click=V\u00FDb\u011Br kliknut\u00EDm
 selection_method_delayed=Opo\u017Ed\u011Bn\u00FD automatick\u00FD v\u00FDb\u011Br
 selection_method_direct=V\u00FDb\u011Br uk\u00E1z\u00E1n\u00EDm
@@ -1678,7 +1682,7 @@ SetLinkAnchorAction.tooltip=<html>Nastav\u00ED vybran\u00FD uzel jako budouc\u00
 SetLinkAnchorAction.tooltip_anchored=<html>Nastav\u00ED vybran\u00FD uzel jako budouc\u00ED<br/> kotvu pro m\u00EDstn\u00ED i glob\u00E1ln\u00ED odkazy. Pr\u00E1v\u011B nastaven\u00E1 kotva:<br>{0}
 SetLinkByFileChooserAction.text=Nastavit odkaz (V\u00FDb\u011Brem souboru)...
 SetLinkByTextFieldAction.text=Nastavit odkaz (Zad\u00E1n\u00EDm)...
-SetNodeLink.text=Nastavit odkaz uzlu
+SetNodeLink.text=Nastavit odkaz uzlu...
 SetNoteWindowPosition.bottom.text=Spodek
 SetNoteWindowPosition.left.text=Vlevo
 SetNoteWindowPosition.right.text=Vpravo
@@ -1834,7 +1838,7 @@ simplyhtml.plainName=b\u011B\u017En\u011B
 simplyhtml.previewLabel=N\u00E1hled
 simplyhtml.previewText=N\u00E1hledu textu
 simplyhtml.prevTableCellLabel=P\u0159edchoz\u00ED bu\u0148ka
-simplyhtml.printLabel=Tisknout
+simplyhtml.printLabel=Tisknout...
 simplyhtml.redFontColorLabel=\u010Cerven\u00E1
 simplyhtml.redoLabel=Znovu
 simplyhtml.redoTip=Vp\u0159ed
diff --git a/freeplane/resources/translations/Resources_de.properties b/freeplane/resources/translations/Resources_de.properties
index 691793b..bf01855 100644
--- a/freeplane/resources/translations/Resources_de.properties
+++ b/freeplane/resources/translations/Resources_de.properties
@@ -28,7 +28,7 @@ accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (Mit verlinktem Bild der Min
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Ressourcen nach Taskjuggler...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Exportiert Ressourcen vom RESOURCES Knoten zu Taskjuggler. </html>
 accessories/plugins/ExportWithXSLT_TASKSTJI.text=Aufgaben nach Taskjuggler...
-accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Exportiert Aufgaben vom TASKS Knoten zu Taskjuggler. </html>
+accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Exportiert Aufgaben vom Tasks-Knoten zu Taskjuggler. </html>
 action_keystroke_in_use_error=Tastaturk\u00FCrzel {0} f\u00FCr {1} wird bereits f\u00FCr {2} verwendet
 active=Aktiv
 actual_map_styles=aktuell auf Knoten angewandte mindmapbezogene Stile
@@ -68,14 +68,14 @@ addons.installer.script.no.execution_mode=f\u00FCr {0} ist das Attribut "executi
 addons.installer.script.no.menulocation=f\u00FCr {0} ist das Attribut "menuLocation" nicht definiert
 addons.installer.script.no.menutitle=f\u00FCr {0} ist das Attribut "menuTitleKey" nicht definiert
 addons.installer.script.no.permissions=Keine Berechtigungen definiert f\u00FCr {0}
-addons.installer.success=Installation erfolgreich.\nDas neue Add-on wird nach einem Neustart zur Verf\u00FCgung stehen.
+addons.installer.success=Installation erfolgreich.\nDas neue Add-On wird nach einem Neustart zur Verf\u00FCgung stehen.
 addons.installer.success.update=Aktualisierung von {0} auf {1} war erfolgreich.\nEinige Funktionen k\u00F6nnten erst im Anschluss an einen Neustart verf\u00FCgbar sein.
 addons.installer.title=Einrichtung der Erweiterungen
-addons.installer.too.new=Die aktuelle Freeplane-Version {0} ist zu neu. Dieses Add-on wird nur bis {1} unterst\u00FCtzt.
-addons.installer.too.old=Die aktuelle Freeplane-Version {0} ist zu alt. Dieses Add-on braucht mindestens {1}.
+addons.installer.too.new=Die aktuelle Freeplane-Version {0} ist zu neu. Dieses Add-On wird nur bis {1} unterst\u00FCtzt.
+addons.installer.too.old=Die aktuelle Freeplane-Version {0} ist zu alt. Dieses Add-On braucht mindestens {1}.
 addons.installer.unknown.deinstallation.rules=Unbekannte Deinstallations-Regel(n): {0}
 addons.installer.update=Update von Version {0}
-addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Die Installation von AddOns sollte nur von vertrauensw\u00FCrdigen Quellen erfolgen. Schadsoftware k\u00F6nnte sonst einen Datenverlust hervorrufen oder zur Verletzung der Privatsph\u00E4re f\u00FChren.</strong></body></html>
+addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Die Installation von Add-Ons sollte nur von vertrauensw\u00FCrdigen Quellen erfolgen. Schadsoftware k\u00F6nnte sonst einen Datenverlust hervorrufen oder zur Verletzung der Privatsph\u00E4re f\u00FChren.</strong></body></html>
 addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Attribute von Stil
 AddStyleAttributes.tooltip=F\u00FCgt die Attribute der Stildefinition ein
@@ -120,7 +120,7 @@ attributes_edit_tooltip=Attribute bearbeiten
 attributes_for_selected=A&usgew\u00E4hlte Knoten
 attributes_for_visible=Alle &sichtbaren Knoten
 attributes_import=&Importieren
-attributes_import_tooltip=Attribute aus anderen geladenen Mindmaps Importieren
+attributes_import_tooltip=Attribute aus anderen geladenen Mindmaps importieren
 attributes_no_import_candidates_found=Keine neue Attribute gefunden
 attributes_popup_delete=Entfernen
 attributes_popup_down=Nach Unten
@@ -140,10 +140,10 @@ attributes_select_all=Alles
 attributes_select_all_tooltip=Alle ausw\u00E4hlen bzw. Auswahl l\u00F6schen
 attributes_show=Zeigen
 attributes_skip_root=&Ohne Wurzelknoten
-attributes_visible=Auswahl f\u00FCr Ansicht->Attribute->Ausgew\u00E4hlte Attribute Anzeigen
+attributes_visible=Auswahl f\u00FCr Ansicht->Attribute->Ausgew\u00E4hlte Attribute anzeigen
 attributes_visible_tooltip=Auswahl f\u00FCr Ansicht->Attribute->Ausgew\u00E4hlte Attribute anzeigen
 automatic_layout=Automatisches Layout (hierarchiebezogen)
-automatic_layout_disabled=(deaktiviert)
+automatic_layout_disabled=deaktiviert
 automatically_save_message=Mindmap wurde automatisch unter dem Dateinamen {0} gespeichert...
 AutomaticEdgeColor.FOR_BRANCHES=f\u00FCr Zweige
 AutomaticEdgeColor.FOR_COLUMNS=f\u00FCr Spalten
@@ -151,7 +151,7 @@ AutomaticEdgeColor.FOR_LEVELS=f\u00FCr Ebenen
 AutomaticEdgeColor.ON_BRANCH_CREATION=beim Erstellen eines Zweiges
 AutomaticEdgeColorHookAction.text=Automatische Linienfarbe
 AutomaticLayout.ALL=f\u00FCr alle Knoten
-AutomaticLayout.HEADINGS=f\u00FCr Knoten, die keine Bl\u00E4tter sind
+AutomaticLayout.HEADINGS=f\u00FCr Knoten, ohne letzte Ebene
 AutomaticLayout.level=Level {0}
 AutomaticLayout.level.root=Wurzel-Knoten
 AutomaticLayoutAction.text=Automatisches Layout
@@ -159,7 +159,7 @@ AutomaticLayoutAction.tooltip=<html>Formatiert die Knoten entsprechend  den Vorg
 AutomaticLayoutControllerAction.ALL.text=f\u00FCr alle Knoten
 AutomaticLayoutControllerAction.COLUMNS.text=f\u00FCr Spalten
 AutomaticLayoutControllerAction.HEADINGS.text=f\u00FCr alle Knoten, mit Ausnahme der letzten Ebene
-AutomaticLayoutControllerAction.null.text=(deaktiviert)
+AutomaticLayoutControllerAction.null.text=deaktiviert
 BackAction.text=Sprung zum Vorg\u00E4nger-Knoten
 BackAction.tooltip=<html>Springt zum vorhergehenden Knoten aus der<br/>Selektions-Historie der aktuellen Mindmap</html>
 background=Hintergrund
@@ -297,7 +297,7 @@ dropped_file_error=Konnte fallen gelassene Datei(en) nicht \u00F6ffnen. Grund: {
 edge=Linie
 edge_is_formatted_by_style=Die Eigenschaften der Knotenlinie werden durch den Knotenstil festgelegt. Zum \u00C4ndern bearbeiten Sie den entsprechenden Knotenstil.
 edge_style=Linienform
-edge_width=Linienbreite
+edge_width=Linienst\u00E4rke
 edge_widths=Kantenbreiten
 EdgeColorAction.text=Linienfarbe...
 EdgeProperties=Linieneigenschaften
@@ -338,11 +338,11 @@ EditAttributesAction.text=Attribute in-line bearbeiten
 EditDetailsAction.text=Knoten-Details in-line bearbeiten
 EditDetailsInDialogAction.text=Details im Editor bearbeiten
 editEdgeColors=Rahmenfarbe \u00E4ndern
-EditFilterAction.text=Filter erstellen
+EditFilterAction.text=Filter verwalten
 EditLongAction.text=Knoten-Text im Editor bearbeiten
 EditNoteInDialogAction.text=Notiz im Editor bearbeiten
 EditScript=Skript bearbeiten...
-EditStylesAction.text=Knoten-Stile bearbeiten
+EditStylesAction.text=Knotenstile bearbeiten
 elements=Elemente
 EncryptedMap.text=Neue verschl\u00FCsselte Mindmap...
 EncryptedMap.tooltip=Neue verschl\u00FCsselte Mindmap
@@ -365,8 +365,8 @@ errornumber={0} Fehler
 ExecuteScript.available_modes_tooltip={0} ist verf\u00FCgbar f\u00FCr
 ExecuteScript.script=Skript
 ExecuteScriptError.text=Fehler beim Ausf\u00FChren des Skripts:\n{0}
-ExecuteScriptForAllNodes.text=Alle Skripte dieser Mindmap ausf\u00FChren
-ExecuteScriptForSelectionAction.text=Alle Skripte dieses Knotens ausf\u00FChren
+ExecuteScriptForAllNodes.text=Alle Skripte ausf\u00FChren
+ExecuteScriptForSelectionAction.text=Skripte des gew\u00E4hlten Knotens ausf\u00FChren
 ExecuteScriptOnSelectedNode.text={0} f\u00FCr alle ausgew\u00E4hlten Knoten ausf\u00FChren
 ExecuteScriptOnSelectedNodeRecursively.text={0} rekursiv f\u00FCr ausgew\u00E4hlte Knoten ausf\u00FChren
 ExecuteScriptOnSingleNode.text={0} f\u00FCr einen ausgew\u00E4hlten Knoten ausf\u00FChren
@@ -375,6 +375,8 @@ ExecuteScripts.text=Skripte
 ExecuteScriptSecurityError.text=Beim Ausf\u00FChren des Skripts ist ein Fehler aufgetreten:\n{0}
 export=Exportieren
 export_failed=Export fehlgeschlagen
+export_pdf_text=Portables Dokumentenformat (PDF)
+export_svg_text=Skalierbare Vektorgrafik (SVG)
 export_using_xslt=Freeplane Export mittels XSLT
 ExportAction.text=Export...
 ExportAllPresentationsAction.text=Alle Pr\u00E4sentationen als PNG-Bild exportieren
@@ -484,7 +486,7 @@ filter_selected_node_view_snapshot=Gespeicherte Auswahl
 filter_style=Knotenstil
 filter_time=\u00C4nderungstag
 FilterCondition=Filterbedingungen
-filterConditions=benutzerdefinierte Filter
+filterConditions=Benutzerdefinierte Filter
 filterConditions.noActions=keine gespeicherten Filter
 filters_not_loaded=Filter konnte nicht geladen werden, die Datei ist besch\u00E4digt
 find=Finden
@@ -498,11 +500,11 @@ fit_map_to_page_height=Mindmap auf Seiten&h\u00F6he einpassen
 fit_map_to_page_width=Mindmap auf Seiten&breite einpassen
 FitToPage.text=Auf Seite einpassen
 FitToPage.tooltip=Stellt die Vergr\u00F6\u00DFerung so ein, dass die gesamte Mindmap in das aktuellen Fenster passt.
-fold=Einklappen
-FoldAllAction.text=Alles einklappen
-FoldAllAction.tooltip=<html>Klappt alle Unterknoten des selektierten Zweigs zu</html>
+fold=Falten / Entfalten
+FoldAllAction.text=Alles einfalten
+FoldAllAction.tooltip=<html>Faltet alle Unterknoten des selektierten Zweigs zu</html>
 FoldOneLevelAction.text=Letzte Ebene zuklappen
-FoldOneLevelAction.tooltip=<html>Klappt letzten Unterknoten des selektierten Zweigs um eine Ebene zu</html>
+FoldOneLevelAction.tooltip=<html>Faltet letzten Unterknoten des selektierten Zweigs um eine Ebene zu</html>
 follow_clone=In "{0}"
 follow_graphical_link=Gehe zu ''{0}''
 FollowLinkAction.text=Hyperlink folgen
@@ -513,7 +515,7 @@ format=&Format
 format_invalid_pattern=kein g\u00FCltiges Format
 format_menu_cloud_shapes=Wolke erstellen oder anpassen
 format_menu_edge_styles=Linienf&ormen
-format_menu_edge_widths=&Linienbreite
+format_menu_edge_widths=&Linienst\u00E4rke
 format_panel=Format
 FormatCopy.text=Knotenstil kopieren
 FormatCopy.tooltip=<html>Kopiert die Formatierung des Knotens in die Zwischenablage</html>
@@ -766,7 +768,7 @@ load_accelerator_presets=Sammlung laden
 load_accelerator_presets.noActions=Keine Voreinstellungen
 LoadAcceleratorPresetsAction.textPatterns.text=Textmuster
 locking_failed_by_open=Die Mindmap {0} ist in Benutzung. Daher wird sie schreibgesch\u00FCtzt ge\u00F6ffnet.
-locking_failed_by_save_as=Die Mindmap {0} ist in Benutzung. Daher wurde die Aktion "Speichern unter..." abgebrochen.
+locking_failed_by_save_as=Die Mindmap {0} ist in Benutzung. Daher wurde die Aktion " Mindmap speichern unter..." abgebrochen.
 locking_old_lock_removed=Die Mindmap {0} war in Benutzung durch den Benutzer {1}. Die Dateisperrung wurde aufgehoben, da sie veraltet war.
 long_node_changed_cancel=Knoten wurde ver\u00E4ndert. Wollen Sie diese \u00C4nderungen verwerfen?
 long_node_changed_submit=Knoten wurde ver\u00E4ndert. Wollen Sie diese \u00C4nderungen speichern?
@@ -780,7 +782,7 @@ MakeLinkFromAnchorAction.tooltip=<html>Erstellt einen lokalen bzw. globalen Hype
 MakeLinkToAnchorAction.text=Link von hier zum Anker
 MakeLinkToAnchorAction.tooltip=<html>erstellt einen lokalen bzw. globalen Hyperlink<br/>vom selektierten Knoten zum Bezugsknoten</html>
 manage_styles=Knotenstile verwalten
-ManageAddOnsAction.text=Add-ons...
+ManageAddOnsAction.text=Add-Ons...
 ManageAddOnsDialog.activate=Aktivieren
 ManageAddOnsDialog.activation.success={0} wird bei einem Neustart aktiviert.
 ManageAddOnsDialog.authored.by=von {0}
@@ -806,7 +808,7 @@ ManageAddOnsDialog.status.downloading=Datei wird heruntergeladen...
 ManageAddOnsDialog.status.installing=Add-On wird installiert...
 ManageAddOnsDialog.status.success={0} erfolgreich installiert.
 ManageAddOnsDialog.tab.install=Suchen und installieren
-ManageAddOnsDialog.tab.install.tooltip=Suchen und installieren von neuen Add-ons
+ManageAddOnsDialog.tab.install.tooltip=Suchen und installieren von neuen Add-Ons
 ManageAddOnsDialog.tab.manage=Add-Ons
 ManageAddOnsDialog.tab.manage.themes=Themen
 ManageAddOnsDialog.tab.manage.themes.tooltip=Verwaltung installierter Themen
@@ -820,7 +822,7 @@ map_background_image=Hintergrundbild
 map_corrupted=Die Mindmap ist nicht lesbar. M\u00F6chten Sie die Details sehen?
 map_load_error=Mindmap {0} konnte nicht geladen werden
 map_locked_by_open=Die Mindmap {0} ist in Benutzung durch den Benutzer {1}. Daher wird sie schreibgesch\u00FCtzt ge\u00F6ffnet.
-map_locked_by_save_as=Die Mindmap {0} ist in Benutzung durch den Benutzer {1}. Daher wurde die Aktion "Speichern unter..." abgebrochen.
+map_locked_by_save_as=Die Mindmap {0} ist in Benutzung durch den Benutzer {1}. Daher wurde die Aktion "Mindmap speichern unter..." abgebrochen.
 map_not_saved=Die Mindmap wurde noch nicht gespeichert.
 MapBackgroundClearAction.text=Leeren
 MapBackgroundColorAction.text=Hintergrundfarbe
@@ -917,7 +919,7 @@ NewLevelStyleAction.text=Neue "Automatisches Layout"-Ebene
 newmap.install.addon.question={0} scheint ein Add-On Paket zu sein.\nM\u00F6chten Sie es installieren?\n(W\u00E4hlen Sie "Nein" zum normalem \u00D6ffnen.)
 newmap.install.addon.title=Add-On installieren?
 NewMapAction.text=Neue Mindmap
-NewMapViewAction.text=Neue Mindmap Ansicht
+NewMapViewAction.text=Neue Mindmap-Ansicht
 NewParentNode.text=Oberknoten (vor)
 NewParentNode.tooltip=<html>Knoten um eine Position vom Wurzelknoten abr\u00FCcken</html>
 NewPreviousSiblingAction.text=Knoten oberhalb
@@ -928,7 +930,7 @@ NextNodeAction.BACK.text=Zum vorherigen Knoten
 NextNodeAction.BACK_N_FOLD.text=Zum vorherigen Knoten (Unterknoten falten)
 NextNodeAction.FORWARD.text=Zum n\u00E4chsten Knoten
 NextNodeAction.FORWARD_N_FOLD.text=Zum n\u00E4chsten Knoten (Unterknoten falten)
-NextPresentationItemAction.text=N\u00E4chsten Pr\u00E4sentationspunkt aufklappen
+NextPresentationItemAction.text=N\u00E4chsten Pr\u00E4sentationspunkt auffalten
 no=Nein
 no_copy_attributes_before_paste_attributes=Sie k\u00F6nnen ein Attribut erst dann einf\u00FCgen, wenn Sie ein anderes kopiert haben.
 NO_FORMAT=Text
@@ -971,7 +973,7 @@ not_saved_for_image_error=Die Mindmap muss gespeichert werden, bevor man ein Bil
 not_saved_for_link_error=Die Mindmap muss gespeichert werden, bevor ein Link per Dateiauswahl gesetzt werden kann
 note_window_location=Editor-&Position
 notes=Noti&z
-NotFoldingNextPresentationItemAction.text=N\u00E4chsten Pr\u00E4sentationsknoten aufklappen
+NotFoldingNextPresentationItemAction.text=N\u00E4chsten Pr\u00E4sentationsknoten auffalten
 NotificationOptions.CLOSE=Schlie\u00DFen
 NotificationOptions.REMIND_ME_LATER=Erinnere mich sp\u00E4ter
 NotificationOptions.REMOVE_REMINDER=Erinnerung entfernen
@@ -993,7 +995,7 @@ option_changes_may_require_restart=Die meisten Eigenschafts\u00E4nderungen werde
 OptionalDontShowMeAgainDialog.cancel=&Nein
 OptionalDontShowMeAgainDialog.dontShowAgain=Nicht wieder &fragen.
 OptionalDontShowMeAgainDialog.ok=&Ja
-OptionalDontShowMeAgainDialog.rememberMyDescision=&Entscheidung merken.
+OptionalDontShowMeAgainDialog.rememberMyDescision=&Entscheidung merken
 OptionPanel.absolute=Absolut
 OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Automatisches Layout
 OptionPanel.ADD_CHILD=Unterknoten hinzuf\u00FCgen
@@ -1006,7 +1008,7 @@ OptionPanel.always_load_last_maps.tooltip=Mindmaps nach obigen Einstellungen \u0
 OptionPanel.always_save_folding=immer
 OptionPanel.always_save_folding_state=Aktuelle Faltung immer speichern
 OptionPanel.always_save_folding_state.tooltip=Wenn diese Option ausgew\u00E4hlt wird, f\u00FChrt jedes Auf- bzw. Zuklappen einer Ebene dazu, dass die Mindmap als ver\u00E4ndert betrachtet wird. Beim Schlie\u00DFen von Freeplane wird dann nach dem Speicherwunsch gefragt.
-OptionPanel.always_show_less_than_N_nodes_after_load=Manche Knoten aufklappen
+OptionPanel.always_show_less_than_N_nodes_after_load=Manche Knoten auffalten
 OptionPanel.always_unfold_all_after_load=Keine Knoten falten
 OptionPanel.antialias=Darstellung
 OptionPanel.antialias.tooltip=<html>Bestimmt das Aussehen der Mindmap. Bitte beachten:<br>Je h\u00F6her die Kantengl\u00E4ttung ist, desto mehr Rechenzeit wird f\u00FCr die Darstellung ben\u00F6tigt.</html>
@@ -1093,7 +1095,7 @@ OptionPanel.edgecolor.tooltip=Linieneigenschaft der Verbindung zum Oberknoten (w
 OptionPanel.edgedash=Rahmenlinientyp
 OptionPanel.edgestyle=Linientyp
 OptionPanel.edgestyle.tooltip=Linieneigenschaft der Verbindung zum Oberknoten (wird auch auf alle Unterknoten angewendet)
-OptionPanel.edgewidth=Linienbreite
+OptionPanel.edgewidth=Linienst\u00E4rke
 OptionPanel.edgewidth.tooltip=Linieneigenschaft der Verbindung zum Oberknoten (wird auch auf alle Unterknoten angewendet)
 OptionPanel.EDIT_CURRENT=Inhalt \u00FCberschreiben
 OptionPanel.edit_on_double_click=Text bei &Doppel-Klick bearbeiten
@@ -1130,7 +1132,7 @@ OptionPanel.exported_image_resolution_dpi=Exportierte Bildaufl\u00F6sung (in DPI
 OptionPanel.Files=Dateien
 OptionPanel.first=Am Anfang
 OptionPanel.fit_to_viewport=Hintergrundbild auf Fenstergr\u00F6\u00DFe anpassen
-OptionPanel.fold_on_click_inside=Knoten beim Hineinklicken falten/entfalten
+OptionPanel.fold_on_click_inside=Knoten beim Hineinklicken falten / entfalten
 OptionPanel.foldingsymbolwidth=Gr\u00F6\u00DFe des Symbols, das die Faltung anzeigt
 OptionPanel.foldingsymbolwidth.tooltip=<html>Gr\u00F6\u00DFe des Kreises, der die Faltung symbolisiert</html>
 OptionPanel.fork=Linie
@@ -1176,6 +1178,7 @@ OptionPanel.ja=Japanisch / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Texttrennzeichen
 OptionPanel.key_type_action=Bei Tastendruck
 OptionPanel.Keystrokes=Tasten
+OptionPanel.kn=Kannada / Kanaresisch
 OptionPanel.ko=Koreanisch / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Schriftart
 OptionPanel.label_font_size=Schriftgr\u00F6\u00DFe
@@ -1195,7 +1198,7 @@ OptionPanel.linear=Linear
 OptionPanel.links=Links
 OptionPanel.links.tooltip=<html>Links k\u00F6nnen etweder relativ, oder absolut sein.</html>
 OptionPanel.load_folding=Faltungszustand der Mindmap laden
-OptionPanel.load_folding_from_map_default_fold_all=Von Mindmap laden oder alles einklappen
+OptionPanel.load_folding_from_map_default_fold_all=Von Mindmap laden oder alles einfalten
 OptionPanel.load_folding_from_map_default_unfold_all=Von Mindmap laden oder alles ausklappen
 OptionPanel.load_last_map=Automatisch letzte Mindmap laden
 OptionPanel.load_last_map.tooltip=<html>Wenn selektiert, l\u00E4dt Freeplane beim Start, automatisch die zuletzt ge\u00F6ffnete Mindmap.</html>
@@ -1246,6 +1249,7 @@ OptionPanel.number_format=Standard Zahlenformat
 OptionPanel.number_format.tooltip=Ein Muster das "#" f\u00FCr optionale, oder eine "0" f\u00FCr obligatorische Stellen enth\u00E4lt. Beispiel: "0.00" "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=Speichertiefe bei automatischen Speicherungen
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>Legt fest, wie viele Versionen einer Datei aufbewahrt werden. \u00C4ltere Dateien werden gel\u00F6scht. </html>
+OptionPanel.oc=Okzitanisch
 OptionPanel.OK=Speichern
 OptionPanel.org.freeplane.plugin.bugreport=Fehlerberichte senden
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Immer senden
@@ -1281,7 +1285,7 @@ OptionPanel.presentation.maxDropBoxRowCount=Maximale Reihen in Ausklappbox
 OptionPanel.presentation.maxDropBoxRowCount.tooltip=Anwenden f\u00FCr Pr\u00E4sentations- und Folienauswahl
 OptionPanel.presentation.processesEscapeKey=Pr\u00E4sentation mit <ESCAPE> beenden
 OptionPanel.presentation.processesNavigationKeys=Navigationstasten f\u00FCr die Steuerung der Pr\u00E4sentation
-OptionPanel.presentation.slideDisplaysAllNodes=Alle Foliennotizen automatisch aufklappen
+OptionPanel.presentation.slideDisplaysAllNodes=Alle Foliennotizen automatisch auffalten
 OptionPanel.presentation.slowMotion=Zeitlupe
 OptionPanel.presentation.switchToFullScreen=Vollbild aktivieren
 OptionPanel.presentation.switchToSpotlight=Rampenlicht aktivieren
@@ -1293,7 +1297,7 @@ OptionPanel.pt_PT=Portugiesisch (Portugal) / Portugu\u00EAs (Portugal)
 OptionPanel.RECT=Rechteck
 OptionPanel.rectangle=Rechteck
 OptionPanel.relative=Relativ
-OptionPanel.remind_type_of_new_nodes.tooltip=<html><ul><li>"Nachfragen" fr\u00E4gt nach</li><li></html>"Ja" zeigt den Richt-Text-Editor an</li><li>"Nein" verwendet den einfachen Text-Editor</li></ul></html>
+OptionPanel.remind_type_of_new_nodes.tooltip=<html><ul><li>"Nachfragen" fragt nach</li><li></html>"Ja" zeigt den Richt-Text-Editor an</li><li>"Nein" verwendet den einfachen Text-Editor</li></ul></html>
 OptionPanel.remind_use_rich_text_in_new_nodes=F\u00FCr eingef\u00FCgte Knoten erweiterte Formatierung verwenden
 OptionPanel.remindersBlink=Blinkende Erinnerung
 OptionPanel.remindersShowNotifications=Erinnerung erzeugt Benachrichtigungseinblendung
@@ -1321,7 +1325,7 @@ OptionPanel.script_user_key_name_for_signing=Optionaler Aliasname eines privaten
 OptionPanel.script_user_key_name_for_signing.tooltip=<html>Wenn Sie Ihre Skripte selbst signieren wollen, dann geben Sie hier einen Alias f\u00FCr den Schl\u00FCssel ein.<br>Es wird erwartet, dass der Schl\u00FCssel im Standard-Schl\u00FCsselspeicher ist.<br>Das geheime Passwort des Schl\u00FCssels muss mit dem Passwort des Schl\u00FCsselspeichers \u00FCbereinstimmen.</html>
 OptionPanel.scrollbar_increment=Geschwindigkeit
 OptionPanel.scrolling_speed=Geschwindigkeit beim Scrollen
-OptionPanel.scrollOnUnfold=Mindmap nach dem Aufklappen eines Knotens neu zentrieren
+OptionPanel.scrollOnUnfold=Mindmap nach dem Auffalten eines Knotens neu zentrieren
 OptionPanel.selection_method=Auswahlmodus
 OptionPanel.selection_method.tooltip=<html>Mit dem folgenden Schalter kann die verz\u00F6gerte Auswahl eines Schemas aktiviert bzw. deaktiviert werden.<br>\u00C4ndern Sie diese Option nicht, da sie ohnehin in auto.properties gespeichert werden.</html>
 OptionPanel.selection_method_by_click=Durch Mausklick
@@ -1414,7 +1418,7 @@ OptionPanel.shouldCenterSmallMaps=Kleine Mindmaps zentrieren
 OptionPanel.show_connectors=Verbindungslinien zeigen
 OptionPanel.show_icon_for_attributes=Icon f\u00FCr Attribut anzeigen
 OptionPanel.show_icons=Symbole zeigen
-OptionPanel.show_less_than_N_nodes_by_default_after_load=Gespeicherten Knotendarstellung von Mindmap laden bzw. manche Knoten aufklappen
+OptionPanel.show_less_than_N_nodes_by_default_after_load=Gespeicherten Knotendarstellung von Mindmap laden bzw. manche Knoten auffalten
 OptionPanel.show_node_tooltips=Notiz anzeigen
 OptionPanel.show_note_icon_in_tooltip=Notizsymbol in Tooltip zeigen
 OptionPanel.show_note_icons=Icon f\u00FCr Notiz anzeigen
@@ -1540,7 +1544,7 @@ PatternToString.Child=Stil des Unterknotens
 PatternToString.color=Farbe
 PatternToString.EdgeColor=Linienfarbe
 PatternToString.EdgeStyle=Linienform
-PatternToString.EdgeWidth=Linienbreite
+PatternToString.EdgeWidth=Linienst\u00E4rke
 PatternToString.FontBold=Fett
 PatternToString.FontItalic=Kursiv
 PatternToString.FontName=Schrift
@@ -1565,7 +1569,7 @@ plugins/ScriptEditor.new_script=&Neues Skript
 plugins/ScriptEditor.run=&Starten
 plugins/ScriptEditor.sign=Skript s&ignieren...
 plugins/ScriptEditor/window.Result=Ergebnis:
-plugins/ScriptEditor/window.title=Skripteditor
+plugins/ScriptEditor/window.title=Skript-Editor
 plugins/ScriptingEngine.illegalAccessToInternalAPI=Unerlaubter Zugriff auf die interne API (Paket {0}). - Bitte kontaktieren Sie das Freeplane-Team, falls die Skript-API nicht ausreicht.
 plugins/TimeList.xml_Created=Erzeugt
 plugins/TimeList.xml_Date=Termin
@@ -1597,7 +1601,7 @@ plugins/TimeManagement.xml_Replace_All=Alle ersetzen
 plugins/TimeManagement.xml_Replace_Selected=Markierte ersetzen
 plugins/TimeManagement.xml_Select=Ausw\u00E4hlen
 plugins/TimeManagement.xml_todayButton=Heute
-plugins/TimeManagement.xml_WindowTitle=Zeitmanagement
+plugins/TimeManagement.xml_WindowTitle=Zeit- und Aufgabenplanung
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Suchen & Ersetzen
 preferences=Einstellungen
 presentation=Pr\u00E4sentation
@@ -1622,7 +1626,7 @@ read_only=Schreibgesch\u00FCtzt
 ReadScriptError.text=Fehler beim Lesen des Skripts
 really_convert_to_current_version=<html>Diese Mindmap wurde mit einer \u00E4lteren Version von Freeplane erzeugt.<br>Soll sie konvertiert werden (empfohlen)?<br>Nicht konvertierte Mindmaps k\u00F6nnen evtl. nicht richtig angezeigt werden.</html>
 really_cut_node=Knoten wirklich ausschneiden?
-really_execute_script=Wollen Sie wirklich die Skripte in dieser Mindmap ausf\u00FChren? Es ist m\u00F6glich, dass diese Skripte Ihren Rechner besch\u00E4digen.
+really_execute_script=Wollen Sie wirklich die Skripte in dieser Mindmap ausf\u00FChren? Es ist m\u00F6glich, dass diese Skripte ihren Rechner besch\u00E4digen.
 really_remove_node=Knoten wirklich l\u00F6schen?
 really_remove_notes=Wollen Sie wirklich die Notizen l\u00F6schen?
 ReapplyFilterAction.text=Erneut anwenden
@@ -1683,13 +1687,13 @@ SaveAll.text=Alle Mindmaps speichern
 SaveAll.tooltip=Speichert alle ge\u00F6ffneten Mindmaps
 SaveAs_toReadonlyMsg={0} ist schreibgesch\u00FCtzt. Bitte eine andere Datei zum Speichern ausw\u00E4hlen.
 SaveAs_toReadonlyTitle=Versuche in eine schreibgesch\u00FCtzte Datei zu speichern
-SaveAsAction.text=Speichern unter...
+SaveAsAction.text=Mindmap speichern unter...
 saved=Gespeichert
 saving_canceled=Speichervorgang abgebrochen
 scanners_not_loaded=Scanner konnten nicht geladen werden, Datei korrupt
 scheme_evaluate=Auswerten!
-script_execution_disabled=Ausf\u00FChrung von Skripten ist deaktiviert, s. Extras/Einstellungen/Plugins
-ScriptEditor.text=Skripteditor...
+script_execution_disabled=Ausf\u00FChrung von Skripten ist deaktiviert, siehe Extras/Einstellungen/Plugins
+ScriptEditor.text=Skript-Editor...
 ScriptEditor.tooltip=Erm\u00F6glicht es Freeplane \u00FCber Skripte zu steuern.
 ScriptEditorPanel.changed_cancel=Die Skripte wurden ver\u00E4ndert. Wollen Sie wirklich abbrechen?
 scripting=Skripte
@@ -1745,7 +1749,7 @@ ShowFirstSlideAction.text=Erste Folie
 ShowFirstSlideAndStartPresentationAction.text=Pr\u00E4sentation von Beginn starten
 ShowFormatPanel.text=Werkzeugtafel
 ShowFormatPanel.tooltip=Dialog, in dem Knoten- und Kantenformate auf einmal ge\u00E4ndert werden k\u00F6nnen.
-ShowHideNoteAction.text=Editor einblenden
+ShowHideNoteAction.text=Editor anzeigen
 ShowHideNoteAction.tooltip=Damit kann man das Notizfenster verbergen bzw. wieder anzeigen.
 ShowLastSlideAction.text=Letzte Folie
 ShowNextChildAction.text=N\u00E4chsten Unterknoten anzeigen
@@ -1952,7 +1956,7 @@ slide.last=Letzter
 slide.next=N\u00E4chster
 slide.nofilter=Kein Filter
 slide.on_the_left.tooltip=auf der linken Seite
-slide.on_the_right.tooltip=auf der linken Seite
+slide.on_the_right.tooltip=auf der rechten Seite
 slide.placenode=Markierten Knoten platzieren
 slide.placenode.tooltip=wenn die Folie pr\u00E4sentiert wird
 slide.present=Pr\u00E4sentation starten
@@ -2040,7 +2044,7 @@ TextAlignAction.LEFT.text=Links ausgerichteter Text
 TextAlignAction.RIGHT.text=Rechts ausgerichteter Text
 textalignment=Textausrichtung
 TextChangeHotKeyAction.text=Tastenk\u00FCrzel f\u00FCr Text\u00E4nderung setzen
-TimeListAction.text=Zeitplan...
+TimeListAction.text=Zeit- und Aufgabenplanung
 TimeListAction.tooltip=Zeigt alle Wiedervorlagezeiten und die dazugeh\u00F6rigen Knoten.
 TimeManagementAction.text=Kalender anzeigen...
 TimeManagementAction.tooltip=<html>Zeigt das Kalender-Modul von Kai Toedter.</html>
@@ -2050,10 +2054,10 @@ TimePeriodUnits.minutes=Minuten
 TimePeriodUnits.ms=Millisekunden
 TimePeriodUnits.seconds=Sekunden
 TimePeriodUnits.weeks=Wochen
-ToggleChildrenFoldedAction.text=Unterknoten falten/entfalten
+ToggleChildrenFoldedAction.text=Unterknoten falten / entfalten
 ToggleDetailsAction.text=Knotendetails ein-/ausblenden
 ToggleFBarAction.text=Funktionstasten
-ToggleFoldedAction.text=Knoten falten/entfalten
+ToggleFoldedAction.text=Knoten falten / entfalten
 ToggleFullScreenAction.text=Vollbildmodus
 ToggleLeftToolbarAction.text=Icons
 ToggleMenubarAction.text=Men\u00FC
@@ -2076,10 +2080,10 @@ underlined=Unterstrichen
 UndoAction.text=R\u00FCckg\u00E4ngig
 UndoFilterAction.text=R\u00FCckg\u00E4ngig
 unfold=Entfalten
-UnfoldAllAction.text=Zweig aufklappen
-UnfoldAllAction.tooltip=<html>Klappt die Unterknoten des selektierten Zweigs auf</html>
-UnfoldOneLevelAction.text=Weitere Ebene aufklappen
-UnfoldOneLevelAction.tooltip=Klappt die selektierten Knoten eine weitere Ebene auf.
+UnfoldAllAction.text=Zweig auffalten
+UnfoldAllAction.tooltip=<html>Faltet die Unterknoten des selektierten Zweigs auf</html>
+UnfoldOneLevelAction.text=Weitere Ebene auffalten
+UnfoldOneLevelAction.tooltip=Faltet die selektierten Knoten eine weitere Ebene auf.
 unparsedLatexPatternFormat=LaTeX f\u00FCr Export
 up=Auf
 UpConditionAction.text=Auf
diff --git a/freeplane/resources/translations/Resources_es.properties b/freeplane/resources/translations/Resources_es.properties
index 5c9a527..464b84c 100644
--- a/freeplane/resources/translations/Resources_es.properties
+++ b/freeplane/resources/translations/Resources_es.properties
@@ -491,7 +491,7 @@ FoldAllAction.tooltip=<html>Dobla los nodos seleccionados y todos sus hijos.</ht
 FoldOneLevelAction.text=Dobla Un Nivel
 FoldOneLevelAction.tooltip=<html>Dobla un nivel de nodos seleccionados.</html>
 follow_clone=En "{0}"
-follow_graphical_link=Ir a:
+follow_graphical_link=Ir a ''{0}''
 FollowLinkAction.text=Ir a:
 font=Fuente
 FontFamilyAction.text=Familia de la Fuente
@@ -548,7 +548,7 @@ help=Ayuda
 HideableAction.tooltip=<html>Marca el fondo de cada nodo que se ha modificado.</html>
 HideAllAttributesAction.text=Esconder Todos los Atributos
 HierarchicalIcons2Action.text=Mostrar las intersecciones de los iconos hijos
-HierarchicalIconsAction.text=Mostrar Iconos Jer\u00E1rquicamente
+HierarchicalIconsAction.text=Mostrar iconos jer\u00E1rquicamente
 HierarchicalIconsAction.tooltip=Si uno de los hijos tiene un \u00EDcono, lo mostrar\u00E9 en un formato peque\u00F1o.
 hot_keys=Teclas de acceso r\u00E1pido
 hot_keys_table=Tabla con las teclas de acceso r\u00E1pido
@@ -696,9 +696,9 @@ IconSelectionPlugin.text=Seleccionar Icono...
 IconSelectionPlugin.tooltip=<html>Aqu\u00ED puede seleccionar un icono utilizando una subventana.</html>
 image_covertLink=Convertir enlace a imagen
 ImageFlavorHandler=Imagen (utilizar un archivo separado)
-import=Importar
+import=I&mportar
 import_linked_branch_no_link=El nodo seleccionado no tiene enlaces que importar.
-ImportAction.text=Importar
+ImportAction.text=Importar mapa
 ImportBranchAction.text=Rama...
 ImportExplorerFavoritesAction.text=Favoritos del Explorer...
 ImportFolderStructureAction.text=Estructura de Carpetas...
diff --git a/freeplane/resources/translations/Resources_et.properties b/freeplane/resources/translations/Resources_et.properties
index fc1b0db..9b1dd8c 100644
--- a/freeplane/resources/translations/Resources_et.properties
+++ b/freeplane/resources/translations/Resources_et.properties
@@ -186,7 +186,7 @@ filter_or=&v\u00F5i
 filter_select=&Vali
 filter_selected_node_view=Hetkel valitud s\u00F5lmed
 find_what=Mida otsida
-FindAction.text=Otsi...
+FindAction.text=&Otsi...
 fit_map_to_page=Mahuta \u00FChele lehek\u00FCljele
 FitToPage.text=Suurenda, et Mahutada lehele
 FitToPage.tooltip=Muuda suurendust selliselt, et kogu kaart mahub k\u00E4esolevasse aknasse.
@@ -414,7 +414,7 @@ OptionPanel.antialias_all=Pehmenda: fonte k\u00F5ikjal
 OptionPanel.antialias_edges=Pehmenda: servad
 OptionPanel.antialias_none=L\u00FClita kirja pehmendamine v\u00E4lja
 OptionPanel.Appearance=V\u00E4limus
-OptionPanel.ar=AR (araabia keel)
+OptionPanel.ar=Araabia / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
 OptionPanel.as_parent=Kui naaber
 OptionPanel.ask=K\u00FCsi
 OptionPanel.automatic=Automaatne
@@ -433,7 +433,7 @@ OptionPanel.cloud=Cloud[translate me]
 OptionPanel.combined=Kombineeritud
 OptionPanel.convert_to_current_version=<html>Teisenda kaardid automaatselt vanast Freeplane-i versioonist <br>k\u00E4esolevasse versiooni?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Ainult v\u00E4ga suurtele kaartidele, mida ei ole vaja teisendada <br>(see info on ekspertidele) v\u00F5id Sa avada vanemas vormingus kaarte neid k\u00E4esolevasse vormingusse teisendamata.</html>
-OptionPanel.cs=CS (t\u0161ehhi keel)
+OptionPanel.cs=T\u0161ehhi / \u010Desky
 OptionPanel.cut_nodes_without_question=L\u00F5igata s\u00F5lmed kinnitust k\u00FCsimata?
 OptionPanel.cut_nodes_without_question.tooltip=Kui see on valitud siis s\u00F5lmed l\u00F5igatakse kinnitust k\u00FCsimata. See v\u00F5ib p\u00F5hjustada informatsiooni kaotuse kui t\u00E4helepanuta kasutada.
 OptionPanel.da=DK (taani keel)
@@ -460,7 +460,7 @@ OptionPanel.edgestyle=\u00DChendusjoone stiil
 OptionPanel.edgestyle.tooltip=Naabers\u00F5lmega \u00FChendava joone omadused (kehtib samuti k\u00F5ikide teisi alams\u00F5lmi \u00FChendavate joonte kohta)
 OptionPanel.edgewidth=\u00DChendusjoone laius
 OptionPanel.edgewidth.tooltip=Naabers\u00F5lmega \u00FChendava joone omadused (kehtib samuti k\u00F5ikide teisi alams\u00F5lmi \u00FChendavate joonte kohta)
-OptionPanel.el=El[translate me]
+OptionPanel.el=Kreeka / \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
 OptionPanel.el__enter_confirms_by_default=Sisestusklahv (Enter) kinnitab vaikimisi
 OptionPanel.el__max_default_window_height=Suurim vaikimisi akna k\u00F5rgus
 OptionPanel.el__max_default_window_width=Suurim vaikimisi akna laius
@@ -503,9 +503,9 @@ OptionPanel.icon=Ikoon
 OptionPanel.icon.tooltip=Kui kehtestada siis s\u00F5lmele tekib t\u00E4pselt samasugune ikoon.
 OptionPanel.id=Id[translate me]
 OptionPanel.it=IT (itaalia keel)
-OptionPanel.ja=JA (jaapani keel)
+OptionPanel.ja=Jaapani / \u65E5\u672C\u8A9E
 OptionPanel.Keystrokes=Kiirklahvid
-OptionPanel.ko=KR (kanuri keel)
+OptionPanel.ko=Korea / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_size=Kirjakuju suurus
 OptionPanel.language=Keel
 OptionPanel.language.tooltip=<html>See on keel, mida programm kasutama peaks. 'automaatne' proovib laadida sisseloginud kasutajakeskkonna keele eelistust. </html>
@@ -553,7 +553,7 @@ OptionPanel.pt_PT=PT PT (portugali keel)
 OptionPanel.relative=Suhteline
 OptionPanel.remove_notes_without_question=Eemaldada m\u00E4rkmed kinnitust k\u00FCsimata?
 OptionPanel.remove_notes_without_question.tooltip=Kui see m\u00E4rkeruut on m\u00E4rgitud siis valitud s\u00F5lmede m\u00E4rkused eemaldatakse kinnitust k\u00FCsimata. See v\u00F5ib lohaka kasutuse tagaj\u00E4rjel tuua kaasa informatsiooni kaotuse.
-OptionPanel.ru=RU (vene keel)
+OptionPanel.ru=Vene / \u0420\u0443\u0441\u0441\u043A\u0438\u0439
 OptionPanel.script_user_key_name_for_signing=V\u00F5imalik kiirklahv allkirjastamiseks
 OptionPanel.script_user_key_name_for_signing.tooltip=<html>Kui soovid oma skripte allkirjastada, sisesta v\u00F5tme analoog siia. <br>See v\u00F5ti j\u00E4\u00E4b vaikimisi kiirklahvide hulka. <br>Salastatud v\u00F5tmete salas\u00F5na peab langema kokku kiirklahvide salas\u00F5naga (see on vaikimisi nii).</html>
 OptionPanel.selection_method=Valiku meetod
@@ -610,8 +610,8 @@ OptionPanel.sharp_linear=terav serv
 OptionPanel.show_icon_for_attributes=N\u00E4ita omaduste ikooni
 OptionPanel.signed_script_are_trusted=Usalda allkirjastatud skripte (soovitatav).
 OptionPanel.signed_script_are_trusted.tooltip=Kui skriptid on allkirjastatud usaldusv\u00E4\u00E4rsete partnerite poolt (nt Freeplane-i autori v\u00F5i Sinu enda poolt), siis see k\u00E4ivitatakse ilma piiranguteta.
-OptionPanel.sk=Sk[translate me]
-OptionPanel.sl=SL (sloveenia keel)
+OptionPanel.sk=Slovaki / sloven\u010Dina
+OptionPanel.sl=Sloveenia / sloven\u0161\u010Dina
 OptionPanel.standardbackgroundcolor=Standardne taustav\u00E4rv
 OptionPanel.standardbackgroundcolor.tooltip=<html>Standardne taustav\u00E4rv HTML-viidetes </html>
 OptionPanel.standardcloudcolor=Standardne pilve v\u00E4rv
@@ -636,7 +636,7 @@ OptionPanel.time_for_delayed_selection.tooltip=<html> S\u00F5lmede valiku viivit
 OptionPanel.toolTipManager.max_tooltip_width=Kohtspikri maksimaalne laius
 OptionPanel.toolTipManager.max_tooltip_width.tooltip=Maksimaalne kohtsprikri laius pikselites.
 OptionPanel.tr=TR (t\u00FCrgi keel)
-OptionPanel.uk_UA=Uk UA[translate me]
+OptionPanel.uk_UA=Ukrainia / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
 OptionPanel.undefined_font=M\u00E4\u00E4ramata kirjakuju
 OptionPanel.undo_levels=V\u00F5ta tasemed tagasi
 OptionPanel.undo_levels.tooltip=<html>M\u00E4\u00E4rab selle, kui mitu sammu tagasiv\u00F5tmiseks salvestatakse.</html>
@@ -646,12 +646,12 @@ OptionPanel.use_common_out_point_for_root_node=\u00DChendusjooned peas\u00F5lmeg
 OptionPanel.use_common_out_point_for_root_node.tooltip=\u00DChendusjooned peas\u00F5lmega algavad \u00FChest punktist
 OptionPanel.use_tabbed_pane=Kasuta kaarte
 OptionPanel.use_tabbed_pane.tooltip=Kui valitud siis kaarte n\u00E4idatakse sakkidena (nagu Firefoxis :-) ).
-OptionPanel.vi=Vi[translate me]
+OptionPanel.vi=Vietnami / Ti\u1EBFng Vi\u1EC7t
 OptionPanel.wheel_velocity=Kiirus
 OptionPanel.wheel_velocity.tooltip=Kaarti saab hiire rattaga kiiremini liigutada kui siia panna suurem v\u00E4\u00E4rtus.
 OptionPanel.windows=Windows
-OptionPanel.zh_CN=ZH CN (hiina keel)
-OptionPanel.zh_TW=ZH (hiina keel)
+OptionPanel.zh_CN=Hiina, lihtsustatud / \u7B80\u4F53\u5B57
+OptionPanel.zh_TW=Hiina, traditsiooniline / \u7E41\u9AD4\u5B57
 out_of_memory=Kogu m\u00E4lu on kasutusel.
 PageAction.text=Lehek\u00FClje seaded...
 PasteAction.text=Aseta
@@ -735,7 +735,7 @@ ResetNodeLocationAction.text=Taasta esialgne Paigutus
 save_failed={0} katse kaarti salvestada eba\u00F5nnestus.
 save_unsaved=Kas salvestada see m\u00F5ttekaart?
 SaveAction.text=&Salvesta
-SaveAll.text=Salvesta &k\u00F5ik avatud kaardid
+SaveAll.text=Salvesta &k\u00F5ik kaardid
 SaveAll.tooltip=Salvestab k\u00F5ik avatud kaardid
 SaveAsAction.text=Salvesta kaart k&ui...
 saved=Salvestatud
diff --git a/freeplane/resources/translations/Resources_fr.properties b/freeplane/resources/translations/Resources_fr.properties
index ca4c7a8..292c8e3 100644
--- a/freeplane/resources/translations/Resources_fr.properties
+++ b/freeplane/resources/translations/Resources_fr.properties
@@ -78,7 +78,7 @@ AddStyleAttributes.text=Ajouter des attributs par style
 AddStyleAttributes.tooltip=Ajouter des attributs bas\u00E9s sur le style du n\u0153ud
 AllMapsNodeListAction.text=Rechercher et remplacer dans toutes les cartes...
 always=Toujours
-AlwaysUnfoldedNodeAction.text=Noeud toujours d\u00E9pli\u00E9
+AlwaysUnfoldedNodeAction.text=N\u0153ud toujours d\u00E9pli\u00E9
 antialias_all=Tout lisser
 antialias_edges=Lisser les lignes
 antialias_none=Ne rien lisser
@@ -170,12 +170,12 @@ branch=Branche
 browse=Ouvrir...
 calendar_attributes_panel=Calendrier et attributs
 calendar_panel=Calendrier
-can_not_clone_encrypted_node=Impossible de cloner des noeuds s\u00E9curis\u00E9s
+can_not_clone_encrypted_node=Impossible de cloner des n\u0153uds crypt\u00E9s
 can_not_connect_to_info_server=Impossible de se connecter au serveur
 can_not_delete_predefined_style=Impossible de supprimer un style syst\u00E8me.
 can_not_delete_root_style=Impossible de supprimer le style du n\u0153ud racine
 can_not_delete_style_group=Impossible de supprimer ce type de style
-can_not_encrypt_cloned_node=Impossible de cloner des noeuds prot\u00E9g\u00E9s
+can_not_encrypt_cloned_node=Impossible de crypter des n\u0153uds clon\u00E9s
 can_not_save_key_set=Impossible d'enregistrer les touches de fonction
 cancel=Annuler
 CancelAction.text=Annuler
@@ -365,6 +365,8 @@ ExecuteScripts.noScriptsAvailable=Aucun script
 ExecuteScripts.text=Scripts
 ExecuteScriptSecurityError.text=Une erreur s''est produite pendant l''ex\u00E9cution du script : {0}
 export_failed=L'export a \u00E9chou\u00E9
+export_pdf_text=Fichier PDF (PDF)
+export_svg_text=Fichier image SVG (SVG)
 export_using_xslt=Exporter la carte
 ExportAction.text=Exporter la carte...
 ExportAllPresentationsAction.text=Exporter toutes les pr\u00E9sentations en images PNG
@@ -719,7 +721,7 @@ invalid_url_msg=Impossible de cr\u00E9er une URL valide pour {0}
 ItalicAction.text=Italique
 italicise_branch=Branche en italique
 java_version=Version Java : {0}
-JoinNodesAction.separator.format=Fusionner les noeuds avec "{0}"
+JoinNodesAction.separator.format=Fusionner les n\u0153uds avec "{0}"
 lastOpenedMaps=Fichiers r\u00E9cents
 lastOpenedMaps.noActions=Aucune carte dans l'historique
 latex_editor=Modifier la formule LaTeX
@@ -1144,6 +1146,7 @@ OptionPanel.ja=Japonais / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=S\u00E9parateur de texte
 OptionPanel.key_type_action=Saisie clavier hors d'un n\u0153ud
 OptionPanel.Keystrokes=Raccourcis clavier
+OptionPanel.kn=Kannada / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=Cor\u00E9en / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Police
 OptionPanel.label_font_size=Taille du texte
@@ -1212,6 +1215,7 @@ OptionPanel.number_format=Format des nombres
 OptionPanel.number_format.tooltip=<html>'#' indique un chiffre optionnel, '0' indique un chiffre obligatoire. Exemples : "0,00" ou "#0".<br>Le format peut aussi contenir des caract\u00E8res fixes. Exemples : "0,0%" ou "0,0#\u20AC"
 OptionPanel.number_of_different_files_for_automatic_save=Nombre de fichiers diff\u00E9rents pour la sauvegarde automatique
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>Nombre de fichiers (n) conserv\u00E9s lors des sauvegardes automatiques.<br>La sauvegarde est cyclique : la (n+1)e sauvegarde \u00E9crase la 1i\u00E8re.
+OptionPanel.oc=Occitan
 OptionPanel.OK=Enregistrer sous...
 OptionPanel.org.freeplane.plugin.bugreport=Pr\u00E9f\u00E9rence
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Toujours envoyer
@@ -1221,7 +1225,7 @@ OptionPanel.org.freeplane.plugin.bugreport.userid=Identifiant \u00E0 ajouter au
 OptionPanel.outline_hgap=Distance horizontale
 OptionPanel.outline_vgap=Distance verticale
 OptionPanel.oval=Ovale
-OptionPanel.paint_connectors_behind=Passer les connecteurs sous les noeuds
+OptionPanel.paint_connectors_behind=Afficher les connecteurs sous les n\u0153uds
 OptionPanel.parse_data=D\u00E9tecter la saisie de nombres et de dates
 OptionPanel.parse_data.tooltip=<html>D\u00E9tecter les nombres et dates et les formater automatiquement.<br>Exemples : 1 002,33 ou 31/12 ou 31/12/99 ou 31-12-1999 ou 31-12-1999 23:59
 OptionPanel.parse_formulas=Identifier les formules
@@ -1286,7 +1290,7 @@ OptionPanel.script_user_key_name_for_signing.tooltip=<html>Si vous d\u00E9sirez
 OptionPanel.scrollbar_increment=Vitesse
 OptionPanel.scrolling_speed=Vitesse de centrage automatique (de 1 \u00E0 30)
 OptionPanel.scrollOnUnfold=Centrer la carte lors du d\u00E9pliage
-OptionPanel.selection_method=S\u00E9lection de noeud
+OptionPanel.selection_method=S\u00E9lection de n\u0153ud
 OptionPanel.selection_method.tooltip=D\u00E9finit la mani\u00E8re de s\u00E9lectionner les n\u0153uds.
 OptionPanel.selection_method_by_click=Au clic
 OptionPanel.selection_method_delayed=Avec d\u00E9lai
@@ -1323,7 +1327,7 @@ OptionPanel.separator.icons=Ic\u00F4nes dans le menu "Ic\u00F4nes"
 OptionPanel.separator.Icons=Ic\u00F4nes
 OptionPanel.separator.initial_map_size=Taille initiale de la carte
 OptionPanel.separator.inline_editor=\u00C9dition de n\u0153ud dans la carte
-OptionPanel.separator.JoinNodesAction=Fusionner les noeuds
+OptionPanel.separator.JoinNodesAction=Fusionner les n\u0153uds
 OptionPanel.separator.key_typing=Saisie clavier
 OptionPanel.separator.language=Langue
 OptionPanel.separator.latex=LaTeX
diff --git a/freeplane/resources/translations/Resources_hr.properties b/freeplane/resources/translations/Resources_hr.properties
index 01f7667..e4a084c 100644
--- a/freeplane/resources/translations/Resources_hr.properties
+++ b/freeplane/resources/translations/Resources_hr.properties
@@ -364,6 +364,8 @@ ExecuteScripts.noScriptsAvailable=Nisu dostupne
 ExecuteScripts.text=Skripte
 ExecuteScriptSecurityError.text=Do\u0161lo je do pogre\u0161ke tijekom izvo\u0111enja skripte: {0}
 export_failed=Izvoz nije uspio
+export_pdf_text=Portable Document Format (PDF)
+export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Izvoz Freeplane mape pomo\u0107u XLST skripte
 ExportAction.text=Izvoz mape\u2026
 ExportAllPresentationsAction.text=Izvoz svih prezentacija u PNG slike
@@ -1138,11 +1140,12 @@ OptionPanel.IGNORE=Ne \u010Dini ni\u0161ta
 OptionPanel.il__enter_confirms_by_default="Enter" kao standardna potvrda unosa
 OptionPanel.image_cache=Za slike
 OptionPanel.indentationUsesTabsInTextOutput=Koristi tabulator u izlaznom tekst
-OptionPanel.it=talijanski
+OptionPanel.it=Talijanski / Italiano
 OptionPanel.ja=Japanski / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Razdjelnik teksta
 OptionPanel.key_type_action=Unos tipkovnicom
 OptionPanel.Keystrokes=Tipkovni\u010Dke kratice
+OptionPanel.kn=Kannadski / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=Korejski / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Oblik slova
 OptionPanel.label_font_size=Veli\u010Dina slova
@@ -1213,6 +1216,7 @@ OptionPanel.number_format=Standardi oblik broja
 OptionPanel.number_format.tooltip=Oblici brojeva mogu sadr\u017Eavati '#' za dodatnu znamenku ili '0' za obaveznu znamenku. Primjeri: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=Broj datoteka koje \u0107e biti automatski spremljene
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> Brojka n razli\u010Ditih datoteka u koje se spremaju Mentalne mape. Prvo automatsko spremanje se izvodi u prvu datoteku itd. do n+1 spremanja koje se opet izvodi u prvu datoteku (kru\u017Eno)</html>
+OptionPanel.oc=Okcitanski
 OptionPanel.OK=Spremi
 OptionPanel.org.freeplane.plugin.bugreport=Postavke sigurnosti
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Uvijek \u0161alji
@@ -1673,7 +1677,7 @@ SelectNoteAction.tooltip=Prebaci iz bilje\u0161ke u \u010Dvor
 set_accelerator_on_next_click_helpmessage=Za stvaranje nove tipkovni\u010Dke kratice kliknite na \u017Eeljenu komandu na izborniku.
 SetAccelerator.dialogTitle=Dodjeljivanje tipkovni\u010Dkih kratica
 SetAccelerator.keystrokeDetected=Tipkovni\u010Dka kratica ''{0}''nije dodana niti jednoj stavci izbornika.
-SetAcceleratorOnNextClickAction.text=Pridru\u017Ei tipkovni\u010Dku kraticu\u2026
+SetAcceleratorOnNextClickAction.text=Pridru\u017Ei tipkovni\u010Dku kraticu
 SetAlwaysUnfoldedNodeFlagsAction.text=Zadr\u017Ei rasklopljene \u010Dvorove
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=Sprije\u010Di rasklapnje za trenutno rasklopljene \u010Dvorove
 SetImageByFileChooserAction.text=Slike (Pretra\u017Eiva\u010D datoteka ili veza)...
diff --git a/freeplane/resources/translations/Resources_it.properties b/freeplane/resources/translations/Resources_it.properties
index d194713..08d8323 100644
--- a/freeplane/resources/translations/Resources_it.properties
+++ b/freeplane/resources/translations/Resources_it.properties
@@ -4,28 +4,30 @@ acceleratorPresets=Preset Tasti Rapidi
 accelerators_loading_error=Impossibile caricare acceleratori da {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=Cambia il formato dei nodi
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Cambia schema
-accessories/plugins/EncryptNode.properties_0=Scegli una password per i nodi cifrati
+accessories/plugins/EncryptNode.properties_0=Scegli la password per i nodi criptati
 accessories/plugins/EncryptNode.properties_1=Le password sono diverse o troppo corte.
-accessories/plugins/EncryptNode.properties_2=Inserisci password:
-accessories/plugins/EncryptNode.properties_3=Inserisci di nuovo la password:
-accessories/plugins/EncryptNode.properties_4=Inserisci la password.
+accessories/plugins/EncryptNode.properties_2=Inserire password:
+accessories/plugins/EncryptNode.properties_3=Inserire nuovamente la password:
+accessories/plugins/EncryptNode.properties_4=Inserire la password.
 accessories/plugins/EncryptNode.properties_5=<html>Ricorda che l'inviolabilit\u00E0 della cifratura<br> dipende quasi completamente dalla qualit\u00E0 della password inserita.
 accessories/plugins/EncryptNode.properties_6=OK
 accessories/plugins/EncryptNode.properties_7=Cancella
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=E' possibile modificare lo stato di criptatura di un nodo criptato. Inserire almeno un nodo usando il menu Strumenti.
 accessories/plugins/EncryptNode.properties_select_me=Selezionami per continuare!
 accessories/plugins/EncryptNode.properties_wrong_password=La password non \u00E8 corretta.
-accessories/plugins/ExportWithTWiki.text=Come TWiki...
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=Esporta la mappa per Java Web Start.
+accessories/plugins/ExportWithTWiki.text=TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Esporta la mappa come documento TWiki.
-accessories/plugins/ExportWithXSLT.tooltip=Questo \u00E8 un metodo di esportazione uniforme che usa scripts XSLT.
-accessories/plugins/ExportWithXSLT_Applet.text=Come Applet Java...
-accessories/plugins/ExportWithXSLT_Applet.tooltip=Esporta la mappa come "applet java".
+accessories/plugins/ExportWithXSLT.tooltip=Questo \u00E8 un metodo di esportazione uniforme.
+accessories/plugins/ExportWithXSLT_Applet.text=Applet Java...
+accessories/plugins/ExportWithXSLT_Applet.tooltip=Esporta la mappa come "java browser applet".
 accessories/plugins/ExportWithXSLT_HTML.text=In XHTML (versione JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=In XHTML (mappa cliccabile)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Risorse dal nodo RISORSE al file Gestore dei processi...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Esporta le risorse dal nodo RISORSE al modulo Gestore dei processi. </html>
 accessories/plugins/ExportWithXSLT_TASKSTJI.text=Compiti dal nodo PROCESSI al file Gestore dei processi...
-accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Esporta i compiti dal nodo PROCESSI al modulo Gestore dei processi. </html>
+accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Esporta i task dal nodo PROCESSI al modulo Gestore dei processi. </html>
 action_keystroke_in_use_error=Il tasto rapido {0} richiesto per l''azione {1} \u00E8 gi\u00E0 in uso per l''azione {2}
 active=Attivo
 actual_map_styles=Stile condizionale della mappa, applicato
@@ -33,6 +35,7 @@ actual_node_styles=Stile condizionale del nodo, applicato
 add=&Aggiungi
 AddConnectorAction.text=Aggiungere Collegamento Grafico
 AddElementaryConditionAction.text=Aggiungere
+AddExecutionLinkAction.text=Aggiungi collegamento ipertestuale per l'esecuzione di un comando di sistema operativo...
 AddLocalLinkAction.text=Aggiungere Collegamento Locale
 AddMenuItemLinkAction.text=Aggiungi collegamento ipertestuale alle voci del menu ...
 AddOnDetailsPanel.authored.by=Da {0}
@@ -57,6 +60,7 @@ addons.installer.no.scripts=Nessun Script trovato
 addons.installer.no.zipdata=Dati zip non trovati
 addons.installer.nonstandard.permissions=Lo Script richiede i seguenti permessi che attualmente non sono abilitati:  {0}.\nDevono essere aggiunti ai permessi standard ?
 addons.installer.one.child.expected=Atteso esattamente un figlio di {0}.
+addons.installer.script.name.suffix=Lo Script {0} non ha un suffisso tipo ".groovy"
 addons.installer.script.no.execution_mode=Nessun attributo "execution_mode" definito per {0}
 addons.installer.script.no.menulocation=Nessun attributo "menuLocation" definito per {0}
 addons.installer.script.no.menutitle=Nessun attributo "menuTitleKey" definito per {0}
@@ -86,13 +90,14 @@ ApplyNoFilteringAction.text=Nessun filtro
 ApplySelectedViewConditionAction.text=Filtra i nodi selezionati
 ApplyToVisibleAction.text=Applica ai nodi filtrati
 as_parent=Come Genitore
-AskForHelp.text=Chiedere Aiuto
-AssignAttributesAction.text=Assegna Attributi
+AskForHelp.text=Chiedere Aiuto nel forum
+AssignAttributesAction.text=Trova e sostituisci Attributi...
 attribute_delete=Cancella tutti i valori
 attribute_delete_value=Cancella questo valore
 attribute_font_size_tooltip=Attributo grandezza carattere
 attribute_list_box_label_text=Valori esistenti
 attribute_name=Nome Attributi
+attribute_name_or_value=Nome o valore attributo
 attribute_replace=Sostituisci con
 attribute_top=Tutti gli Attributi conosciuti per la mappa aperta
 attribute_value=Valore Attributi
@@ -134,6 +139,10 @@ attributes_visible_tooltip=Seleziona visibili
 automatic_layout=Formato Automatico
 automatic_layout_disabled=Disabilitato
 automatically_save_message=La mappa \u00E8 stata salvata automaticamente (usando il nome {0})...
+AutomaticEdgeColor.FOR_BRANCHES=per rami
+AutomaticEdgeColor.FOR_COLUMNS=per colonne
+AutomaticEdgeColor.FOR_LEVELS=per livelli
+AutomaticEdgeColor.ON_BRANCH_CREATION=alla creazione rami
 AutomaticEdgeColorHookAction.text=Colore Auto Collegamenti
 AutomaticLayout.ALL=Per tutti
 AutomaticLayout.HEADINGS=Per le intestazioni
@@ -142,6 +151,7 @@ AutomaticLayout.level.root=Nodo Principale
 AutomaticLayoutAction.text=Applica Stili Livelli
 AutomaticLayoutAction.tooltip=<html>Regola la formattazione della mappa. <br> Il primo livello nero, il secondo blu, etc.</html>
 AutomaticLayoutControllerAction.ALL.text=per tutti i nodi
+AutomaticLayoutControllerAction.COLUMNS.text=per colonne
 AutomaticLayoutControllerAction.HEADINGS.text=per i nodi terminali
 AutomaticLayoutControllerAction.null.text=disabilitato
 BackAction.text=Indietro
@@ -158,10 +168,12 @@ branch=Ramo
 browse=Esplora...
 calendar_attributes_panel=Calendario e Attributi
 calendar_panel=Calendario
+can_not_clone_encrypted_node=I nodi criptati non possono essere clonati
 can_not_connect_to_info_server=Connessione al server delle informazioni non riuscita
 can_not_delete_predefined_style=Non si pu\u00F2 cancellare lo stile predefinito
 can_not_delete_root_style=Non si pu\u00F2 cancellare lo stile del nodo Principale
 can_not_delete_style_group=Non si pu\u00F2 cancellare lo stile del gruppo
+can_not_encrypt_cloned_node=Non si possono criptare i nodi clone
 can_not_save_key_set=Salvataggio configurazione Tasti Rapidi, non riuscita
 cancel=&Annulla
 CancelAction.text=Annulla
@@ -169,7 +181,8 @@ cannot_add_parent_diff_parents=Tutti i nodi devono avere lo stesso genitore per
 cannot_add_parent_to_root=Il nodo radice non pu\u00F2 essere aggiunto ad un nuovo genitore.
 cannot_delete_root=Il nodo radice non pu\u00F2 essere cancellato o tagliato.
 cannot_join_nodes_with_children=Impossibile collegare i nodi con i figli
-cannot_move_to_child=Impossibile spostare un nodo ad uno dei figli
+cannot_move_into_child_node=Non si pu\u00F2 spostare in un nodo derivato
+cannot_move_to_child=Impossibile spostare un nodo ad uno dei sui derivati.
 CenterAction.text=Centra
 ChangeConnectorArrowsAction.backward.text=Indietro
 ChangeConnectorArrowsAction.both.text=Entrambe
@@ -187,18 +200,31 @@ ChangeNodeLevelRightsAction.tooltip=I nodi che si trovano alla destra del nodo c
 choose_cloud_color=Scegliere il colore della nuvola:
 choose_edge_color=Scegliere il colore collegamento
 choose_map_background_color=Scegliere il colore di sfondo della mappa
-choose_node_background_color=Scegliere il colore di sfondo del nodo
-choose_node_color=Scegliere il colore del nodo
+choose_node_background_color=Scegliere il colore di sfondo del nodo:
+choose_node_color=Scegliere il colore del nodo:
 ClearLinkAnchorAction.text=Cancella link \u00E0ncora
 ClearLinkAnchorAction.tooltip=<html>cancella il link \u00E0ncora precedentemente creato</html>
+CloneAction.text=incolla Clone
 close_btn=&Chiudi
-CloseAction.text=Chiudi
+CloseAction.text=&Chiudi mappa attuale
+CloseAllMapsAction.text=Chiudi tutte le mappe
+CloseAllOtherMapsAction.text=Chiudi tutte le altre mappe
+cloud_shapes=Forme nuvola
 CloudAction.text=Nuvola
-CloudColorAction.text=Colore nuvola
+CloudColorAction.text=Colore nuvola...
 CloudShapeAction.ARC.text=Arco
 CloudShapeAction.RECT.text=Rettangolo
 CloudShapeAction.ROUND_RECT.text=Rettangolo Arrotondato
 CloudShapeAction.STAR.text=Stella
+collection.copy.presentation=Copia presentazione
+collection.copy.slide=Copia Slide
+collection.delete=Cancella
+collection.down=Gi\u00F9
+collection.move=Muovi
+collection.moveTo=Muovi alla posizione
+collection.new.presentation=Nuova presentazione
+collection.new.slide=Nuova Slide
+collection.up=Su
 ColorProperty.ResetColor=Ripristina colore
 combined=Combinato
 condition=Condizione
@@ -209,13 +235,16 @@ connector_label=Etichetta del Collegamento grafico
 connector_lines=Linea del Collegamento grafico
 connector_shapes=Forma del Collegamento grafico
 ConnectorColorAction.text=Colore del Collegamento grafico...
-CopyAction.text=Copia
+controls=Controlli
+ConvertCloneToIndependentNodeAction.text=de-Clona
+copy_name={0} (copia)
+CopyAction.text=&Copia
 CopyAction.tooltip=Copia l'intero ramo
 CopyAttributes.text=Copia Attributi
 CopyIDAction.text=Copia l'ID del nodo
 CopyMapStylesAction.text=Copia lo stile della mappa...
 CopyNodeURIAction.text=Copiare URI del Nodo
-copyright=Copyright \u00A9 2000-2014 Freeplane team and others
+copyright=Copyright \u00A9 2000-2017 Freeplane team ed altri
 CopySingleAction.text=Copia Nodo (singolo)
 CopySingleAction.tooltip=Copia solo il nodo selezionato
 CopyStyleExtensionsAction.text=Copiare le estensioni dallo stile del nodo
@@ -223,14 +252,16 @@ corrupt_map=Il contenuto della mappa \u00E8 corrotto
 CreateConjunctConditionAction.text=E
 CreateDisjunctConditionAction.text=O
 CreateNotSatisfiedConditionAction.text=Non
-CreationModificationPluginAction.text=Visualizza i tempi di modifica
+CreationModificationPluginAction.text=Visualizza i tempi di &modifica
 CreationModificationPluginAction.tooltip=<html>Questa funzione tiene traccia dei tempi di modifica e creazione dei nodi.</html>
 current_dir=Mappe
-CutAction.text=Taglia
+CutAction.text=&Taglia
 decrease_branch_font_size=Diminuisci carattere
 DecreaseNodeFontAction.text=Diminuisci carattere
 default=Predefinito
+defaultAuxiliaryWordList=a, il, di
 DefaultColorAction.text=Colore predefinito
+defaultstyle.attributes=Attributi
 defaultstyle.details=Dettagli
 defaultstyle.floating=Nodo Flottante
 defaultstyle.note=Note
@@ -251,13 +282,16 @@ dialect_info.warning=Freeplane pu\u00F2 aprire, visualizzare o salvare non corre
 DirectHtmlFlavorHandler=HTML come nodo singolo
 DocumentationAction.text=Documentazione
 down=G&i\u00F9
+DownConditionAction.text=Gi\u00F9
 download=Scarica
 dropped_file_error=Impossibile aprire i file mancanti. Motivo: {0}
 edge=Collegamenti
 edge_is_formatted_by_style=Il colore dei Collegamenti \u00E8 controllato dallo Stile. Modificare lo Stile relativo, se necessario.
 edge_style=Stile Collegamenti
 edge_width=Spessore Collegamenti
-EdgeColorAction.text=Colore Collegamenti
+edge_widths=Larghezza bordo
+EdgeColorAction.text=Colore Collegamenti...
+EdgeProperties=Propriet\u00E0 bordo
 EdgeStyleAction.bezier.text=Curve arrotondate (bezier)
 EdgeStyleAction.bezier.tooltip=<html>Visualizza i collegamenti in modo arrotondatto.</html>
 EdgeStyleAction.hide_edge.text=Nascondi i Collegamenti
@@ -281,7 +315,7 @@ edit_details=Modifica Dettagli del nodo
 edit_end_label=<html>Etichetta<br>Collegamento Grafico
 edit_label_font_family=Carattere
 edit_label_font_size=Dimensione Carattere
-edit_link_manually=Inserire manualmente il collegamento ipertestuale (es. http://www.google.com)
+edit_link_manually=Inserire manualmente il collegamento ipertestuale (es. http://www.google.com)...
 edit_long_node=Modifica nodo avanzata
 edit_middle_label=<html>Etichetta<br>Centrale
 edit_note=Modifica Note
@@ -293,14 +327,17 @@ EditAction.text=Modifica nodo
 EditAttributesAction.text=Modifica Attributi
 EditDetailsAction.text=Modifica Dettagli del nodo
 EditDetailsInDialogAction.text=Modifica i dettagli del nodo, in una finestra separata
-EditFilterAction.text=Modifica...
-EditLongAction.text=Modifica avanzata nodo...
-EditNoteInDialogAction.text=Modifica note...
+editEdgeColors=Modifica colore bordo
+EditFilterAction.text=Comporre filtro
+EditLongAction.text=Modifica avanzata nodo
+EditNoteInDialogAction.text=Modifica note
 EditScript=Modifica Script...
 EditStylesAction.text=Modifica Stili
-EncryptedMap.text=Crea mappa criptata ...
+EncryptedMap.text=&Crea mappa criptata ...
 EncryptedMap.tooltip=Crea una nuova mappa criptata
+encryption=Criptatura
 enter_base_url=Sto incollando i collegamenti relativi. Immetti l'URL di base.
+enter_command=Inserire comando
 enter_condition_name=Inserire nuovo nome condizione
 enter_confirms=&Inserisci conferma
 enter_keyset_name=Inserire il nome del set di Tasti Rapidi
@@ -310,11 +347,13 @@ enter_node_id=Inserire l'ID del nodo
 enter_zoom=Inserire Zoom
 EnterPassword.text=Commuta Criptato / Non Criptato
 error=Errore
-error_applying_template=Errore nell'applicazione del modello XSL
+error_applying_template=Errore nell'applicazione del modello XSL.
 error_creating_directory=Impossibile creare directory per esportare.
 error_in_template=Errore nel modello della mappa di default {0}. Provare a rimuovere questo file.
 errornumber={0} errori
-ExecuteScriptError.text=Errore eseguendo lo script:\n   {0}\nControllare il file di Log per i dettagli.
+ExecuteScript.available_modes_tooltip={0} \u00E8 disponibile per
+ExecuteScript.script=Script
+ExecuteScriptError.text=Errore eseguendo lo script:\n   {0}\nControllare il file di Log per i dettagli
 ExecuteScriptForAllNodes.text=Eseguire tutti gli script
 ExecuteScriptForSelectionAction.text=Eseguire script nodo selezionato
 ExecuteScriptOnSelectedNode.text=Eseguire {0} su tutti i nodi selezionati
@@ -324,12 +363,14 @@ ExecuteScripts.noScriptsAvailable=Nessuno disponibile
 ExecuteScripts.text=Script
 ExecuteScriptSecurityError.text=E'' accaduto un errore durante l''esecuzione dello script: {0}
 export_failed=Esportazione fallita
-export_using_xslt=Esporta a Freeplane usando XSLT
-ExportAction.text=Esporta
+export_using_xslt=Esportazione Freeplane
+ExportAction.text=Esporta mappa...
+ExportAllPresentationsAction.text=Esporta tutte le presentazioni come immagini PNG
 ExportBranchAction.text=Ramifica come nuova mappa...
 ExportBranchToHTMLAction.text=Esporta ramo in HTML
 exported_file={0} file
 ExportPdf.text=In PDF...
+ExportPresentationAction.text=Esporta la presentazione attuale come immagine PNG
 ExportSvg.text=In SVG...
 ExportToHTMLAction.text=Come HTML
 ExportToImage.jpg.text=In JPEG...
@@ -344,12 +385,13 @@ ExternalImageAddAction.text=Aggiungi Immagine Esterna...
 ExternalImageChangeAction.text=Modifica Immagine Esterna...
 ExternalImageRemoveAction.text=Rimuovi Immagine Esterna
 ExtractLinkFromTextAction.text=Collegamenti ipertestuali dal testo
-ExtractLinkFromTextAction.tooltip=Setta i collegamenti ipertestuali trovati nei nodi di testo
+ExtractLinkFromTextAction.tooltip=Setta i collegamenti &ipertestuali trovati nei nodi di testo
 extras=&Strumenti
 f_button_unassigned=<nessuna azione>
 FaqOpenURLAction.text=FAQ
 file=&File
 file_already_exists=Il file {0} esiste gi\u00E0. Sovrascriverlo?
+file_not_accessible=File {0} non accessibile
 file_not_found=File {0} non trovato
 FileListFlavorHandler=Collegamenti ai files
 FileProperties_BranchLeafCount=Numero di nodi finali nei rami selezionati:
@@ -380,6 +422,8 @@ filter=Fi&ltra
 filter_add=&Aggiungi
 filter_and=E
 filter_any_text=Cuore, dettagli o note
+filter_clone_snapshot=I cloni salvati della selezione
+filter_clones=Cloni di selezione
 filter_conditions=Filtri
 filter_contains=Contiene
 filter_created_after=Creato dopo
@@ -400,7 +444,7 @@ filter_link=Collegamento Ipertestuale
 filter_match_approximately=&Approssima
 filter_match_approximately_tooltip=<html>Ricerca approssimata,<br/>ad esempio cercando 'casa' trover\u00E0 anche 'case'.</html>
 filter_match_case=&Maiuscole/minuscole
-filter_match_case_tooltip=Verifica la corrispondenza Maiuscole e minuscole
+filter_match_case_tooltip=Verifica la corrispondenza Maiuscole e minuscole.
 filter_modified_after=Modificato dopo
 filter_modified_before=Modificato prima
 filter_no_filtering=Nessun filtro
@@ -426,11 +470,16 @@ filter_selected_node_view=Nodo selezionato correntemente
 filter_selected_node_view_snapshot=Selezione salvata
 filter_style=Stile
 filter_time=Filtra per data
-filters_not_loaded=Il filtro non pu\u00F2 essere caricato, file corrotto.
+FilterCondition=Condizioni filtro
+filterConditions=Filtri definiti dall'utente
+filterConditions.noActions=filtri senza nome
+filters_not_loaded=Il filtro non pu\u00F2 essere caricato, file corrotto
+find=Cerca
 find_what=Trova cosa
-FindAction.text=Trova...
+FindAction.text=&Trova...
 FindNextAction.text=Trova successivo
 FindPreviousAction.text=Trova precedente
+fit_background_to_page=Adatta l'immagine di sfondo ad una pagina
 fit_map_to_page=Adatta a una pagina
 fit_map_to_page_height=Adatta alla pagina in altezza
 fit_map_to_page_width=Adatta alla pagina in larghezza
@@ -441,7 +490,8 @@ FoldAllAction.text=Collassa tutti
 FoldAllAction.tooltip=<html>Collassa il nodo selezionato e tutti i suoi figli.</html>
 FoldOneLevelAction.text=Collassa di un livello
 FoldOneLevelAction.tooltip=<html>Collassa i nodi selezionati di un livello.</html>
-follow_graphical_link=Vai a:
+follow_clone=All''interno di ''{0}''
+follow_graphical_link=Vai a: ''{0}''
 FollowLinkAction.text=Segui collegamento
 font=Carattere
 FontFamilyAction.text=Tipo Carattere
@@ -456,7 +506,7 @@ FormatCopy.text=Copia formattazione
 FormatCopy.tooltip=<html>Copia il formato di un nodo.</html>
 FormatPaste.text=Incolla formattazione
 FormatPaste.tooltip=<html>Incolla la formattazione di un nodo.</html>
-formats_not_loaded=La formattazione non pu\u00F2 essere caricata, file corrotto.
+formats_not_loaded=La formattazione non pu\u00F2 essere caricata, file corrotto
 formula.error.attributeValueIsNull=Valore Attributo ''{0}'' \u00E8 nullo dopo la valutazione.
 formula.error.circularReference=Riferimento Circolare: La formula nel nodo ''{0}'' \u00E8 riferita a se stessa.
 formula.EvaluateAllAction.text=Valuta tutto
@@ -470,7 +520,7 @@ Freeplane.progress.buildScreen=Costruisci schermo...
 Freeplane.progress.createController=Crea Controllore...
 Freeplane.progress.createInitialMode=Crea modello iniziale...
 Freeplane.progress.endStartup=Termina avvio.
-Freeplane.progress.gettingPreferenceDirectories=Prendi directory preferenze
+Freeplane.progress.gettingPreferenceDirectories=Prendendo cartella preferenze...
 Freeplane.progress.gettingPreferences=Prendi preferenze
 Freeplane.progress.loadMaps=Carica Mappe...
 Freeplane.progress.propagateLookAndFeel=Propaga Aspetto del programma
@@ -481,6 +531,8 @@ freeplane_reverted=Freeplane_Ritorno_
 FreeplaneHelpStarter.text=Aiuto...
 FreeplaneHelpStarter.tooltip=Aiuto esteso di Freeplane
 GettingStartedAction.text=Per Iniziare
+goto=Vai
+goto.noActions=Nessun nodo destinatario
 GotoLinkNodeAction.text=Vai al collegamento
 GotoNodeAction.text=Vai al nodo con ID...
 GrabKeyDialog.common.cancel=Cancella
@@ -492,19 +544,19 @@ GrabKeyDialog.grab-key.remove=Elimina
 GrabKeyDialog.grab-key.remove-ask=Sei sicuro di volere rimuovere questa combinazione tasti?
 GrabKeyDialog.grab-key.title=Inserisci nuovo tasto
 green=Verde
-help=&?
+help=&Help
 HideableAction.tooltip=<html>Segnala lo sfondo di ogni nodo modificato.</html>
 HideAllAttributesAction.text=Nascondi tutti gli Attributi
 HierarchicalIcons2Action.text=Visualizza le Icone in modo gerarchico AND
-HierarchicalIconsAction.text=Visualizza le icone in modo gerarchico OR
+HierarchicalIconsAction.text=Visualizza le icone in modo gerarchico &OR
 HierarchicalIconsAction.tooltip=Visualizza le icone dei nodi figli, anche nei nodi genitori, se presenti anche in un solo nodo
 hot_keys=Tasti rapidi
 hot_keys_table=Tabella dei tasti rapidi
 HotKeyInfoAction.text=Elenco funzioni tasti
 html_export_based_on_headings=Esporta ad HTML - Basato su intestazioni
-html_export_fold_all=Esporta ad HTML - Collassa tutto
+html_export_fold_all=Esporta in HTML - Collassa tutto
 html_export_fold_currently_folded=Esporta in HTML - Collassa i collassati
-html_export_no_folding=Esporta ad HTML- Nessun collasso
+html_export_no_folding=Esporta in HTML- Nessun collasso
 html_problem=<html>Non \u00E8 possibile tradurre html<br><br>{0}
 icon_0%=0%
 icon_100%=100%
@@ -595,6 +647,9 @@ icon_penguin=Linux
 icon_positive=Positivo
 icon_prepare=Semaforo Giallo
 icon_revision=Revisione
+icon_revision-green=Revisione verde
+icon_revision-pink=Revisione rosa
+icon_revision-red=Revisione rossa
 icon_smiley-angry=Arrabbiato
 icon_smiley-neutral=Nessuna idea
 icon_smiley-oh=Sorpresa
@@ -612,7 +667,7 @@ icon_wizard=Magico
 icon_xmag=Da discutere
 icon_yes=Importante
 IconGroupPopupAction.arrows.text=Frecce
-IconGroupPopupAction.docs_folders.text=Documenti e Cartelle
+IconGroupPopupAction.docs_folders.text=&Documenti e Cartelle
 IconGroupPopupAction.flags.text=Bandiere
 IconGroupPopupAction.math.text=Matematica
 IconGroupPopupAction.media.text=Media
@@ -635,7 +690,8 @@ IconProgressIconDownAction.tooltip=Decrementa / inserisci Icona di Avanzamento (
 IconProgressIconUpAction.text=Incrementa Avanzamento
 IconProgressIconUpAction.tooltip=Decrementa / inserisci Icona di Avanzamento (0% -> 25% -> 50% -> 75% -> 100% + OK).
 IconProgressRemoveAction.text=Rimuovi indicatore Avanzamento
-IconProgressRemoveAction.tooltip=Rimuove l'icona di avanzamento e l'icona estesa
+IconProgressRemoveAction.tooltip=Rimuove l'icona di avanzamento e l'icona estesa.
+icons=Icone
 IconSelectionPlugin.text=Seleziona icona...
 IconSelectionPlugin.tooltip=<html>Qui \u00E8possibile selezionare un'icona usando una sottofinestra.</html>
 image_covertLink=Convertire Link in Immagine
@@ -643,12 +699,13 @@ ImageFlavorHandler=Immagine (In File separato)
 import=I&mporta
 import_linked_branch_no_link=Il seguente nodo non ha link da cui importare.
 ImportAction.text=Importa
-ImportBranchAction.text=Importa ramo...
-ImportExplorerFavoritesAction.text=Importa preferiti di Internet Explorer...
-ImportFolderStructureAction.text=Importa struttura cartella...
+ImportBranchAction.text=&Importa ramo...
+ImportExplorerFavoritesAction.text=Importa preferiti di Internet &Explorer...
+ImportFolderStructureAction.text=&Struttura cartella...
 ImportLinkedBranchAction.text=Importa ramo collegato
 ImportLinkedBranchWithoutRootAction.text=Importa senza radice
 ImportMindmanagerFiles.text=MindManager X5 Map...
+ImportXmlFile.text=Importa file xml
 increase_branch_font_size=Aumenta carattere
 IncreaseNodeFontAction.text=Aumenta carattere
 internal_error_tooltip=Errore interno. Consultare l''ultimo log file in {0} per maggiori informazioni.
@@ -660,10 +717,22 @@ invalid_url_msg=Impossibile creare URL valido per {0}
 ItalicAction.text=Corsivo
 italicise_branch=Corsivo sul ramo
 java_version=Versione Java: {0}
+JoinNodesAction.separator.format=Unisci nodi con "{0}"
+lastOpenedMaps=Mappe recenti
+lastOpenedMaps.noActions=Nessuna mappa in cronologia
+latex_editor=Modifica formula LaTeX
 LatexDeleteLatexAction.text=Rimuovi formula LaTeX
 LatexEditLatexAction.text=Modifica formula LaTeX...
+LatexInsertLatexAction.msg1=<html>Si sta tentando di inserire un <i> legacy</i> 3 formula LaTeX.<br/> Il nuovo modo di creare testi/formule  LaTeX \u00E8 descritto in questa pagina:</html>
+LatexInsertLatexAction.msg2=<html>In breve: <ul><li>utilizzare un prefisso "\\latex" nel testo del nodo o</li> <li><i>visualizza-> pannello strumenti</i>, quindi <i>corpo del testo-> formato-> Latex</i></li></ul></html>
 LatexInsertLatexAction.text=Aggiungere formula LaTeX...
-less_than_two_selected_nodes=Seleziona almeno due nodi per collegarli
+latexPatternFormat=LaTeX
+LengthUnits.cm=cm
+LengthUnits.in=in
+LengthUnits.mm=mm
+LengthUnits.pt=pt
+LengthUnits.px=px
+less_than_two_selected_nodes=Selezionare almeno due nodi per collegarli.
 license=Licenza
 license_text=<html>This program is free software; you can redistribute it and/or<br>modify it under the terms of the GNU General Public License<br>as published by the Free Software Foundation; either version 2<br>of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful,<br>but WITHOUT ANY WARRANTY; without even the implied warranty of<br>MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the<br>GNU General Public  [...]
 link_error=Errato collegamento "{0}" non caricato
@@ -672,6 +741,7 @@ link_not_found=Collegamento {0} non trovato.
 links=Collegamenti
 load=&Carica
 load_accelerator_presets=Carica
+load_accelerator_presets.noActions=Nessun preset
 LoadAcceleratorPresetsAction.textPatterns.text=Schemi di testo
 locking_failed_by_open=Blocco della mappa {0} fallito. Apertura in sola lettura.
 locking_failed_by_save_as=Blocco della mappa  {0} fallito. Azione "Salva come" annullata.
@@ -679,6 +749,7 @@ locking_old_lock_removed=La mappa {0} era in uso dall''utente {1}. Il blocco \u0
 long_node_changed_cancel=Sono stati apportati cambiamenti al nodo, annullare i cambiamenti ?
 long_node_changed_submit=Sono stati apportati cambiamenti al nodo, salvare i cambiamenti ?
 lots_of_links_warning=Si stanno per creare molti collegamenti allo stesso nodo, proseguire ?
+main_menu=Menu
 main_resource_directory=Risorse installazione: {0}
 MainView.errorUpdateText=Errore impostando il testo per il seguente input: {0}.
 MakeLinkFromAnchorAction.text=Crea collegamento da \u00E0ncora
@@ -720,12 +791,17 @@ ManageAddOnsDialog.visit.addon.page=Visitare la pagina add-on...
 ManageConditionalStylesAction.text=Gestione Stili Condizionali per le Mappe
 ManageNodeConditionalStylesAction.text=Gestione Stili Condizionali per i Nodi
 map_already_exists=La mappa esiste gi\u00E0. Sovrascriverla ?
+map_background=Sfondo mappa
+map_background_image=Immagine di sfondo
 map_corrupted=Mappa corrotta. Vedere dettagli?
 map_load_error=Non \u00E8 stato possibile caricare la mappa {0}
 map_locked_by_open=La mappa {0} \u00E8 utilizzata dall''utente {1}. Apertura in sola lettura.
 map_locked_by_save_as=La mappa {0} \u00E8 utilizzata dall''utente {1}. Azione "Salva come" annullata.
 map_not_saved=La mappa non \u00E8 stata salvata precedentemente
+MapBackgroundClearAction.text=Cancella
 MapBackgroundColorAction.text=Colore Sfondo Mappa
+MapBackgroundImageAction.text=Immagine di sfondo...
+maps=Mappe
 MaxNodeWidth.text=Impostare la massima larghezza del nodo
 menu_applyStyle=Applica Stile
 menu_attributes=&Attributi
@@ -752,6 +828,7 @@ menu_node_features=Caratteristiche nodi
 menu_nodes=&Nodi
 menu_nodeView=Cuore del Nodo
 menu_noteView=Note
+menu_openmaps=Mappe
 menu_remove_icons=Rimuovere le icone
 menu_removeAttribute=Rimuovere Attributi
 menu_select=Seleziona
@@ -770,13 +847,17 @@ mode_File=Modalit\u00E0 File
 mode_MindMap=Modalit\u00E0 MindMap
 mode_na=Modalit\u00E0 non disponibile
 mode_status=Modalit\u00E0 cambiata a {0}
+mode_StyleMap=Modifica stile
 mode_title=Freeplane -  {0}
 modes=Modalit\u00E0
 ModesMenuAction.Browse.text=Mappa del Browser
 ModesMenuAction.File.text=Esplora file
 ModesMenuAction.MindMap.text=Editor mappe mentali
 most_recent_files=&File recenti
+MoveAction.text=Muovi
 MoveSelectedNodeAction.CENTER.text=Centra il nodo selezionato
+MoveSelectedNodeAction.EAST.text=Muovi i nodi selezionati alla destra
+MoveSelectedNodeAction.WEST.text=Muovi i nodi selezionati alla sinistra
 MoveToRootAction.text=Vai al nodo centrale
 NameConditionAction.text=Imposta nome
 navigate=&Naviga
@@ -796,10 +877,11 @@ NewerFileRevisionsFoundDialog.file_name=File
 NewerFileRevisionsFoundDialog.file_size=Bytes
 NewerFileRevisionsFoundDialog.open=&Apri
 NewerFileRevisionsFoundDialog.open.tooltip=Apri file anche se potrebbero essere obsoleti
-NewerFileRevisionsFoundDialog.question=Trovata nuova versione di {0}!\nSi vuole aprire lo stesso {0} (guardare la prima riga) ?\nPer rimpiazzare {0} da un file di salvataggio automatico dalla lista\nselezionarlo e cliccare su ''Ripristina''.
+NewerFileRevisionsFoundDialog.question=Trovata nuova versione di {0}!
 NewerFileRevisionsFoundDialog.restore=Ripris&tina
-NewerFileRevisionsFoundDialog.restore.tooltip=Rimpiazzare  {0} con {1}
+NewerFileRevisionsFoundDialog.restore.tooltip=Rimpiazzare {0} con {1}
 NewerFileRevisionsFoundDialog.title=Nuova revisione del file trovata!
+NewFreeNodeAction.text=Nuovo nodo flottante
 NewLevelStyleAction.text=Aggiungere Stile di formattazione automatica
 newmap.install.addon.question={0} sembra esserci un pacchetto add-on\nSi vuole installare?\n(Selezionare "No" per aprirlo senza installarlo.)
 newmap.install.addon.title=Installare add-on ?
@@ -815,18 +897,21 @@ NextNodeAction.BACK.text=Nodo precedente
 NextNodeAction.BACK_N_FOLD.text=Nodo precedente (collassa)
 NextNodeAction.FORWARD.text=Nodo successivo
 NextNodeAction.FORWARD_N_FOLD.text=Nodo successivo (espandi)
+NextPresentationItemAction.text=Espandi prossimo elemento
 no=No
 no_copy_attributes_before_paste_attributes=Non si possono incollare Attributi, finch\u00E8 non vengono copiati prima.
 NO_FORMAT=Testo
 no_format_copy_before_format_paste=Non \u00E8 possibile incollare un formato finch\u00E9 non ne viene copiato uno.
-no_found_from=<html>Nessun <u>{0}</u> trovato da "{1}".
-no_more_found_from=<html>Non \u00E8 stato trovato nessun altro <u>{0}</u>  a partire dal nodo "{1}".
+no_found_from=<html>Nessun <u>{0}</u> trovato da"{1}".</html>
+no_more_found_from=<html>Non \u00E8 stato trovato nessun altro <u>{0}</u> a partire dal nodo "{1}".</html>
 no_previous_find=Nessun precedente trovato.
 no_styles_found_in_map=Non sono stati trovati stili nella mappa
+no_translation_strings_found=Non \u00E8 stata trovata nessuna stringa traducibile
 node=Nodo
 node_changed_discard_changes=Il nodo \u00E8 stato modificato, si vuole abbandonare le modifiche?
 node_is_write_protected=Il nodo destinatario \u00E8 protetto da scrittura.
 node_location_help=Trascinare per cambiare la posizione del nodo, ctrl+trascina cambia le distanze di tutti i nodi fratelli, doppio click e ctrl+doppio click ripristina la posizione standard.
+node_popup_scripting=Scripts
 node_selector=Selezione Nodo
 node_selector_message=Doppio Click seleziona Nodo
 node_styles=Stili Nodo
@@ -840,6 +925,10 @@ NodeListAction.text=Trova e sostituisci...
 NodeListAction.tooltip=Visualizza tutti i nodi come lista ricerche con le propriet\u00E0 del filtro.
 NodeShapeAction.bubble.text=Bolla
 NodeShapeAction.fork.text=Biforcazione
+NodeShapeAction.narrow_hexagon.text=Esagono stretto
+NodeShapeAction.oval.text=Ovale
+NodeShapeAction.rectangle.text=Rettangolo
+NodeShapeAction.wide_hexagon.text=Esagono largo
 NodeUpAction.text=Sposta Nodo sopra
 nonboldify_branch=Togli grassetto
 nonitalicise_branch=Togli corsivo
@@ -849,12 +938,19 @@ not_saved_for_link_error=La mappa deve essere salvata, prima di scegliere un col
 note_window_location=Posizione finestra delle note
 notes=Note
 NotFoldingNextPresentationItemAction.text=Espandi il prossimo elemento della presentazione
+NotificationOptions.CLOSE=Chiudi
+NotificationOptions.REMIND_ME_LATER=Posponi
+NotificationOptions.REMOVE_REMINDER=Elimina promemoria
+NotificationOptions.SELECT_NODE=Vai al promemoria
 ok=&OK
 OKAction.text=OK
 OnlineReference.text=Mappa documentazione Online
 open_asMindMap=Mappa Mentale
 OpenAction.text=Apri mappa salvata...
 OpenFreeplaneSiteAction.text=Homepage di Freeplane
+OpenMapsAddLocation.text=Aggiungi posizione OpenMaps...
+OpenMapsRemoveLocation.text=Rimuovi posizione OpenMaps
+OpenMapsViewLocation.text=Visualizza posizione OpenMaps
 OpenPathAction.text=Apri File
 OpenURLMapAction.text=Apri mappa dall'indirizzo...
 OpenUserDirAction.text=Apri la cartella utente
@@ -868,18 +964,22 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Format
 OptionPanel.ADD_CHILD=Aggiungi Nodo Figlio
 OptionPanel.ADD_SIBLING=Aggiungi Nodo Fratello
 OptionPanel.addons=Add-on
+OptionPanel.af=Afrikaans
 OptionPanel.always_fold_all_after_load=Collassa Tutto
 OptionPanel.always_load_last_maps=Apri sempre le ultime e le nuove mappe
 OptionPanel.always_load_last_maps.tooltip=Apri gli ultimi file come da opzioni precedenti, anche avviando Freeplane con doppio click su un file mappa
 OptionPanel.always_save_folding=sempre
 OptionPanel.always_save_folding_state=Salva sempre i cambiamenti allo stato di espansione/collasso
 OptionPanel.always_save_folding_state.tooltip=Se impostato, anche per la sola azione di espansione/collasso verr\u00E0 richiesto il salvataggio della mappa.
+OptionPanel.always_show_less_than_N_nodes_after_load=Collassa alcuni nodi
 OptionPanel.always_unfold_all_after_load=Espandi tutto
 OptionPanel.antialias=Antialias
 OptionPanel.antialias.tooltip=<html> Determina la qualit\u00E0 della mappa. Un antialias pi\u00F9 accurato richiede pi\u00F9 tempo.</html>
 OptionPanel.antialias_all=Antialias tutto
 OptionPanel.antialias_edges=Antialias collegamenti
 OptionPanel.antialias_none=No antialias
+OptionPanel.antialias_svg=Antialias SVGs
+OptionPanel.antialias_svg.tooltip=<html>Determina la qualit\u00E0 del rendering SVG. Maggiore Antialias ha bisogno di pi\u00F9 tempo.</html>
 OptionPanel.Appearance=Visualizzazione
 OptionPanel.approximate_search_threshold=Soglia di approssimazione
 OptionPanel.approximate_search_threshold.tooltip=<html>Soglia di approssimazione per il confronto<br/><font size="2">vedere http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(pi\u00F9 alto \u00E8 il valore, minore \u00E8 la tolleranza<br/>per i termini riconosciuti)</html>
@@ -894,6 +994,12 @@ OptionPanel.automaticFormat_level2=1. Livello, Formato del nodo
 OptionPanel.backup_file_number=Numero di file di Backup mantenuti
 OptionPanel.Behaviour=Comportamento
 OptionPanel.bezier=Bezier
+OptionPanel.border_color=Colore
+OptionPanel.border_color_matches_edge_color=Usa colore bordo
+OptionPanel.border_dash=Tipo di linea del bordo
+OptionPanel.border_dash_matches_edge_dash=Usa linea del bordo
+OptionPanel.border_width=Spessore linea
+OptionPanel.border_width_matches_edge_width=Usa spessore bordo
 OptionPanel.bubble=Bolla
 OptionPanel.ca=Catalano, Valenziano / Catal\u00E0
 OptionPanel.Cancel=Cancella
@@ -908,14 +1014,19 @@ OptionPanel.cloudcolor=Colore
 OptionPanel.cloudshape=Forma
 OptionPanel.combined=Combinato
 OptionPanel.compare_as_number=Confronta come Numeri
+OptionPanel.connector_arrows=Frecce connettore
+OptionPanel.connector_dash=Tipo linea
 OptionPanel.convert_to_current_version=<html>Convertire automaticamente le mappe create con vecchie versioni di Freeplane <br>alla versione attuale?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Solo per mappe molto grandi che non richiedono di essere convertite <br>(per utenti esperti) \u00E8 possibile aprire le mappe senza conversione.</html>
+OptionPanel.copyFormatToNewSibling=Copia il formato ad un nuovo nodo fratello
+OptionPanel.copyFormatToNewSiblingIncludesIcons=Copia formato con icone
 OptionPanel.cs=Ceco / \u010Desky
 OptionPanel.cut_nodes_without_question=Tagliare i nodi senza conferma?
 OptionPanel.cut_nodes_without_question.tooltip=Se selezionato, i nodi verranno tagliati senza richiesta di conferma. Questo pu\u00F2 causare perdita di dati, tagliando accidentalmente.
+OptionPanel.cut_out_pictures_when_pasting_html=Rimuovi le immagini dall'HTML
 OptionPanel.da=Danese / dansk
 OptionPanel.date_format=Formato data Standard
-OptionPanel.date_format.tooltip=Formati: "SHORT","MEDIUM","LONG","FULL" o una stringa tipo "MM/dd/yyyy"
+OptionPanel.date_format.tooltip=Formati: SHORT, MEDIUM, LONG, FULL o una stringa tipo "MM/dd/yyyy"
 OptionPanel.datetime_format=Formato data-ora standard
 OptionPanel.datetime_format.tooltip=Entrambe <stile data> e <stile ora> con i formati: "SHORT","MEDIUM","LONG","FULL" o una stringa tipo "M/dd/yyyy hh:mm"
 OptionPanel.de=Tedesco / Deutsch
@@ -931,6 +1042,7 @@ OptionPanel.default_browser_command_windows_9x.tooltip=<html>Per Windows (il seg
 OptionPanel.default_browser_command_windows_nt=Comando sfoglia predefinito Windows Nt
 OptionPanel.default_browser_command_windows_nt.tooltip=<html>Per Windows (il segno "" \u00E8 necessario a causa del collegamento, c'\u00E8 un "=" nel loro URL).</html>
 OptionPanel.default_charset=Codifica dei caratteri
+OptionPanel.default_save_dir=Directory di salvataggio di default
 OptionPanel.Defaults=Predefiniti
 OptionPanel.delete_automatic_saves_at_exit=Elimina i salvataggi automatici in uscita
 OptionPanel.delete_automatic_saves_at_exit.tooltip=<html> Se i file devono essere cancellati automaticamente in chiusura normale di Freeplane imposta le variabili seguenti a 'vero'</html>
@@ -942,6 +1054,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Visualizza l'editor in linea
 OptionPanel.display_node_id=Visualizza l'ID del nodo
 OptionPanel.edgecolor=Colore
 OptionPanel.edgecolor.tooltip=Propriet\u00E0 del collegamento al nodo genitore (viene applicato anche a tutti i figli)
+OptionPanel.edgedash=Tipo linea bordo
 OptionPanel.edgestyle=Stile
 OptionPanel.edgestyle.tooltip=Propriet\u00E0 del collegamento al nodo genitore (viene applicato anche a tutti i figli)
 OptionPanel.edgewidth=Spessore
@@ -962,6 +1075,7 @@ OptionPanel.en=Inglese / English
 OptionPanel.Environment=Ambiente
 OptionPanel.es=Spagnolo, Castiliano / espa\u00F1ol, castellano
 OptionPanel.et=Estone / eesti, eesti keel
+OptionPanel.eu=Basco
 OptionPanel.execute_scripts_without_asking=Abilitazione esecuzione script
 OptionPanel.execute_scripts_without_asking.tooltip=<html>Gli script di Freeplane sono principalmente in grado di effettuare qualsiasi azione sul computer. <br>Perci\u00F2, non eseguire script se non si \u00E8 sicuri di ci\u00F2 che si fa.
 OptionPanel.execute_scripts_without_exec_restriction=Permetti di eseguire altre applicazioni (SCONSIGLIATO)
@@ -976,8 +1090,10 @@ OptionPanel.experimental_file_locking_on=Blocco file aperti da altri utenti
 OptionPanel.experimental_file_locking_on.tooltip=<html> Se una mappa \u00E8 gi\u00E0 aperta da un utente, impedisce ad altri utenti di modificarla  </html>
 OptionPanel.export_icons_in_html=Esporta icone in Html
 OptionPanel.export_icons_in_html.tooltip=<html> Imposta se l'Html esportato da Freeplane pu\u00F2 contenere icone.<br> Il problema con le icone \u00E8 che spesso i collegamenti non vengono trovati nell'Html esportato.</html>
+OptionPanel.exported_image_resolution_dpi=Risoluzione immagine esportata (in DPI)
 OptionPanel.Files=Files
 OptionPanel.first=Primo
+OptionPanel.fit_to_viewport=Adatta l'immagine di sfondo alla finestra
 OptionPanel.fold_on_click_inside=Espandi/Collassa con click all'interno del nodo
 OptionPanel.foldingsymbolwidth=Contrai larghezza simboli
 OptionPanel.foldingsymbolwidth.tooltip=<html>Larghezza del cerchio di contrazione</html>
@@ -990,8 +1106,12 @@ OptionPanel.fr=Francese / Fran\u00E7ais
 OptionPanel.gl=Gallico / Galego
 OptionPanel.goto_note_end_on_edit=Posizionare il cursore alla fine, quando si modifica una nota.
 OptionPanel.grid_size=Dimensione intervallo Griglia
+OptionPanel.groovy_editor_font=Tipo di carattere per Groovy Syntax Highlighting Editor
+OptionPanel.groovy_editor_font.tooltip=Utilizzare "Dialog" o "monospaced" se servono i caratteri unicode !
+OptionPanel.groovy_editor_font_size=Dimensione del carattere per Groovy Syntax Highlighting Editor
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Nascondi Collegamenti
+OptionPanel.hide_single_end_connectors=Nascondi i connettori con fine singola
 OptionPanel.highlight_formulas=Evidenzia Formule
 OptionPanel.horizontal=Orizzontale
 OptionPanel.hr=Croato / hrvatski
@@ -1007,16 +1127,20 @@ OptionPanel.ic_file=Usa il disco
 OptionPanel.ic_ram=In RAM
 OptionPanel.icon=Icona
 OptionPanel.icon.tooltip=Se applicato, il nodo avr\u00E0 esattamente questa icona.
+OptionPanel.icon_size=Dimensione icona
 OptionPanel.icons.list=Lista delle icone standard visualizzate
 OptionPanel.icons.list.tooltip=Qui \u00E8 possibile ordinare o disabilitare le icone standard. Le icone devono essere separate dal carattere ";"
 OptionPanel.id=Indonese / Bahasa Indonesia
 OptionPanel.IGNORE=Non fare Nulla
 OptionPanel.il__enter_confirms_by_default=Conferma con il tasto Invio
 OptionPanel.image_cache=per le immagini
+OptionPanel.indentationUsesTabsInTextOutput=Utilizza le tabulazioni nel formato testo
 OptionPanel.it=Italiano / Italiano
 OptionPanel.ja=Giapponese / \u65E5\u672C\u8A9E
+OptionPanel.JoinNodesAction.textSeparators=Separatore testo
 OptionPanel.key_type_action=Scrivendo con la tastiera
 OptionPanel.Keystrokes=Tasti Rapidi
+OptionPanel.kn=Kannada / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=Coreano / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Tipo Carattere
 OptionPanel.label_font_size=Dimensione Carattere
@@ -1024,6 +1148,12 @@ OptionPanel.language=Lingua
 OptionPanel.language.tooltip=<html>Questa \u00E8 la lingua che verr\u00E0 utilizzata nel programma. 'automatico' carica la lingua standard dell'utente. </html>
 OptionPanel.last=Ultimo
 OptionPanel.last_opened_list_length=Lunghezza lista file recenti
+OptionPanel.latex_disable_editor=Disattivare LaTeX Syntax Highlighting Editor
+OptionPanel.latex_disable_editor.tooltip=Controllare questo, in caso di problemi con l'editor LaTeX
+OptionPanel.latex_editor_font=Caratteri per LaTeX Syntax Highlighting Editor
+OptionPanel.latex_editor_font.tooltip=Usare 'Dialog' or 'Monospaced' se servono i caratteri unicode!
+OptionPanel.latex_editor_font_size=Dimensione del carattere per LaTeX Syntax Highlighting Editor
+OptionPanel.latex_macros=Macro comuni LaTeX
 OptionPanel.layout_map_on_text_change=Ridisegna Mappa durante la modifica del nodo
 OptionPanel.layout_map_on_text_change.tooltip=Disabilitare per migliorare le prestazioni
 OptionPanel.linear=Lineare
@@ -1036,8 +1166,12 @@ OptionPanel.load_last_map=Apri automaticamente l'ultima mappa
 OptionPanel.load_last_map.tooltip=<html>Se selezioni questa opzione, all'apertura di Freeplane si aprir\u00E0 automaticamente l'ultima mappa utilizzata.</html>
 OptionPanel.load_last_maps=Carica tutte le ultime mappe
 OptionPanel.lookandfeel=Aspetto del programma
+OptionPanel.lookandfeel.scaleuifonts=Scala i caratteri della UI
+OptionPanel.lookandfeel.scaleuifonts.tooltip=Utile per schermi ad alta densit\u00E0
 OptionPanel.lookandfeel.tooltip=<html> Per inserire un aspetto personalizzato, inserire qui il nome della classe e assicurarsi che i corrispondenti file jar siano caricati. <br>Se ci sono problemi con l'apetto, sceglere "nulls" qui. Questo funziona per gli applet.<br> Attenzione 'mac' \u00E8 disponibile solo su MacOS.</html>
 OptionPanel.lt=Lituano / kalba
+OptionPanel.markClones=Colora Cloni evidenziati
+OptionPanel.markSelectedClones=Colora i cloni per evidenziare la selezione
 OptionPanel.max_displayed_node_count=Numero massimo di nodi visualizzati
 OptionPanel.max_image_width=Larghezza iniziale massima dell'immagine
 OptionPanel.max_image_width.tooltip=Le nuove immagini verranno scalate a questa larghezza
@@ -1045,11 +1179,15 @@ OptionPanel.max_menu_item_count=Numero massimo di elementi del menu
 OptionPanel.max_menu_item_count.tooltip=Limita il numero di elementi in un sottomenu, almeno 10
 OptionPanel.max_node_width=Largh.max.
 OptionPanel.max_shortened_text_length=Lunghezza massima dei nodi accorciati
+OptionPanel.menuItemFontSize=Dimensione caratteri dei menu
 OptionPanel.metal=Metallo
 OptionPanel.min_node_width=Largh.min.
+OptionPanel.monitor_size_inches=Dimensione schermo (pollici)
 OptionPanel.motif=Motivo
+OptionPanel.narrow_hexagon=Esagono stretto
 OptionPanel.nb=Norvegese Bokm\u00E5l/ Norsk bokm\u00E5l
 OptionPanel.never_save_folding=mai
+OptionPanel.neverShowSurvey=Non mostrare mai domande, sondaggi e suggerimenti
 OptionPanel.nl=Olandese / Nederlands, Vlaams
 OptionPanel.nn=Norvegese Nynorsk / Norsk nynorsk
 OptionPanel.nodebackgroundcolor=Sfondo
@@ -1065,6 +1203,7 @@ OptionPanel.nodeformat=Formato
 OptionPanel.nodeformat.tooltip=<html>Rimpiazzamento testo e/o Formattazione:<ul><li><em>Espressione del Modello</em> (<tt>%s</tt> \u00E8 il testo originale), es. <tt>DIFFIDARE: %s</tt><li><em>Formattazione di date e numeri</em> - vedere gli esempi nella casella di selezione</ul></html>
 OptionPanel.nodenumbering=Num.Nodi
 OptionPanel.nodenumbering.tooltip=Aggiungi numeri progressivi (as.1.3.1) al testo dei nodi
+OptionPanel.nodeshape=Forma
 OptionPanel.nodetext=Testo del Nodo
 OptionPanel.nodetext.tooltip=Qui \u00E8 possibile definire il testo del nodo. Quando viene applicato questo modello, il testo precedente viene scartato.
 OptionPanel.nothing=Nulla
@@ -1072,6 +1211,7 @@ OptionPanel.number_format=Formato standard per i numeri
 OptionPanel.number_format.tooltip=Una stringa con i simboli '#' per i le cifre optional o '0' per quelle obbligatorie. Esempio: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=Numero di file per il salvataggio automatico
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> Numero di file differenti in cui salvare la mappa.  Il primo salvataggio automatico viene effettuato sul primo file e cos\u00EC via al salvataggio n+1, fino a tornare al primo (ciclico)</html>
+OptionPanel.oc=Occitano
 OptionPanel.OK=Salva
 OptionPanel.org.freeplane.plugin.bugreport=Comportamento
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Inviare sempre
@@ -1080,11 +1220,18 @@ OptionPanel.org.freeplane.plugin.bugreport.denied=Non inviare mai
 OptionPanel.org.freeplane.plugin.bugreport.userid=Identificativo opzionale da inviare
 OptionPanel.outline_hgap=Distanza orizzontale
 OptionPanel.outline_vgap=Distanza verticale
+OptionPanel.oval=Ovale
 OptionPanel.paint_connectors_behind=Disegna i connettori dietro ai nodi
 OptionPanel.parse_data=Riconoscimento automatico dei numeri e delle date-orari digitati
 OptionPanel.parse_data.tooltip=Riconosce date e numeri inseriti, ed applica i formati standard. Esempio: 100,000.00, 12/31, 12/31/99, 1999-12-31 and 1999-12-31 23:59
+OptionPanel.parse_formulas=Riconosci le formule
+OptionPanel.parse_formulas.tooltip=Analizzare le formule sui nodi che iniziano con '=': Vedere http://www.freeplane.org/wiki/index.php/Formulas.
+OptionPanel.parse_latex=Riconosci LaTeX
+OptionPanel.parse_latex.tooltip=Riconoscere le formule LaTeX dal formato o dal prefisso: Vedere http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Incolla come HTML
 OptionPanel.PASTE_PLAIN_TEXT=Incolla come testo semplice
+OptionPanel.pasteImagesFromFiles=Incolla immagini da file
+OptionPanel.pasteImagesFromFiles.tooltip=Inserisci immagine se il file \u00E8 rilasciato nella mappa
 OptionPanel.path_property_may_not_be_empty=Il percorso non pu\u00F2 essere vuoto! La modifica \u00E8 stata annullata.
 OptionPanel.patternname=Nome
 OptionPanel.patternname.tooltip=Nome univoco dello schema univoco
@@ -1093,14 +1240,30 @@ OptionPanel.placenewbranches=Inserisci nuovo ramo
 OptionPanel.placenewbranches.tooltip=<html>Quando inserisci un nuovo ramo i valori validi sono 'primo' e 'ultimo' </html>
 OptionPanel.plugin.tooltip=Plugin secondari
 OptionPanel.plugins=Plugin
+OptionPanel.Presentation=Presentazione
+OptionPanel.presentation.combineAll=Associare tutte le presentazioni
+OptionPanel.presentation.exportDirectory=nome cartella presentazioni esportate
+OptionPanel.presentation.maxDropBoxRowCount=Numero massimo di righe nella casella a discesa
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Applica alla presentazione ed al selettore Slide
+OptionPanel.presentation.processesEscapeKey=Tasto ESC per terminare la presentazione
+OptionPanel.presentation.processesNavigationKeys=I tasti di navigazione controllano la presentazione
+OptionPanel.presentation.slideDisplaysAllNodes=Espandi tutti i nodi delle Slide automaticamente
+OptionPanel.presentation.slowMotion=Rallentatore
+OptionPanel.presentation.switchToFullScreen=Attiva schermo intero
+OptionPanel.presentation.switchToSpotlight=Attiva riflettore
+OptionPanel.presentation.zoom=Usa zoom mappa
 OptionPanel.printonwhitebackground=<html>Sfondo bianco per la stampa</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Usa sempre lo sfondo bianco per la stampa</html>
 OptionPanel.pt_BR=Portoghese (Brasile) / Portugu\u00EAs (Brasil)
 OptionPanel.pt_PT=Portoghese (Portogallo) / Portugu\u00EAs (Portugal)
 OptionPanel.RECT=Rettangolo
+OptionPanel.rectangle=Rettangolo
 OptionPanel.relative=Relativo
 OptionPanel.remind_type_of_new_nodes.tooltip=<html>"Chiedi" chieder\u00E0 (usare se si \u00E8 nel dubbio).<br>"Si" visualizzer\u00E0 la finestra di modifica testo avanzato.<br>"No" visualizzer\u00E0 la finestra di modifica testo semplice.</html>
 OptionPanel.remind_use_rich_text_in_new_nodes=Usa formattazione testo avanzata (RTF) per i nodi Incollati
+OptionPanel.remindersBlink=Lampeggio promemoria
+OptionPanel.remindersShowNotifications=I promemoria mostrano notifiche popup
+OptionPanel.remindersStandardDelay=Ritardo promemoria
 OptionPanel.remove_notes_without_question=Rimuovere le note senza conferma?
 OptionPanel.remove_notes_without_question.tooltip=Se selezionato, le note appartenenti  ai nodi selezionati saranno rimosse senza richiesta di conferma. Questo pu\u00F2 causare perdita di informazioni se premuto accidentalmente.
 OptionPanel.resources_use_default_font_for_notes_too=Usa i caratteri predefiniti anche per le note
@@ -1111,15 +1274,19 @@ OptionPanel.ROUND_RECT=Rettangolo Arrotondato
 OptionPanel.ru=Russo / \u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A
 OptionPanel.save_folding=Salva stato Espansione/Collasso
 OptionPanel.save_folding_if_map_is_changed=Se la mappa \u00E8 cambiata
+OptionPanel.save_last_visited_node=Salva l'ultima posizione nella mappa
 OptionPanel.save_modification_times=Salva i tempi di modifica
-OptionPanel.script_classpath=Script classpath: Cartella contenente le classi e JARs
+OptionPanel.script_classpath=Script classpath: Cartelle aggiuntive contenenti classi e/o JARs (vedere tooltip)
 OptionPanel.script_classpath.tooltip=<html>Una lista di JARs e cartelle da aggiungere alle classpath degli script e delle formule. <br>Usare ; (Windows) or : (Linux, Mac) per separare le voci.<br>Le cartelle saranno utilizzate per i JARs e per i file .class<br>I percorsi che non sono assoluti saranno considerati relativi alla cartella utente di Freeplane.<br>Impostando la classpath \u00E8 necessario permettere anche l'accesso in lettura!</html>
-OptionPanel.script_directories=Percorsi di ricerca degli script (separati dal simbolo ;;)
+OptionPanel.script_compilation_disabled_extensions=Estensioni file da non compilare (vedere tooltip)
+OptionPanel.script_compilation_disabled_extensions.tooltip=<html>Se tutti gli script di una lingua addizionale installata (tranne <br>Groovy e JavaScript) hanno un problema di compilazione generale <br>tenta di aggiungere l'estensione qui (elenco separato da virgole).</html>
+OptionPanel.script_directories=Percorsi di ricerca degli script (vedere tooltip)
 OptionPanel.script_directories.tooltip=<html>Una lista di cartelle. <br>Usare ; (Windows) o : (Linux, Mac) per separare le voci.<br>I percorsi non assoluti saranno considerati relativi alla cartella utente di Freeplane.</html>
 OptionPanel.script_user_key_name_for_signing=Chiave alias utente facoltativa per la firma
 OptionPanel.script_user_key_name_for_signing.tooltip=<html>Per firmare i tuoi script, inserisci il nome della chiave qui. <br>La chiave risiede nelle impostazioni dei tasti standard. <br>La password segreta deve coincidere con la password digitata (standard).</html>
 OptionPanel.scrollbar_increment=Velocit\u00E0
 OptionPanel.scrolling_speed=Velocit\u00E0 automatica di scorrimento mappa
+OptionPanel.scrollOnUnfold=Scorrere la mappa dopo l'espansione di un nodo
 OptionPanel.selection_method=Seleziona metodo
 OptionPanel.selection_method.tooltip=<html> Con la seguente opzione \u00E8 possibile attivare/disattivare la selezione ritardata. Opzione automatica. Non modificare, poich\u00E9 verranno salvati comunque in auto.properties.</html>
 OptionPanel.selection_method_by_click=Click del mouse
@@ -1132,6 +1299,8 @@ OptionPanel.separator.automatic_save=Salvataggio automatico
 OptionPanel.separator.behaviour=Comportamento
 OptionPanel.separator.browser=Sfoglia
 OptionPanel.separator.cache=Cache
+OptionPanel.separator.clones=Cloni
+OptionPanel.separator.cloud=Nuvola
 OptionPanel.separator.CloudControls=Nuvole
 OptionPanel.separator.commands_for_the_program=Comandi per il programma
 OptionPanel.separator.connectors=Collegamenti Grafici
@@ -1142,6 +1311,7 @@ OptionPanel.separator.default_styles=Stili predefiniti
 OptionPanel.separator.EdgeControls=Collegamenti
 OptionPanel.separator.edit_long_node_window=Finestra modifica nodo avanzata
 OptionPanel.separator.editing=Impostazioni dell'editor
+OptionPanel.separator.export=Esporta
 OptionPanel.separator.files=Files
 OptionPanel.separator.formula=Plugin "Formula"
 OptionPanel.separator.General=Generale
@@ -1149,17 +1319,22 @@ OptionPanel.separator.html_export=Esporta Html
 OptionPanel.separator.html_import=Importazione Html
 OptionPanel.separator.hyperlink_types=Tipi di collegamento
 OptionPanel.separator.icon_properties=Icone
+OptionPanel.separator.IconControls=Icone
 OptionPanel.separator.icons=Icone in "Seleziona Icona..."
+OptionPanel.separator.Icons=Icone
 OptionPanel.separator.initial_map_size=Dimensione iniziale mappa
 OptionPanel.separator.inline_editor=Editor semplice del nodo
+OptionPanel.separator.JoinNodesAction=unione nodi
 OptionPanel.separator.key_typing=Scrivi chiave
 OptionPanel.separator.language=Lingua
+OptionPanel.separator.latex=LaTeX
 OptionPanel.separator.load=Carica
 OptionPanel.separator.look_and_feel=Aspetto del programma
 OptionPanel.separator.mouse_wheel=Rotella del mouse
 OptionPanel.separator.new_node_commands=Nuovo comando nodo
 OptionPanel.separator.node_editing_commands=Comandi modifica nodi
 OptionPanel.separator.node_navigation_commands=Comandi navigazione nodi
+OptionPanel.separator.NodeBorder=Bordo del nodo
 OptionPanel.separator.NodeColors=Colore del nodo
 OptionPanel.separator.NodeFont=Carattere dei nodi
 OptionPanel.separator.NodeShape=Forma del nodo
@@ -1171,6 +1346,8 @@ OptionPanel.separator.other_defaults=Altro predefinito
 OptionPanel.separator.others=Altre chiavi dipendenti
 OptionPanel.separator.outline_view=Visualizzazione lineare ad albero
 OptionPanel.separator.patterns=Schemi
+OptionPanel.separator.presentation=Presentazione
+OptionPanel.separator.reminderOptions=Opzioni Promemoria
 OptionPanel.separator.RichTextEditor=Editor testo Avanzato
 OptionPanel.separator.root_node_appearance=Aspetto nodo radice
 OptionPanel.separator.save=Salva
@@ -1181,18 +1358,29 @@ OptionPanel.separator.selection_colors=Colori per indicare la Selezione
 OptionPanel.separator.selection_method=Metodo di selezione
 OptionPanel.separator.single_instance_mode=Unica finestra di Programma
 OptionPanel.separator.size_limits=Limite di dimensione
-OptionPanel.separator.spelling=Opzioni di controllo ortografico
+OptionPanel.separator.spelling=Opzioni controllo ortografico
+OptionPanel.separator.SplitToWordsAction=Dividere il nodo in parole
 OptionPanel.separator.status=Linea di Stato
+OptionPanel.separator.surveys=Sondaggi
+OptionPanel.separator.svg_icons=Icone SVG
+OptionPanel.separator.tooltip=Tooltip
 OptionPanel.separator.undo=Annulla
 OptionPanel.separator.updates=Aggiornamenti Programma
-OptionPanel.set_property_text=Modifica
-OptionPanel.set_property_text.tooltip=Vuoto: non modificare; Meno: rimuovi propriet\u00E0 (imposta valori predefiniti); Pi\u00F9: cambia propriet\u00E0
+OptionPanel.set_property_text=Mod.
+OptionPanel.set_property_text.tooltip=Impostato: cambia propriet\u00E0  Vuoto: non modificare / rimuovi propriet\u00E0 (imposta valori predefiniti)
 OptionPanel.setscript=Modificare?
 OptionPanel.setscript.tooltip=Uno script pu\u00F2 essere associato allo stile.
+OptionPanel.shape_horizontal_margin=Margine orizzontale
+OptionPanel.shape_vertical_margin=Margine verticale
 OptionPanel.sharp_bezier=bezier leggero
 OptionPanel.sharp_linear=lineare leggero
+OptionPanel.shouldCenterSmallMaps=Centra le mappe piccole
+OptionPanel.show_connectors=Visualizza linee connettore
 OptionPanel.show_icon_for_attributes=Visualizza l'icona per indicare la presenza di attributi del nodo
+OptionPanel.show_icons=Mostra icone
+OptionPanel.show_less_than_N_nodes_by_default_after_load=Carica dalla mappa o espandi alcuni nodi
 OptionPanel.show_node_tooltips=Visualizza i suggerimenti "ToolTip" per i Nodi
+OptionPanel.show_note_icon_in_tooltip=Mostra icona note nel tooltip
 OptionPanel.show_note_icons=Mostra le icone delle note
 OptionPanel.show_styles_in_tooltip=Visualizza gli stili dei nodi nel "ToolTip"
 OptionPanel.signed_script_are_trusted=Script con firma affidabile (raccomandato).
@@ -1206,21 +1394,31 @@ OptionPanel.single_instance=Apre le mappe nella finestra di programma gi\u00E0 i
 OptionPanel.single_instance_force=Evita una seconda finestra di programma in ogni caso
 OptionPanel.single_instance_force.tooltip=Evita una seconda finestra del programma, anche se non c'\u00E8 nessun file da caricare.
 OptionPanel.sk=Slovacco / sloven\u010Dina
+OptionPanel.skip_template_selection=Saltare finestra selezione modello
 OptionPanel.sl=Sloveno / sloven\u0161\u010Dina
+OptionPanel.slow_scroll_selected_node=Espandi nodi selezionati lentamente
 OptionPanel.spelling_opt_case_sensitive=Maiuscole e minuscole
 OptionPanel.spelling_opt_ignore_all_caps_words=Ignorare tutte le parole maiuscole
 OptionPanel.spelling_opt_ignore_capitalization=Ignorare le lettere maiuscole a inizio parola
 OptionPanel.spelling_opt_ignore_words_with_numbers=Ignorare parole con numeri
 OptionPanel.spelling_opt_suggestions_limit_dialog=Numero massimo di suggerimenti nella finestra di dialogo
 OptionPanel.spelling_opt_suggestions_limit_menu=Numero massimo di suggerimenti nel menu
+OptionPanel.SplitToWordsAction.auxiliaryWordList=elenco parole ausiliarie
+OptionPanel.SplitToWordsAction.charactersAcceptedInWord=caratteri in parole
+OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=lasciare vuoto il nodo originale
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=numero nodi in riga
+OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=salva il testo originale come dettagli
+OptionPanel.spotlight=Riflettore
+OptionPanel.spotlight_background_color=Colore di sfondo del riflettore
 OptionPanel.sr=Serbo / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=File Modello Standard
-OptionPanel.standardbackgroundcolor=<html>Imposta il colore predefinito di sfondo</html>
+OptionPanel.standardbackgroundcolor=Colore predefinito di sfondo
 OptionPanel.standardbackgroundcolor.tooltip=<html>Il colore di sfondo predefinito in notazione html </html>
 OptionPanel.standardcloudcolor=Colore predefinito nuvola
 OptionPanel.standardcloudcolor.tooltip=<html>Seleziona il colore standard delle nuvole</html>
 OptionPanel.standardcloudestyle=Stile predefinito nuvole
 OptionPanel.standardcloudestyle.tooltip=<html>Lo stile predefinito delle nuvole. Al momento \u00E8 supportato solo lo stile 'bezier'</html>
+OptionPanel.standardcloudshape=Forma nuvola standard
 OptionPanel.standarddrawrectangleforselection=Visualizza i nodi selezionati con delle bolle
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Evidenzia i nodi selezionati circoscrivendoli con delle bolle.</html>
 OptionPanel.standardlinkcolor=Colore predefinito dei Collegamenti Grafici
@@ -1232,28 +1430,37 @@ OptionPanel.standardselectednodecolor.tooltip=<html>Colore usato per indicare il
 OptionPanel.standardselectednoderectanglecolor=Colore della Bolla di selezione
 OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Seleziona il colore della bolla che indica i nodi selezionati</html>
 OptionPanel.STAR=Stella
+OptionPanel.statesymbolwidth=Larghezza del simbolo dello stato
 OptionPanel.structured_html_import=Importa HTML come struttura nodo
 OptionPanel.structured_icon_toolbar=Barra delle icone strutturata
 OptionPanel.summary=Sommario
 OptionPanel.sv=Svedese / svenska
 OptionPanel.text.use_ctrl_key=E' anche possibile assegnare i Tasti Rapidi, cliccando sui predefiniti del menu Stili, tenendo premuto CTRL
+OptionPanel.textalignment=Allineamento testo
 OptionPanel.time_for_automatic_save=Intervallo salvataggio automatico
 OptionPanel.time_for_automatic_save.tooltip=<html> Tempo che intercorre tra due azioni automatiche di salvataggio (in msec): Per disabilitare il salvataggio automatico imposta il numero a 2000000000.</html>
 OptionPanel.time_for_delayed_selection=Tempo di attesa per la selezione posticipata, ms
-OptionPanel.time_for_delayed_selection.tooltip=<html> Selezionare il tempo di ritardo affinch\u00E8 il nodo venga selezionato, quando il mouse si porta sopra di esso (in msec).</html>
+OptionPanel.time_for_delayed_selection.tooltip=<html> Impostare il tempo di ritardo affinch\u00E9 il nodo venga selezionato, quando il mouse si porta sopra di esso (in millisecondi)</html>
+OptionPanel.toolbar_icon_height=Altezza icone Toolbar
 OptionPanel.toolTipManager.dismissDelay=Tempo di permanenza, ms
 OptionPanel.toolTipManager.initialDelay=Ritardo iniziale, ms
-OptionPanel.toolTipManager.max_tooltip_width=Larghezza suggerimenti
-OptionPanel.toolTipManager.max_tooltip_width.tooltip=<html>La larghezza predefinita dei suggerimenti in pixel.</html>
+OptionPanel.toolTipManager.max_tooltip_height=Altezza massima nodo tooltip
+OptionPanel.toolTipManager.max_tooltip_height.tooltip=Altezza massima suggerimenti, in pixels.
+OptionPanel.toolTipManager.max_tooltip_width=Larghezza massima suggerimenti
+OptionPanel.toolTipManager.max_tooltip_width.tooltip=Larghezza massima tooltip, in pixel.
 OptionPanel.toolTipManager.reshowDelay=Tempo di ripetizione, ms
+OptionPanel.tr=Turco / T\u00FCrk\u00E7e
 OptionPanel.uk_UA=Ucraino / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
 OptionPanel.undefined_font=Carattere non definito
 OptionPanel.undo_levels=Azioni memorizzate per il comando "Annulla"
 OptionPanel.undo_levels.tooltip=<html>Imposta quanti passaggi vengono salvati per la funzione "Annulla".</html>
 OptionPanel.unfold_on_paste=Espandi nodo quando si "incolla"
 OptionPanel.unfold_on_paste.tooltip=Espandi i nodi quando si Incolla o si sposta, Drag-And-Drop
+OptionPanel.uniform_shape=Uniforme
 OptionPanel.use_common_out_point_for_root_node=I collegamenti iniziano da un punto del nodo radice
 OptionPanel.use_common_out_point_for_root_node.tooltip=In uscita al nodo principale, i collegamenti iniziano da un punto a destra e uno a sinistra, poi si diramano.
+OptionPanel.use_svg_icons=Usa Icone SVG
+OptionPanel.use_svg_icons.tooltip=<html>Determina la qualit\u00E0 del rendering delle icone. Le icone SVG hanno bisogno di pi\u00F9 tempo.</html>
 OptionPanel.use_tabbed_pane=Usa schede per indicare le mappe aperte
 OptionPanel.use_tabbed_pane.tooltip=Se selezionato, le mappe sono visualizzate in schede (come in FireFox ) ).
 OptionPanel.validate_classpath_needs_readaccess=Script: Quando si setta la classpath, \u00E8 necessario permettere l'accesso in lettura ai file!
@@ -1263,9 +1470,12 @@ OptionPanel.validate_invalid_number_format=Formato numero non valido
 OptionPanel.validate_write_without_read=Script: Considera di aggiungere ai file in Scrittura anche la Lettura
 OptionPanel.validation_error=<html><body>Errore di Validazione:<p><em>{0}</em><p>Cambiare le preferenze per risolvere il problema.</body></html>
 OptionPanel.validation_warning=<html><body>Avviso di Validazione:<p><em>{0}</em></body></html>
+OptionPanel.vertical_child_gap=Spazio nodi derivati
+OptionPanel.vertical_child_gap.tooltip=Distanza verticale tra i nodi derivati
 OptionPanel.vi=Vietnamita / Ti\u1EBFng Vi\u1EC7t
 OptionPanel.wheel_velocity=Velocit\u00E0
 OptionPanel.wheel_velocity.tooltip=Un valore pi\u00F9 alto fa s\u00EC che la rotella del mouse muova pi\u00F9 velocemente la mappa.
+OptionPanel.wide_hexagon=Esagono Largo
 OptionPanel.windows=Windows
 OptionPanel.zh_CN=Cinese semplificato / \u7B80\u4F53\u5B57
 OptionPanel.zh_TW=Cinese tradizionale / \u7E41\u9AD4\u5B57
@@ -1285,7 +1495,7 @@ out_of_memory=Memoria massima superata.
 overwrite_keyset_question=Sovrascrivere le impostazioni dei tasti esistenti ?
 PageAction.text=Impostazione pagina
 password_is_not_ascii=La password non \u00E8 un carattere valido ASCII
-PasteAction.text=Incolla
+PasteAction.text=&Incolla
 PasteAttributes.text=Incolla attributi
 PatternNewNameProperty=Nuovo schema
 PatternToString.backgroundColor=Colore di sfondo
@@ -1309,6 +1519,7 @@ PeriodUnit.YEAR=anni
 plugins/latex/LatexNodeHook.editorTitle=Modifica Testo Latex
 plugins/script_filter=Filtro Script {0}
 plugins/script_filter_error={0} doveva tornare un risultato booleano su {1} ma ha tornato {2}
+plugins/script_filter_execute_error=Errore eseguendo {0}\nper il nodo {1}:\n{2}
 plugins/ScriptEditor.cancel=&Annulla modifiche ed esci
 plugins/ScriptEditor.exit=&Salva ed Esci
 plugins/ScriptEditor.FORBIDDEN_ACTION=Gli script groovy di Freeplane sono stati limitati. L'operazione seguente {0,choice,0#File|1#Network|2#Exec} \u00E8 proibita: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write}. E' possibile cambiare l'impostazione di restrizione nelle opzioni.
@@ -1321,6 +1532,7 @@ plugins/ScriptEditor/window.title=Editor Script
 plugins/ScriptingEngine.illegalAccessToInternalAPI=Accesso illegale alla API interna (pacchetto {0}). - Per favore contattare il team di Freeplane se lo script API non \u00E8 sufficentemente potente.
 plugins/TimeList.xml_Created=Creato
 plugins/TimeList.xml_Date=Data
+plugins/TimeList.xml_Details=Dettagli
 plugins/TimeList.xml_Icons=Icone
 plugins/TimeList.xml_Modified=Modificato
 plugins/TimeList.xml_Notes=Note
@@ -1351,11 +1563,14 @@ plugins/TimeManagement.xml_todayButton=Oggi
 plugins/TimeManagement.xml_WindowTitle=Gestione della data
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Trova e sostituisci
 preferences=Preferenze
+presentation=Presentazione
+presentation.combineAll=Associare tutte le presentazioni
 print_preview_title=Anteprima di stampa
-PrintAction.text=Stampa...
+PrintAction.text=&Stampa...
 PrintDirectAction.text=Stampa
 printing_settings=Scalatura stampa
 PrintPreviewAction.text=Anteprima di stampa...
+program_terminates=Errore interno, programma terminato.
 progress=Avanzamento
 PropertyAction.dialog=Preferenze
 PropertyAction.text=Preferenze...
@@ -1380,11 +1595,14 @@ RedoFilterAction.text=Ripristina
 regular_expressions=Espressione Regolare
 ReminderHookAction.text=Togli Promemoria
 ReminderHookAction.tooltip=Rimuovi un promemoria da un nodo.
+reminderNotification=Notifica promemoria
 remove_file_from_list_on_error=File {0} non trovato. Rimuoverlo dall''elenco dei file recenti ?
 remove_shortcut_question=Sostituire il tasto?
+RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Resetta nodi espansi
+RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Consente implosione per ogni nodo
 RemoveAllIconsAction.text=Rimuovi tutte le icone
 RemoveConnectorAction.text=Rimuovi Collegamenti Grafici
-RemoveEncryption.text=Rimuovi Criptatura
+RemoveEncryption.text=Rimuovi password
 RemoveFormatAction.text=Rimuovi Formato
 RemoveIcon_0_Action.text=Rimuovere la prima icona
 RemoveIconAction.text=Rimuovi ultima icona
@@ -1409,9 +1627,13 @@ save_unsaved=Salvare la seguente mappa ?
 save_unsaved_styles=Salvare Stili ?
 SaveAcceleratorPresetsAction.text=Salva il set di Tasti Rapidi
 SaveAction.text=Salva
+SaveAction_readonlyMsg=Questa mappa \u00E8 in sola lettura. Usare 'File->Salva con nome...
+SaveAction_readonlyTitle=Tentativo si salvare una mappa di sola lettura
 SaveAll.text=Salva tutto
 SaveAll.tooltip=Salva tutte le mappe aperte.
-SaveAsAction.text=Salva con nome
+SaveAs_toReadonlyMsg={0} \u00E8 di sola lettura. Salvare in un''altro file.
+SaveAs_toReadonlyTitle=Tentativo di salvare su un file di sola lettura
+SaveAsAction.text=Salva con nome...
 saved=Salvata
 saving_canceled=Salvataggio annullato
 scanners_not_loaded=Impossibile caricare Scanners, file corrotto
@@ -1420,17 +1642,22 @@ script_execution_disabled=Esecuzione degli script disabilitata
 ScriptEditor.text=Editor Script...
 ScriptEditor.tooltip=Strumento per scrivere script estesi di Freeplane.
 ScriptEditorPanel.changed_cancel=Gli script sono stati cambiati. Vuoi veramente annullare questi cambiamenti?
+scripting=Scripts
 scripting_api_generator_legend=Legenda
 scripting_api_generator_proxy=Proxy
 scripting_api_generator_title=API Script
 scripting_api_generator_utilities=Utilit\u00E0
 scripting_api_generator_web=Risorse Web
+ScriptsRunToggleAction.ON_SELECTED_NODE.text=Eseguire gli script su tutti i nodi selezionati
+ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=Eseguire gli script sui nodi selezionati, in modo ricorsivo
+ScriptsRunToggleAction.ON_SINGLE_NODE.text=Eseguire gli script sul nodo selezionato
 select_favorites_folder=Seleziona la cartella dei Preferiti
 select_file_export_to=Seleziona il file da esportare
 select_folder_for_importing=Seleziona la cartella da importare
 select_icon=Selezionare una Icona
 select_menu_item_dialog=Selezionare un elemento del menu
 select_menu_item_root_node=Menu
+select_template=Seleziona modello
 SelectAllAction.text=Seleziona tutto il visibile
 SelectBranchAction.text=Seleziona rami visibili
 SelectedPasteAction.text=Incolla come...
@@ -1439,7 +1666,12 @@ selection_method_delayed=Sezione ritardi automatici.
 selection_method_direct=Puntare per selezionare
 SelectNoteAction.text=Modifica note
 SelectNoteAction.tooltip=Commuta tra la finestra principale e la finestra delle note
+set_accelerator_on_next_click_helpmessage=Per creare un nuovo tasto di scelta rapida, fare clic sul comando desiderato dal menu.
+SetAccelerator.dialogTitle=Assegnazione tasti rapidi
+SetAccelerator.keystrokeDetected=La sequenza di tasti "{0}" non \u00E8 assegnata a nessuna voce di menu.
 SetAcceleratorOnNextClickAction.text=Assegna scorciatoia
+SetAlwaysUnfoldedNodeFlagsAction.text=Mantieni i nodi espansi
+SetAlwaysUnfoldedNodeFlagsAction.tooltip=Impedire collasso per i nodi attualmente espansi
 SetImageByFileChooserAction.text=Immagini
 SetLinkAnchorAction.text=Imposta collegamento \u00E0ncora
 SetLinkAnchorAction.tooltip=<html>imposta il nodo selezionato come \u00E0ncora per la successiva<br/>creazione di un collegamento locale o globale.
@@ -1458,11 +1690,17 @@ ShowAncestorsAction.text=Visualizza ascendenti
 ShowAttributeDialogAction.text=Gestione attributi
 ShowDescendantsAction.text=Visualizza discendenti
 ShowFilterToolbarAction.text=Barra del Filtro
+ShowFirstSlideAction.text=Prima Slide
+ShowFirstSlideAndStartPresentationAction.text=Avviare la presentazione dall'inizio
+ShowFormatPanel.text=Pannello strumenti
 ShowFormatPanel.tooltip=Presenta un pannello in cui gli attributi dei nodi e dei collegamenti, possono essere modificati.
 ShowHideNoteAction.text=Finestra delle note
 ShowHideNoteAction.tooltip=Mostra o nasconde la finestra delle note.
+ShowLastSlideAction.text=Ultima Slide
 ShowNextChildAction.text=Visualizza nodo figlio successivo
+ShowNextSlideAction.text=Slide successiva
 ShowNotesInMapAction.text=Visualizza le note nella Mappa
+ShowPreviousSlideAction.text=Slide precedente
 ShowSelectedAttributesAction.text=Visualizza attributi selezionati
 ShowSelectionAsRectangleAction.text=Riquadra nodo selezionato
 simplyhtml.aboutFrameTitle=Informazioni sull'applicazione
@@ -1477,6 +1715,8 @@ simplyhtml.appendTableColLabel=Aggiungi colonna, sotto
 simplyhtml.appendTableRowLabel=Aggiungi riga, sotto
 simplyhtml.applyCellAttrLabel=Applica a
 simplyhtml.backgroundLabel=Sfondo:
+simplyhtml.blackFontColorLabel=Nero
+simplyhtml.blueFontColorLabel=Blu
 simplyhtml.boldItalicName=corsivo grassetto
 simplyhtml.boldName=grassetto
 simplyhtml.borderColorLabel=Colore:
@@ -1506,6 +1746,7 @@ simplyhtml.cTagNamePara=Paragrafo
 simplyhtml.cTagNameUL=Lista non ordinata
 simplyhtml.cutLabel=Taglia
 simplyhtml.cutTip=taglia
+simplyhtml.decreaseFontSizeLabel=Pi\u00F9 piccolo
 simplyhtml.defaultDocName=Senza titolo
 simplyhtml.deleteTableColLabel=Cancella colonna
 simplyhtml.deleteTableRowLabel=Cancella riga
@@ -1538,9 +1779,11 @@ simplyhtml.formatParaLabel=Paragrafo...
 simplyhtml.formatParaTip=Cambia formato paragrafo
 simplyhtml.formatTableLabel=Tabella...
 simplyhtml.formatTableTip=Formato tabella
+simplyhtml.greenFontColorLabel=Verde
 simplyhtml.helpLabel=Aiuto
 simplyhtml.htmlTabTitle=Visualizzatore codice HTML
 simplyhtml.imageFileDesc=Immagine da file
+simplyhtml.increaseFontSizeLabel=Maggiore
 simplyhtml.insertTableColLabel=Aggiungi colonna, sopra
 simplyhtml.insertTableLabel=Tabella...
 simplyhtml.insertTableMsg=Quante colonne?
@@ -1592,8 +1835,10 @@ simplyhtml.previewLabel=Anteprima
 simplyhtml.previewText=Anteprima testuale
 simplyhtml.prevTableCellLabel=Cella precedente
 simplyhtml.printLabel=Stampa...
+simplyhtml.redFontColorLabel=Rosso
 simplyhtml.redoLabel=Ripeti
 simplyhtml.redoTip=ripeti
+simplyhtml.removeFontColorLabel=Rimuovi colore
 simplyhtml.replace=Sostituisci...
 simplyhtml.replaceAll=Tutti
 simplyhtml.replaceDone=Fatto
@@ -1609,6 +1854,7 @@ simplyhtml.searchFromStart.tooltip=Inizia a cercare dall'alto al posto di inizia
 simplyhtml.searchUp=Cerca su
 simplyhtml.searchUp.tooltip=Cerca dal basso all'alto
 simplyhtml.selectAllLabel=Seleziona tutto
+simplyhtml.selectedFontColorLabel=Colore carattere selezionato
 simplyhtml.sizeLabel=Dimensione
 simplyhtml.standardStyleName=standard
 simplyhtml.strikeLabel=Barrato
@@ -1619,7 +1865,7 @@ simplyhtml.tableBgColLabel=Colore di sfondo:
 simplyhtml.tableDialogTitle=Formatta tabella
 simplyhtml.tableLabel=Tabella
 simplyhtml.tablePanelTitle=Formato tabella
-simplyhtml.tableWidthLabel=Larghezza
+simplyhtml.tableWidthLabel=Larghezza:
 simplyhtml.textIndentLabel=Rientro:
 simplyhtml.textToFind=Testo da trovare:
 simplyhtml.thisCellRangeLabel=questa cella
@@ -1643,14 +1889,54 @@ simplyhtml.valignMiddle=centro
 simplyhtml.valignTop=sopra
 simplyhtml.wholeWordsOnly=Solo tutte le parole
 simplyhtml.wholeWordsOnly.tooltip=Restringi confronto alle parole intere.
+slide.add=Aggiungi
+slide.add.tooltip=Aggiungi i nodi attualmente selezionati alla slide
+slide.at_center.tooltip=al centro
+slide.content=Contenuto slide
+slide.descendants=Mostra discendenti
+slide.edge=al margine
+slide.filter=Filtro
+slide.first=Primo
+slide.last=Ultimo
+slide.next=Prossimo
+slide.nofilter=No filtro
+slide.on_the_left.tooltip=alla sinistra
+slide.on_the_right.tooltip=alla sinistra
+slide.placenode=Posiziona nodo selezionato
+slide.placenode.tooltip=quando la Slide \u00E8 presentata
+slide.present=Presente
+slide.presentation=Presentazione
+slide.presentations=Presentazioni
+slide.previous=Precedente
+slide.remove=Rimuovi
+slide.remove.tooltip=Rimuovi i nodi selezionati dalla Slide
+slide.select=Seleziona
+slide.select.tooltip=Seleziona i nodi della Slide sulla mappa
+slide.set=Imposta
+slide.set.tooltip=Rendere i nodi attualmente selezionati, il contenuto della Slide
+slide.setfilter=Imposta filtro
+slide.setfilter.tooltip=Impostare o rimuovere il filtro da applicare quando la Slide viene visualizzata
+slide.setfoldingstate=Imposta espansione
+slide.setfoldingstate.tooltip=Ripristinare l'espansione attuale, quando la Slide viene visualizzata
+slide.setzoom=Imposta zoom
+slide.setzoom.tooltip=Impostare o rimuovere lo zoom applicato alla mappa, quando la Slide viene visualizzata
+slide.showancestors=Mostra predecessori
+slide.showonlyselected=Mostra solo i nodi selezionati
+slide.showonlyselected.tooltip=Nascondi gli altri nodi quando una Slide \u00E8 visualizzata
+slide.slides=Slide
+slide.stop=Stop
 SortNodes.text=Ordina alfabeticamente i figli
 SortNodes.tooltip=Ordinamento alfabetico dei figli del nodo
 split=&Dividi
 SplitConditionAction.text=Dividi
 SplitNode.text=Dividi nodo
 SplitNode.tooltip=<html>Crea un nuovo nodo, per ogni riga del nodo originario</html>
+SplitToWordsAction.text=Dividere con {0} parole in linea
 STANDARD_FORMAT=Standard
+StartPresentationAction.text=Avvia presentazione
+StartPresentationOrShowNextSlideAction.text=Avvia presentazione/Prossima Slide
 stop_processing=Stop
+StopPresentationAction.text=Ferma presentazione
 StringFlavorHandler=Nodi gerarchici, formato testo semplice
 StructuredHtmlFlavorHandler=Nodi Html in modo gerarchico
 style=Stile
@@ -1681,6 +1967,7 @@ styles.subtopic=Subtopic
 styles.topic=Topic
 styles.user-defined=Stili definiti dall'utente
 styles.website=Sito Internet
+styles_background_html=\n <html><head></head> <body><table width="800" style="text-align: left; vertical-align: top"> <tr valign="top"> <th><div style="margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; margin-left: 0pt; text-align: center; font-weight: bold"> In merito a questo stile</div> <div style="text-align: left; font-weight: normal"> <div style="margin: 3pt"> questo standard \u00E8 stato sviluppato dopo 11 anni di ricerca pedagogica su come rendere il processo di conoscenza  [...]
 styles_menu=Stili
 submenu_keystroke_in_use_error=Il tasto rapido {0} non pu\u00F2 essere utilizzato per il sottomenu {1}. Tasto rapido rimosso.
 summary_nodes=Nodi Sommario
@@ -1688,7 +1975,11 @@ summary_not_possible=Impossibile creare un Nodo Sommario per la selezione corren
 svg=SVG
 template_dir=Modelli Standard
 TextAlignAction.CENTER.text=Testo centrato
+TextAlignAction.DEFAULT.text=Default
+TextAlignAction.LEFT.text=Testo allineato a sinistra
+TextAlignAction.RIGHT.text=Testo allineato a destra
 textalignment=Allineamento testo
+TextChangeHotKeyAction.text=Impostare il testo del tasto di scelta rapida
 TimeListAction.text=Visualizza lista avvisi ...
 TimeListAction.tooltip=Visualizza tutti gli avvisi ed i corrispondenti nodi.
 TimeManagementAction.text=Gestione Calendario...
@@ -1696,6 +1987,7 @@ TimeManagementAction.tooltip=<html>Gestione Calendario.</html>
 TimePeriodUnits.days=giorni
 TimePeriodUnits.hours=ore
 TimePeriodUnits.minutes=minuti
+TimePeriodUnits.ms=ms
 TimePeriodUnits.seconds=secondi
 TimePeriodUnits.weeks=settimane
 ToggleChildrenFoldedAction.text=Collassa/Espandi figli
@@ -1705,8 +1997,14 @@ ToggleFoldedAction.text=Collassa/Espandi
 ToggleFullScreenAction.text=Modalit\u00E0 a schermo intero
 ToggleLeftToolbarAction.text=Barra delle icone
 ToggleMenubarAction.text=Barra dei menu
+ToggleScrollbarsAction.text=Barre di scorrimento
 ToggleStatusAction.text=Visualizza la Linea di Stato
 ToggleToolbarAction.text=Barra degli strumenti
+TranslatedElement.BORDER=Testo del bordo
+TranslatedElement.TEXT=Testo
+TranslatedElement.TOOLTIP=Tooltip
+uiTextChanger.originalTextIsNotDefined=Testo originale non definito
+uiTextChanger.replaceText=Sostituisci testo UI
 undefined_error=Si \u00E8 verificato un errore imprevisto. Inviare un rapporto errori, grazie.
 underline=Sottolinea
 UnderlineAction.text=Sottolinea
@@ -1718,25 +2016,32 @@ UnfoldAllAction.text=Espandi tutti
 UnfoldAllAction.tooltip=<html>Espandi i nodi selezionati e tutti i loro figli.</html>
 UnfoldOneLevelAction.text=Espandi di un livello
 UnfoldOneLevelAction.tooltip=<html>Espandi il nodo selezionato di un livello.</html>
+unparsedLatexPatternFormat=LaTeX non analizzato
 up=&Su
 UpConditionAction.text=Su
 update_failed=Aggiornamento fallito con messaggio {0}
 UpdateCheckAction.text=Controllo Aggiornamenti
 updatecheckdialog=Aggiorna finestra controllo
+updater.component=Componente
+updater.goToDownload=Vai al download
 updater.version.installed=Versione installata
 updater.version.latest=Ultima versione
+updater.version.noUpdateUrl=Nessun URL di aggiornamento o homepage per questo add-on.
+updater.version.unknown=sconosciuto
+updater.version.unreachable=Sorgente irraggiungibile:
 updater.viewChangelog=Vedi Changelog
 url_error=URL non corretto !
 url_open_error=Impossibile aprire l''URL {0}.
 used_in_menu=Questo tasto rapido non pu\u00F2 essere impostato, \u00E8 usato per il menu.
 UsePlainTextAction.text=Usa formattazione testo semplice
 user_config_folder=Cartella configurazione utente: {0}
+user_defined_filters=Filtri definiti dall'utente
 user_defined_scale=Scala definita dall'utente
 user_defined_zoom=Definito dall'utente.
 user_defined_zoom_status_bar=Impostato il livello di zoom definito dall''utente di {0}%.
 user_icon=Icona utente "{0}"
 user_template_dir=Modelli Utente
-user_zoom=Fattore ingradimento stampa (0.0 - 2.0):
+user_zoom=Fattore ingrandimento stampa (0.0 - 2.0):
 userScripts=Script
 value_format=Formato valore
 version_up_to_date=E' gi\u00E0 in uso la versione pi\u00F9 aggiornata
@@ -1744,6 +2049,7 @@ view=&Visualizza
 ViewLayoutTypeAction.OUTLINE.text=Visualizzazione lineare ad albero
 web_resources=Risorse Web
 WebDocuAction.text=Documentazione web
+WhatsNewAction.text=Novit\u00E0 in Freeplane 1.5.x
 width=Spessore
 wrong_regexp=Errata espressione regolare "{0}", errore {1}
 xslt_export.html=Documento HTML
diff --git a/freeplane/resources/translations/Resources_ja.properties b/freeplane/resources/translations/Resources_ja.properties
index 7017e12..ca1a3be 100644
--- a/freeplane/resources/translations/Resources_ja.properties
+++ b/freeplane/resources/translations/Resources_ja.properties
@@ -361,6 +361,8 @@ ExecuteScripts.noScriptsAvailable=\u4F7F\u7528\u53EF\u80FD\u30B9\u30AF\u30EA\u30
 ExecuteScripts.text=\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u9078\u3093\u3067\u5B9F\u884C
 ExecuteScriptSecurityError.text=\u30B9\u30AF\u30EA\u30D7\u30C8\uFF1A {0} \n\u3000\u3000\u3092\u5B9F\u884C\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
 export_failed=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+export_pdf_text=Portable Document Format (PDF)
+export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Freeplane \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportAction.text=\u30DE\u30C3\u30D7\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8...
 ExportAllPresentationsAction.text=\u3059\u3079\u3066\u306E\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092 PNG \u3067\u51FA\u529B\u3059\u308B
@@ -1139,6 +1141,7 @@ OptionPanel.ja=\u65E5\u672C\u8A9E\uFF0F\u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=\u30C6\u30AD\u30B9\u30C8\u5206\u96E2\u8A18\u53F7
 OptionPanel.key_type_action=\u30AD\u30FC\u30BF\u30A4\u30D7\u306E\u52D5\u4F5C
 OptionPanel.Keystrokes=\u30AD\u30FC\u8A2D\u5B9A
+OptionPanel.kn=\u30AB\u30F3\u30CA\u30C0\u8A9E / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=\u97D3\u56FD\u8A9E\uFF0F \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=\u30D5\u30A9\u30F3\u30C8\u540D
 OptionPanel.label_font_size=\u6587\u5B57\u30B5\u30A4\u30BA
@@ -1209,6 +1212,7 @@ OptionPanel.number_format=\u6570\u5024\u306E\u6A19\u6E96\u66F8\u5F0F
 OptionPanel.number_format.tooltip=<html>'#' \u3067\u6307\u5B9A\u3055\u308C\u305F\u6841\u306F\u8A72\u5F53\u6570\u5024\u306E\u6709\u7121\u306B\u5FDC\u3058\u3066\u8868\u793A\uFF0F\u975E\u8868\u793A\u3001'0' \u306E\u6841\u306F\u5F37\u5236\u8868\u793A\u3068\u306A\u308A\u307E\u3059\u3002<br>\u3000\u3000\u4E8B\u4F8B\uFF1A"0.00"\u3001"0.0%"\u3001"$#.00"\u3001"#0"</html>
 OptionPanel.number_of_different_files_for_automatic_save=\u30D5\u30A1\u30A4\u30EB\u3054\u3068\u306E\u81EA\u52D5\u4FDD\u5B58\u4EF6\u6570
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>\u30DE\u30C3\u30D7\u6BCE\u306E\u81EA\u52D5\u4FDD\u5B58\u30D5\u30A1\u30A4\u30EB\u6570\uFF08n\uFF09\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u6700\u521D\u306E\u81EA\u52D5\u4FDD\u5B58\u6642\u306B\u306F \u300C1\u300D\u306E\u756A\u53F7<br>\u4ED8\u304D\u30D5\u30A1\u30A4\u30EB\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u540C\u69D8\u306E\u5F62\u3067\u4FDD\u5B58\u3057\u3066\u3044\u304D\u3001\u300Cn + 1\u300D\u56DE\u76EE\u306E\ [...]
+OptionPanel.oc=\u30AA\u30C3\u30AF\u8A9E
 OptionPanel.OK=\u4FDD\u5B58
 OptionPanel.org.freeplane.plugin.bugreport=\u57FA\u672C\u7684\u306A\u5BFE\u5FDC\u65B9\u91DD
 OptionPanel.org.freeplane.plugin.bugreport.allowed=\u5E38\u306B\u9001\u4FE1
@@ -1899,7 +1903,7 @@ slide.last=\u6700\u5F8C
 slide.next=\u6B21\u3078
 slide.nofilter=\u30D5\u30A3\u30EB\u30BF\u7121\u3057
 slide.on_the_left.tooltip=\u5DE6\u63C3\u3048
-slide.on_the_right.tooltip=\u5DE6\u63C3\u3048
+slide.on_the_right.tooltip=\u53F3\u63C3\u3048
 slide.placenode=\u9078\u629E\u3055\u308C\u305F\u30CE\u30FC\u30C9\u306E\u4F4D\u7F6E
 slide.placenode.tooltip=\u30B9\u30E9\u30A4\u30C9\u304C\u63D0\u793A\u3055\u308C\u308B\u6642
 slide.present=\u30D7\u30EC\u30BC\u30F3
diff --git a/freeplane/resources/translations/Resources_kn.properties b/freeplane/resources/translations/Resources_kn.properties
new file mode 100644
index 0000000..e69de29
diff --git a/freeplane/resources/translations/Resources_ko.properties b/freeplane/resources/translations/Resources_ko.properties
index 5bfe81c..8fd1abe 100644
--- a/freeplane/resources/translations/Resources_ko.properties
+++ b/freeplane/resources/translations/Resources_ko.properties
@@ -259,7 +259,7 @@ CutAction.text=\uC798\uB77C\uB0B4\uAE30(T)
 decrease_branch_font_size=\uB354 \uC791\uC740 \uAE00\uAF34
 DecreaseNodeFontAction.text=\uB354 \uC791\uC740 \uAE00\uAF34
 default=\uAE30\uBCF8 \uC124\uC815
-defaultAuxiliaryWordList=a, the, of
+defaultAuxiliaryWordList=\uD558\uB098\uC758, \uADF8, \uC758
 DefaultColorAction.text=\uAE30\uBCF8 \uC0C9
 defaultstyle.attributes=\uC18D\uC131
 defaultstyle.details=\uC0C1\uC138
@@ -363,6 +363,8 @@ ExecuteScripts.noScriptsAvailable=\uC774\uC6A9 \uAC00\uB2A5 \uC2A4\uD06C\uB9BD\u
 ExecuteScripts.text=\uC2A4\uD06C\uB9BD\uD2B8
 ExecuteScriptSecurityError.text=\uC2A4\uD06C\uB9BD\uD2B8 \uC2E4\uD589 \uD558\uB294 \uB3D9\uC548 \uC624\uB958\uAC00 \uBC1C\uC0DD \uD588\uC2B5\uB2C8\uB2E4: {0}
 export_failed=\uB0B4\uBCF4\uB0B4\uAE30 \uC2E4\uD328
+export_pdf_text=\uC774\uB3D9\uAC00\uB2A5 \uBB38\uC11C\uD615\uC2DD (PDF)
+export_svg_text=\uC2A4\uCF00\uC77C\uB7EC\uBE14 \uBCA1\uD130 \uADF8\uB798\uD53D\uC2A4 (SVG)
 export_using_xslt=\uD504\uB9AC\uD50C\uB808\uC778 \uB0B4\uBCF4\uB0B4\uAE30
 ExportAction.text=\uC9C0\uB3C4 \uB0B4\uBCF4\uB0B4\uAE30...
 ExportAllPresentationsAction.text=\uBAA8\uB4E0 \uD504\uB808\uC820\uD14C\uC774\uC158\uC744 PNG \uADF8\uB9BC\uD30C\uC77C\uB85C \uB0B4\uBCF4\uB0B4\uAE30
@@ -1140,7 +1142,8 @@ OptionPanel.ja=\uC77C\uBCF8\uC5B4 / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=\uAE00\uC790 \uAD6C\uBD84
 OptionPanel.key_type_action=\uD0A4 \uC785\uB825 \uC2DC
 OptionPanel.Keystrokes=\uB2E8\uCD95\uD0A4
-OptionPanel.ko=Korean / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
+OptionPanel.kn=\uCE74\uB098\uB2E4\uC5B4 / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
+OptionPanel.ko=\uD55C\uAD6D\uC5B4 / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=\uAE00\uAF34 \uAC00\uC871
 OptionPanel.label_font_size=\uAE00\uAF34 \uD06C\uAE30
 OptionPanel.language=\uC5B8\uC5B4
@@ -1211,6 +1214,7 @@ OptionPanel.number_format=\uD45C\uC900 \uBC88\uD638 \uD615\uC2DD
 OptionPanel.number_format.tooltip=\uBC18\uB4DC\uC2DC \uB4E4\uC5B4\uAC00\uC57C\uD560 \uC22B\uC790\uB294 '0' \uC744 \uC120\uD0DD\uC801\uC778 \uACBD\uC6B0'#'\uC744 \uD3EC\uD568\uD558\uB294 \uD328\uD134\uC785\uB2C8\uB2E4.\r\n\uC608\uC81C: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=\uC784\uC2DC \uC790\uB3D9\uC800\uC7A5 \uD30C\uC77C \uC22B\uC790
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>\uC9C0\uB3C4 \uC790\uB3D9 \uC800\uC7A5\uC5D0 \uC0AC\uC6A9\uB420 \uD30C\uC77C \uC218 n. \uCCAB\uBC88\uC9F8 \uC790\uB3D9 \uC800\uC7A5\uC740 \uCCAB\uBC88\uC9F8 \uD30C\uC77C\uC5D0\uC11C \uB429\uB2C8\uB2E4. \uADF8\uB9AC\uACE0 n+1\uBC88\uC9F8 \uC800\uC7A5\uC740 \uCCAB\uBC88\uC9F8 \uD30C\uC77C\uC5D0 \uB2E4\uC2DC \uC800\uC7A5\uB429\uB2C8\uB2E4(\uC21C\uD658\uD615).</html>
+OptionPanel.oc=\uC624\uD06C\uC5B4
 OptionPanel.OK=\uC800\uC7A5
 OptionPanel.org.freeplane.plugin.bugreport=\uC815\uCC45
 OptionPanel.org.freeplane.plugin.bugreport.allowed=\uD56D\uC0C1 \uBCF4\uB0B4\uAE30
diff --git a/freeplane/resources/translations/Resources_nl.properties b/freeplane/resources/translations/Resources_nl.properties
index 2484c03..0fa98a9 100644
--- a/freeplane/resources/translations/Resources_nl.properties
+++ b/freeplane/resources/translations/Resources_nl.properties
@@ -127,7 +127,7 @@ attributes_refresh=Vernieuwen
 attributes_RemoveAllAttributesAction.text=Alle attributen verwijderen
 attributes_RemoveFirstAttributeAction.text=Eerste attribuut verwijderen
 attributes_RemoveLastAttributeAction.text=Laatste attribuut verwijderen
-attributes_restricted_attributes_tooltip=Beperk de set attributen
+attributes_restricted_attributes_tooltip=De set attributen beperken
 attributes_restricted_values_tooltip=Beperk waardenbereik voor huidig attribuut
 attributes_restriction=Beperkte set
 attributes_select_all=Alle attributen
@@ -186,7 +186,7 @@ cannot_move_to_child=Een ouderknoop kan niet direkt aan zijn kindknoop worden ge
 CenterAction.text=Centreren
 ChangeConnectorArrowsAction.backward.text=Pijl achteruit
 ChangeConnectorArrowsAction.both.text=Pijlen naar beide kanten
-ChangeConnectorArrowsAction.forward.text=Pijl vooruit
+ChangeConnectorArrowsAction.forward.text=Pijl naar voren trekken
 ChangeConnectorArrowsAction.none.text=Lijn zonder pijl
 ChangeConnectorArrowsAction.text=Wijzig pijlen verbindingslijn
 ChangeConnectorShapeAction.CUBIC_CURVE.text=Bocht
@@ -194,7 +194,7 @@ ChangeConnectorShapeAction.EDGE_LIKE.text=Als tak
 ChangeConnectorShapeAction.LINE.text=Lijn
 ChangeConnectorShapeAction.LINEAR_PATH.text=Rechthoekige lijn
 ChangeNodeLevelLeftsAction.text=Naar beneden en ouderniveau
-ChangeNodeLevelLeftsAction.tooltip=Geselecteerde knopen links van de stamknoop verplaatsen naar boven en worden kindknopen van de knoop boven de huidige knoop. Knopen rechts van de stamknoop verplaatsen naar boven. Hierop is een uitzondering: knopen direct links of rechts van de stamknoop verplaatsen naar de andere zijde van de stamknoop.
+ChangeNodeLevelLeftsAction.tooltip=Geselecteerde knopen links van de stamknoop verplaatsen zich naar een niveau lager en de zus/broer boven de geselecteerde knoop wordt de nieuwe ouder. Knopen rechts van de stamknoop verplaatsen zich naar een niveau hoger en de grootouder wordt de nieuwe ouder. Knopen direct rechts van de stamknoop verplaatsen zich naar de linkerkant van de stamknoop.
 ChangeNodeLevelRightsAction.text=Naar boven en kindniveau
 ChangeNodeLevelRightsAction.tooltip=Geselecteerde knopen rechts van de stamknoop verplaatsen naar beneden en worden kindknopen van de knoop onder de huidge knoop. Knopen links van de stamknoop verplaatsen naar boven. Hierop is een uitzondering: knopen direct links of rechts van de stamknoop verplaatsen naar de andere zijde van de stamknoop.
 choose_cloud_color=Kies wolkkleur:
@@ -239,7 +239,7 @@ controls=Besturingselementen
 ConvertCloneToIndependentNodeAction.text=Ontklonen
 copy_name={0} (kopi\u00EBren)
 CopyAction.text=Kopi\u00EBren
-CopyAction.tooltip=Kopieer geselecteerde tak
+CopyAction.tooltip=Kopi\u00EBren geselecteerde tak
 CopyAttributes.text=Kopi\u00EBren attributen
 CopyIDAction.text=Kopi\u00EBren knoop-ID
 CopyMapStylesAction.text=kopieer Mindmapstijl van\u2026
@@ -267,7 +267,7 @@ defaultstyle.floating=Zwevende knoop
 defaultstyle.note=Knoopnotitie
 delete=&Wissen
 delete_child=Wissen kindknoop
-DeleteAction.text=Verwijderen knoop
+DeleteAction.text=Knoop verwijderen
 DeleteConditionAction.text=Wissen
 DeleteDetailsAction.text=Verwijderen knoopdetails
 DeleteLevelStyleAction.text=Wissen automatische opmaakstijl voor niveau
@@ -318,7 +318,7 @@ edit_label_font_size=Lettergrootte
 edit_link_manually=De koppeling intypen...
 edit_long_node=Bewerken knoopkern in apart venster
 edit_middle_label=Tekstlabel midden
-edit_note=Bewerken notitie
+edit_note=Notitie bewerken
 edit_source_label=Tekstabel begindzijde
 edit_target_label=Tekstlabel eindzijde
 edit_transparency_label=Doorschijnendheid
@@ -363,6 +363,8 @@ ExecuteScripts.noScriptsAvailable=Niet aanwezig
 ExecuteScripts.text=Beschikbare groovy scripts
 ExecuteScriptSecurityError.text=Er is een fout opgetreden bij de uitvoering van script: {0}
 export_failed=xporteren is mislukt
+export_pdf_text=Portable Document Format (PDF)
+export_svg_text=Schaalbare vectorafbeeldingen (SVG)
 export_using_xslt=Exporteren naar:
 ExportAction.text=Exporteren...
 ExportAllPresentationsAction.text=Alle presentaties exporteren als PNG-afbeeldingen
@@ -378,7 +380,7 @@ ExportToImage.png.text=PNG, Portable Network Graphic
 ExportToOoWriter.text=ODT, Open Office Text
 extension_menu=&Opmaakpatronen...
 ExternalImage_popupMenu_Change=Wijzig...
-ExternalImage_popupMenu_Open=Open in viewer
+ExternalImage_popupMenu_Open=Openen in viewer
 ExternalImage_popupMenu_Remove=Verwijder
 ExternalImage_popupMenu_ResetZoom=Herstel zoom
 ExternalImageAddAction.text=voeg afbeelding toe...
@@ -463,7 +465,7 @@ filter_reminder_after=vindt plaats na
 filter_reminder_before=vindt plaats voor
 filter_reminder_executed=al uitgevoerd
 filter_reminder_later=later ingesteld
-filter_root=stamknoop
+filter_root=Stamknoop
 filter_script=Script filter
 filter_select=&Selecteren
 filter_selected_node_view=Huidige geselecteerde knopen
@@ -659,7 +661,7 @@ icon_stop-sign=Stop
 icon_subtraction=Aftrekking
 icon_unchecked=Zonder vinkje
 icon_up=Naar boven
-icon_user_icon=Gebruikerpictogrammen
+icon_user_icon=Gebruikerspictogrammen
 icon_very_negative=Zeer negatief
 icon_very_positive=Zeer positief
 icon_video=Video
@@ -783,7 +785,7 @@ ManageAddOnsDialog.status.installing=Installeren plug-in...
 ManageAddOnsDialog.status.success={0} installeren geslaagd.
 ManageAddOnsDialog.tab.install=Zoeken en installeren
 ManageAddOnsDialog.tab.install.tooltip=Zoeken en installeren niewue add-ons
-ManageAddOnsDialog.tab.manage=Beheren add-ons
+ManageAddOnsDialog.tab.manage=Add-ons
 ManageAddOnsDialog.tab.manage.themes=Thema's
 ManageAddOnsDialog.tab.manage.themes.tooltip=Beheren geinstalleerde thema's
 ManageAddOnsDialog.tab.manage.tooltip=Beheren add-ons
@@ -1007,7 +1009,7 @@ OptionPanel.center_selected_node=Centreren geselecteerde knopen
 OptionPanel.check_updates_automatically=Bij de start controleren of er nieuwe programmaonderdelen zijn
 OptionPanel.childpattern=Opmaakprofiel kindknoop
 OptionPanel.childpattern.tooltip=De gekozen opmaak toepassen op alle kindknopen van de huidige knoop.
-OptionPanel.clear_all_setters=Wissen alle instellingen
+OptionPanel.clear_all_setters=Alle instellingen wisselen
 OptionPanel.clear_all_setters.tooltip=In- of uitschakelen van alle wijzigingsindicatoren.
 OptionPanel.cloud=Wolk
 OptionPanel.cloudcolor=Kleur wolk
@@ -1027,7 +1029,7 @@ OptionPanel.cut_out_pictures_when_pasting_html=HTML afbeeldingen verwijderen
 OptionPanel.da=Deens / Dansk
 OptionPanel.date_format=Standaard opmaak datum
 OptionPanel.date_format.tooltip=Ofwel SHORT, MEDIUM, LONG of FULL of een patroon zoals "dd-mm-yyyy"
-OptionPanel.datetime_format=Staandaard opmaak datum-tijd
+OptionPanel.datetime_format=Standaard opmaak datum-tijd
 OptionPanel.datetime_format.tooltip=U kunt <datumformaat>,<tijdformaat> beide met het formaat SHORT, MEDIUM, LONG of FULL vullen of een volledig patroon invullen zoals "dd-mm-yyyy HH:mm"
 OptionPanel.de=Duits / Deutsch
 OptionPanel.default=Standaard knoopstijl
@@ -1056,7 +1058,7 @@ OptionPanel.edgecolor=Kleur tak
 OptionPanel.edgecolor.tooltip=Opmaak van de tak naar de ouderknoop (wordt ook toegepast op de eigen kindknopen)
 OptionPanel.edgedash=Lijntype voor tak
 OptionPanel.edgestyle=Vorm tak
-OptionPanel.edgestyle.tooltip=Opmaak van de tak naar de ouderknoop; deze wordt ook toegepast op de eigen kindknopen
+OptionPanel.edgestyle.tooltip=Opmaak van de tak naar de ouderknoop; deze wordt ook op de eigen kindknopen toegepast
 OptionPanel.edgewidth=Dikte tak
 OptionPanel.edgewidth.tooltip=Opmaak van de tak naar de ouderknoop; deze wordt ook toegepast naar de eigen kindknopen
 OptionPanel.EDIT_CURRENT=Inhoud overschrijven
@@ -1140,6 +1142,7 @@ OptionPanel.ja=Japans / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Scheidingsteken tekst
 OptionPanel.key_type_action=Bij toetsindruk
 OptionPanel.Keystrokes=Sneltoetsen
+OptionPanel.kn=Kannada / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=Koreaans / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Naam lettertype
 OptionPanel.label_font_size=Grootte lettertype
@@ -1181,7 +1184,7 @@ OptionPanel.max_shortened_text_length=Maximale beperking knooplengte
 OptionPanel.menuItemFontSize=Lettertype grootte voor menus
 OptionPanel.metal=Metaal
 OptionPanel.min_node_width=Minimum knoopbreedte
-OptionPanel.monitor_size_inches=Monitor grootte (inches)
+OptionPanel.monitor_size_inches=Monitor grootte (inch)
 OptionPanel.motif=Motief
 OptionPanel.narrow_hexagon=Nauwe zeshoek
 OptionPanel.nb=Noors / Norsk bokm\u00E5l
@@ -1210,10 +1213,11 @@ OptionPanel.number_format=Standaard opmaak getal
 OptionPanel.number_format.tooltip=Een patroon met '#' voor optionele of '0' voor verplichte cijfers. Voorbeelden: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=Aantal verschillende reservebestanden bij automatisch bewaren
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>Aantal verschillende reservebestanden dat tijdens het werken automatisch wordt bewaard. De eerste keer automatisch bewaren gebeurt in het eerste bestand enz. Wanneer het laatste bestand gevuld is, wordt het eerste reservebestand overschreven, enz.</html>
+OptionPanel.oc=Occitaans
 OptionPanel.OK=Bewaren
 OptionPanel.org.freeplane.plugin.bugreport=Beleid
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Altijd verzenden
-OptionPanel.org.freeplane.plugin.bugreport.ask=Tonen dialoog voor foutenmelding
+OptionPanel.org.freeplane.plugin.bugreport.ask=Dialoog tonen om fout te rapporteren
 OptionPanel.org.freeplane.plugin.bugreport.denied=Nooit verzenden
 OptionPanel.org.freeplane.plugin.bugreport.userid=Te verzenden gebruikers-ID (optioneel)
 OptionPanel.outline_hgap=Horizontale afstand
@@ -1612,7 +1616,7 @@ rename=&Hernoemen
 repair_link=Herstellen snelkoppeling
 repair_link_question=Kan de gekoppelde mindmap niet laden. Wilt u de koppeling handmatig herstellen?
 replace=Vervangen
-replace_shortcut_question=Deze sneltoets is op dit moment verbonden mer\n {0}.\nDeze koppeling verwijderen?
+replace_shortcut_question=Momenteel is deze sneltoets toegewezen aan\n {0}.\nDeze toewijzing vervangen?
 replace_shortcut_title=Sneltoets vervangen?
 ReportBugAction.text=Melden van een fout
 RequestFeatureAction.text=Vragen om een nieuwe functie
@@ -1639,7 +1643,7 @@ saving_canceled=Bewaren is geannuleerd
 scanners_not_loaded=Scanners niet geladen, bestand is beschadigd
 scheme_evaluate=Bereken!
 script_execution_disabled=Uitvoering van scripts is uitgeschakeld, zie Extra > Instellingen\u2026 > Plugins
-ScriptEditor.text=Bewerken scripts...
+ScriptEditor.text=Script bewerken\u2026
 ScriptEditor.tooltip=Laat toe om grotere scripts te maken in Freeplane.
 ScriptEditorPanel.changed_cancel=De scripts werden veranderd. Ben je zeker dat je de aanpassingen niet wil bewaren?
 scripting=Scripts
@@ -1669,7 +1673,7 @@ SelectNoteAction.tooltip=Wissel naar/van notitievenster
 set_accelerator_on_next_click_helpmessage=Op de gewenste opdracht in het menu klikken om een nieuw sneltoets te cre\u00EBren.
 SetAccelerator.dialogTitle=Definitie sneltoets
 SetAccelerator.keystrokeDetected=Toets ''{0}'' is niet aan een menu item toegewezen.
-SetAcceleratorOnNextClickAction.text=Toewijzen sneltoets...
+SetAcceleratorOnNextClickAction.text=Toewijzen sneltoets
 SetAlwaysUnfoldedNodeFlagsAction.text=Opengevouwen knopen behouden
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=Voorkomt dat de knopen die nu zijn opengevouwen worden dichtgevouwen
 SetImageByFileChooserAction.text=Toevoegen afbeelding of converteren link...
@@ -1873,7 +1877,7 @@ simplyhtml.thisColRangeLabel=deze kolom
 simplyhtml.thisRowRangeLabel=deze rij
 simplyhtml.toggleBulletsLabel=Lijst met opsommingstekens
 simplyhtml.toggleBulletsTip=Lijst met opsommingstekens aan/uit
-simplyhtml.toggleNumbersLabel=Lijst met nummers
+simplyhtml.toggleNumbersLabel=Genummerde lijst in-/ uitschakelen
 simplyhtml.toggleNumbersTip=Lijst met nummers aan/uit
 simplyhtml.topLabel=bovenaan:
 simplyhtml.uLineLabel=Onderlijnd
@@ -2029,8 +2033,8 @@ updater.version.latest=Meest recente versie
 updater.version.noUpdateUrl=Geen update-URL of homepage voor deze add-on.
 updater.version.unknown=onbekend
 updater.version.unreachable=Onbereikbare bron:
-updater.viewChangelog=Zie log bestand
-url_error=Deze URL is onjuist!
+updater.viewChangelog=Bekijk de wijzigingslog
+url_error=Deze URL is ongeldig!
 url_open_error=Kon URL {0} niet openen.
 used_in_menu=Deze sneltoets kan niet worden ingesteld omdat deze al in gebruik is.
 UsePlainTextAction.text=Platte tekstopmaak
@@ -2040,7 +2044,7 @@ user_defined_scale=Door de gebruiker gedefinieerde schaal
 user_defined_zoom=Door gebruiker gedefinieerd
 user_defined_zoom_status_bar=De zoomfactor wijzigen naar het door de gebruiker opgegeven percentage van {0}%.
 user_icon=Gebruiker pictogram "{0}"
-user_template_dir=Door de gebruiker gedefinieerde mindmapstijlen
+user_template_dir=Gebruikerssjablonen
 user_zoom=Zoomfactor (0.0 - 2.0) voor afdrukken:
 userScripts=Beschikbare groovy scripts
 value_format=Opmaak waarde
diff --git a/freeplane/resources/translations/Resources_oc.properties b/freeplane/resources/translations/Resources_oc.properties
new file mode 100644
index 0000000..16a32d3
Binary files /dev/null and b/freeplane/resources/translations/Resources_oc.properties differ
diff --git a/freeplane/resources/translations/Resources_pl.properties b/freeplane/resources/translations/Resources_pl.properties
index 46cf4ef..7de8b60 100644
--- a/freeplane/resources/translations/Resources_pl.properties
+++ b/freeplane/resources/translations/Resources_pl.properties
@@ -1,8 +1,8 @@
 about=O programie
 about_text=Freeplane - wolne oprogramowanie do tworzenia map pami\u0119ci i wiedzy
 AboutAction.text=O programie
-acceleratorPresets=Ustawienia skr\u00F3t\u00F3w klawiszowych
-accelerators_loading_error=Nie mog\u0119 za\u0142adowa\u0107 skr\u00F3t\u00F3w klawiszowych z {0}
+acceleratorPresets=Ustawienia skr\u00F3t\u00F3w klawiaturowych
+accelerators_loading_error=Nie mog\u0119 za\u0142adowa\u0107 skr\u00F3t\u00F3w klawiaturowych z {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=Zmie\u0144 format w\u0119z\u0142\u00F3w
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Zmie\u0144 szablon
 accessories/plugins/EncryptNode.properties_0=Podaj has\u0142o dla zaszyfrowanego w\u0119z\u0142a
@@ -21,7 +21,7 @@ accessories/plugins/Export_JavaWebStart.tooltip=Eksportuje map\u0119 do uruchomi
 accessories/plugins/ExportWithTWiki.text=Jako TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Eksportuje map\u0119 jako dokument TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=Jest to og\u00F3lna metoda eksportu.
-accessories/plugins/ExportWithXSLT_Applet.text=Do apletu Javy ...
+accessories/plugins/ExportWithXSLT_Applet.text=Aplet Javy...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Eksportuj map\u0119 do apletu javy.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML (wersja JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (Wersja obrazu z map\u0105 do klikni\u0119cia)...
@@ -29,14 +29,14 @@ accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Zasoby z w\u0119z\u0142a RE
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Eksportuje zasoby z w\u0119z\u0142a RESOURCES do modu\u0142u Taskjugglera. </html>
 accessories/plugins/ExportWithXSLT_TASKSTJI.text=Zadania z w\u0119z\u0142a TASKS do pliku TaskJuggler...
 accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Eksportuje zadania z w\u0119z\u0142a TASKS do modu\u0142u Taskjugglera. </html>
-action_keystroke_in_use_error=Klawisz {0} wybrany dla polecenia {1} jest ju\u017C u\u017Cywany przez polecenie {2}
+action_keystroke_in_use_error=Skr\u00F3t klawiaturowy {0} wybrany dla polecenia {1} jest ju\u017C u\u017Cywany przez polecenie {2}
 active=Aktywny
 actual_map_styles=Warunkowe style mapy zastosowane do w\u0119z\u0142a
 actual_node_styles=Warunkowe style w\u0119z\u0142a zastosowane do w\u0119z\u0142a
 add=Dodaj
 AddConnectorAction.text=Po\u0142\u0105cz
 AddElementaryConditionAction.text=Dodaj
-AddExecutionLinkAction.text=Dodaj hiper\u0142\u0105cze do wykonywania polecenia OS...
+AddExecutionLinkAction.text=Dodaj odno\u015Bnik do wykonywania jako polecenie OS...
 AddLocalLinkAction.text=Dodaj odno\u015Bnik do innego w\u0119z\u0142a
 AddMenuItemLinkAction.text=Dodaj odno\u015Bnik do polecenia z menu...
 AddOnDetailsPanel.authored.by=autorstwa {0}
@@ -60,7 +60,7 @@ addons.installer.missing.translation=Brakuj\u0105ce t\u0142umaczenie {0} dla lok
 addons.installer.no.scripts=Nie znaleziono skrypt\u00F3w
 addons.installer.no.zipdata=Nie znaleziono spakowanych danych (zip)
 addons.installer.nonstandard.permissions=Skrypt wymaga nast\u0119puj\u0105cych uprawnie\u0144, kt\u00F3re nie s\u0105 aktualnie w\u0142\u0105czone: {0}.\nCzy maj\u0105 by\u0107 dodane do standardowych uprawnie\u0144?
-addons.installer.one.child.expected=Oczekiwany dok\u0142adnie jeden potomek {0}, ale otrzymano {1}.
+addons.installer.one.child.expected=Oczekiwano dok\u0142adnie jednego potomka {0}, ale otrzymano {1}.
 addons.installer.script.name.suffix=Nazwa skryptu {0} nie ma rozszerzenia ".groovy"
 addons.installer.script.no.execution_mode=Atrybut "execution_mode" nie zdefiniowany dla {0}
 addons.installer.script.no.menulocation=Atrybut "menuLocation" nie zdefiniowany dla {0}
@@ -80,9 +80,9 @@ AddStyleAttributes.tooltip=Dodaj atrybuty z w\u0119z\u0142a stylu
 AllMapsNodeListAction.text=Znajd\u017A i zast\u0105p we wszystkich mapach
 always=Zawsze
 AlwaysUnfoldedNodeAction.text=Zawsze rozwini\u0119ty w\u0119ze\u0142 (w\u0142./wy\u0142.)
-antialias_all=Antyaliasing wszystkiego
-antialias_edges=Antyaliasing ga\u0142\u0119zi
-antialias_none=Bez antyaliasingu
+antialias_all=Wyg\u0142adzanie wszystkiego
+antialias_edges=Wyg\u0142adzanie ga\u0142\u0119zi
+antialias_none=Bez wyg\u0142adzania
 apply=Zastosuj
 ApplyAction.text=Zastosuj
 ApplyFormatPlugin.text=Zmie\u0144 format...
@@ -132,7 +132,7 @@ attributes_restricted_attributes_tooltip=Ogranicz zestaw atrybut\u00F3w
 attributes_restricted_values_tooltip=Ogranicz zakres warto\u015Bci dla aktywnego atrybutu
 attributes_restriction=Ograniczony zbi\u00F3r warto\u015Bci
 attributes_select_all=Wszystkie
-attributes_select_all_tooltip=Zaznacz / Odzancz wszystkie
+attributes_select_all_tooltip=Zaznacz/odznacz wszystkie
 attributes_show=Poka\u017C
 attributes_skip_root=Pomi\u0144 w\u0119ze\u0142 korzenia
 attributes_visible=Zazanczone widoczne
@@ -175,7 +175,7 @@ can_not_delete_predefined_style=Nie mo\u017Cna usun\u0105\u0107 predefiniowanych
 can_not_delete_root_style=Nie mo\u017Cna usun\u0105\u0107 stylu korzenia
 can_not_delete_style_group=Nie mo\u017Cna usun\u0105\u0107 grupy styl\u00F3w
 can_not_encrypt_cloned_node=Nie mo\u017Cna zaszyfrowa\u0107 sklonowanych w\u0119z\u0142\u00F3w
-can_not_save_key_set=Nie mo\u017Cna zapisa\u0107 zestawu skr\u00F3t\u00F3w klawiszowych
+can_not_save_key_set=Nie mo\u017Cna zapisa\u0107 zestawu skr\u00F3t\u00F3w klawiaturowych
 cancel=Anuluj
 CancelAction.text=Anuluj
 cannot_add_parent_diff_parents=Wszystkie w\u0119z\u0142y musz\u0105 mie\u0107 tego samego rodzica, aby u\u017Cy\u0107 tej funkcji.
@@ -204,7 +204,7 @@ choose_map_background_color=Wybierz kolor t\u0142a mapy
 choose_node_background_color=Wybierz kolor t\u0142a w\u0119z\u0142a:
 choose_node_color=Wybierz kolor w\u0119z\u0142a:
 ClearLinkAnchorAction.text=Wy\u0142\u0105cz zakotwiczenie w\u0119z\u0142a
-ClearLinkAnchorAction.tooltip=<html>Wy\u0142\u0105cz zakotwiczenie w\u0119z\u0142a wcze\u015Bniej wybranego</html>
+ClearLinkAnchorAction.tooltip=<html>wy\u0142\u0105cz zakotwiczony wcze\u015Bniej w\u0119ze\u0142</html>
 CloneAction.text=Wklej klon
 close_btn=Zamknij
 CloseAction.text=Zamknij aktywn\u0105 map\u0119
@@ -298,7 +298,7 @@ EdgeStyleAction.bezier.tooltip=<html>Wy\u015Bwietla ga\u0142\u0105\u017A jako g\
 EdgeStyleAction.hide_edge.text=Ukryj ga\u0142\u0105\u017A
 EdgeStyleAction.hide_edge.tooltip=<html>Dla wybranych w\u0119z\u0142\u00F3w wy\u015Bwietlaj ga\u0142\u0105\u017A do elementu nadrz\u0119dnego jako lini\u0119 przerywan\u0105.<br>W przeciwnym razie ukryj ga\u0142\u0105\u017A.</html>
 EdgeStyleAction.horizontal.text=Pionowa
-EdgeStyleAction.horizontal.tooltip=<html>U\u017Cyj prostej prostopad\u0142ej do kraw\u0119dzi.</html>
+EdgeStyleAction.horizontal.tooltip=<html>U\u017Cyj prostych prostopad\u0142ych linii dla ga\u0142\u0119zi.</html>
 EdgeStyleAction.linear.text=Linia
 EdgeStyleAction.linear.tooltip=<html>Wy\u015Bwietl kraw\u0119d\u017A jako lini\u0119 prost\u0105.</html>
 EdgeStyleAction.sharp_bezier.text=Ostra krzywa B\u00E9ziera
@@ -337,15 +337,15 @@ EditStylesAction.text=Edytuj style
 EncryptedMap.text=Utw\u00F3rz zaszyfrowan\u0105 map\u0119...
 EncryptedMap.tooltip=Nowa zaszyfrowana mapa
 encryption=Szyfrowanie
-enter_base_url=Freeplane automatycznie wklei linki wzgl\u0119dne. Podaj bazowy URL.
+enter_base_url=Freeplane automatycznie wklei odno\u015Bniki wzgl\u0119dne. Podaj bazowy URL.
 enter_command=Wpisz polecenie
 enter_condition_name=Wprowad\u017A nazw\u0119 nowego warunku
 enter_confirms=Enter potwierdza
-enter_keyset_name=Podaj nazw\u0119 zestawu skr\u00F3t\u00F3w klawiszowych
+enter_keyset_name=Podaj nazw\u0119 zestawu skr\u00F3t\u00F3w klawiaturowych
 enter_map_url=Wprowad\u017A adres URL mapy
 enter_new_style_name=Wprowad\u017A nazw\u0119 nowego stylu
 enter_node_id=Wprowad\u017A ID w\u0119z\u0142a
-enter_zoom=Wpisz zoom
+enter_zoom=Ustaw powi\u0119kszenie
 EnterPassword.text=W\u0142\u0105cz/wy\u0142\u0105cz szyfrowanie
 error=B\u0142\u0105d
 error_applying_template=B\u0142\u0105d aplikowania szablonu XSL.
@@ -370,12 +370,12 @@ ExportAllPresentationsAction.text=Eksportuj wszystkie prezentacje do obraz\u00F3
 ExportBranchAction.text=Przenie\u015B ga\u0142\u0105\u017A do nowej mapy...
 ExportBranchToHTMLAction.text=Ga\u0142\u0105\u017A do dokumentu HTML
 exported_file=plik {0}
-ExportPdf.text=Do dokumentu PDF...
+ExportPdf.text=PDF
 ExportPresentationAction.text=Eksportuj bie\u017C\u0105c\u0105 prezentacj\u0119 do obraz\u00F3w PNG
-ExportSvg.text=Do obrazu SVG...
-ExportToHTMLAction.text=Do dokumentu HTML...
-ExportToImage.jpg.text=Do obrazu JPEG...
-ExportToImage.png.text=Do obrazu PNG...
+ExportSvg.text=SVG
+ExportToHTMLAction.text=HTML
+ExportToImage.jpg.text=JPEG
+ExportToImage.png.text=PNG
 ExportToOoWriter.text=Do dokumentu OpenOffice Writer...
 ExportToOoWriter.tooltip=<html> Rozwini\u0119te ga\u0142\u0119zie tworz\u0105 struktur\u0119 dokumentu, a zwini\u0119te zawarto\u015B\u0107</html>
 extension_menu=Styl
@@ -386,8 +386,8 @@ ExternalImage_popupMenu_ResetZoom=Powi\u0119kszenie 1:1
 ExternalImageAddAction.text=Dodaj obrazek...
 ExternalImageChangeAction.text=Zmie\u0144 obrazek...
 ExternalImageRemoveAction.text=Usu\u0144 obrazek
-ExtractLinkFromTextAction.text=Utw\u00F3rz \u0142\u0105cze z tekstu w\u0119z\u0142a
-ExtractLinkFromTextAction.tooltip=Tworzy \u0142\u0105cze z adresu w tek\u015Bcie w\u0119z\u0142a
+ExtractLinkFromTextAction.text=Utw\u00F3rz odno\u015Bnik z tekstu w\u0119z\u0142a
+ExtractLinkFromTextAction.tooltip=Tworzy odno\u015Bnik z adresu w tek\u015Bcie w\u0119z\u0142a
 extras=Narz\u0119dzia
 f_button_unassigned=<brak>
 FaqOpenURLAction.text=FAQ
@@ -485,9 +485,9 @@ fit_background_to_page=Dopasuj obraz t\u0142a do jednej strony
 fit_map_to_page=Dopasuj do strony
 fit_map_to_page_height=Dopasuj wysoko\u015B\u0107 do strony
 fit_map_to_page_width=Dopasuj szeroko\u015B\u0107 do strony
-FitToPage.text=Dopasuj do strony
+FitToPage.text=Dopasuj powi\u0119kszenie do strony
 FitToPage.tooltip=Dostosowuje powi\u0119kszenie mapy do aktualnego okna.
-fold=Rozwi\u0144/Zwi\u0144
+fold=Zwi\u0144/Rozwi\u0144
 FoldAllAction.text=Zwi\u0144 wszystko
 FoldAllAction.tooltip=<html>Zwija zaznaczone w\u0119z\u0142y i ich w\u0119z\u0142y potomne</html>
 FoldOneLevelAction.text=Zwi\u0144 jeden poziom
@@ -521,7 +521,7 @@ FreeNodeAction.text=Swobodne po\u0142o\u017Cenie w\u0119z\u0142a (w\u0142./wy\u0
 Freeplane.progress.buildScreen=Budowanie interfejsu...
 Freeplane.progress.createController=Tworzenie kontrolera...
 Freeplane.progress.createInitialMode=Tryb inicjacji...
-Freeplane.progress.endStartup=Uruchamianie...
+Freeplane.progress.endStartup=Finisz uruchamiania.
 Freeplane.progress.gettingPreferenceDirectories=Pobieranie katalogow ustawie\u00F1...
 Freeplane.progress.gettingPreferences=Pobieranie ustawie\u00F1...
 Freeplane.progress.loadMaps=Wczytywanie map...
@@ -543,7 +543,7 @@ GrabKeyDialog.grab-key.assigned-to=Przypisany do
 GrabKeyDialog.grab-key.assigned-to.none=Obecnie nie przypisany
 GrabKeyDialog.grab-key.clear=Wyczy\u015B\u0107
 GrabKeyDialog.grab-key.remove=Usu\u0144
-GrabKeyDialog.grab-key.remove-ask=Czy na pewno chcesz usun\u0105\u0107 ten skr\u00F3t klawiszowy?
+GrabKeyDialog.grab-key.remove-ask=Czy na pewno chcesz usun\u0105\u0107 ten skr\u00F3t klawiaturowy?
 GrabKeyDialog.grab-key.title=Wybierz nowy skr\u00F3t klawiaturowy
 green=Zielony
 help=Pomoc
@@ -552,9 +552,9 @@ HideAllAttributesAction.text=Ukryj wszystkie atrybuty
 HierarchicalIcons2Action.text=Poka\u017C wsp\u00F3lne ikony potomk\u00F3w
 HierarchicalIconsAction.text=Poka\u017C ikony hierarchicznie
 HierarchicalIconsAction.tooltip=Je\u015Bli jeden z potomk\u00F3w w\u0119z\u0142a ma ikon\u0119, to zostanie ona r\u00F3wnie\u017C wy\u015Bwietlona w w\u0119\u017Ale (rodzicu).
-hot_keys=Skr\u00F3ty klawiszowe
-hot_keys_table=Lista skr\u00F3t\u00F3w klawiszowych
-HotKeyInfoAction.text=Lista skr\u00F3t\u00F3w klawiszowych
+hot_keys=Skr\u00F3ty klawiaturowe
+hot_keys_table=Lista skr\u00F3t\u00F3w klawiaturowych
+HotKeyInfoAction.text=Lista skr\u00F3t\u00F3w klawiaturowych
 html_export_based_on_headings=Eksport HTML - jako esej
 html_export_fold_all=Eksport HTML - zwijanie wszystkich w\u0119z\u0142\u00F3w
 html_export_fold_currently_folded=Eksport HTML - zwijanie aktualnie zwini\u0119tych
@@ -704,8 +704,8 @@ ImportAction.text=Importuj
 ImportBranchAction.text=Mapa jako nowa ga\u0142\u0105\u017A...
 ImportExplorerFavoritesAction.text=Ulubionych z Internet Explorer...
 ImportFolderStructureAction.text=Struktury katalog\u00F3w...
-ImportLinkedBranchAction.text=Odno\u015Bnika z zaznaczonego w\u0119z\u0142a
-ImportLinkedBranchWithoutRootAction.text=Odno\u015Bnika z zaznaczonego w\u0119z\u0142a (bez korzenia)...
+ImportLinkedBranchAction.text=Odno\u015Bnik z wybranego w\u0119z\u0142a
+ImportLinkedBranchWithoutRootAction.text=Odno\u015Bnik z wybranego w\u0119z\u0142a bez korzenia...
 ImportMindmanagerFiles.text=Mapa programu MindManager X5...
 ImportXmlFile.text=Importuj plik xml
 increase_branch_font_size=Zwi\u0119ksz czcionk\u0119
@@ -734,15 +734,15 @@ LengthUnits.in=cal
 LengthUnits.mm=mm
 LengthUnits.pt=pt
 LengthUnits.px=px
-less_than_two_selected_nodes=Wybierz co najmniej dwa w\u0119z\u0142y, aby utworzy\u0107 po\u0142\u0105czenie.
+less_than_two_selected_nodes=Wybierz co najmniej dwa w\u0119z\u0142y, aby utworzy\u0107 odno\u015Bnik.
 license=Licencja: GPL 2 lub p\u00F3\u017Aniejsza
 license_text=<html>This program is free software; you can redistribute it and/or<br>modify it under the terms of the GNU General Public License<br>as published by the Free Software Foundation; either version 2<br>of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful,<br>but WITHOUT ANY WARRANTY; without even the implied warranty of<br>MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the<br>GNU General Public  [...]
 LicenseAction.text=Licencja
 link_error=Nieprawid\u0142owy odno\u015Bnik "{0}" nie za\u0142adowany
-link_not_available_any_more=Po\u0142\u0105czenie jest nieaktualne. Jeden z w\u0119z\u0142\u00F3w zosta\u0142 usuni\u0119ty.
+link_not_available_any_more=Odno\u015Bnik jest nieaktualny. Jeden z w\u0119z\u0142\u00F3w zosta\u0142 usuni\u0119ty.
 link_not_found=Nie znaleziono odno\u015Bnika {0}.
-links=\u0141\u0105cze
-load=Wczytywanie
+links=Odno\u015Bnik
+load=Wczytaj
 load_accelerator_presets=Wczytaj
 load_accelerator_presets.noActions=Brak ustawie\u0144
 LoadAcceleratorPresetsAction.textPatterns.text=Wzorce tekstowe
@@ -755,10 +755,10 @@ lots_of_links_warning=Czy na pewno chcesz utworzy\u0107 wiele odno\u015Bnik\u00F
 main_menu=Menu
 main_resource_directory=Zasoby instalacji: {0}
 MainView.errorUpdateText=B\u0142\u0105d ustawienia tekstu dla wej\u015Bcia: {0}.
-MakeLinkFromAnchorAction.text=Utw\u00F3rz \u0142\u0105cze z zakotwiczonego w\u0119z\u0142a
-MakeLinkFromAnchorAction.tooltip=<html>utw\u00F3rz lokalne lub globalne \u0142\u0105cze z<br/>zakotwiczonego w\u0119z\u0142a do innego w\u0119z\u0142a</html>
-MakeLinkToAnchorAction.text=Utw\u00F3rz \u0142\u0105cze do zakotwiczonego w\u0119z\u0142a
-MakeLinkToAnchorAction.tooltip=<html>utw\u00F3rz lokalne lub globalne \u0142\u0105cze do<br/>zakotwiczonego w\u0119z\u0142a z innego w\u0119z\u0142a</html>
+MakeLinkFromAnchorAction.text=Utw\u00F3rz odno\u015Bnik z zakotwiczonego w\u0119z\u0142a
+MakeLinkFromAnchorAction.tooltip=<html>utw\u00F3rz lokalny lub globalny odno\u015Bnik z<br/>zakotwiczonego w\u0119z\u0142a do wybranego w\u0119z\u0142a</html>
+MakeLinkToAnchorAction.text=Utw\u00F3rz odno\u015Bnik do zakotwiczonego w\u0119z\u0142a
+MakeLinkToAnchorAction.tooltip=<html>utw\u00F3rz lokalny lub globalny odno\u015Bnik z<br/>wybranego w\u0119z\u0142a do zakotwiczonego w\u0119z\u0142a</html>
 ManageAddOnsAction.text=Dodatki
 ManageAddOnsDialog.activate=W\u0142\u0105cz
 ManageAddOnsDialog.activation.success={0} b\u0119dzie w\u0142\u0105czony po ponownym uruchomieniu programu.
@@ -900,7 +900,7 @@ NextNodeAction.BACK.text=Id\u017A do poprzedniego w\u0119z\u0142a
 NextNodeAction.BACK_N_FOLD.text=Id\u017A do poprzedniego w\u0119z\u0142a (zwi\u0144)
 NextNodeAction.FORWARD.text=Id\u017A do nast\u0119pnego w\u0119z\u0142a
 NextNodeAction.FORWARD_N_FOLD.text=Id\u017A do nast\u0119pnego w\u0119z\u0142a (zwi\u0144)
-NextPresentationItemAction.text=Rozwi\u0144 nast\u0119pny element prezentacji (zwi\u0144 poprzedni)
+NextPresentationItemAction.text=Rozwi\u0144 nast\u0119pny element prezentacji (zwi\u0144)
 no=Nie
 no_copy_attributes_before_paste_attributes=Nie mo\u017Cesz wklei\u0107 atrybut\u00F3w zanim ich nie skopiowano.
 NO_FORMAT=Tekst
@@ -976,9 +976,9 @@ OptionPanel.always_save_folding_state=Zawsze zapisuj zmiany stanu zwini\u0119\u0
 OptionPanel.always_save_folding_state.tooltip=Je\u017Celi w\u0142\u0105czone, ka\u017Cda zmiana zwini\u0119cia zaznacza map\u0119 jako zmodyfikowan\u0105 i przypomina o konieczno\u015Bci jej zapisania.
 OptionPanel.always_show_less_than_N_nodes_after_load=Rozwijaj kilka w\u0119z\u0142\u00F3w
 OptionPanel.always_unfold_all_after_load=Rozwi\u0144 wszystko
-OptionPanel.antialias=Antyaliasing
+OptionPanel.antialias=Wyg\u0142adzanie
 OptionPanel.antialias.tooltip=<html>Okre\u015Bla jako\u015B\u0107 wy\u015Bwietlania mapy. Im wi\u0119cej wyg\u0142adzania, tym wolniej dzia\u0142a Freeplane</html>
-OptionPanel.antialias_all=Antyaliasing wszystkiego
+OptionPanel.antialias_all=Wyg\u0142adzanie wszystkiego
 OptionPanel.antialias_edges=Wyg\u0142adzanie ga\u0142\u0119zi
 OptionPanel.antialias_none=brak
 OptionPanel.antialias_svg=Wyg\u0142adzanie SVG
@@ -999,7 +999,7 @@ OptionPanel.Behaviour=Spos\u00F3b dzia\u0142ania
 OptionPanel.bezier=bezier
 OptionPanel.border_color=Kolor
 OptionPanel.border_color_matches_edge_color=U\u017Cyj kolor ga\u0142\u0119zi
-OptionPanel.border_dash=Typ linii brzegowej
+OptionPanel.border_dash=Typ linii obramowania
 OptionPanel.border_dash_matches_edge_dash=U\u017Cyj typ linii ga\u0142\u0119zi
 OptionPanel.border_width=Szeroko\u015B\u0107 linii
 OptionPanel.border_width_matches_edge_width=U\u017Cyj szeroko\u015Bci ga\u0142\u0119zi
@@ -1013,7 +1013,7 @@ OptionPanel.childpattern.tooltip=Wybrany szablon zostanie zastosowany dla wszyst
 OptionPanel.clear_all_setters=Prze\u0142\u0105cz wszystkie
 OptionPanel.clear_all_setters.tooltip=W\u0142\u0105cza lub wy\u0142\u0105cza wszystkie zmiany wskaza\u0144.
 OptionPanel.cloud=Chmurka
-OptionPanel.cloudcolor=Chmurka i kolor
+OptionPanel.cloudcolor=Kolor chmurki
 OptionPanel.cloudshape=Kszta\u0142t chmurki
 OptionPanel.combined=Ramka/bez ramki
 OptionPanel.compare_as_number=Por\u00F3wnaj jako liczby
@@ -1028,9 +1028,9 @@ OptionPanel.cut_nodes_without_question=Wycina\u0107 w\u0119z\u0142y bez potwierd
 OptionPanel.cut_nodes_without_question.tooltip=Je\u017Celi w\u0142\u0105czone, w\u0119z\u0142y b\u0119d\u0105 wycinane bez potwierdzania. Mo\u017Ce to spowodowa\u0107 utrat\u0119 danych przy przypadkowym u\u017Cyciu.
 OptionPanel.cut_out_pictures_when_pasting_html=Usu\u0144 obrazy z HTML
 OptionPanel.da=Du\u0144ski
-OptionPanel.date_format=Standardowe formatowanie daty
+OptionPanel.date_format=Domy\u015Blny format daty
 OptionPanel.date_format.tooltip=Mo\u017Cliwe opcje: SHORT, MEDIUM, LONG, FULL lub wz\u00F3r typu "MM/dd/yyyy"
-OptionPanel.datetime_format=Standardowe formatowanie daty i czasu
+OptionPanel.datetime_format=Domy\u015Blny format daty i czasu
 OptionPanel.datetime_format.tooltip=Zar\u00F3wno: <datestyle>,<timestyle> (style: SHORT, MEDIUM, LONG lub FULL) lub pe\u0142ny wz\u00F3r typu "M/d/yyyy hh:mm"
 OptionPanel.de=Niemiecki
 OptionPanel.default=domy\u015Blny
@@ -1041,9 +1041,9 @@ OptionPanel.default_browser_command_mac.tooltip=<html> Dla Mac'a: (dzi\u0119kuje
 OptionPanel.default_browser_command_other_os=Inne systemy operacyjne
 OptionPanel.default_browser_command_other_os.tooltip=<html> G\u0142\u00F3wnie odnosi si\u0119 do Linuxa</html>
 OptionPanel.default_browser_command_windows_9x=Windows 9x
-OptionPanel.default_browser_command_windows_9x.tooltip=<html> Dla Windows (znaki "" s\u0105 konieczne z powodu odno\u015Bnik\u00F3w, kt\u00F3re zawieraj\u0105 "=" w sobie)</html>
+OptionPanel.default_browser_command_windows_9x.tooltip=<html>Dla Windows (znaki "" s\u0105 konieczne z powodu odno\u015Bnik\u00F3w, kt\u00F3re zawieraj\u0105 w sobie "=")</html>
 OptionPanel.default_browser_command_windows_nt=Windows NT
-OptionPanel.default_browser_command_windows_nt.tooltip=<html> Dla Windows (znaki "" s\u0105 konieczne z powodu odno\u015Bnik\u00F3w, kt\u00F3re zawieraj\u0105 "=" w sobie)</html>
+OptionPanel.default_browser_command_windows_nt.tooltip=<html>Dla Windows (znaki "" s\u0105 konieczne z powodu odno\u015Bnik\u00F3w, kt\u00F3re zawieraj\u0105 w sobie "=")</html>
 OptionPanel.default_charset=Zestaw znak\u00F3w
 OptionPanel.default_save_dir=Domy\u015Blny katalog zapisywania
 OptionPanel.Defaults=Domy\u015Blne
@@ -1099,7 +1099,7 @@ OptionPanel.first=pierwsza
 OptionPanel.fit_to_viewport=Dopasuj obraz t\u0142a do okna
 OptionPanel.fold_on_click_inside=Zwi\u0144 po klikni\u0119ciu wewn\u0105trz
 OptionPanel.foldingsymbolwidth=\u015Arednica symbolu zwini\u0119tych w\u0119z\u0142\u00F3w
-OptionPanel.foldingsymbolwidth.tooltip=<html> \u015Arednica okr\u0119gu obok zwini\u0119tych w\u0119z\u0142\u00F3w</html>
+OptionPanel.foldingsymbolwidth.tooltip=<html>\u015Arednica okr\u0119gu obok zwini\u0119tych w\u0119z\u0142\u00F3w</html>
 OptionPanel.fork=bez ramki
 OptionPanel.format_locale=Lokalizacja formatowania
 OptionPanel.format_locale.tooltip=Ustawienia lokalizacji dla formatowania i przetwarzania danych
@@ -1121,7 +1121,7 @@ OptionPanel.hr=Chorwacki
 OptionPanel.HTML=HTML
 OptionPanel.html_export_based_on_headings=jako esej
 OptionPanel.html_export_fold_all=Zwi\u0144 wszystko
-OptionPanel.html_export_fold_currently_folded=zwi\u0144 obecnie zwini\u0119te
+OptionPanel.html_export_fold_currently_folded=Zwi\u0144 obecnie zwini\u0119te
 OptionPanel.html_export_folding=Zwijanie dokument\u00F3w HTML
 OptionPanel.html_export_no_folding=bez zwijania
 OptionPanel.hu=W\u0119gierski
@@ -1142,12 +1142,12 @@ OptionPanel.it=W\u0142oski
 OptionPanel.ja=Japo\u0144ski
 OptionPanel.JoinNodesAction.textSeparators=Separator tekstu
 OptionPanel.key_type_action=Przy naci\u015Bni\u0119ciu klawisza
-OptionPanel.Keystrokes=Klawiatura
+OptionPanel.Keystrokes=Skr\u00F3ty klawiaturowe
 OptionPanel.ko=Korea\u0144ski
 OptionPanel.label_font_family=Rodzina czcionek
 OptionPanel.label_font_size=Rozmiar czcionki
 OptionPanel.language=J\u0119zyk
-OptionPanel.language.tooltip=<html> To jest j\u0119zyk, kt\u00F3ry powinien zosta\u0107 u\u017Cyty przez program. 'automatyczny' pr\u00F3buje za\u0142adowa\u0107 j\u0119zyk systemowy</html>
+OptionPanel.language.tooltip=<html>To jest j\u0119zyk, kt\u00F3ry powinien zosta\u0107 u\u017Cyty przez program. 'automatyczny' pr\u00F3buje za\u0142adowa\u0107 j\u0119zyk systemowy</html>
 OptionPanel.last=ostatnia
 OptionPanel.last_opened_list_length=D\u0142ugo\u015B\u0107 listy ostatnio otwieranych
 OptionPanel.latex_disable_editor=Wy\u0142\u0105cz pod\u015Bwietlanie sk\u0142adni LaTeX
@@ -1159,11 +1159,11 @@ OptionPanel.latex_macros=Wsp\u00F3lne makra LaTeX
 OptionPanel.layout_map_on_text_change=Aktualizuj uk\u0142ad mapy podczas edycji
 OptionPanel.layout_map_on_text_change.tooltip=Wy\u0142\u0105cz, aby program dzia\u0142a\u0142 p\u0142ynniej
 OptionPanel.linear=liniowy
-OptionPanel.links=Odno\u015Bnik
-OptionPanel.links.tooltip=<html> Tworzenie wzgl\u0119dnych lub bezwzgl\u0119dnych odno\u015Bnik\u00F3w</html>
+OptionPanel.links=Odno\u015Bniki
+OptionPanel.links.tooltip=<html>Tworzenie wzgl\u0119dnych lub bezwzgl\u0119dnych odno\u015Bnik\u00F3w</html>
 OptionPanel.load_folding=Przy wczytywaniu
-OptionPanel.load_folding_from_map_default_fold_all=Za\u0142aduj z mapy, lub zwi\u0144 wszystko
-OptionPanel.load_folding_from_map_default_unfold_all=Za\u0142aduj z mapy, lub rozwi\u0144 wszystko
+OptionPanel.load_folding_from_map_default_fold_all=Za\u0142aduj z mapy lub zwi\u0144 wszystko
+OptionPanel.load_folding_from_map_default_unfold_all=Za\u0142aduj z mapy lub rozwi\u0144 wszystko
 OptionPanel.load_last_map=Automatycznie otw\u00F3rz ostatni\u0105 map\u0119
 OptionPanel.load_last_map.tooltip=<html>Je\u017Celi zaznaczone, podczas uruchamiania Freeplanea zostanie za\u0142adowana ostatnio otworzona mapa.</html>
 OptionPanel.load_last_maps=Otw\u00F3rz wszystkie mapy z poprzedzniej sesji
@@ -1173,7 +1173,7 @@ OptionPanel.lookandfeel.scaleuifonts.tooltip=U\u017Cyteczne dla monitor\u00F3w o
 OptionPanel.lookandfeel.tooltip=<html>Look&Feel - wygl\u0105d programu. Je\u015Bli chcesz u\u017Cy\u0107 w\u0142asnego, wprowad\u017A nazw\u0119 klasy i upewnij si\u0119, \u017Ce odpowiednie pliki *.jar s\u0105 \u0142adowane.<br>Je\u015Bli masz jaki\u015B problem z Look&Feel wybierz '\u017Baden'. Dzia\u0142a r\u00F3wnie\u017C z appletami</html>
 OptionPanel.lt=Litewski
 OptionPanel.markClones=Maluj znaczniki klon\u00F3w
-OptionPanel.markSelectedClones=Maluj znaczniki dla wybranych klon\u00F3w
+OptionPanel.markSelectedClones=Maluj znaczniki klon\u00F3w dla wybranych
 OptionPanel.max_displayed_node_count=Maksymalna liczba wy\u015Bwietlanych w\u0119z\u0142\u00F3w
 OptionPanel.max_image_width=Maksymalna pocz\u0105tkowa szeroko\u015B\u0107 obrazu
 OptionPanel.max_image_width.tooltip=Nowe obrazy s\u0105 zmniejszane do szeroko\u015Bci
@@ -1198,7 +1198,7 @@ OptionPanel.nodebackgroundcolor.tooltip=T\u0142o w\u0119z\u0142a, gdy nie zosta\
 OptionPanel.nodecolor=Kolor w\u0119z\u0142a
 OptionPanel.nodecolor.tooltip=Kolor tekstu w\u0119z\u0142a, je\u015Bli nie zosta\u0142 wybrany.
 OptionPanel.nodefontbold=Pogrubienie czcionki
-OptionPanel.nodefonthyperlink=Hiper\u0142\u0105cze
+OptionPanel.nodefonthyperlink=Odno\u015Bnik
 OptionPanel.nodefontitalic=Kursywa
 OptionPanel.nodefontname=Czcionka w\u0119z\u0142a
 OptionPanel.nodefontsize=Wielko\u015B\u0107 czcionki w\u0119z\u0142a
@@ -1210,7 +1210,7 @@ OptionPanel.nodeshape=Kszta\u0142t w\u0119z\u0142a
 OptionPanel.nodetext=Edytuj w\u0119ze\u0142
 OptionPanel.nodetext.tooltip=Tutaj mo\u017Cna zdefiniowa\u0107 tekst w\u0119z\u0142a. Poprzedni tekst jest odrzucany, gdy ten wzorzec jest stosowany.
 OptionPanel.nothing=Nic
-OptionPanel.number_format=Standardowe formatowanie liczb
+OptionPanel.number_format=Domy\u015Blne formatowanie liczb
 OptionPanel.number_format.tooltip=Wz\u00F3r zawieraj\u0105cy '#' dla opcjonalnych lub '0' dla obowi\u0105zkowych cyfr. Przyk\u0142ady: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=Liczba przechowywanych automatycznych kopii
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> liczba n r\u00F3\u017Cnych plik\u00F3w u\u017Cywanych do przechowywania automatycznych zapis\u00F3w. Pierwsza kopia jest przechowywana w pierwszym pliku, odpowiednio a\u017C do n+1-kopii, kt\u00F3ra jest zapisywana znowu w pierwszym pliku (cyklicznie)</html>
@@ -1225,9 +1225,9 @@ OptionPanel.outline_vgap=Pionowa odleg\u0142o\u015B\u0107
 OptionPanel.oval=Owal
 OptionPanel.paint_connectors_behind=Rysuj po\u0142\u0105czenia za (poni\u017Cej) w\u0119z\u0142ami
 OptionPanel.parse_data=Rozpoznawaj liczby i dat\u0119-godzin\u0119
-OptionPanel.parse_data.tooltip=Pr\u00F3buje przetworzy\u0107 dat\u0119, dat\u0119-godzin\u0119 i liczby i zastosowa\u0107 stoandardowe formatowania. Przyk\u0142ady: 100,000.00, 12/31, 12/31/99, 1999-12-31 and 1999-12-31 23:59
+OptionPanel.parse_data.tooltip=Pr\u00F3buje przetworzy\u0107 dat\u0119, dat\u0119-godzin\u0119 i liczby i zastosowa\u0107 domy\u015Blne formatowania. Przyk\u0142ady: 100,000.00, 12/31, 12/31/99, 1999-12-31 and 1999-12-31 23:59
 OptionPanel.parse_formulas=Rozpoznaj formu\u0142y
-OptionPanel.parse_formulas.tooltip=Parsuj formu\u0142y w w\u0119z\u0142ach zaczynaj\u0105ce si\u0119 od '=' Zobacz http://www.freeplane.org/wiki/index.php/Formulas.
+OptionPanel.parse_formulas.tooltip=Parsuj formu\u0142y w w\u0119z\u0142ach zaczynaj\u0105ce si\u0119 od '=': Zobacz http://www.freeplane.org/wiki/index.php/Formulas.
 OptionPanel.parse_latex=Rozpoznawaj LaTeX
 OptionPanel.parse_latex.tooltip=Rozpoznawaj formu\u0142y LaTeX po formacie lub przedrostkiem: Zobacz http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Wklej jako HTML
@@ -1237,7 +1237,7 @@ OptionPanel.pasteImagesFromFiles.tooltip=Wstaw obraz, je\u015Bli plik obrazu zos
 OptionPanel.path_property_may_not_be_empty=W\u0142a\u015Bciwo\u015Bci \u015Bcie\u017Cki nie mog\u0105 by\u0107 puste. Zmiana zosta\u0142a anulowana.
 OptionPanel.patternname=Nazwa
 OptionPanel.patternname.tooltip=Unikatowa nazwa szablonu
-OptionPanel.pl=*Polski*
+OptionPanel.pl=Polski
 OptionPanel.placenewbranches=Po\u0142o\u017Cenie nowych ga\u0142\u0119zi
 OptionPanel.placenewbranches.tooltip=<html>Gdzie umieszcza\u0107 nowe ga\u0142\u0119zie. Poprawne warto\u015Bci to 'pierwsza' i 'ostatnia' </html>
 OptionPanel.plugin.tooltip=Dodatkowe wtyczki.
@@ -1252,15 +1252,15 @@ OptionPanel.presentation.processesNavigationKeys=Klawisze strza\u0142ek steruj\u
 OptionPanel.presentation.slideDisplaysAllNodes=Automatycznie rozwi\u0144 wszystkich w\u0119z\u0142y slajd\u00F3w
 OptionPanel.presentation.slowMotion=Zwolnione tempo
 OptionPanel.presentation.switchToFullScreen=Aktywuj pe\u0142ny ekran
-OptionPanel.presentation.switchToSpotlight=Aktywuj \u015Bwiat\u0142o punktowe
-OptionPanel.presentation.zoom=U\u017Cyj zoomu mapy
+OptionPanel.presentation.switchToSpotlight=Aktywuj pod\u015Bwietlanie
+OptionPanel.presentation.zoom=U\u017Cyj powi\u0119kszenie mapy
 OptionPanel.printonwhitebackground=<html>Bia\u0142e t\u0142o przy wydruku</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Zawsze u\u017Cywaj bia\u0142ego t\u0142a przy wydruku</html>
 OptionPanel.pt_BR=Portugalski (Brazylia)
 OptionPanel.pt_PT=Portugalski (Portugalia)
 OptionPanel.RECT=Prostok\u0105t
 OptionPanel.rectangle=Prostok\u0105t
-OptionPanel.relative=wzgl\u0119dny
+OptionPanel.relative=Wzgl\u0119dny
 OptionPanel.remind_type_of_new_nodes.tooltip=<html>"Pytaj" zapyta Ci\u0119 (w razie w\u0105tpliwo\u015Bci).<br>"Tak" wy\u015Bwietla bogaty edytor tekstu.<br>"Nie" wy\u015Bwietla edytor tekstowy.</html>
 OptionPanel.remind_use_rich_text_in_new_nodes=U\u017Cywaj tekstu sformatowanego dla wklejanych w\u0119z\u0142\u00F3w
 OptionPanel.remindersBlink=Migaj\u0105ce przypomnienia
@@ -1278,11 +1278,11 @@ OptionPanel.save_folding=Zapisuj zwini\u0119cia
 OptionPanel.save_folding_if_map_is_changed=je\u017Celi mapa zosta\u0142a zmodyfikowana
 OptionPanel.save_last_visited_node=Zapisz ostatni\u0105 pozycj\u0119 na mapie
 OptionPanel.save_modification_times=Zapisuj czas modyfikacji
-OptionPanel.script_classpath=classpath skrytpu: Katalogi zawieraj\u0105ce klasy lub/i JARy
+OptionPanel.script_classpath=classpath skrytpu: Katalogi zawieraj\u0105ce klasy lub/i JARy (zobacz podpowied\u017A)
 OptionPanel.script_classpath.tooltip=<html>Lista JAR\u00F3w i/lub katalog\u00F3w do dodania do \u015Bcie\u017Cki klas (classpath) skrypt\u00F3w i formu\u0142. <br>Use ; (Windows) or : (Linux, Mac) to separate entries.<br>Directories will be scanned for JARs and for .class files.<br>Paths that are not absolute are considered relative to the Freeplane user directory.<br>If you set the classpath you have to permit read access too!</html>
 OptionPanel.script_compilation_disabled_extensions=Nie mo\u017Cna skompilowa\u0107 rozszerzenia plik\u00F3w (zobacz podpowied\u017A)
 OptionPanel.script_compilation_disabled_extensions.tooltip=<html>Je\u015Bli wszystkie skrypty z dodatkowo zainstalowanymi j\u0119zykami (z wyj\u0105tkiem Groovy i JavaScript) maj\u0105 og\u00F3lny problem kompilacji - spr\u00F3buj doda\u0107 rozszerzenie pliku tutaj (lista rozdzielana przecinkami).</html>
-OptionPanel.script_directories=\u015Acie\u017Cka wyszukiwania skrypt\u00F3w
+OptionPanel.script_directories=\u015Acie\u017Cka wyszukiwania skrypt\u00F3w (zobacz podpowied\u017A)
 OptionPanel.script_directories.tooltip=<html>Lista katalog\u00F3w.<br>U\u017Cyj ; (Windows) lub : (Linux, Mac) aby rozdzieli\u0107 wpisy.<br>\u015Acie\u017Cki nie b\u0119d\u0105ce bezwzgl\u0119dnymi s\u0105 traktowane jako wzgl\u0119dne do katalogu u\u017Cytkownika Freeplane'a.</html>
 OptionPanel.script_user_key_name_for_signing=Opcjonalny alias klucza u\u017Cytkownika dla podpisywania skrypt\u00F3w
 OptionPanel.script_user_key_name_for_signing.tooltip=<html>Je\u017Celi chcesz podpisywa\u0107 swoje skrypty, wpisz tutaj alias klucza. <br>Oczekuje si\u0119, \u017Ce klucz jest przechowywany w domy\u015Blnej bazie kluczy. <br>Has\u0142o tajnego klucza musi si\u0119 zgadza\u0107 z has\u0142em bazy kluczy (domy\u015Blnie).</html>
@@ -1319,7 +1319,7 @@ OptionPanel.separator.formula=Formu\u0142y
 OptionPanel.separator.General=Og\u00F3lne
 OptionPanel.separator.html_export=Eksport HTML
 OptionPanel.separator.html_import=Import Html
-OptionPanel.separator.hyperlink_types=Typ odno\u015Bnika
+OptionPanel.separator.hyperlink_types=Typy odno\u015Bnik\u00F3w
 OptionPanel.separator.icon_properties=Ikony
 OptionPanel.separator.IconControls=Ikony
 OptionPanel.separator.icons=Ikony w "Wybierz ikon\u0119..."
@@ -1336,7 +1336,7 @@ OptionPanel.separator.mouse_wheel=K\u00F3\u0142ko myszy
 OptionPanel.separator.new_node_commands=Polecenia tworzenia nowych w\u0119z\u0142\u00F3w
 OptionPanel.separator.node_editing_commands=Polecenia edycji w\u0119z\u0142\u00F3w
 OptionPanel.separator.node_navigation_commands=Polecenia nawigacyjne
-OptionPanel.separator.NodeBorder=Granica w\u0119z\u0142a
+OptionPanel.separator.NodeBorder=Obramowanie w\u0119z\u0142a
 OptionPanel.separator.NodeColors=Kolory w\u0119z\u0142a
 OptionPanel.separator.NodeFont=Czcionka w\u0119z\u0142a
 OptionPanel.separator.NodeShape=Kszta\u0142t w\u0119z\u0142a
@@ -1345,7 +1345,7 @@ OptionPanel.separator.NodeText=Tekst w\u0119z\u0142a
 OptionPanel.separator.notifications=Potwierdzenia
 OptionPanel.separator.org.freeplane.plugin.bugreport=Automatyczne raportowanie b\u0142\u0119d\u00F3w
 OptionPanel.separator.other_defaults=Inne ustawienia domy\u015Blne
-OptionPanel.separator.others=Inne skr\u00F3ty klawiszowe
+OptionPanel.separator.others=Inne skr\u00F3ty klawiaturowe
 OptionPanel.separator.outline_view=Widok konspektu
 OptionPanel.separator.patterns=Szablony
 OptionPanel.separator.presentation=Prezentacja
@@ -1410,24 +1410,24 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=znaki w s\u0142owach
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=pozostaw oryginalny w\u0119ze\u0142 pusty
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=numer w\u0119z\u0142a w wierszu
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=zachowaj oryginalny tekst jako szczeg\u00F3\u0142y
-OptionPanel.spotlight=\u015Awiat\u0142o punktowe
-OptionPanel.spotlight_background_color=Kolor t\u0142a \u015Bwiat\u0142a punktowego
+OptionPanel.spotlight=Pod\u015Bwietlanie
+OptionPanel.spotlight_background_color=Kolor t\u0142a pod\u015Bwietlania
 OptionPanel.sr=Serbski
-OptionPanel.standard_template=Standardowy szablon
-OptionPanel.standardbackgroundcolor=Kolor t\u0142a
+OptionPanel.standard_template=Standardowy plik szablonu
+OptionPanel.standardbackgroundcolor=Domy\u015Blny kolor t\u0142a
 OptionPanel.standardbackgroundcolor.tooltip=<html>Domy\u015Blny kolor t\u0142a w notacji HTML </html>
-OptionPanel.standardcloudcolor=Kolor chmurki
+OptionPanel.standardcloudcolor=Domy\u015Blny kolor chmurki
 OptionPanel.standardcloudcolor.tooltip=<html>Domy\u015Blny kolor chmurki w notacji HTML </html>
-OptionPanel.standardcloudestyle=Styl chmurki
+OptionPanel.standardcloudestyle=Domy\u015Blny styl chmurki
 OptionPanel.standardcloudestyle.tooltip=<html>Domy\u015Blny styl chmurki. </html>
 OptionPanel.standardcloudshape=Domy\u015Blny kszta\u0142t chmurek
 OptionPanel.standarddrawrectangleforselection=Wy\u015Bwietlaj zaznaczone w\u0119z\u0142y w balonach
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Zaznaczaj wybrane w\u0119z\u0142y poprzez otoczenie balonem.</html>
-OptionPanel.standardlinkcolor=Kolor po\u0142\u0105cze\u0144
+OptionPanel.standardlinkcolor=Domy\u015Blny kolor po\u0142\u0105cze\u0144
 OptionPanel.standardlinkcolor.tooltip=<html>Domy\u015Blny kolor po\u0142\u0105cze\u0144 w notacji HTML </html>
-OptionPanel.standardlinkestyle=Styl po\u0142\u0105czenia
+OptionPanel.standardlinkestyle=Domy\u015Blny styl po\u0142\u0105czenia
 OptionPanel.standardlinkestyle.tooltip=<html>Domy\u015Blny styl po\u0142\u0105czenia. Obecnie obs\u0142ugiwana jest tylko 'Krzywa B\u00E9ziera' </html>
-OptionPanel.standardselectednodecolor=Kolor zaznaczonego w\u0119z\u0142a
+OptionPanel.standardselectednodecolor=Domy\u015Blny kolor zaznaczonego w\u0119z\u0142a
 OptionPanel.standardselectednodecolor.tooltip=<html>Domy\u015Blny kolor zaznaczonego w\u0119z\u0142a w notacji HTML (#RRGGBB z warto\u015Bciami szestnastkowymi)</html>
 OptionPanel.standardselectednoderectanglecolor=Kolor balonu wybranego w\u0119z\u0142a
 OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Kolor balonu zaznaczaj\u0105cego wybrane w\u0119z\u0142y. W notacji html (#RRGGBB w warto\u015Bciach szesnastkowych) </html>
@@ -1437,7 +1437,7 @@ OptionPanel.structured_html_import=Importuj HTML jako struktur\u0119 w\u0119z\u0
 OptionPanel.structured_icon_toolbar=Grupuj ikony w pasku narz\u0119dziowym
 OptionPanel.summary=Podsumowanie
 OptionPanel.sv=Szwedzki
-OptionPanel.text.use_ctrl_key=U\u017Cyj 'Przypisz do skr\u00F3tu klawiszowego' z menu Narz\u0119dzia
+OptionPanel.text.use_ctrl_key=U\u017Cyj 'Przypisz do skr\u00F3tu klawiaturowego' z menu Narz\u0119dzia
 OptionPanel.textalignment=Wyr\u00F3wnanie tekstu
 OptionPanel.time_for_automatic_save=Czas pomi\u0119dzy zapisami (ms)
 OptionPanel.time_for_automatic_save.tooltip=<html> Czas pomi\u0119dzy kolejnymi automatycznymi zapisami. Ustaw na 2000000000, aby wy\u0142\u0105czy\u0107</html>
@@ -1448,8 +1448,8 @@ OptionPanel.toolTipManager.dismissDelay=Czas wy\u015Bwietlania, ms
 OptionPanel.toolTipManager.initialDelay=Op\u00F3\u017Anienie pocz\u0105tkowe, ms
 OptionPanel.toolTipManager.max_tooltip_height=Maksymalna wysoko\u015B\u0107 podpowiedzi
 OptionPanel.toolTipManager.max_tooltip_height.tooltip=Maksymalna wysoko\u015B\u0107 podpowiedzi w pikselach.
-OptionPanel.toolTipManager.max_tooltip_width=Szeroko\u015B\u0107 dymk\u00F3w podpowiedzi
-OptionPanel.toolTipManager.max_tooltip_width.tooltip=Maksymalna szeroko\u015B\u0107 dymku podpowiedzi w pikselach.
+OptionPanel.toolTipManager.max_tooltip_width=Maksymalna szeroko\u015B\u0107 podpowiedzi
+OptionPanel.toolTipManager.max_tooltip_width.tooltip=Maksymalna szeroko\u015B\u0107 podpowiedzi w pikselach.
 OptionPanel.toolTipManager.reshowDelay=Op\u00F3\u017Anienie ponownego wy\u015Bwietlenia, ms
 OptionPanel.tr=Turecki / T\u00FCrk\u00E7e
 OptionPanel.uk_UA=Ukrai\u0144ski
@@ -1466,9 +1466,9 @@ OptionPanel.use_svg_icons.tooltip=<html>Okre\u015Bla jako\u015B\u0107 renderowan
 OptionPanel.use_tabbed_pane=U\u017Cuwaj kart
 OptionPanel.use_tabbed_pane.tooltip=Je\u017Celi w\u0142\u0105czone, mapy b\u0119d\u0105 wy\u015Bwietlane w kartach (jak w Firefoksie).
 OptionPanel.validate_classpath_needs_readaccess=Skrypty: Kiedy ustawiasz \u015Bcie\u017Ck\u0119 klas 'classpath' musisz mie\u0107 prawa odczytu w tym katalogu!
-OptionPanel.validate_invalid_date_format=Nieprawid\u0142owy standardowy format dnia
-OptionPanel.validate_invalid_datetime_format=Nieprawid\u0142owy standardowy format dnia-godziny
-OptionPanel.validate_invalid_number_format=Nieprawid\u0142owy standardowy format liczby
+OptionPanel.validate_invalid_date_format=Nieprawid\u0142owy domy\u015Blny format dnia
+OptionPanel.validate_invalid_datetime_format=Nieprawid\u0142owy domy\u015Blny format dnia-godziny
+OptionPanel.validate_invalid_number_format=Nieprawid\u0142owy domy\u015Blny format liczby
 OptionPanel.validate_write_without_read=Skrypty rozwa\u017C dodanie Read/File do Write/File.
 OptionPanel.validation_error=<html><body>B\u0142\u0119dy walidacji:<p><em>{0}</em><p>Zmie\u0144 ustawienia w preferencjach, \u017Ceby naprawi\u0107 b\u0142\u0119dy.</body></html>
 OptionPanel.validation_warning=<html><body>Ostrze\u017Cenia walidacji:<p><em>{0}</em></body></html>
@@ -1494,7 +1494,7 @@ org.freeplane.plugin.bugreport.report=Aktualny raport
 org.freeplane.plugin.bugreport.wanted_bug=Wyst\u0105pi\u0142 b\u0142\u0105d wewn\u0119trzny i zosta\u0142 automatycznie zg\u0142oszony.
 org.freeplane.plugin.script.NodeIdHighlighter.node_is_not_defined=W\u0119ze\u0142 {0} nie jes zdefiniowany
 out_of_memory=Brak pami\u0119ci.
-overwrite_keyset_question=Nadpisa\u0107 istniej\u0105cy zestaw skr\u00F3t\u00F3w klawiszowych?
+overwrite_keyset_question=Nadpisa\u0107 istniej\u0105cy zestaw skr\u00F3t\u00F3w klawiaturowych?
 PageAction.text=Ustawienia strony...
 password_is_not_ascii=Has\u0142o nie jest ASCII
 PasteAction.text=Wklej
@@ -1599,7 +1599,7 @@ ReminderHookAction.text=Usu\u0144 przypomnienie
 ReminderHookAction.tooltip=Usuwa przypomnienie z w\u0119z\u0142a.
 reminderNotification=Zawiadomienie o przypomnieniu
 remove_file_from_list_on_error=Plik {0} nie otwarty. Czy usun\u0105\u0107 go z listy ostatio otwieranych plik\u00F3w?
-remove_shortcut_question=Wymie\u0144 skr\u00F3t klawiszowy?
+remove_shortcut_question=Zast\u0105pi\u0107 skr\u00F3t klawiaturowy?
 RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Odblokuj zwijanie w\u0119z\u0142\u00F3w
 RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Pozwala na zwijanie wszystkich w\u0119z\u0142\u00F3w
 RemoveAllIconsAction.text=Usu\u0144 wszystkie ikony
@@ -1627,9 +1627,9 @@ save=Zapisz
 save_failed=Zapisywanie mapy {0} nie powiod\u0142o si\u0119.
 save_unsaved=Zapisa\u0107 nast\u0119puj\u0105c\u0105 map\u0119 my\u015Bli?
 save_unsaved_styles=Zapisa\u0107 style?
-SaveAcceleratorPresetsAction.text=Zapisz zestaw skr\u00F3t\u00F3w klawiszowych...
+SaveAcceleratorPresetsAction.text=Zapisz zestaw skr\u00F3t\u00F3w klawiaturowych...
 SaveAction.text=Zapisz
-SaveAction_readonlyMsg=Ta mapa jest tylko do odczytu. Prosz\u0119 u\u017Cyj 'Plik-> Zapisz jako...', aby zapisa\u0107 map\u0119.
+SaveAction_readonlyMsg=Ta mapa jest tylko do odczytu. Prosz\u0119 u\u017Cyj 'Plik->Zapisz jako...', aby zapisa\u0107 map\u0119.
 SaveAction_readonlyTitle=Pr\u00F3buj zapisa\u0107 map\u0119 tylko do odczytu
 SaveAll.text=Zapisz wszystko
 SaveAll.tooltip=Zapisz wszystkie otwarte mapy
@@ -1640,7 +1640,7 @@ saved=Zapisane
 saving_canceled=Zapisywanie anulowane
 scanners_not_loaded=Skanery nie mog\u0142y by\u0107 za\u0142adowane, plik uszkodzony
 scheme_evaluate=Oce\u0144!
-script_execution_disabled=Wykonywanie skrypt\u00F3w wy\u0142\u0105czone (patrz Preferencje -> Wtyczki)
+script_execution_disabled=Wykonywanie skrypt\u00F3w wy\u0142\u0105czone, zobacz Narz\u0119dzia/Preferencje/Wtyczki
 ScriptEditor.text=Edytor skrypt\u00F3w...
 ScriptEditor.tooltip=Pozwala tworzy\u0107 wi\u0119ksze skrypty w programie Freeplane.
 ScriptEditorPanel.changed_cancel=Skrypty zosta\u0142y zmienione. Czy rzeczywi\u015Bcie chcesz porzuci\u0107 te zmiany?
@@ -1669,17 +1669,17 @@ selection_method_direct=Zaznaczanie przez wskazanie mysz\u0105
 SelectNoteAction.text=Prze\u0142\u0105czenie edycji notatki
 SelectNoteAction.tooltip=Przej\u015Bcie z/do okienka edycji notatki
 set_accelerator_on_next_click_helpmessage=Kliknij na polecenie w menu, aby utworzy\u0107 dla niego skr\u00F3t klawiaturowy.
-SetAccelerator.dialogTitle=Przypisywanie skr\u00F3t\u00F3w klawiszowych
-SetAccelerator.keystrokeDetected=Skr\u00F3t klawiszowy ''{0}'' nie jest przypisany do \u017Cadnej pozycji menu.
-SetAcceleratorOnNextClickAction.text=Przypisz skr\u00F3t klawiszowy
+SetAccelerator.dialogTitle=Przypisywanie skr\u00F3t\u00F3w klawiaturowych
+SetAccelerator.keystrokeDetected=Skr\u00F3t klawiaturowy ''{0}'' nie jest przypisany do \u017Cadnej pozycji menu.
+SetAcceleratorOnNextClickAction.text=Przypisz skr\u00F3t klawiaturowy
 SetAlwaysUnfoldedNodeFlagsAction.text=Zablokuj zwijanie w\u0119z\u0142\u00F3w
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=Zapobiega zwijaniu obecnie rozwini\u0119tych w\u0119z\u0142\u00F3w
 SetImageByFileChooserAction.text=Obraz (wybierz plik)...
 SetLinkAnchorAction.text=Zakotwicz w\u0119ze\u0142
-SetLinkAnchorAction.tooltip=<html>Zakotwicz wybrany w\u0119ze\u0142 jako element do<br/>utworzenia \u0142\u0105czy lokalnych lub globalnych.
-SetLinkAnchorAction.tooltip_anchored=<html>ustaw wybrany w\u0119ze\u0142 jako kotwic\u0119 do przysz\u0142ego <br/> tworzenia lokalnych lub globalnych link\u00F3w. Aktualna kotwica: <br/> {0}
-SetLinkByFileChooserAction.text=Odno\u015Bnik (wybierz plik)...
-SetLinkByTextFieldAction.text=Dodanie lub modyfikacja \u0142\u0105cza...
+SetLinkAnchorAction.tooltip=<html>Zakotwicz wybrany w\u0119ze\u0142 do przysz\u0142ego<br/>utworzenia dla niego \u0142\u0105czy lokalnych lub globalnych.
+SetLinkAnchorAction.tooltip_anchored=<html>ustaw wybrany w\u0119ze\u0142 jako zakotwiczony do przysz\u0142ego<br/>utworzenia lokalnych lub globalnych \u0142\u0105czy. Aktualne zakotwiczenie:<br/>{0}
+SetLinkByFileChooserAction.text=Dodaj hiper\u0142\u0105cze (wybierz plik)...
+SetLinkByTextFieldAction.text=Dodanie lub modyfikacja hiper\u0142\u0105cza...
 SetNodeLink.text=Ustaw odno\u015Bnik w\u0119z\u0142a...
 SetNoteWindowPosition.bottom.text=D\u00F3\u0142
 SetNoteWindowPosition.left.text=Lewo
@@ -1742,7 +1742,7 @@ simplyhtml.cTagNameHead3=Nag\u0142\u00F3wek 3
 simplyhtml.cTagNameHead4=Nag\u0142\u00F3wek 4
 simplyhtml.cTagNameHead5=Nag\u0142\u00F3wek 5
 simplyhtml.cTagNameHead6=Nag\u0142\u00F3wek 6
-simplyhtml.cTagNameLink=Hiper\u0142\u0105cze
+simplyhtml.cTagNameLink=Link
 simplyhtml.cTagNameOL=Lista numerowana
 simplyhtml.cTagNamePara=Akapit
 simplyhtml.cTagNameUL=Lista wypunktowana
@@ -1849,16 +1849,16 @@ simplyhtml.replaceThisQuery=zamieni\u0107 to wyst\u0105pienie
 simplyhtml.replaceWith=Zast\u0105p przez:
 simplyhtml.replaceYes=Tak
 simplyhtml.rightLabel=po prawej:
-simplyhtml.searchDown=Szukaj w prz\u00F3d
+simplyhtml.searchDown=Szukaj w d\u00F3\u0142
 simplyhtml.searchDown.tooltip=Wyszukaj od g\u00F3ry do do\u0142u.
 simplyhtml.searchFromStart=Szukaj od pocz\u0105tku
 simplyhtml.searchFromStart.tooltip=Rozpocznij wyszukiwanie u g\u00F3ry zamiast od pozycji kursora.
-simplyhtml.searchUp=Szukaj wstecz
+simplyhtml.searchUp=Szukaj w g\u00F3r\u0119
 simplyhtml.searchUp.tooltip=Szukaj od do\u0142u do g\u00F3ry.
 simplyhtml.selectAllLabel=Wybierz wszystko
 simplyhtml.selectedFontColorLabel=Wybrany kolor czcionki
 simplyhtml.sizeLabel=Rozmiar
-simplyhtml.standardStyleName=standardowy
+simplyhtml.standardStyleName=domy\u015Blny
 simplyhtml.strikeLabel=Przekre\u015Blenie
 simplyhtml.styleLabel=Styl
 simplyhtml.styleNameInputText=Nazwa nowego stylu?
@@ -1934,7 +1934,7 @@ SplitConditionAction.text=Podziel
 SplitNode.text=Podziel w\u0119ze\u0142
 SplitNode.tooltip=<html>W\u0119ze\u0142 jest podzielony</html>
 SplitToWordsAction.text=Podziel wed\u0142ug {0} wyrazy w wierszu
-STANDARD_FORMAT=Standardowe
+STANDARD_FORMAT=Domy\u015Blny
 StartPresentationAction.text=Uruchom prezentacj\u0119
 StartPresentationOrShowNextSlideAction.text=Uruchom prezentacj\u0119/Nast\u0119pny slajd
 stop_processing=Stop
@@ -1971,7 +1971,7 @@ styles.user-defined=Style zdefiniowane przez u\u017Cytkownika
 styles.website=Strona sieciowa
 styles_background_html=\n <html>\n <head>\n </head>\n <body>\n <table width="800" style="text-align: left; vertical-align: top">\n <tr valign="top">\n <th>\n <div style="margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; margin-left: 0pt; text-align: center; font-weight: bold">\n O tym zestawie stylu\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n Niniejsza norma zosta\u0142a opracowana po 11 latach bada\u0144 pedagogicznych o tym, jak uc [...]
 styles_menu=Dost\u0119pne style
-submenu_keystroke_in_use_error=Naci\u015Bni\u0119cie klawiszy {0} nie mo\u017Ce by\u0107 u\u017Cyty dla podmenu {1}. Naci\u015Bni\u0119cie klawiszy usuni\u0119te.
+submenu_keystroke_in_use_error=Skr\u00F3t klawiaturowy {0} nie mo\u017Ce by\u0107 u\u017Cyty dla podmenu {1}. Skr\u00F3t klawiaturowy zosta\u0142 usuni\u0119ty.
 summary_nodes=W\u0119z\u0142y zbiorcze
 summary_not_possible=Nie mo\u017Cna utworzy\u0107 w\u0119z\u0142a zbiorczego dla aktualnego zaznaczenia
 svg=SVG
@@ -1982,7 +1982,7 @@ TextAlignAction.LEFT.text=Wyr\u00F3wnaj tekst do lewej
 TextAlignAction.RIGHT.text=Wyr\u00F3wnaj tekst do prawej
 textalignment=Wyr\u00F3wnanie tekstu
 TextChangeHotKeyAction.text=Set text change hot key (t\u0142umaczenie)
-TimeListAction.text=Poka\u017C zaplanowane zadania...
+TimeListAction.text=Zarz\u0105dzaj zadaniami ...
 TimeListAction.tooltip=Wy\u015Bwietla wszystkie zaplanowane czasy wraz z odpowiadaj\u0105cymi im w\u0119z\u0142ami.
 TimeManagementAction.text=Poka\u017C kalendarz...
 TimeManagementAction.tooltip=<html>Pokazuje modu\u0142 kalendarza autorstwa Kai Toedter</html>
diff --git a/freeplane/resources/translations/Resources_pt_PT.properties b/freeplane/resources/translations/Resources_pt_PT.properties
index e7a2a51..ff20d31 100644
--- a/freeplane/resources/translations/Resources_pt_PT.properties
+++ b/freeplane/resources/translations/Resources_pt_PT.properties
@@ -365,6 +365,8 @@ ExecuteScripts.noScriptsAvailable=Nenhum dispon\u00EDvel
 ExecuteScripts.text=Scripts
 ExecuteScriptSecurityError.text=Ocorreu um erro durante a execu\u00E7\u00E3o do script: {0}
 export_failed=Falha na exporta\u00E7\u00E3o
+export_pdf_text=Portable Document Format (PDF)
+export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Exportar para Freeplane
 ExportAction.text=Exportar mapa...
 ExportAllPresentationsAction.text=Exportar todas as apresenta\u00E7\u00F5es para PNG
@@ -1145,6 +1147,7 @@ OptionPanel.ja=Japon\u00EAs/\u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Separador de texto
 OptionPanel.key_type_action=Ao escrever
 OptionPanel.Keystrokes=Atalhos
+OptionPanel.kn=Kannada / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=Coreano/\uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Fam\u00EDlia da letra
 OptionPanel.label_font_size=Tamanho da letra
@@ -1216,6 +1219,7 @@ OptionPanel.number_format=Formato num\u00E9rico padr\u00E3o
 OptionPanel.number_format.tooltip=Um padr\u00E3o contendo '#' para opcionais e '0' para obrigat\u00F3rios. Exemplos: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=N\u00FAmero de ficheiros diferentes para grava\u00E7\u00F5es autom\u00E1ticas
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> n\u00FAmero n de ficheiros diferentes onde armazenar mapas.  A primeira grava\u00E7\u00E3o autom\u00E1tica \u00E9 feita no primeiro ficheiro e assim por diante at\u00E9 n+1 - grava\u00E7\u00E3o que ser\u00E1 de novo gravada no primeiro ficheiro (c\u00EDclico)</html>
+OptionPanel.oc=Occitano
 OptionPanel.OK=Gravar
 OptionPanel.org.freeplane.plugin.bugreport=Pol\u00EDtica
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Enviar sempre
@@ -1675,7 +1679,7 @@ SelectNoteAction.tooltip=Abre o editor de notas ao fundo do ecr\u00E3
 set_accelerator_on_next_click_helpmessage=Para criar um novo atalho de teclado, clique no comando desejado no menu.
 SetAccelerator.dialogTitle=Atribui\u00E7\u00E3o de atalhos
 SetAccelerator.keystrokeDetected=A chave {0} n\u00E3o est\u00E1 atribu\u00EDda a nenhum item de menu.
-SetAcceleratorOnNextClickAction.text=Atribuir atalho...
+SetAcceleratorOnNextClickAction.text=Atribuir atalho
 SetAlwaysUnfoldedNodeFlagsAction.text=Manter n\u00F3s desdobrados
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=Impedir dobras nos n\u00F3s actualmente desdobrados
 SetImageByFileChooserAction.text=Imagem por escolha ou liga\u00E7\u00E3o...
diff --git a/freeplane/resources/translations/Resources_ru.properties b/freeplane/resources/translations/Resources_ru.properties
index 3ec516d..7cffee1 100644
--- a/freeplane/resources/translations/Resources_ru.properties
+++ b/freeplane/resources/translations/Resources_ru.properties
@@ -15,6 +15,8 @@ accessories/plugins/EncryptNode.properties_7=\u041E\u0442\u043C\u0435\u043D\u043
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=<html>\u042D\u0442\u0430 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u044F \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043F\u0440\u0438\u043C\u0435\u043D\u0435\u043D\u0430 \u0442\u043E\u043B\u044C\u043A\u043E \u043A \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044E\u0449\u0435\u043C\u0443 \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u043C\u0443 \u0443\u0437\u043B\u0443.<br [...]
 accessories/plugins/EncryptNode.properties_select_me=\u0412\u044B\u0431\u0435\u0440\u0438 \u043C\u0435\u043D\u044F!
 accessories/plugins/EncryptNode.properties_wrong_password=\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u043F\u0430\u0440\u043E\u043B\u044C.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=\u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0430\u0441\u0441\u043E\u0446\u0438\u0430\u0442\u0438\u0432\u043D\u043E\u0439 \u043A\u0430\u0440\u0442\u044B \u0434\u043B\u044F java web start
 accessories/plugins/ExportWithTWiki.text=\u041A\u0430\u043A TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=\u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u0430\u0440\u0442\u0443 \u043A\u0430\u043A \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442 TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=\u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0447\u0435\u0440\u0435\u0437 XSLT - \u0441\u043A\u0440\u0438\u043F\u0442.
diff --git a/freeplane/resources/translations/Resources_sk.properties b/freeplane/resources/translations/Resources_sk.properties
index abedd08..80445a6 100644
--- a/freeplane/resources/translations/Resources_sk.properties
+++ b/freeplane/resources/translations/Resources_sk.properties
@@ -1,6 +1,6 @@
-about_text=Freeplane - slobodn\u00FD softv\u00E9r na tvorbu my\u0161lienkov\u00FDch m\u00E1p a datab\u00E1z znalost\u00ED
+about_text=Freeplane - slobodn\u00FD softv\u00E9r na tvorbu my\u0161lienkov\u00FDch m\u00E1p a znalostn\u00FDch datab\u00E1z
 AboutAction.text=O programe
-acceleratorPresets=Kl\u00E1vesov\u00E9 skratky
+acceleratorPresets=Predvo\u013Eby kl\u00E1vesov\u00FDch skratiek
 accelerators_loading_error=Nedaj\u00FA sa na\u010D\u00EDta\u0165 skratky z {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=Zmeni\u0165 form\u00E1t uzlov
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Zmeni\u0165 vzor
@@ -12,7 +12,7 @@ accessories/plugins/EncryptNode.properties_4=Zadajte svoje heslo.
 accessories/plugins/EncryptNode.properties_5=<html>Pam\u00E4tajte, \u017Ee sila za\u0161ifrovania<br> z\u00E1vis\u00ED takmer v\u00FDlu\u010Dne od kvality v\u00E1\u0161ho hesla.
 accessories/plugins/EncryptNode.properties_6=OK
 accessories/plugins/EncryptNode.properties_7=Zru\u0161i\u0165
-accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Stav ochrany (za\u0161ifrovania) m\u00F4\u017Eete meni\u0165 iba na za\u0161ifrovanom uzle. Vlo\u017Ete pros\u00EDm tak\u00FDto uzol pomocou menu n\u00E1strojov.
+accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Stav ochrany (za\u0161ifrovania) m\u00F4\u017Eete meni\u0165 iba na za\u0161ifrovanom uzle. Vlo\u017Ete pros\u00EDm tak\u00FDto uzol pomocou ponuky n\u00E1strojov.
 accessories/plugins/EncryptNode.properties_select_me=Pre pokra\u010Dovanie ma zvo\u013Ete!
 accessories/plugins/EncryptNode.properties_wrong_password=Heslo je nespr\u00E1vne.
 accessories/plugins/Export_JavaWebStart.text=Java Web Start...
@@ -30,17 +30,17 @@ accessories/plugins/ExportWithXSLT_TASKSTJI.text=\u00DAlohy z uzla TASKS do s\u0
 accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Exportuje \u00FAlohy z uzla TASKS do modulu TaskJuggler.</html>
 action_keystroke_in_use_error=Kl\u00E1vesov\u00E1 skratka {0} po\u017Eadovan\u00E1 pre akciu {1} sa u\u017E pou\u017E\u00EDva pre akciu {2}
 active=Akt\u00EDvne
-actual_map_styles=Podmienen\u00E9 \u0161t\u00FDly mapy boli aplikovan\u00E9 na uzol
-actual_node_styles=Podmienen\u00E9 \u0161t\u00FDly uzla boli aplikovan\u00E9 na uzol
+actual_map_styles=Podmienen\u00E9 \u0161t\u00FDly mapy pou\u017Eit\u00E9 na uzol
+actual_node_styles=Podmienen\u00E9 \u0161t\u00FDly uzla pou\u017Eit\u00E9 na uzol
 add=Prid&a\u0165
-AddConnectorAction.text=Spoji\u0165
+AddConnectorAction.text=Prepoji\u0165
 AddElementaryConditionAction.text=Prida\u0165
-AddExecutionLinkAction.text=Prida\u0165 odkaz na spustenie pr\u00EDkazu OS...
+AddExecutionLinkAction.text=Prida\u0165 odkaz na sp\u00FA\u0161\u0165anie pr\u00EDkazu OS...
 AddLocalLinkAction.text=Prida\u0165 miestny odkaz
 AddMenuItemLinkAction.text=Prida\u0165 odkaz na polo\u017Eku v menu...
 AddOnDetailsPanel.authored.by=Pod\u013Ea {0}
 AddOnDetailsPanel.header.function=Funkcia
-AddOnDetailsPanel.header.menu=Umiestnenie v ponuke
+AddOnDetailsPanel.header.menu=Umiestnenie v menu
 AddOnDetailsPanel.header.shortcut=Kl\u00E1vesov\u00E1 skratka
 AddOnDetailsPanel.homepage=Domovsk\u00E1 str\u00E1nka:
 addons.installer.canceled=In\u0161tal\u00E1cia zru\u0161en\u00E1
@@ -58,34 +58,34 @@ addons.installer.missing.properties=Ch\u00FDbaj\u00FAce vlastnosti: {0}
 addons.installer.missing.translation=Ch\u00FDba preklad {0} pre lokaliz\u00E1ciu {1}
 addons.installer.no.scripts=Nen\u00E1jden\u00E9 \u017Eiadne skripty
 addons.installer.no.zipdata=Nen\u00E1jden\u00E9 \u017Eiadne zip \u00FAdaje
-addons.installer.nonstandard.permissions=Skript vy\u017Eaduje nasleduj\u00FAce opr\u00E1vnenia, ktor\u00E9 v s\u00FA\u010Dasnosti nem\u00E1: {0}.\nMali by by\u0165 pridan\u00E9 k \u0161tandardn\u00FDm opr\u00E1vneniam?
+addons.installer.nonstandard.permissions=Skript vy\u017Eaduje nasleduj\u00FAce opr\u00E1vnenia, ktor\u00E9 v s\u00FA\u010Dasnosti nem\u00E1: {0}.\nM\u00F4\u017Eu by\u0165 pridan\u00E9 k \u0161tandardn\u00FDm opr\u00E1vneniam?
 addons.installer.one.child.expected=O\u010Dak\u00E1va sa pr\u00E1ve jeden potomok {0}, obdr\u017Ean\u00FDch je ale {1}.
 addons.installer.script.name.suffix=Skript s n\u00E1zvom {0} nem\u00E1 pr\u00EDponu typu ".groovy"
 addons.installer.script.no.execution_mode=Pre {0} nie s\u00FA zadan\u00E9 \u017Eiadne "execution_mode" atrib\u00FAty
 addons.installer.script.no.menulocation=Pre {0} ne s\u00FA zadan\u00E9 \u017Eiadne "menuLocation" atrib\u00FAty
-addons.installer.script.no.menutitle=Pre {0} nie s\u00FA zadan\u00E9 \u017Eiadne "menuTitleKey" atrib\u00FAty
+addons.installer.script.no.menutitle=Pre {0} nie je zadan\u00FD \u017Eiaden "menuTitleKey" atrib\u00FAt
 addons.installer.script.no.permissions=Pre {0} nie s\u00FA definovan\u00E9 \u017Eiadne opr\u00E1vnenia
 addons.installer.success=In\u0161tal\u00E1cia prebehla \u00FAspe\u0161ne.\nNov\u00FD doplnok bude k dispoz\u00EDcii po re\u0161tarte.
 addons.installer.success.update=Aktualiz\u00E1cia z {0} na {1} prebehla \u00FAspe\u0161ne.\nNiektor\u00E9 funkcie m\u00F4\u017Eu by\u0165 dostupn\u00E9 a\u017E po re\u0161tarte.
 addons.installer.title=In\u0161tal\u00E1tor doplnku
-addons.installer.too.new=Aktu\u00E1lna verzia Freeplane {0} je nov\u0161ia, ne\u017E ak\u00FA podporuje tento doplnok. Nepodporuje verziu vy\u0161\u0161iu ako {1}
+addons.installer.too.new=Aktu\u00E1lna verzia Freeplane {0} je nov\u0161ia, ne\u017E ak\u00FA podporuje tento doplnok. Podporovan\u00E1 je verzia nie vy\u0161\u0161ia ako {1}
 addons.installer.too.old=Aktu\u00E1lna verzia Freeplane {0} je zastaral\u00E1. Tento doplnok potrebuje aspo\u0148 verziu {1}
-addons.installer.unknown.deinstallation.rules=Nezn\u00E1me odin\u0161tala\u010D\u00E9 pravidlo/pravidl\u00E1 {0}
+addons.installer.unknown.deinstallation.rules=Nezn\u00E1me odin\u0161tala\u010Dn\u00E9 pravidl\u00E1 {0}
 addons.installer.update=Aktualiz\u00E1cia z verzie {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Mali by ste in\u0161talova\u0165 len doplnky z d\u00F4veryhodn\u00FDch zdrojov. \u0160kodliv\u00FD softv\u00E9r m\u00F4\u017Ee sp\u00F4sobi\u0165 po\u0161kodenie va\u0161ich \u00FAdajov alebo naru\u0161enie v\u00E1\u0161ho s\u00FAkromia.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Atrib\u00FAty zo \u0161t\u00FDlu
-AddStyleAttributes.tooltip=Prida\u0165 atrib\u00FAty z uzlu \u0161t\u00FDlu
+AddStyleAttributes.tooltip=Prida\u0165 atrib\u00FAty zo \u0161t\u00FDlov\u00E9ho uzlu
 AllMapsNodeListAction.text=N\u00E1js\u0165 a nahradi\u0165 vo v\u0161etk\u00FDch map\u00E1ch
 always=V\u017Edy
 AlwaysUnfoldedNodeAction.text=V\u017Edy rozbalen\u00FD uzol (nastavi\u0165/resetova\u0165)
 antialias_all=Vyhladzova\u0165 v\u0161etko
-antialias_edges=Vyhladzova\u0165 hrany
+antialias_edges=Vyhladzova\u0165 spoje
 antialias_none=Nevyhladzova\u0165 ni\u010D
 apply=Pou\u017Ei\u0165
 ApplyAction.text=Pou\u017Ei\u0165
 ApplyFormatPlugin.text=Zmeni\u0165 form\u00E1t ...
-ApplyFormatPlugin.tooltip=Zobrazuje dial\u00F3g, v ktorom mo\u017Eno naraz zmeni\u0165 vlastnosti uzlov aj hr\u00E1n.
+ApplyFormatPlugin.tooltip=Zobrazuje dial\u00F3g, v ktorom mo\u017Eno naraz zmeni\u0165 vlastnosti uzlov aj spojov.
 ApplyNoFilteringAction.text=Bez filtrovania
 ApplySelectedViewConditionAction.text=Filtrova\u0165 vybran\u00E9 uzly
 ApplyToVisibleAction.text=Pou\u017E\u00EDva sa na filtrovan\u00E9 uzly
@@ -102,7 +102,7 @@ attribute_replace=Nahradi\u0165 s
 attribute_top=V\u0161etky zn\u00E1me atrib\u00FAty na\u010D\u00EDtan\u00FDch m\u00E1p
 attribute_value=Hodnota atrib\u00FAtu
 attributes_AddAttributeAction.text=Prida\u0165 atrib\u00FAt v dial\u00F3gu...
-attributes_adding_empty_attribute_error=Ako n\u00E1zov atrib\u00FAtu nemo\u017Eno pou\u017Ei\u0165 pr\u00E1zdny re\u0165azac
+attributes_adding_empty_attribute_error=Nemo\u017Eno pou\u017Ei\u0165 pr\u00E1zdny re\u0165azec ako n\u00E1zov atrib\u00FAtu
 attributes_all=V\u0161etky atrib\u00FAty
 attributes_assign_dialog=Roz\u0161\u00EDren\u00FD editor atrib\u00FAtu
 attributes_attribute=Atrib\u00FAty
@@ -143,7 +143,7 @@ AutomaticEdgeColor.FOR_BRANCHES=pre vetvy
 AutomaticEdgeColor.FOR_COLUMNS=pre st\u013Apce
 AutomaticEdgeColor.FOR_LEVELS=pre \u00FArovne
 AutomaticEdgeColor.ON_BRANCH_CREATION=pri vytv\u00E1ran\u00ED vetvy
-AutomaticEdgeColorHookAction.text=Automatick\u00E1 farba hrany
+AutomaticEdgeColorHookAction.text=Automatick\u00E1 farba spoja
 AutomaticLayout.ALL=pre v\u0161etky uzly
 AutomaticLayout.HEADINGS=pre in\u00E9 ako koncov\u00E9 uzly
 AutomaticLayout.level=\u00DArove\u0148 {0}
@@ -154,56 +154,57 @@ AutomaticLayoutControllerAction.ALL.text=pre v\u0161etky uzly
 AutomaticLayoutControllerAction.COLUMNS.text=pre st\u013Apce
 AutomaticLayoutControllerAction.HEADINGS.text=pre in\u00E9 ako koncov\u00E9 uzly
 AutomaticLayoutControllerAction.null.text=zak\u00E1zan\u00E9
-BackAction.text=Nasp\u00E4\u0165
+BackAction.text=\u00CDs\u0165 sp\u00E4\u0165
+BackAction.tooltip=Sko\u010D\u00ED sp\u00E4\u0165 vo vybranom re\u0165azci
 background=Pozadie
 bitmaps=Bitmapy
 black=\u010Cierna
 BlinkingNodeHookAction.text=Blikaj\u00FAci uzol
 BlinkingNodeHookAction.tooltip=<html>Toto sp\u00F4sob\u00ED blikanie uzla. Bu\u010Fte v\u0161ak opatrn\u00ED. Nenastavuje to pr\u00EDli\u0161 mnoh\u00FDm uzlom, a <strong> nie spolu s \u010Fal\u0161\u00EDmi automatick\u00FDmi form\u00E1tovaniami na tom istom uzle</strong></html>
 blue=Modr\u00E1
-BoldAction.text=Tu\u010Dn\u00E9
-boldify_branch=Zmeni\u0165 na tu\u010Dn\u00E9
+BoldAction.text=Hrub\u00E9
+boldify_branch=Zmeni\u0165 na hrub\u00E9
 branch=Vetva
 browse=Prech\u00E1dza\u0165...
 calendar_attributes_panel=Kalend\u00E1r a atrib\u00FAty
 calendar_panel=Kalend\u00E1r
-can_not_clone_encrypted_node=Za\u0161ifrovan\u00E9 uzly nemo\u017Eno klonova\u0165
+can_not_clone_encrypted_node=Nemo\u017Eno klonova\u0165 za\u0161ifrovan\u00E9 uzly
 can_not_connect_to_info_server=Ned\u00E1 sa pripoji\u0165 k informa\u010Dn\u00E9mu serveru
 can_not_delete_predefined_style=Preddefinovan\u00FD \u0161t\u00FDl nemo\u017Eno zmaza\u0165
-can_not_delete_root_style=Kore\u0148ov\u00FD \u0161t\u00FDl nemo\u017Eno zmaza\u0165
-can_not_delete_style_group=Skupinu \u0161t\u00FDlov nemo\u017Eno zmaza\u0165
-can_not_encrypt_cloned_node=Klonovan\u00E9 uzly nemo\u017Eno za\u0161ifrova\u0165
-can_not_save_key_set=Sadu hor\u00FAcich kl\u00E1ves nemo\u017Eno ulo\u017Ei\u0165
-cancel=Storno
-CancelAction.text=Storno
-cannot_add_parent_diff_parents=Pre pou\u017Eitie tejto funkcie musia ma\u0165 v\u0161etky uzly rovnak\u00E9ho rodi\u010Da, .
+can_not_delete_root_style=Nemo\u017Eno zmaza\u0165 kore\u0148ov\u00FD \u0161t\u00FDl
+can_not_delete_style_group=Nemo\u017Eno zmaza\u0165 skupinu \u0161t\u00FDlov
+can_not_encrypt_cloned_node=Nemo\u017Eno za\u0161ifrova\u0165 klonovan\u00E9 uzly
+can_not_save_key_set=Nemo\u017Eno ulo\u017Ei\u0165 sadu kl\u00E1vesov\u00FDch skratiek
+cancel=Zru\u0161i\u0165
+CancelAction.text=Zru\u0161i\u0165
+cannot_add_parent_diff_parents=Na pou\u017Eitie tejto funkcie musia ma\u0165 v\u0161etky uzly rovnak\u00E9ho rodi\u010Da.
 cannot_add_parent_to_root=Kore\u0148ov\u00FD uzol nemo\u017Eno prida\u0165 pod nov\u00E9ho rodi\u010Da.
-cannot_delete_root=Kore\u0148ov\u00FD uzol nemo\u017Eno zmaza\u0165 ani vystrihn\u00FA\u0165.
+cannot_delete_root=Kore\u0148ov\u00FD uzol nemo\u017Eno zmaza\u0165 alebo vystrihn\u00FA\u0165.
 cannot_join_nodes_with_children=Nemo\u017Eno spoji\u0165 uzly s potomkami
 cannot_move_into_child_node=Nemo\u017Eno presun\u00FA\u0165 do podraden\u00E9ho uzla
 cannot_move_to_child=Nemo\u017Eno presun\u00FA\u0165 uzol do jedn\u00E9ho z jeho potomkov.
 CenterAction.text=Vycentrova\u0165
 ChangeConnectorArrowsAction.backward.text=Nakresli\u0165 \u0161\u00EDpku sp\u00E4\u0165
-ChangeConnectorArrowsAction.both.text=Nakresli\u0165 \u0161\u00EDpky \u010Falej a sp\u00E4\u0165
-ChangeConnectorArrowsAction.forward.text=Nakresli\u0165 \u0161\u00EDpku \u010Falej
+ChangeConnectorArrowsAction.both.text=Nakresli\u0165 \u0161\u00EDpky dopredu a sp\u00E4\u0165
+ChangeConnectorArrowsAction.forward.text=Nakresli\u0165 \u0161\u00EDpku dopredu
 ChangeConnectorArrowsAction.none.text=\u017Diadne
-ChangeConnectorArrowsAction.text=Zmeni\u0165 \u0161\u00EDpky spojenia
+ChangeConnectorArrowsAction.text=Zmeni\u0165 \u0161\u00EDpky prepojenia
 ChangeConnectorShapeAction.CUBIC_CURVE.text=Krivka
-ChangeConnectorShapeAction.EDGE_LIKE.text=Simulova\u0165 hranu
+ChangeConnectorShapeAction.EDGE_LIKE.text=Simulova\u0165 spoj
 ChangeConnectorShapeAction.LINE.text=\u010Ciara
 ChangeConnectorShapeAction.LINEAR_PATH.text=Priama cesta
-ChangeNodeLevelLeftsAction.text=Presun\u00FA\u0165 uzol (Rodi\u010Dovsk\u00FD sused)
-ChangeNodeLevelLeftsAction.tooltip=Uzly na\u013Eavo od kore\u0148a sa posun\u00FA nadol. Stan\u00FA sa poduzlami uzla, ktor\u00FD bol nad nimi. Uzly napravo od kore\u0148a sa posun\u00FA nahor. Priamo pri koreni uzly zmenia stranu.
-ChangeNodeLevelRightsAction.text=Presun\u00FA\u0165 uzol (Susedov potomok)
+ChangeNodeLevelLeftsAction.text=Presun\u00FA\u0165 uzol (Rodi\u010Dovsk\u00FD s\u00FArodenec)
+ChangeNodeLevelLeftsAction.tooltip=Uzly na\u013Eavo od kore\u0148a sa posun\u00FA nadol. Stan\u00FA sa potomkami uzla, ktor\u00FD bol nad nimi. Uzly napravo od kore\u0148a sa posun\u00FA nahor. Uzly priamo pri koreni si vymenia strany.
+ChangeNodeLevelRightsAction.text=Presun\u00FA\u0165 uzol (S\u00FArodencov potomok)
 ChangeNodeLevelRightsAction.tooltip=Uzly napravo od kore\u0148a sa posun\u00FA nadol. Stan\u00FA sa poduzlami uzla, ktor\u00FD bol nad nimi. Uzly na\u013Eavo od kore\u0148a sa posun\u00FA nahor. Priamo pri koreni uzly zmenia stranu.
 choose_cloud_color=Zvo\u013Ete farbu oblaku:
-choose_edge_color=Zvo\u013Ete farbu hrany
+choose_edge_color=Zvoli\u0165 farbu spoja
 choose_map_background_color=Zvo\u013Ete farbu pozadia mapy
 choose_node_background_color=Zvo\u013Ete farbu pozadia uzla:
 choose_node_color=Zvo\u013Ete farbu uzla:
 ClearLinkAnchorAction.text=Vymaza\u0165 kotvu odkazu
-ClearLinkAnchorAction.tooltip=<html>vymaza\u0165 predt\u00FDm nastaven\u00E9 ukotvenie uzla</html>
-CloneAction.text=Vl\u017Ei\u0165 klon
+ClearLinkAnchorAction.tooltip=<html>vymaza\u0165 predt\u00FDm nastaven\u00FA kotvu uzla</html>
+CloneAction.text=Vlo\u017Ei\u0165 klon
 close_btn=Zavrie\u0165
 CloseAction.text=Zavrie\u0165 aktu\u00E1lnu mapu
 CloseAllMapsAction.text=Zavrie\u0165 v\u0161etky mapy
@@ -228,12 +229,12 @@ ColorProperty.ResetColor=Vr\u00E1ti\u0165 p\u00F4vodn\u00FA farbu
 combined=Kombinovan\u00E9
 condition=Podmienka
 confirmation=Potvrdenie
-connector=Spojenie
-connector_arrows=\u0160\u00EDpky spojenia
-connector_label=Popis spojenia
-connector_lines=Spojovacie \u010Diary
-connector_shapes=Tvary spojenia
-ConnectorColorAction.text=Farba spojenia...
+connector=Prepojenie
+connector_arrows=\u0160\u00EDpky prepojenia
+connector_label=Popis prepojenia
+connector_lines=\u010Ciary prepojenia
+connector_shapes=Tvary prepojenia
+ConnectorColorAction.text=Farba prepojenia...
 controls=Ovl\u00E1dacie prvky
 ConvertCloneToIndependentNodeAction.text=Zru\u0161i\u0165 klonovanie
 copy_name={0} (kop\u00EDrova\u0165)
@@ -245,8 +246,8 @@ CopyMapStylesAction.text=Kop\u00EDrova\u0165 \u0161t\u00FDl mapy z...
 CopyNodeURIAction.text=Kop\u00EDrova\u0165 URI uzla
 copyright=Copyright \u00A9 2000-2017 Freeplane t\u00EDm a \u010Fal\u0161\u00ED
 CopySingleAction.text=Kop\u00EDrova\u0165 uzol (jednotliv\u00FD)
-CopySingleAction.tooltip=Kop\u00EDrova\u0165 len vybrat\u00FD uzol
-CopyStyleExtensionsAction.text=Kop\u00EDrova\u0165 roz\u0161\u00EDrenia z uzlu \u0161t\u00FDlu
+CopySingleAction.tooltip=Kop\u00EDrova\u0165 len vybran\u00FD uzol
+CopyStyleExtensionsAction.text=Kop\u00EDrova\u0165 roz\u0161\u00EDrenia zo \u0161t\u00FDlov\u00E9ho uzlu
 corrupt_map=Obsah mapy je po\u0161koden\u00FD
 CreateConjunctConditionAction.text=A
 CreateDisjunctConditionAction.text=Alebo
@@ -274,7 +275,7 @@ DeleteUserStyleAction.text=Odstr\u00E1ni\u0165 pou\u017E\u00EDvate\u013Eom defin
 dialect_info.app=S\u00FAbor s my\u0161lienkovou mapou {0} bol vytvoren\u00FD programom {1}.
 dialect_info.later_version=S\u00FAbor s my\u0161lienkovou mapou {0} bol vytvoren\u00FD niektorou zo star\u0161\u00EDch verzi\u00ED tohoto programu.
 dialect_info.unknownApp=S\u00FAbor s my\u0161lienkovou mapou {0} bol vytvoren\u00FD nezn\u00E1mym programom.
-dialect_info.unknownURL=Webov\u00E1 str\u00E1nka je nezn\u00E1ma.
+dialect_info.unknownURL=Webov\u00E1 str\u00E1nka nie je zn\u00E1ma.
 dialect_info.url=Pre viac inform\u00E1ci\u00ED nav\u0161t\u00EDvte str\u00E1nku programu {0}.
 dialect_info.warning=Freeplane to nemus\u00ED otvori\u0165, zobrazi\u0165 alebo ulo\u017Ei\u0165 spr\u00E1vne.
 DirectHtmlFlavorHandler=HTML ako jednotliv\u00FD uzol
@@ -282,49 +283,51 @@ DocumentationAction.text=Dokument\u00E1cia
 down=D&olu
 DownConditionAction.text=Dolu
 download=Stiahnu\u0165
-dropped_file_error=Nemo\u017Eno otvori\u0165 pretiahnut\u00FD s\u00FAbor(y). D\u00F4vod: {0}
-edge=Hrana
-edge_is_formatted_by_style=Form\u00E1t hr\u00E1n sa riadi pod\u013Ea \u0161t\u00FDlu. Ak je to potrebn\u00E9, upravte pr\u00EDslu\u0161n\u00FD \u0161t\u00FDl.
-edge_style=\u0160t\u00FDl hrany
-edge_width=Hr\u00FAbka hrany
-edge_widths=\u0160\u00EDrky hrany
-EdgeColorAction.text=Farba hrany...
-EdgeProperties=Vlastnosti hrany
-EdgeStyleAction.bezier.text=Hladko zakriven\u00E9 (b\u00E9zier)
-EdgeStyleAction.bezier.tooltip=<html>Zobrazi\u0165 hranu ako hladk\u00FA krivku.</html>
-EdgeStyleAction.hide_edge.text=Skry\u0165 hranu
-EdgeStyleAction.hide_edge.tooltip=<html>Pre vybran\u00E9 uzly zobrazi\u0165 hranu k rodi\u010Dovsk\u00E9mu uzlu ako<br>bodkovan\u00FA \u010Diaru. Inak hranu skry\u0165.</html>
+dropped_file_error=Nemo\u017Eno otvori\u0165 pretiahnut\u00FD(\u00E9) s\u00FAbor(y). D\u00F4vod: {0}
+edge=Spoj
+edge_is_formatted_by_style=Form\u00E1t spoja sa riadi pod\u013Ea \u0161t\u00FDlu. Ak je to potrebn\u00E9, upravte pr\u00EDslu\u0161n\u00FD \u0161t\u00FDl.
+edge_style=\u0160t\u00FDl spoja
+edge_width=Hr\u00FAbka spoja
+edge_widths=Hr\u00FAbky spoja
+EdgeColorAction.text=Farba spoja...
+EdgeProperties=Vlastnosti spoja
+EdgeStyleAction.bezier.text=Krivky (b\u00E9zier)
+EdgeStyleAction.bezier.tooltip=<html>Zobrazi\u0165 spoj ako hladk\u00FA krivku.</html>
+EdgeStyleAction.hide_edge.text=Skry\u0165 spoj
+EdgeStyleAction.hide_edge.tooltip=<html>Pre vybran\u00E9 uzly zobrazi\u0165 spoj s rodi\u010Dovsk\u00FDm uzlom ako<br>bodkovan\u00FA \u010Diaru. Inak spoj skry\u0165.</html>
 EdgeStyleAction.horizontal.text=Vodorovn\u00E9
-EdgeStyleAction.horizontal.tooltip=<html>Pre hrany pou\u017Ei\u0165 kolm\u00E9 priamky.</html>
-EdgeStyleAction.linear.text=Line\u00E1rne
-EdgeStyleAction.linear.tooltip=<html>Hranu zobrazi\u0165 ako priamku.</html>
-EdgeStyleAction.sharp_bezier.text=Ostro zakriven\u00E9 (b\u00E9zier)
-EdgeStyleAction.sharp_bezier.tooltip=<html>Zobrazi\u0165 hrany ako hladk\u00E9 krivky so zaostren\u00FDmi koncami.</html>
-EdgeStyleAction.sharp_linear.text=Ostr\u00E9 line\u00E1rne
-EdgeStyleAction.sharp_linear.tooltip=<html>Zobrazi\u0165 hrany ako priamky so zaostren\u00FDmi koncami.</html>
+EdgeStyleAction.horizontal.tooltip=<html>Pre spoje pou\u017Ei\u0165 kolm\u00E9 priamky.</html>
+EdgeStyleAction.linear.text=Priamky
+EdgeStyleAction.linear.tooltip=<html>Spoj zobrazi\u0165 ako priamku.</html>
+EdgeStyleAction.sharp_bezier.text=Ostr\u00E9 krivky (b\u00E9zier)
+EdgeStyleAction.sharp_bezier.tooltip=<html>Zobrazi\u0165 spoj ako hladk\u00FA krivku s ostr\u00FDmi koncami.</html>
+EdgeStyleAction.sharp_linear.text=Ostr\u00E9 priamky
+EdgeStyleAction.sharp_linear.tooltip=<html>Zobrazi\u0165 spoj ako priamku s ostr\u00FDmi koncami.</html>
 EdgeStyleAsParentAction.text=Ako rodi\u010D
-EdgeStyleAsParentAction.tooltip=<html>Pou\u017Ei\u0165 \u0161t\u00FDl hrany rodi\u010Dovsk\u00E9ho uzla.</html>[zastaral\u00E9]
+EdgeStyleAsParentAction.tooltip=<html>Pou\u017Ei\u0165 \u0161t\u00FDl spoja z rodi\u010Dovsk\u00E9ho uzla.</html>[zastaran\u00E9]
 EdgeWidthAction_width_parent.text=Rodi\u010D
 EdgeWidthAction_width_thin.text=Tenk\u00E1
 edit=Upravi\u0165
 edit.decision=HTML Editor
-edit.edit_rich_text=Chcete pou\u017Ei\u0165 form\u00E1tovanie ako tu\u010Dn\u00E9 alebo kurz\u00EDva?
+edit.edit_rich_text=Chcete pou\u017Ei\u0165 form\u00E1tovanie ako hrub\u00E9 alebo kurz\u00EDva?
 edit_details=Upravi\u0165 podrobnosti uzla
-edit_end_label=<html>Popiska<br>spojenia
+edit_end_label=<html>Popiska<br>prepojenia
 edit_label_font_family=P\u00EDsmo
 edit_label_font_size=Ve\u013Ekos\u0165 p\u00EDsma
 edit_link_manually=Upravi\u0165 odkaz manu\u00E1lne...
 edit_long_node=Upravi\u0165 jadro uzla v dial\u00F3gu
-edit_middle_label=Edit Middle Label[translate me]
+edit_middle_label=<html>Stred<br>menovky
 edit_note=Upravi\u0165 pozn\u00E1mku
+edit_source_label=<html>Zdrojov\u00FD<br>\u0161t\u00EDtok
+edit_target_label=<html>Cie\u013Eov\u00FD<br>\u0161t\u00EDtok
 edit_transparency_label=Prieh\u013Eadnos\u0165
 edit_width_label=\u0160\u00EDrka
-EditAction.text=Upravi\u0165 jadro uzla v riadku
+EditAction.text=Upravi\u0165 jadro uzla na mieste
 EditAttributesAction.text=Upravi\u0165 atrib\u00FAty v riadku
 EditDetailsAction.text=Upravi\u0165 podrobnosti uzla v riadku
 EditDetailsInDialogAction.text=Upravi\u0165 podrobnosti uzla v dial\u00F3gu
-editEdgeColors=Upravi\u0165 farby hr\u00E1n
-EditFilterAction.text=Vytvori\u0165 filter
+editEdgeColors=Upravi\u0165 farby spojov
+EditFilterAction.text=Zostavi\u0165 filter
 EditLongAction.text=Upravi\u0165 jadro uzla v dial\u00F3gu
 EditNoteInDialogAction.text=Upravi\u0165 pozn\u00E1mku v dial\u00F3gu
 EditScript=Upravi\u0165 skript...
@@ -336,11 +339,16 @@ enter_base_url=Id\u00FA sa vklada\u0165 relat\u00EDvne odkazy. Zadajte pros\u00E
 enter_command=Zada\u0165 pr\u00EDkaz
 enter_condition_name=Zada\u0165 nov\u00FD n\u00E1zov podmienky
 enter_confirms=Enter potvrdzuje
-EnterPassword.text=Zme\u0148 vidite\u013En\u00E9 / za\u0161ifrovan\u00E9
+enter_keyset_name=Zadaj n\u00E1zov kl\u00E1vesovej skratky
+enter_map_url=Zadaj URL mapy
+enter_new_style_name=Zadaj n\u00E1zov nov\u00E9ho \u0161t\u00FDlu
+enter_node_id=Zadaj ID uzla
+enter_zoom=Zadaj zv\u00E4\u010D\u0161enie
+EnterPassword.text=Zada\u0165 heslo
 error=Chyba
-error_applying_template=Chyba pri pou\u017Eit\u00ED \u0161abl\u00F3ny XSL
+error_applying_template=Chyba pri pou\u017Eit\u00ED \u0161abl\u00F3ny XSL.
 error_creating_directory=Nemo\u017Eno vytvori\u0165 adres\u00E1r na export.
-error_in_template=Chyby v predvolenej \u0161abl\u00F3ne mapy {0}. Po\u00FAste sa tento s\u00FAbor odstr\u00E1ni\u0165.
+error_in_template=Chyby v predvolenej \u0161abl\u00F3ne mapy {0}. Pok\u00FAste sa tento s\u00FAbor odstr\u00E1ni\u0165.
 errornumber={0} ch\u00FDb
 ExecuteScript.available_modes_tooltip={0} je dostupn\u00E9 pre
 ExecuteScript.script=Skript
@@ -350,9 +358,12 @@ ExecuteScriptForSelectionAction.text=Spusti\u0165 skripty vybran\u00E9ho uzla
 ExecuteScriptOnSelectedNode.text=Spusti\u0165 {0} na v\u0161etk\u00FDch vybran\u00FDch uzloch
 ExecuteScriptOnSelectedNodeRecursively.text=Spusti\u0165 {0} na vybran\u00FDch uzloch, rekurz\u00EDvne
 ExecuteScriptOnSingleNode.text=Spusti\u0165 {0} na jednom vybranom uzle
+ExecuteScripts.noScriptsAvailable=Nedostupn\u00FD
 ExecuteScripts.text=Skripty
 ExecuteScriptSecurityError.text=Pri vykon\u00E1van\u00ED skriptu sa vyskytla chyba: {0}
 export_failed=Exportovanie zlyhalo
+export_pdf_text=Portable Document Format (PDF)
+export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Exportovanie z Freeplane
 ExportAction.text=Exportova\u0165 mapu...
 ExportAllPresentationsAction.text=Exportova\u0165 v\u0161etky prezent\u00E1cie do PNG obr\u00E1zkov
@@ -365,74 +376,168 @@ ExportSvg.text=SVG
 ExportToHTMLAction.text=HTML
 ExportToImage.jpg.text=JPEG
 ExportToImage.png.text=PNG
-ExportToOoWriter.text=Ako dokument programu OpenOffice Writer...
+ExportToOoWriter.text=Otvori\u0165 dokument programu OpenOffice Writer...
 ExportToOoWriter.tooltip=Rozbalen\u00E9 uzly tvoria \u0161trukt\u00FAru, zbalen\u00E9 uzly tvoria obsah dokumentu.
 extension_menu=Fyzick\u00FD \u0161t\u00FDl
-extras=N\u00E1stroje
-f_button_unassigned=<no action>[translate me]
+ExternalImage_popupMenu_Change=Zmeni\u0165...
+ExternalImage_popupMenu_Open=Otvori\u0165 v prehliada\u010Di
+ExternalImage_popupMenu_Remove=Odstr\u00E1ni\u0165
+ExternalImage_popupMenu_ResetZoom=Obnovi\u0165 zv\u00E4\u010D\u0161enie
+ExternalImageAddAction.text=Prida\u0165 obr\u00E1zok...
+ExternalImageChangeAction.text=Zmeni\u0165 obr\u00E1zok...
+ExternalImageRemoveAction.text=Odstr\u00E1ni\u0165 obr\u00E1zok
+ExtractLinkFromTextAction.text=Konvertova\u0165 vn\u00FAtorn\u00FD text na odkaz
+ExtractLinkFromTextAction.tooltip=Vytvori\u0165 hypertextov\u00FD odkaz z adresy v texte uzla
+extras=N\u00E1s&troje
+f_button_unassigned=<\u017Eiadna akcia>
 FaqOpenURLAction.text=Ot\u00E1zky
 file=S\u00FAbor
 file_already_exists=S\u00FAbor {0} u\u017E existuje. Chcete ho prep\u00EDsa\u0165?
+file_not_accessible=S\u00FAbor {0} nie je dostupn\u00FD
 file_not_found=S\u00FAbor {0} sa nena\u0161iel
-filter=Filter[translate me]
-filter_add=Pridaj
+FileListFlavorHandler=Odkazy na s\u00FAbory
+FileProperties_BranchLeafCount=Po\u010Det koncov\u00FDch uzlov vo vybran\u00FDch vetv\u00E1ch:
+FileProperties_BranchNodeCount=Po\u010Det uzlov vo vybran\u00FDch vetv\u00E1ch:
+FileProperties_ChangesSinceLastSave=Zmeny od posledn\u00E9ho ulo\u017Eenia:
+FileProperties_FileName=N\u00E1zov s\u00FAboru:
+FileProperties_FileSaved=S\u00FAbor ulo\u017Een\u00FD:
+FileProperties_FileSize=Ve\u013Ekos\u0165 s\u00FAboru:
+FileProperties_MainBranchCount=Po\u010Det hlavn\u00FDch vetiev:
+FileProperties_NeverSaved=Nikdy neulo\u017Een\u00E9
+FileProperties_NodeChildCount=Po\u010Det potomkov vybran\u00E9ho uzla:
+FileProperties_NodeSelectionCount=Po\u010Det vybran\u00FDch uzlov:
+FileProperties_TotalFilteredCount=Po\u010Det uzlov vyhovuj\u00FAcich filtru:
+FileProperties_TotalLeafCount=Celkov\u00FD po\u010Det listov\u00FDch uzlov:
+FileProperties_TotalNodeCount=Celkov\u00FD po\u010Det uzlov:
+FilePropertiesAction.text=\u0160tatistika mapy...
+FileRevisionsDialog.cancel=Zru\u0161i\u0165
+FileRevisionsDialog.file_last_modified=\u010Casov\u00E1 zna\u010Dka
+FileRevisionsDialog.file_name=S\u00FAbor
+FileRevisionsDialog.file_size=Bajty
+FileRevisionsDialog.open=Otvori\u0165
+FileRevisionsDialog.open.tooltip=Otvori\u0165 s\u00FAbor, aj ke\u010F by mohol by\u0165 zastaral\u00FD
+FileRevisionsDialog.question=Zisten\u00E9 rev\u00EDzie {0}
+FileRevisionsDialog.restore=Obnovi\u0165
+FileRevisionsDialog.restore.tooltip=Nahradi\u0165 {0} {1}
+FileRevisionsDialog.title=Rev\u00EDzie s\u00FAboru
+filter=F&iltrova\u0165
+filter_add=Prida\u0165
 filter_and=A
+filter_any_text=Jadro, podrobnosti alebo pozn\u00E1mka
+filter_clone_snapshot=Ulo\u017Een\u00E9 klony v\u00FDberu
+filter_clones=Klony v\u00FDberu
 filter_conditions=Filtre
 filter_contains=Obsahuje
+filter_created_after=Vytvoren\u00E9 po
+filter_created_before=Vytvoren\u00E9 pred
 filter_delete=Vyma\u017E
+filter_details=Detaily
 filter_dialog=N\u00E1vrh filtra
 filter_does_not_exist=Neexistuje
-filter_edit_description=Edituj zoznam filtrov
+filter_edit_description=Uprav zoznam filtrov
 filter_enter_value=Vlo\u017E hodnotu
+filter_even_level=Nez\u00E1visl\u00FD uzol \u00FArovne
 filter_exist=Existuje
 filter_icon=Ikona
 filter_is_equal_to=Sa rovn\u00E1
 filter_is_not_equal_to=Sa nerovn\u00E1
-filter_link=Hyperlink[translate me]
-filter_no_filtering=Bez filtra
-filter_node=Text uzla
+filter_leaf=Listov\u00FD uzol
+filter_link=Internetov\u00FD odkaz
+filter_match_approximately=Pribli\u017En\u00FD
+filter_match_approximately_tooltip=<html>Ak chcete povoli\u0165 pribli\u017En\u00E9 porovn\u00E1vanie, <br/> napr. h\u013Eadanie "kon\u00E1r" n\u00E1jde aj "kor\u00E1n". </html>
+filter_match_case=Rozli\u0161ova\u0165 mal\u00E9 a ve\u013Ek\u00E9 p\u00EDsmen\u00E1
+filter_match_case_tooltip=\u010Ci sa m\u00E1 v pr\u00EDpade zhody re\u0161pektova\u0165 ve\u013Ekos\u0165 p\u00EDsmen.
+filter_modified_after=Zmenen\u00FD po
+filter_modified_before=Zmenen\u00FD pred
+filter_no_filtering=Bez filtra (odstr\u00E1ni\u0165)
+filter_node=Text jadra
+filter_node_level=\u00DArove\u0148 uzla
 filter_not=Nie
+filter_note=Pozn\u00E1mka
+filter_odd_level=Rovnak\u00E1 \u00FArove\u0148 uzla
 filter_or=Alebo
+filter_parent=Rodi\u010Dovsk\u00FD text
+filter_periodic_level=Periodick\u00FD
+filter_priority=Priorita
+filter_regexp_matches=Zodpoved\u00E1 regul\u00E1rnemu v\u00FDrazu
+filter_reminder=Pripomienka
+filter_reminder_after=napl\u00E1novan\u00E9 po
+filter_reminder_before=napl\u00E1novan\u00E9 pred
+filter_reminder_executed=u\u017E vystrelil
+filter_reminder_later=napl\u00E1novan\u00E9 nesk\u00F4r
+filter_root=Kore\u0148ov\u00FD uzol
+filter_script=Filter skriptov
 filter_select=V\u00FDber
 filter_selected_node_view=Moment\u00E1lne vybran\u00E9 uzly
-find_what=N\u00E1jdi \u010Do
-FindAction.text=N\u00E1jdi...
-fit_map_to_page=Zmesti na jednu stranu
-FitToPage.text=Zaostri na str\u00E1nku
-FitToPage.tooltip=Prisp\u00F4sob\u00ED zaostrenie, aby sa cel\u00E1 mapa zmestila do s\u00FA\u010Dasn\u00E9ho okna.
-fold=Zba\u013E
+filter_selected_node_view_snapshot=Ulo\u017Een\u00FD v\u00FDber
+filter_style=\u0160t\u00FDl
+filter_time=D\u00E1tov\u00FD filter
+FilterCondition=Podmienky filtra
+filterConditions=Filtre definovan\u00E9 pou\u017E\u00EDvate\u013Eom
+filterConditions.noActions=Filtre bez n\u00E1zvu
+filters_not_loaded=Filter sa ned\u00E1 na\u010D\u00EDta\u0165, s\u00FAbor je po\u0161koden\u00FD
+find=N\u00E1js\u0165
+find_what=N\u00E1js\u0165 \u010Do
+FindAction.text=N\u00E1js\u0165...
+FindNextAction.text=N\u00E1js\u0165 \u010Fal\u0161\u00ED
+FindPreviousAction.text=N\u00E1js\u0165 predch\u00E1dzaj\u00FAci
+fit_background_to_page=Prisp\u00F4sobi\u0165 obr\u00E1zok pozadia na jednu stranu
+fit_map_to_page=Prisp\u00F4sobi\u0165 na jednu stranu
+fit_map_to_page_height=Prisp\u00F4sobi\u0165 v\u00FD\u0161ku na jednu stranu
+fit_map_to_page_width=Prisp\u00F4sobi\u0165 \u0161\u00EDrku na jednu str\u00E1nku
+FitToPage.text=Zobrazi\u0165 cel\u00FA mapu
+FitToPage.tooltip=Uprav\u00ED pribl\u00ED\u017Eenie tak, aby sa cel\u00E1 mapa zmestila do s\u00FA\u010Dasn\u00E9ho okna.
+fold=Zbali\u0165
 FoldAllAction.text=Zba\u013E v\u0161etko
-FoldAllAction.tooltip=<html>Zbal\u00ED ozna\u010Den\u00FD uzol a v\u0161etky jeho poduzly.</html>
+FoldAllAction.tooltip=<html>Zbal\u00ED ozna\u010Den\u00E9 uzly a v\u0161etky jeho poduzly.</html>
 FoldOneLevelAction.text=Zba\u013E jednu \u00FArove\u0148
 FoldOneLevelAction.tooltip=<html>Zbal\u00ED ozna\u010Den\u00E9 uzly o jednu \u00FArove\u0148.</html>
-FollowLinkAction.text=Otvor hyperlinku:
+follow_clone=Vo vn\u00FAtri "{0}"
+follow_graphical_link=Sko\u010D\u00ED na "{0}"
+FollowLinkAction.text=Prejs\u0165 na odkaz
 font=P\u00EDsmo
 FontFamilyAction.text=typ p\u00EDsma
 FontSizeAction.text=ve\u013Ekos\u0165 p\u00EDsma
-format=Form\u00E1t
-format_menu_edge_styles=\u0160t\u00FDly hr\u00E1n
-format_menu_edge_widths=Hr\u00FAbky hr\u00E1n
-FormatCopy.text=Kop\u00EDruj form\u00E1t
-FormatCopy.tooltip=<html>Skop\u00EDruje form\u00E1t uzla.</html>
-FormatPaste.text=Vlo\u017E form\u00E1t
-FormatPaste.tooltip=<html>Vlo\u017E\u00ED form\u00E1t uzla.</html>
-ForwardAction.text=Dopredu
+format=F&orm\u00E1tova\u0165
+format_invalid_pattern=Neplatn\u00E1 vzorka
+format_menu_cloud_shapes=Prida\u0165 oblak alebo zmeni\u0165 \u0161t\u00FDl
+format_menu_edge_styles=\u0160t\u00FDly spojov
+format_menu_edge_widths=Hr\u00FAbky spojov
+format_panel=Form\u00E1t
+FormatCopy.text=Kop\u00EDrova\u0165 form\u00E1tovanie
+FormatCopy.tooltip=<html>Skop\u00EDruje form\u00E1tovanie uzla.</html>
+FormatPaste.text=Vlo\u017Ei\u0165 form\u00E1tovanie
+FormatPaste.tooltip=<html>Vlo\u017E\u00ED form\u00E1tovanie uzla.</html>
+formats_not_loaded=Form\u00E1ty sa nedaj\u00FA na\u010D\u00EDta\u0165, s\u00FAbor je po\u0161koden\u00FD
+formula.error.attributeValueIsNull=Hodnota atrib\u00FAtu "{0}" je po vyhodnoten\u00ED null.
+formula.error.circularReference=Cyklick\u00FD odkaz: Vzorec v uzle "{0}" odkazuje s\u00E1m na seba.
+formula.EvaluateAllAction.text=Vyhodnoti\u0165 v\u0161etko
+formula.EvaluateAllAction.tooltip=Vyhodnoti\u0165 v\u0161etky vzorce v aktu\u00E1lnej mape
+formula.menuname=Vzorce
+formula_editor=Uprav vzorec
+ForwardAction.text=\u00CDs\u0165 vpred
+ForwardAction.tooltip=Sko\u010D\u00ED dopredu vo vybranom re\u0165azci
+FreeNodeAction.text=Vo\u013Ene umiestnen\u00FD uzol (nastavi\u0165/obnovi\u0165)
 Freeplane.progress.buildScreen=Zostavujem obrazovku...
-Freeplane.progress.createController=Vytv\u00E1ram ovl\u00E1da\u010D...
+Freeplane.progress.createController=Vytvori\u0165 ovl\u00E1da\u010D...
 Freeplane.progress.createInitialMode=Vytv\u00E1ram po\u010Diato\u010Dn\u00FD re\u017Eim...
 Freeplane.progress.endStartup=Dokon\u010Dujem \u0161tart.
 Freeplane.progress.gettingPreferenceDirectories=Zis\u0165ujem adres\u00E1re s nastaveniami...
 Freeplane.progress.gettingPreferences=Zis\u0165ujem nastavenia...
-Freeplane.progress.loadMaps=Na\u010D\u00EDtavam mapy...
+Freeplane.progress.loadMaps=Na\u010D\u00EDta\u0165 mapy...
 Freeplane.progress.propagateLookAndFeel=Preber\u00E1m v\u00FDzor a spr\u00E1vanie...
 Freeplane.progress.settingPreferences=Aplikujem nastavenia...
-Freeplane.progress.startCreateController=Za\u010D\u00EDnam vytv\u00E1ra\u0165 ovl\u00E1da\u010D...
+Freeplane.progress.startCreateController=Za\u010Da\u0165 vytv\u00E1ra\u0165 ovl\u00E1da\u010D...
 Freeplane.progress.updateLookAndFeel=Aktualizujem v\u00FDzor a spr\u00E1vanie...
 freeplane_reverted=Freeplane_Reverted_[translate me]
 FreeplaneHelpStarter.text=Pomoc...
 FreeplaneHelpStarter.tooltip=Podrobn\u00E1 pomoc k programu Freeplane
-GotoLinkNodeAction.text=Cho\u010F na linku
-GrabKeyDialog.common.cancel=Storno
+GettingStartedAction.text=N\u00E1vod
+goto=Skok na
+goto.noActions=\u017Diadne cie\u013Eov\u00E9 uzly
+GotoLinkNodeAction.text=Prejs\u0165 na odkaz
+GotoNodeAction.text=Skok na uzol s ID...
+GrabKeyDialog.common.cancel=Zru\u0161i\u0165
 GrabKeyDialog.common.ok=OK
 GrabKeyDialog.grab-key.assigned-to=Pridelen\u00E9 k
 GrabKeyDialog.grab-key.assigned-to.none=Moment\u00E1lne nepridelen\u00E9
@@ -440,42 +545,65 @@ GrabKeyDialog.grab-key.clear=Vy\u010Disti
 GrabKeyDialog.grab-key.remove=Odstr\u00E1\u0148
 GrabKeyDialog.grab-key.remove-ask=Ur\u010Dite chcete odstr\u00E1ni\u0165 t\u00FAto kl\u00E1vesu?
 GrabKeyDialog.grab-key.title=Zadajte nov\u00FA kl\u00E1vesu
+green=zelen\u00FD
 help=Pomoc
-HideAllAttributesAction.text=Ukry v\u0161etky atrib\u00FAty
+HideableAction.tooltip=<html>Ozna\u010D\u00ED pozadie ka\u017Ed\u00E9ho zmenen\u00E9ho uzla. </html>
+HideAllAttributesAction.text=Skry\u0165 v\u0161etky atrib\u00FAty
+HierarchicalIcons2Action.text=Zobrazi\u0165 kri\u017Eovatku podraden\u00FDch ikon
 HierarchicalIconsAction.text=Zobraz ikony hierarchicky
-HierarchicalIconsAction.tooltip=Ak m\u00E1 niektor\u00FD z mojich pod(pod)uzlov ikonu, zobraz\u00EDm t\u00FAto ikonu v malom form\u00E1te aj ja.
+HierarchicalIconsAction.tooltip=Ak m\u00E1 niektor\u00FD z mojich (pod)poduzlov ikonu, zobraz\u00EDm t\u00FAto ikonu v malom form\u00E1te tie\u017E.
+hot_keys=Kl\u00E1vesov\u00E9 skratky
+hot_keys_table=Tabu\u013Eka kl\u00E1vesov\u00FDch skratiek
+HotKeyInfoAction.text=Zoznam kl\u00E1vesov\u00FDch skratiek
 html_export_based_on_headings=Export do HTML - pod\u013Ea hlavi\u010Diek
 html_export_fold_all=Export do HTML - zba\u013E v\u0161etko
 html_export_fold_currently_folded=Export do HTML - zba\u013E moment\u00E1lne zbalen\u00E9
 html_export_no_folding=Export do HTML - nezba\u013E ni\u010D
-icon_0%=0%[translate me]
-icon_100%=100%[translate me]
-icon_25%=25%[translate me]
-icon_50%=50%[translate me]
-icon_75%=75%[translate me]
+html_problem=<html>Nie je mo\u017En\u00E9 vykresli\u0165 html<br><br>{0}
+icon_0%=0%
+icon_100%=100%
+icon_25%=25%
+icon_50%=50%
+icon_75%=75%
+icon_addition=Dodatok
 icon_attach=Pozri sem
-icon_back=Nasp\u00E4\u0165
-icon_bee=Freeplane[translate me]
+icon_audio=Audio
+icon_back=Sp\u00E4\u0165
+icon_bee=Freeplane
 icon_bell=Pam\u00E4taj
 icon_bookmark=Vynikaj\u00FAce
-icon_broken-line=Broken[translate me]
+icon_broken-line=Zlomen\u00FD
 icon_button_cancel=Nie OK
 icon_button_ok=OK
 icon_calendar=D\u00E1tum
+icon_checked=Za\u0161krtnut\u00E9
 icon_clanbomber=Nebezpe\u010Dn\u00E9
-icon_closed=No Entry[translate me]
-icon_decrypted=Unlocked[translate me]
+icon_clock=\u010Cas
+icon_clock2=Pripomienka
+icon_closed=Bez vstupu
+icon_decrypted=Odomknut\u00E9
 icon_desktop_new=Nezabudni
+icon_division=Delenie
 icon_down=Dole
-icon_fema=Females[translate me]
-icon_female1=Female1[translate me]
-icon_female2=Female2[translate me]
-icon_females=Females[translate me]
-icon_flag=Vlajka
-icon_flag-black=Black Flag[translate me]
-icon_flag-green=Green Flag[translate me]
+icon_edit=zjemni\u0165
+icon_encrypted=Zamknut\u00FD
+icon_executable=Spustite\u013En\u00FD
+icon_family=Rodina
+icon_fema=Mu\u017E a \u017Dena
+icon_female1=\u017Dena 1
+icon_female2=\u017Dena 2
+icon_females=\u017Deny
+icon_flag=\u010Cerven\u00E1 vlajka
+icon_flag-black=\u010Cierna vlajka
+icon_flag-blue=Modr\u00E1 vlajka
+icon_flag-green=Zelen\u00E1 vlajka
+icon_flag-orange=Oran\u017Eov\u00E1 vlajka
+icon_flag-pink=Ru\u017Eov\u00E1 vlajka
+icon_flag-yellow=\u017Dlt\u00E1 vlajka
+icon_folder=Prie\u010Dinok
 icon_forward=Dopredu
-icon_freemind_butterfly=FreeMind[translate me]
+icon_freemind_butterfly=FreeMind
+icon_full-0=Priorita 0
 icon_full-1=Priorita 1
 icon_full-2=Priorita 2
 icon_full-3=Priorita 3
@@ -483,100 +611,316 @@ icon_full-4=Priorita 4
 icon_full-5=Priorita 5
 icon_full-6=Priorita 6
 icon_full-7=Priorita 7
+icon_full-8=Priorita 8
+icon_full-9=Priorita 9
+icon_go=Zelen\u00E9 svetlo semafora
 icon_gohome=Domov
+icon_group=Skupina
 icon_help=Ot\u00E1zka
+icon_hourglass=\u010Cakanie
+icon_icon_not_found=Ikona nen\u00E1jden\u00E1
 icon_idea=N\u00E1pad
-icon_info=Info[translate me]
+icon_image=Obr\u00E1zok
+icon_info=Info
+icon_internet=Internet
+icon_internet_warning=Varovanie internetu
 icon_kaddressbook=Telef\u00F3n
-icon_kmail=E-Mail[translate me]
+icon_kmail=E-Mail
 icon_knotify=Hudba
-icon_korn=Schr\u00E1nka
-icon_ksmiletris=Som vesel\u00FD
+icon_korn=Po\u0161tov\u00E1 schr\u00E1nka
+icon_ksmiletris=Som \u0161\u0165astn\u00FD
+icon_launch=Spusti\u0165
 icon_licq=Pekn\u00E9
+icon_list=Zoznam
 icon_Mail=Po\u0161ta
-icon_male1=Male1[translate me]
-icon_male2=Male2[translate me]
-icon_males=Males[translate me]
+icon_male1=Mu\u017E 1
+icon_male2=Mu\u017E 2
+icon_males=Mu\u017Ei
 icon_menu=Ikony
 icon_messagebox_warning=D\u00F4le\u017Eit\u00E9
+icon_mindmap=My\u0161lienkov\u00E1 mapa
+icon_multiplication=N\u00E1sobenie
+icon_narrative=Pr\u00EDbeh
+icon_negative=Negat\u00EDvne
+icon_neutral=Neutral
 icon_password=K\u013E\u00FA\u010D
 icon_pencil=Treba upresni\u0165
 icon_penguin=Linux
+icon_positive=Pozit\u00EDv
+icon_prepare=\u017Dlt\u00E9 svetlo semafora
+icon_revision=Opakovanie
+icon_revision-green=Rev\u00EDzia - zelen\u00E1
+icon_revision-pink=Rev\u00EDzia - ru\u017Eov\u00E1
+icon_revision-red=Rev\u00EDzia - \u010Derven\u00E1
+icon_smiley-angry=Nahnevan\u00FD
 icon_smiley-neutral=No Mind[translate me]
+icon_smiley-oh=Prekvapuj\u00FAce
 icon_smily_bad=To ma nebav\u00ED
-icon_stop=Stop
-icon_stop-sign=Stop[translate me]
+icon_stop=\u010Cerven\u00E9 svetlo semafora
+icon_stop-sign=Stop
+icon_subtraction=Od\u010D\u00EDtanie
+icon_unchecked=neza\u0161krtnut\u00E9
 icon_up=Hore
+icon_user_icon=Pou\u017E\u00EDvate\u013Esk\u00E9 ikony
+icon_very_negative=Ve\u013Emi negat\u00EDvne
+icon_very_positive=Ve\u013Emi pozit\u00EDvne
+icon_video=Video
 icon_wizard=K\u00FAzlo
 icon_xmag=Treba prediskutova\u0165
 icon_yes=D\u00F4le\u017Eit\u00E9
-IconGroupPopupAction.arrows.text=Arrows[translate me]
+IconGroupPopupAction.arrows.text=\u0160\u00EDpky
 IconGroupPopupAction.docs_folders.text=Docs & Folders[translate me]
-IconGroupPopupAction.smiley.text=Smiley[translate me]
-IconSelectionPlugin.text=Vyber ikonu...
+IconGroupPopupAction.flags.text=Vlajky
+IconGroupPopupAction.math.text=Matematika
+IconGroupPopupAction.media.text=M\u00E9di\u00E1
+IconGroupPopupAction.miscellaneous.text=Zmie\u0161an\u00FD
+IconGroupPopupAction.nature.text=Pr\u00EDroda
+IconGroupPopupAction.numbers.text=\u010C\u00EDsla
+IconGroupPopupAction.office.text=\u00DArad
+IconGroupPopupAction.people.text=\u013Dudia
+IconGroupPopupAction.rating.text=Hodnotenie
+IconGroupPopupAction.signs.text=Znamienka
+IconGroupPopupAction.smiley.text=Usmievav\u00FD
+IconGroupPopupAction.time.text=\u010Cas
+IconGroupPopupAction.user.text=Pou\u017E\u00EDvate\u013Esk\u00E9 ikony
+IconProgressExtended10Action.text=Roz\u0161\u00EDren\u00FD pokrok o 10%
+IconProgressExtended10Action.tooltip=<html>Prid\u00E1va indik\u00E1ciu pokroku, ktor\u00E1 sa zv\u00FD\u0161i o 10% po dvojitom kliknut\u00ED \u013Eav\u00FDm tla\u010Didlom my\u0161i. <br> CTRL + dvojit\u00E9 kliknutie \u013Eav\u00FDm tla\u010Didlom my\u0161i: klesne / odstr\u00E1ni.</html>
+IconProgressExtended25Action.text=Roz\u0161\u00EDren\u00FD pokrok o 25%
+IconProgressExtended25Action.tooltip=<html>Prid\u00E1va indik\u00E1ciu pokroku, ktor\u00E1 sa zv\u00FD\u0161i o 25% po dvojitom kliknut\u00ED \u013Eav\u00FDm tla\u010Didlom my\u0161i. <br>CTRL + dvojit\u00E9 kliknutie \u013Eav\u00FDm tla\u010Didlom my\u0161i: klesne / odstr\u00E1ni.</html>
+IconProgressIconDownAction.text=Pokrok dole
+IconProgressIconDownAction.tooltip=Zn\u00ED\u017Ei/ vlo\u017E\u00ED/ odstr\u00E1ni ikony pokroku (100% -> 75% -> 50% -> 25% -> 0% -> odstr\u00E1ni\u0165).
+IconProgressIconUpAction.text=Pokrok hore
+IconProgressIconUpAction.tooltip=Zv\u00FD\u0161i / vlo\u017E\u00ED ikony pokroku (0% -> 25% -> 50% -> 75% -> 100% + OK).
+IconProgressRemoveAction.text=Odstr\u00E1ni\u0165 pokrok
+IconProgressRemoveAction.tooltip=Odstr\u00E1ni ikony pokroku a roz\u0161\u00EDren\u00FA ikonu pokroku.
+icons=Ikony
+IconSelectionPlugin.text=Ikona z tabu\u013Eky...
 IconSelectionPlugin.tooltip=<html>Tu m\u00F4\u017Eete vybra\u0165 ikonu pomocou podokna.</html>
-import=Importuj
+image_covertLink=Zmeni\u0165 odkaz na obr\u00E1zok
+ImageFlavorHandler=Obr\u00E1zok (pou\u017E\u00EDva samostatn\u00FD s\u00FAbor)
+import=I&mportova\u0165
 import_linked_branch_no_link=Ozna\u010Den\u00FD uzol nem\u00E1 linku, z ktorej by sa dalo importova\u0165.
-ImportAction.text=Importuj
+ImportAction.text=Import mapy
 ImportBranchAction.text=Vetva...
 ImportExplorerFavoritesAction.text=Ob\u013E\u00FAben\u00E9 polo\u017Eky z Explorera...
 ImportFolderStructureAction.text=Adres\u00E1rov\u00E1 \u0161trukt\u00FAra...
-ImportLinkedBranchAction.text=Linkovan\u00E1 vetva
-ImportLinkedBranchWithoutRootAction.text=(Linkovan\u00E1 vetva) Bez kore\u0148a...
-ImportMindmanagerFiles.text=Mapa programu MindManager X5...
+ImportLinkedBranchAction.text=Odkazovan\u00E1 vetva
+ImportLinkedBranchWithoutRootAction.text=Odkazovan\u00E1 vetva bez kore\u0148a...
+ImportMindmanagerFiles.text=Mapa MindManager X5...
+ImportXmlFile.text=Import XML s\u00FAboru
 increase_branch_font_size=V\u00E4\u010D\u0161ie p\u00EDsmo
 IncreaseNodeFontAction.text=V\u00E4\u010D\u0161ie p\u00EDsmo
+internal_error_tooltip=Nastala vn\u00FAtorn\u00E1 chyba. Kliknite na otvorenie posledn\u00E9ho logovacieho s\u00FAbora log.0 pre viac inform\u00E1ci\u00ED.
+invalid_export_file=Neplatn\u00FD n\u00E1zov exportovan\u00E9ho s\u00FAbora
+invalid_file_msg=Nepodarilo sa n\u00E1js\u0165 s\u00FAbor pre {0}
+invalid_uri=Neplatn\u00E1 URI {0}
+invalid_url=Nemo\u017Eno vytvori\u0165 platn\u00FA URL
+invalid_url_msg=Nemo\u017Eno vytvori\u0165 platn\u00FA URL pre {0}
 ItalicAction.text=Kurz\u00EDva
 italicise_branch=Zme\u0148 na kurz\u00EDvu
-less_than_two_selected_nodes=Aby ste dostali linky, mus\u00EDte vybra\u0165 aspo\u0148 dva uzly.
+java_version=Java verzia: {0}
+JoinNodesAction.separator.format=Spoji\u0165 uzly s "{0}"
+lastOpenedMaps=Naposledy otvoren\u00E9 mapy
+lastOpenedMaps.noActions=\u017Diadne mapy v hist\u00F3rii
+latex_editor=Upravi\u0165 LaTeX vzorec
+LatexDeleteLatexAction.text=Odstr\u00E1ni\u0165 LaTeX vzorec
+LatexEditLatexAction.text=Upravi\u0165 LaTeX vzorec...
+LatexInsertLatexAction.msg1=<html>Pok\u00FA\u0161ate sa vlo\u017Ei\u0165 <i>zastaral\u00FD</i> vzorec LaTeX-u.<br/>Nov\u00FD sp\u00F4sob ako vytvori\u0165 text/vzorec LaTeX-u je pop\u00EDsan\u00FD na tejto str\u00E1nke:</html>
+LatexInsertLatexAction.msg2=<html>V skratke: <ul><li>pou\u017Eite k\u013E\u00FA\u010Dov\u00E9 slovo "\\latex " pred samotn\u00FDm textom uzla, alebo</li><li><i>Zobrazenie->Ovl\u00E1dacie prvky->Panel n\u00E1strojov</i>, potom <i>Form\u00E1tovanie->Text jadra->Form\u00E1t->Latex</i></li></ul></html>
+LatexInsertLatexAction.text=Prida\u0165 LaTeX vzorec...
+latexPatternFormat=LaTeX
+LengthUnits.cm=cm
+LengthUnits.in=v
+LengthUnits.mm=mm
+LengthUnits.pt=pt
+LengthUnits.px=px
+less_than_two_selected_nodes=Aby ste mohli vytvori\u0165 odkazy, mus\u00EDte vybra\u0165 aspo\u0148 dva uzly.
+license=Licencia: GPL 2 alebo nov\u0161ia
+license_text=<html>Tento program je vo\u013Ene dostupn\u00FD softv\u00E9r; m\u00F4\u017Ee\u0161 ho redistribuova\u0165 a/alebo<br>modifikova\u0165 za rovnak\u00FDch podmienok GNU General Public License<br> zverejnen\u00E9 Free Software Foundation; bu\u010F verzia 2 licencie, alebo (pod\u013Ea vlastn\u00E9ho uv\u00E1\u017Eenia) ak\u00FAko\u013Evek neskor\u0161iu verziu. <br> <br> Tento program je distribuovan\u00FD v n\u00E1deji, \u017Ee to bude u\u017Eito\u010Dn\u00E9, ale BEZ AKEJKO\u01 [...]
+link_error=Nespr\u00E1vny odkaz "{0}" - nebol na\u010D\u00EDtan\u00FD
 link_not_available_any_more=T\u00E1to linka u\u017E neplat\u00ED. Uzol bol medzi\u010Dasom zmazan\u00FD.
 link_not_found=Nena\u0161la sa linka {0}.
-LoadAcceleratorPresetsAction.textPatterns.text=Text Patterns[translate me]
+links=Odkaz
+load=Na\u010D\u00EDta\u0165
+load_accelerator_presets=Na\u010D\u00EDta\u0165
+load_accelerator_presets.noActions=\u017Diadne predvo\u013Eby
+LoadAcceleratorPresetsAction.textPatterns.text=Textov\u00E9 vzorky
 locking_failed_by_open=Nepodarilo sa zamkn\u00FA\u0165 mapu {0}. Otv\u00E1ram ju iba na \u010D\u00EDtanie.
 locking_failed_by_save_as=Nepodarilo sa zamkn\u00FA\u0165 mapu {0}. Akcia Ulo\u017E ako zru\u0161en\u00E1.
 locking_old_lock_removed=Mapu {0} u\u017E zamkol pou\u017E\u00EDvate\u013E {1}. Z\u00E1mok bol zru\u0161en\u00FD, preto\u017Ee je star\u00FD.
 long_node_changed_cancel=Zmenili ste uzol. Chcete zru\u0161i\u0165 tieto zmeny?
-lots_of_links_warning=Idete vytvori\u0165 mnoho liniek na rovnak\u00FD uzol. Naozaj chcete vytvori\u0165 tieto linky?
+long_node_changed_submit=Zmenili ste uzol. Chcete ulo\u017Ei\u0165 zmeny?
+lots_of_links_warning=Chyst\u00E1te sa vytvori\u0165 viacero odkazov na rovnak\u00FD uzol. Naozaj chcete vytvori\u0165 tieto odkazy?
+main_menu=Ponuka
+main_resource_directory=In\u0161tala\u010Dn\u00E9 zdroje: {0}
+MainView.errorUpdateText=Chybn\u00E9 nastavenie textu pre nasleduj\u00FAci vstup: {0}.
+MakeLinkFromAnchorAction.text=Vytvori\u0165 odkaz z kotvy
+MakeLinkFromAnchorAction.tooltip=<html>vytvori\u0165 miestny alebo glob\u00E1lny odkaz<br/>z uzla s kotvou na zvolen\u00FD uzol</html>
+MakeLinkToAnchorAction.text=Vytvori\u0165 odkaz na kotvu
+MakeLinkToAnchorAction.tooltip=<html>vytvori\u0165 miestny alebo glob\u00E1lny odkaz<br/>zo zvolen\u00E9ho uzla na uzol s kotvou</html>
+ManageAddOnsAction.text=Doplnky
+ManageAddOnsDialog.activate=Aktivova\u0165
+ManageAddOnsDialog.activation.success={0} po re\u0161tarte bude aktivovan\u00FD.
+ManageAddOnsDialog.authored.by=s {0}
+ManageAddOnsDialog.cannot.activate=nem\u00F4\u017Ee aktivova\u0165: {0} je u\u017E akt\u00EDvne.
+ManageAddOnsDialog.cannot.configure=nem\u00F4\u017Ee konfigurova\u0165 {0}.
+ManageAddOnsDialog.cannot.deactivate=Nemo\u017Eno deaktivova\u0165: {0} nie je akt\u00EDvny.
+ManageAddOnsDialog.cannot.deinstall=Nemo\u017Eno odin\u0161talova\u0165 {0}.
+ManageAddOnsDialog.configure=Konfigurova\u0165
+ManageAddOnsDialog.deactivate=Deaktivova\u0165
+ManageAddOnsDialog.deactivation.success={0} bude deaktiovan\u00FD po re\u0161tarte.
+ManageAddOnsDialog.deinstall=Odin\u0161talova\u0165
+ManageAddOnsDialog.deinstallation.success={0} bude odin\u0161talovan\u00FD po re\u0161tarte.
+ManageAddOnsDialog.error=Chyba v in\u0161tal\u00E1cii: {0}.
+ManageAddOnsDialog.install=&In\u0161talova\u0165
+ManageAddOnsDialog.install.from.known.location=In\u0161tal\u00E1cia doplnku zo zn\u00E1mej lokality
+ManageAddOnsDialog.install.tooltip=Sem vlo\u017Ete URL z in\u0161tala\u010Dn\u00E9ho s\u00FAboru doplnku
+ManageAddOnsDialog.map.not.opened=Mapa {0} sa nezd\u00E1 by\u0165 otvoren\u00E1.
+ManageAddOnsDialog.really.deinstall=Skuto\u010Dne odin\u0161talova\u0165 {0}?
+ManageAddOnsDialog.search=H\u013Eada\u0165 doplnky
+ManageAddOnsDialog.search.file=H\u013Eada\u0165
+ManageAddOnsDialog.select.tooltip=Vybra\u0165 s\u00FAbor
+ManageAddOnsDialog.status.downloading=S\u0165ahovanie s\u00FAboru...
+ManageAddOnsDialog.status.installing=In\u0161tal\u00E1cia doplnku...
+ManageAddOnsDialog.status.success=\u00DAspe\u0161ne nain\u0161talovan\u00FD {0}.
+ManageAddOnsDialog.tab.install=H\u013Eada\u0165 a in\u0161talova\u0165
+ManageAddOnsDialog.tab.install.tooltip=H\u013Eada\u0165 a in\u0161talova\u0165 nov\u00FD doplnok
+ManageAddOnsDialog.tab.manage=Doplnky
+ManageAddOnsDialog.tab.manage.themes=Mot\u00EDvy
+ManageAddOnsDialog.tab.manage.themes.tooltip=Spr\u00E1va nain\u0161talovan\u00FDch mot\u00EDvov
+ManageAddOnsDialog.tab.manage.tooltip=Spr\u00E1va in\u0161talovan\u00FDch doplnkov
+ManageAddOnsDialog.visit.addon.page=N\u00E1v\u0161teva str\u00E1nky s doplnkami...
+ManageConditionalStylesAction.text=Spravova\u0165 podmienen\u00E9 \u0161t\u00FDly pre mapu
+ManageNodeConditionalStylesAction.text=Spravova\u0165 podmienen\u00E9 \u0161t\u00FDly pre uzol
 map_already_exists=Mapa u\u017E existuje. Chcete ju prep\u00EDsa\u0165?
+map_background=Pozadie mapy
+map_background_image=Obr\u00E1zok pozadia
 map_corrupted=Mapa je po\u0161koden\u00E1. Zobrazi\u0165 podrobnosti?
+map_load_error=Nemo\u017Eno na\u010D\u00EDta\u0165 mapu {0}
 map_locked_by_open=Mapu {0} u\u017E edituje pou\u017E\u00EDvate\u013E {1}. Otv\u00E1ram iba na \u010D\u00EDtanie.
 map_locked_by_save_as=Mapu {0} edituje pou\u017E\u00EDvate\u013E {1}. Akcia Ulo\u017E ako zru\u0161en\u00E1.
 map_not_saved=T\u00E1to mapa e\u0161te nebola ulo\u017Een\u00E1.
-menu_attributes=Vlastnosti
-menu_insert=Vlo\u017E
+MapBackgroundClearAction.text=Vy\u010Disti\u0165
+MapBackgroundColorAction.text=Farba pozadia
+MapBackgroundImageAction.text=Obr\u00E1zok pozadia...
+maps=Mapy
+MaxNodeWidth.text=Nastav maxim\u00E1lnu \u0161\u00EDrku uzla
+menu_applyStyle=Pou\u017Ei\u0165 \u0161t\u00FDl
+menu_attributes=Vlastnos\u0165
+menu_clouds=Oblaky
+menu_copy=Kop\u00EDrova\u0165
+menu_coreFormat=Jadro uzla
+menu_details=Detaily
+menu_displayAttributes=Atrib\u00FAty uzla
+menu_encryption=Ochrana heslom
+menu_error=Chyba v pou\u017E\u00EDvate\u013Eom definovanej \u0161trukt\u00FAre menu {0}:\n{1}\nRu\u0161\u00ED sa
+menu_extensions=Roz\u0161\u00EDrenia uzla
+menu_group=Skupina uzlov
+menu_hoverView=Bublinkov\u00E1 pomoc
+menu_iconByCategory=Ikony pod\u013Ea kateg\u00F3rie...
+menu_iconView=Ikony
+menu_image=Obr\u00E1zok
+menu_insert=Vlo\u017Ei\u0165
+menu_latex_formula=LaTeX vzorec
+menu_manageStyles=Spravova\u0165 \u0161t\u00FDly
+menu_moveNode=Presun\u00FA\u0165 a zoradi\u0165
+menu_newNode=Nov\u00FD uzol
+menu_node=Uzol
+menu_node_features=Vlastnosti uzla
+menu_nodes=Uzly
+menu_nodeView=Jadro uzla
+menu_noteView=Pozn\u00E1mky
+menu_openmaps=Mapy
+menu_remove_icons=Odstr\u00E1ni\u0165 ikony
+menu_removeAttribute=Odstr\u00E1ni\u0165 atrib\u00FAt
+menu_select=V\u00FDber
+menu_time=Organiz\u00E1cia \u010Dasu
+menu_title=Jadro uzla
+menu_viewmode=Nastavenia zobrazenia
+MenuUtils.invalid_menuitem={0} nie je platn\u00E1 kl\u00E1vesov\u00E1 skratka v ponuke.
 mindmap=Mapa
+MindMapNodesFlavorHandler=Uzlov\u00E1 hierarchia
 mindmaps=Mapy
 mindmaps_desc=Mapy (*.mm)
+mindmaps_filter_desc=Filtre (*.mmfilter)
+MinNodeWidth.text=Nastav minim\u00E1lnu uzlov\u00FA \u0161\u00EDrku
+mode_Browse=Re\u017Eim prehliadania
+mode_File=Re\u017Eim s\u00FAboru
+mode_MindMap=Re\u017Eim my\u0161lienkovej mapy
 mode_na=Re\u017Eim nie je k dispoz\u00EDcii
 mode_status=Re\u017Eim zmenen\u00FD na re\u017Eim {0}
+mode_StyleMap=\u00DAprava \u0161t\u00FDlu
 mode_title=Freeplane - Re\u017Eim {0}
 modes=Re\u017Eimy
-ModesMenuAction.MindMap.text=Mind Map Editor[translate me]
+ModesMenuAction.Browse.text=Prehliada\u010D mapy
+ModesMenuAction.File.text=Spr\u00E1vca s\u00FAborov
+ModesMenuAction.MindMap.text=Mind Map editor
 most_recent_files=Naposledy pou\u017Eit\u00E9 s\u00FAbory
-MoveToRootAction.text=Presu\u0148 na kore\u0148
-navigate=Naviguj
+MoveAction.text=Presun\u00FA\u0165
+MoveSelectedNodeAction.CENTER.text=Vycentrova\u0165 vybran\u00FD uzol
+MoveSelectedNodeAction.EAST.text=Presun\u00FA\u0165 vybran\u00FD uzol vpravo
+MoveSelectedNodeAction.WEST.text=Presun\u00FA\u0165 vybran\u00FD uzol v\u013Eavo
+MoveToRootAction.text=Skok na kore\u0148
+NameConditionAction.text=Zadaj n\u00E1zov
+navigate=&Navigova\u0165
 NavigationNextMapAction.text=\u010Eal\u0161ia mapa
 NavigationPreviousMapAction.text=Predch\u00E1dzaj\u00FAca mapa
+new=Nov\u00FD
+new_map_from_user_templates.text=Nov\u00E1 mapa pod\u013Ea \u0161abl\u00F3ny...
 new_mindmap=Nov\u00E1 mapa my\u0161lienok
 new_node=Nov\u00FD uzol
 new_node_as_sibling_not_possible_for_the_root=Nemo\u017Eno vytvori\u0165 nov\u00FD uzol ved\u013Ea kore\u0148a
-NewChildAction.text=Nov\u00FD poduzol
-NewMapAction.text=Nov\u00FD
-NewParentNode.text=Nov\u00FD rodi\u010Dovsk\u00FD uzol
-NewParentNode.tooltip=<html>V\u0161etky ozna\u010Den\u00E9 uzly sa po\u0161l\u00FA k nov\u00E9mu rodi\u010Dovsk\u00E9mu.</html>
+new_version_available=Nov\u00E1 verzia "{0}" je dostupn\u00E1
+NewChildAction.text=Nov\u00FD podriaden\u00FD uzol
+NewerFileRevisionsFoundDialog.cancel=Presko\u010Di\u0165
+NewerFileRevisionsFoundDialog.cancel.tooltip=Neotv\u00E1ra\u0165 tento s\u00FAbor
+NewerFileRevisionsFoundDialog.file_last_modified=\u010Casov\u00E1 zna\u010Dka
+NewerFileRevisionsFoundDialog.file_name=S\u00FAbor
+NewerFileRevisionsFoundDialog.file_size=Bajty
+NewerFileRevisionsFoundDialog.open=Otvori\u0165
+NewerFileRevisionsFoundDialog.open.tooltip=Otvori\u0165 s\u00FAbor, aj ke\u010F by mohol by\u0165 neaktu\u00E1lny
+NewerFileRevisionsFoundDialog.question=Na\u0161la sa nov\u0161ia rev\u00EDzia {0}!
+NewerFileRevisionsFoundDialog.restore=Obnovi\u0165
+NewerFileRevisionsFoundDialog.restore.tooltip=Nahradi\u0165 {0} {1}
+NewerFileRevisionsFoundDialog.title=N\u00E1jden\u00FD nov\u0161\u00ED s\u00FAbor rev\u00EDzie!
+NewFreeNodeAction.text=Nov\u00FD pl\u00E1vaj\u00FAci uzol
+NewLevelStyleAction.text=Prida\u0165 \u00FArov\u0148ov\u00FD \u0161t\u00FDl
+newmap.install.addon.question=zd\u00E1 sa, \u017Ee {0} je doplnkov\u00FDm bal\u00EDkom\nChcete ho nain\u0161talova\u0165?\n(Pre norm\u00E1lne otvorenie vyberte "Nie".)
+newmap.install.addon.title=In\u0161talova\u0165 doplnok?
+NewMapAction.text=Nov\u00E1 mapa
+NewMapViewAction.text=Nov\u00FD poh\u013Ead na mapu
+NewParentNode.text=Nov\u00FD nadraden\u00FD uzol
+NewParentNode.tooltip=<html>V\u0161etko ozna\u010Den\u00E9 sa po\u0161le k nov\u00E9mu nadraden\u00E9mu uzlu.</html>
 NewPreviousSiblingAction.text=Nov\u00FD predch\u00E1dzaj\u00FAci s\u00FArodeneck\u00FD uzol
 NewSiblingAction.text=Nov\u00FD s\u00FArodeneck\u00FD uzol
+NewSummaryAction.text=Nov\u00FD s\u00FAhrnn\u00FD uzol (vybran\u00E9 uzly)
+NewUserStyleAction.text=Nov\u00FD \u0161t\u00FDl z v\u00FDberu
+NextNodeAction.BACK.text=Skok na predch\u00E1dzaj\u00FAci uzol
+NextNodeAction.BACK_N_FOLD.text=Skok na predch\u00E1dzaj\u00FAci uzol (zbali\u0165)
+NextNodeAction.FORWARD.text=Skok na nasleduj\u00FAci uzol
+NextNodeAction.FORWARD_N_FOLD.text=Skok na nasleduj\u00FAci uzol (zbali\u0165)
+NextPresentationItemAction.text=Rozbali\u0165 nasleduj\u00FAcu polo\u017Eku prezent\u00E1cie (zbali\u0165)
 no=Nie
+no_copy_attributes_before_paste_attributes=Nem\u00F4\u017Eete vlo\u017Ei\u0165 atrib\u00FAty, pokia\u013E nejak\u00E9 neskop\u00EDrujete.
+NO_FORMAT=Text
 no_format_copy_before_format_paste=Aby ste vlo\u017Eili form\u00E1t, mus\u00EDte najprv nejak\u00FD skop\u00EDrova\u0165.
 no_found_from=<html>Nena\u0161lo sa \u017Eiadne <b>{0}</b> od <b>{1}</b>.</html>
-no_more_found_from=<html>Nena\u0161lo sa \u010Fal\u0161ie <b>{0}</b> od <b>{1}</b>.
+no_more_found_from=<html>Nena\u0161lo sa \u010Fal\u0161ie <u>{0}</u> od "{1}".</html>
 no_previous_find=Nena\u0161lo sa predch\u00E1dzaj\u00FAce.
+no_styles_found_in_map=\u0160t\u00FDly v mape neboli n\u00E1jden\u00E9
+no_translation_strings_found=Neboli n\u00E1jden\u00E9 \u017Eiadne prelo\u017Eite\u013En\u00E9 re\u0165azce
 node=Uzol
 node_changed_discard_changes=Zmenili ste uzol. Chcete zru\u0161i\u0165 tieto zmeny?
+node_is_write_protected=Cie\u013Eov\u00FD uzol je chr\u00E1nen\u00FD proti z\u00E1pisu.
+node_location_help=\u0164ahanie zmen\u00ED umiestnenie uzla, ctrl+\u0165ahanie zmen\u00ED vzdialenosti, dvojklik a ctrl+dvojklik ich obnov\u00ED.
+node_popup_scripting=Skripty
+node_selector=Uzlov\u00FD v\u00FDber
+node_selector_message=Dvojklikom vybra\u0165 uzol
+node_styles=Uzlov\u00E9 \u0161t\u00FDly
 NodeBackgroundColorAction.text=Farba pozadia uzla...
 NodeColorAction.text=Farba uzla...
 NodeColorBlendAction.text=Namie\u0161a\u0165 farbu
-NodeDownAction.text=Uzol nadol
+NodeDownAction.text=Uzol nadol (s\u00FArodenec dole)
 NodeExtensions.EditNodeExtensions=Upravi\u0165 roz\u0161\u00EDrenia uzla
 NodeExtensions.RemoveNodeExtensions=Odstr\u00E1ni\u0165 roz\u0161\u00EDrenia uzla
 NodeListAction.text=N\u00E1js\u0165 a nahradi\u0165...
@@ -587,43 +931,110 @@ NodeShapeAction.narrow_hexagon.text=\u00DAzky \u0161es\u0165uholn\u00EDk
 NodeShapeAction.oval.text=Ov\u00E1l
 NodeShapeAction.rectangle.text=Obd\u013A\u017Enik
 NodeShapeAction.wide_hexagon.text=\u0160irok\u00FD \u0161es\u0165uholn\u00EDk
-NodeUpAction.text=Uzol nahor
-nonboldify_branch=Zru\u0161 tu\u010Dn\u00E9
+NodeUpAction.text=Uzol nahor (s\u00FArodenec hore)
+nonboldify_branch=Zru\u0161i\u0165 hrub\u00E9
 nonitalicise_branch=Zru\u0161 kurz\u00EDvu
 normal=Norm\u00E1lne
+not_saved_for_image_error=Mapa mus\u00ED by\u0165 ulo\u017Een\u00E1 predt\u00FDm, ako nastav\u00EDte obr\u00E1zok pod\u013Ea prieskumn\u00EDka
 not_saved_for_link_error=Mapa mus\u00ED by\u0165 ulo\u017Een\u00E1 sk\u00F4r ako nastav\u00EDte linku v\u00FDberom s\u00FAboru
+note_window_location=Poz\u00EDcia panela s pozn\u00E1mkou
+notes=Pozn\u00E1mka
+NotFoldingNextPresentationItemAction.text=Rozbali\u0165 nasleduj\u00FAcu polo\u017Eku prezent\u00E1cie
+NotificationOptions.CLOSE=Zatvori\u0165
+NotificationOptions.REMIND_ME_LATER=Pripomen\u00FA\u0165 nesk\u00F4r
+NotificationOptions.REMOVE_REMINDER=Odstr\u00E1ni\u0165 pripomienku
+NotificationOptions.SELECT_NODE=\u00CDs\u0165 na pripomienku
 ok=OK
 OKAction.text=OK
-OpenAction.text=Otvor...
-OpenPathAction.text=Open File[translate me]
+OnlineReference.text=Online dokument\u00E1cia mapy
+open_asMindMap=My\u0161lienkov\u00E1 mapa
+OpenAction.text=Otvori\u0165 ulo\u017Een\u00FA mapu...
+OpenFreeplaneSiteAction.text=Domovsk\u00E1 str\u00E1nka Freeplane
+OpenMapsAddLocation.text=Prida\u0165 umiestnenie otvorenej mapy...
+OpenMapsRemoveLocation.text=Odstr\u00E1ni\u0165 umiestnenie Otvorenej mapy
+OpenMapsViewLocation.text=N\u00E1h\u013Ead umiestnenia Otvorenej mapy...
+OpenPathAction.text=Otvori\u0165 s\u00FAbor
+OpenURLMapAction.text=Otvori\u0165 mapu z URL...
+OpenUserDirAction.text=Otvori\u0165 prie\u010Dinok pou\u017E\u00EDvate\u013Ea
 option_changes_may_require_restart=Aby ste videli \u00FA\u010Dinok zmenen\u00FDch nastaven\u00ED, mus\u00EDte asi re\u0161tartova\u0165 Freeplane.
+OptionalDontShowMeAgainDialog.cancel=&Nie
+OptionalDontShowMeAgainDialog.dontShowAgain=Nep\u00FDtaj sa ma znova.
+OptionalDontShowMeAgainDialog.ok=\u00C1no
+OptionalDontShowMeAgainDialog.rememberMyDescision=Zapam\u00E4ta\u0165 si moju vo\u013Ebu.
 OptionPanel.absolute=Absol\u00FAtne
-OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Automatick\u00E9 vzory rozlo\u017Eenia
-OptionPanel.antialias=Antialias
-OptionPanel.antialias.tooltip=<html>Ur\u010Duje kvalitu mapy. V\u00E4\u010D\u0161ie antialiasovanie vy\u017Eaduje viac \u010Dasu.</html>
-OptionPanel.antialias_all=Vyhla\u010F v\u0161etko
-OptionPanel.antialias_edges=Vyhla\u010F hrany
-OptionPanel.antialias_none=Bez antialiasingu
+OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Vzory \u0161t\u00FDlu \u00FArovne
+OptionPanel.ADD_CHILD=Prida\u0165 podriaden\u00FD uzol
+OptionPanel.ADD_SIBLING=Pridaj s\u00FArodeneck\u00FD uzol
+OptionPanel.addons=Doplnky
+OptionPanel.af=Afrik\u00E1n\u010Dina
+OptionPanel.always_fold_all_after_load=Zbali\u0165 v\u0161etko
+OptionPanel.always_load_last_maps=Na\u010D\u00EDta\u0165 posledn\u00E9 a nov\u00E9 mapy
+OptionPanel.always_load_last_maps.tooltip=Otv\u00E1ra\u0165 posledn\u00E9 s\u00FAbory s vy\u0161\u0161ie uveden\u00FDmi nastaveniami, ako aj sp\u00FA\u0161\u0165anie FP so zvolen\u00FDm s\u00FAborom mapy.
+OptionPanel.always_save_folding=V\u017Edy
+OptionPanel.always_save_folding_state=V\u017Edy ukladajte zmeny skladania
+OptionPanel.always_save_folding_state.tooltip=Ak je za\u0161krtnut\u00E9, ka\u017Ed\u00E1 akcia zbalenia alebo rozbalenia ozna\u010D\u00ED mapu za upraven\u00FA a pripomenie, \u017Ee ju treba ulo\u017Ei\u0165.
+OptionPanel.always_show_less_than_N_nodes_after_load=Rozba\u013Ete niektor\u00E9 uzly
+OptionPanel.always_unfold_all_after_load=Rozbali\u0165 v\u0161etko
+OptionPanel.antialias=Vyhladzovanie
+OptionPanel.antialias.tooltip=<html>Ur\u010Duje kvalitu mapy. Kvalitnej\u0161ie vyhladzovanie vy\u017Eaduje viac \u010Dasu.</html>
+OptionPanel.antialias_all=Vyhladzova\u0165 v\u0161etko
+OptionPanel.antialias_edges=Vyhladzova\u0165 spoje
+OptionPanel.antialias_none=Bez vyhladzovania
+OptionPanel.antialias_svg=Vyhladzova\u0165 grafiku SVG
+OptionPanel.antialias_svg.tooltip=<html>Ur\u010Duje kvalitu vykres\u013Eovanie SVG. Lep\u0161ie vyhladzovanie si \u017Eiada viac \u010Dasu.</html>
 OptionPanel.Appearance=V\u00FDzor
-OptionPanel.ar=Ar[translate me]
-OptionPanel.as_parent=Ako rodi\u010Dovsk\u00FD uzol
-OptionPanel.automatic=Automatick\u00E9
-OptionPanel.automaticFormat_level=Automatick\u00E9 \u0161t\u00FDly rozlo\u017Eenia
+OptionPanel.approximate_search_threshold=Prah pre pribli\u017En\u00E9 porovn\u00E1vanie
+OptionPanel.approximate_search_threshold.tooltip=<html>Prah pre pribli\u017En\u00E9 porovn\u00E1vanie<br/><font size="2">vi\u010F http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(\u010D\u00EDm je vy\u0161\u0161\u00ED t\u00FDm bude n\u00E1jden\u00FDch<br/>menej vari\u00E1ci\u00ED vyh\u013Ead\u00E1van\u00E9ho term\u00EDnu)</html>
+OptionPanel.ar=Arabsky
+OptionPanel.ARC=Obl\u00FAk
+OptionPanel.as_parent=Ako rodi\u010D
+OptionPanel.ask=Po\u017Eiadavka
+OptionPanel.automatic=Automaticky
+OptionPanel.automaticFormat_level=Pou\u017Ei\u0165 \u0161t\u00FDly \u00FArovne
 OptionPanel.automaticFormat_level1=Form\u00E1t kore\u0148ov\u00E9ho uzla
 OptionPanel.automaticFormat_level2=Form\u00E1t uzla 1. \u00FArovne
+OptionPanel.backup_file_number=Po\u010Det ponechan\u00FDch z\u00E1lo\u017En\u00FDch s\u00FAborov
 OptionPanel.Behaviour=Spr\u00E1vanie
+OptionPanel.bezier=Krivka (b\u00E9zier)
+OptionPanel.border_color=Farba
+OptionPanel.border_color_matches_edge_color=Pou\u017Ei\u0165 farbu spoja
+OptionPanel.border_dash=Typ \u010Diary okraja
+OptionPanel.border_dash_matches_edge_dash=Pou\u017Ei\u0165 typ \u010Diary spoja
+OptionPanel.border_width=\u0160\u00EDrka \u010Diary
+OptionPanel.border_width_matches_edge_width=Pou\u017Ei\u0165 \u0161\u00EDrku spoja
 OptionPanel.bubble=Bubble[translate me]
-OptionPanel.Cancel=Storno
+OptionPanel.ca=Katal\u00E1nsky, Valenci\u00E1nsky / Katal\u00E1nsky
+OptionPanel.Cancel=Zru\u0161i\u0165
+OptionPanel.center_selected_node=Automaticky vycentrova\u0165 vybran\u00FD uzol
+OptionPanel.check_updates_automatically=Kontrola aktualiz\u00E1cii pri spusten\u00ED programu
 OptionPanel.childpattern=Vzor poduzla
 OptionPanel.childpattern.tooltip=Vybran\u00FD vzor je pou\u017Eit\u00FD na v\u0161etky poduzly.
 OptionPanel.clear_all_setters=Prepni v\u0161etko
 OptionPanel.clear_all_setters.tooltip=Zapne alebo vypne v\u0161etky indik\u00E1tory zmeny.
-OptionPanel.cloud=Cloud[translate me]
-OptionPanel.combined=Kombinovan\u00E1
-OptionPanel.cs=Cs
+OptionPanel.cloud=Oblak
+OptionPanel.cloudcolor=Farba oblaku
+OptionPanel.cloudshape=Tvar oblaku
+OptionPanel.combined=Kombinovan\u00FD
+OptionPanel.compare_as_number=Porovnaj ako \u010D\u00EDsla
+OptionPanel.connector_arrows=\u0160\u00EDpky prepojenia
+OptionPanel.connector_dash=typ \u010Diary
+OptionPanel.convert_to_current_version=<html>Automaticky konvertova\u0165 mapu zo star\u0161\u00EDch verzi\u00ED Freeplane<tr>do aktu\u00E1lnej verzie?</html>
+OptionPanel.convert_to_current_version.tooltip=<html>Len pre ve\u013Emi ve\u013Ek\u00E9 mapy, ktor\u00E9 nemusia by\u0165 konvertovan\u00E9<br>(toto je odborn\u00E1 znalos\u0165), m\u00F4\u017Eete otvori\u0165 mapy bez konverzie. </ html>
+OptionPanel.copyFormatToNewSibling=Kop\u00EDrova\u0165 form\u00E1tovanie do nov\u00FDch s\u00FArodencov
+OptionPanel.copyFormatToNewSiblingIncludesIcons=Kop\u00EDrova\u0165 form\u00E1t s ikonami
+OptionPanel.cs=\u010Desky
+OptionPanel.cut_nodes_without_question=Vystrihn\u00FA\u0165 uzly bez potvrdenia?
+OptionPanel.cut_nodes_without_question.tooltip=Ak je t\u00E1to vo\u013Eba za\u0161krtnut\u00E1, uzly bud\u00FA vystrihnut\u00E9 bez potvrdenia. M\u00F4\u017Ee to zapr\u00ED\u010Dini\u0165 stratu inform\u00E1ci\u00ED, ak d\u00F4jde k ne\u00FAmyseln\u00E9mu uklepnutiu.
+OptionPanel.cut_out_pictures_when_pasting_html=Odstr\u00E1ni\u0165 obr\u00E1zky z HTML
 OptionPanel.da=Dk
+OptionPanel.date_format=\u0160tandardn\u00FD form\u00E1t d\u00E1tumu
+OptionPanel.date_format.tooltip=Bu\u010F SHORT, MEDIUM, LONG or FULL alebo vzorka ako "MM/dd/yyyy"
+OptionPanel.datetime_format=\u0160tandardn\u00FD form\u00E1t d\u00E1tumu-\u010Dasu
+OptionPanel.datetime_format.tooltip=Bu\u010F <datestyle>,<timestyle> (s SHORT, MEDIUM, LONG or FULL ako \u0161t\u00FDl)  alebo \u00FApln\u00E1 vzorka ako "M/d/yyyy hh:mm"
 OptionPanel.de=De
 OptionPanel.default=\u0160tandardn\u00E9
+OptionPanel.default_attribute_key_column_width=\u0160tandardn\u00E1 \u0161\u00EDrka po\u013Ea s k\u013E\u00FA\u010Dmi atrib\u00FAtu
+OptionPanel.default_attribute_value_column_width=\u0160tandardn\u00E1 vlastnos\u0165 - hodnota \u0161\u00EDrky
 OptionPanel.default_browser_command_mac=\u0160tandardn\u00FD pr\u00EDkaz prezera\u010Da pre Mac
 OptionPanel.default_browser_command_mac.tooltip=<html> a MAC: (v\u010Faka, Nick!)</html>
 OptionPanel.default_browser_command_other_os=\u0160tandardn\u00FD pr\u00EDkaz prezera\u010Da pre in\u00FD OS
@@ -632,18 +1043,30 @@ OptionPanel.default_browser_command_windows_9x=\u0160tandardn\u00FD pr\u00EDkaz
 OptionPanel.default_browser_command_windows_9x.tooltip=<html>Pre Windows (znamienka "" s\u00FA potrebn\u00E9 kv\u00F4li link\u00E1m, ktor\u00E9 maj\u00FA "=" v URL).</html>
 OptionPanel.default_browser_command_windows_nt=\u0160tandardn\u00FD pr\u00EDkaz prezera\u010Da pre Windows NT
 OptionPanel.default_browser_command_windows_nt.tooltip=<html>Pre Windows (znamienka "" s\u00FA potrebn\u00E9 kv\u00F4li link\u00E1m, ktor\u00E9 maj\u00FA "=" v URL).</html>
+OptionPanel.default_charset=Znakov\u00E1 sada
+OptionPanel.default_save_dir=Predvolen\u00FD adres\u00E1r ukladania
 OptionPanel.Defaults=\u0160tandardn\u00E9
-OptionPanel.delete_automatic_saves_at_exit=Vyma\u017E automaticky ulo\u017Een\u00E9 s\u00FAbory pri skon\u010Den\u00ED
-OptionPanel.delete_automatic_saves_at_exit.tooltip=<html>Ak by mali by\u0165 s\u00FAbory automaticky vymazan\u00E9 pri norm\u00E1lnom vypnut\u00ED programu Freeplane, nastavte t\u00FAto premenn\u00FA na 'true'</html>
+OptionPanel.delete_automatic_saves_at_exit=Zmaza\u0165 automaticky ulo\u017Een\u00E9 s\u00FAbory pri skon\u010Den\u00ED
+OptionPanel.delete_automatic_saves_at_exit.tooltip=<html>Ak maj\u00FA by\u0165 s\u00FAbory vymazan\u00E9 automaticky pri norm\u00E1lnom vypnut\u00ED Freeplane, nastavte t\u00FAto premenn\u00FA na 'true'</html>
+OptionPanel.delete_nodes_without_question=Zmaza\u0165 uzly bez potvrdenia?
+OptionPanel.delete_nodes_without_question.tooltip=Ak tento checkbox je nastaven\u00FD, uzly bud\u00FA zmazan\u00E9 bez potvrdenia. Toto m\u00F4\u017Ee sp\u00F4sobi\u0165 stratu inform\u00E1ci\u00ED.
 OptionPanel.disable_cursor_move_paper=Vypni kurzor pri pos\u00FAvan\u00ED papiera
 OptionPanel.disable_cursor_move_paper.tooltip=<html>Nezobrazuj kurzor 'pohyb' po\u010Das pos\u00FAvania papiera</html>
-OptionPanel.edgecolor=Farba hrany
-OptionPanel.edgecolor.tooltip=Vlastnos\u0165 hrany rodi\u010Dovsk\u00E9ho uzla (sa pou\u017Eije aj na v\u0161etky podzuly)
-OptionPanel.edgestyle=\u0160t\u00FDl hrany
-OptionPanel.edgestyle.tooltip=Vlastnos\u0165 hrany rodi\u010Dovsk\u00E9ho uzla (sa pou\u017Eije aj na v\u0161etky podzuly)
-OptionPanel.edgewidth=Hr\u00FAbka hrany
-OptionPanel.edgewidth.tooltip=Vlastnos\u0165 hrany rodi\u010Dovsk\u00E9ho uzla (sa pou\u017Eije aj na v\u0161etky podzuly)
-OptionPanel.el=El[translate me]
+OptionPanel.display_inline_editor_for_all_new_nodes=Zobraz inline editor pre v\u0161etky nov\u00E9 uzly
+OptionPanel.display_node_id=Zobrazi\u0165 ID uzla
+OptionPanel.edgecolor=Farba spoja
+OptionPanel.edgecolor.tooltip=Vlastnos\u0165 spoja s rodi\u010Dovsk\u00FDm uzlom (pou\u017Eije sa aj na v\u0161etky podriaden\u00E9 uzly)
+OptionPanel.edgedash=Typ \u010Diary spoja
+OptionPanel.edgestyle=\u0160t\u00FDl spoja
+OptionPanel.edgestyle.tooltip=Vlastnos\u0165 spoja s rodi\u010Dovsk\u00FDm uzlom (pou\u017Eije sa aj na v\u0161etky podriaden\u00E9 uzly)
+OptionPanel.edgewidth=Hr\u00FAbka spoja
+OptionPanel.edgewidth.tooltip=Vlastnos\u0165 spoja s rodi\u010Dovsk\u00FDm uzlom (pou\u017Eije sa aj na v\u0161etky podriaden\u00E9 uzly)
+OptionPanel.EDIT_CURRENT=Prep\u00EDsa\u0165 obsah
+OptionPanel.edit_on_double_click=Upravova\u0165 na dvojit\u00E9 kliknutie
+OptionPanel.editor_extra_width=Stupe\u0148 extra \u0161\u00EDrky
+OptionPanel.editor_extra_width.tooltip=<html>Ur\u010Duje po\u010Det pixlov na zv\u00E4\u010D\u0161enie \u0161\u00EDrky uzla, ak text presiahne aktu\u00E1lnu \u0161\u00EDrku.</html>
+OptionPanel.el=gr\u00E9cky
+OptionPanel.el__buttons_above=Tla\u010D\u00EDtka navrchu
 OptionPanel.el__enter_confirms_by_default=Enter \u0161tandardne potvrdzuje
 OptionPanel.el__max_default_window_height=Max \u0161tandardn\u00E1 v\u00FD\u0161ka okna
 OptionPanel.el__max_default_window_width=Max \u0161tandardn\u00E1 \u0161\u00EDrka okna
@@ -654,17 +1077,45 @@ OptionPanel.en=En
 OptionPanel.Environment=Prostredie
 OptionPanel.es=Es
 OptionPanel.et=Et[translate me]
-OptionPanel.experimental_file_locking_on=Experiment\u00E1lna zamykanie s\u00FAborov
+OptionPanel.eu=Baskick\u00FD
+OptionPanel.execute_scripts_without_asking=Umo\u017Enen\u00E9 spustenie skriptu
+OptionPanel.execute_scripts_without_asking.tooltip=<html>Skripty programu Freeplane s\u00FA schopn\u00E9 hlavne vykona\u0165 \u013Eubovo\u013En\u00FA akciu vo va\u0161om po\u010D\u00EDta\u010Di.<br>Preto by ste nemali vykon\u00E1va\u0165 skripty, ktor\u00E9 neviete by\u0165 bezpe\u010Dn\u00E9. </html>
+OptionPanel.execute_scripts_without_exec_restriction=Povoli\u0165 spustenie in\u00FDch aplik\u00E1ci\u00ED (nedoporu\u010Duje sa)
+OptionPanel.execute_scripts_without_exec_restriction.tooltip=<html> <body> Ak va\u0161e Groovy skripty potrebuj\u00FA sp\u00FA\u0161\u0165a\u0165 \u0161peci\u00E1lne in\u00E9 aplik\u00E1cie (napr. prehliada\u010D) bez toho, aby ste sa p\u00FDtali (!), mus\u00EDte povoli\u0165 t\u00FAto mo\u017Enos\u0165. <br> Ale pou\u017E\u00EDvajte to opatrne, preto\u017Ee teraz \u0161kodliv\u00E9 skripty m\u00F4\u017Eu po\u0161kodi\u0165 v\u00E1\u0161 po\u010D\u00EDta\u010D! </body> </html>
+OptionPanel.execute_scripts_without_file_restriction=Povolenie s\u00FAboru / \u010D\u00EDta\u0165 oper\u00E1cie (nedoporu\u010Duje sa)
+OptionPanel.execute_scripts_without_file_restriction.tooltip=<html><body>Ak va\u0161e Groovy skripty potrebuj\u00FA pr\u00EDstup na \u010D\u00EDtanie (otv\u00E1ranie, zatv\u00E1ranie, \u010D\u00EDtanie),<br>mus\u00EDte t\u00FAto mo\u017Enos\u0165 povoli\u0165. <br>Bu\u010Fte v\u0161ak opatrn\u00ED, preto\u017Ee z\u00E1\u0161kodn\u00EDcke skripty m\u00F4\u017Eu po\u0161kodi\u0165 v\u00E1\u0161 po\u010D\u00EDta\u010D!</body></html>
+OptionPanel.execute_scripts_without_network_restriction=Povoli\u0165 sie\u0165ov\u00E9 oper\u00E1cie (NEOPOR\u00DA\u010CA SA)
+OptionPanel.execute_scripts_without_network_restriction.tooltip=<html><body>Ak va\u0161e Groovy skripty potrebuj\u00FA vykon\u00E1va\u0165 \u0161peci\u00E1lne sie\u0165ov\u00E9 oper\u00E1cie,<br>mus\u00EDte t\u00FAto mo\u017Enos\u0165 povoli\u0165. <br>Bu\u010Fte v\u0161ak opatrn\u00ED, preto\u017Ee z\u00E1\u0161kodn\u00EDcke skripty m\u00F4\u017Eu odhali\u0165 va\u0161e tajomstv\u00E1!</body></html>
+OptionPanel.execute_scripts_without_write_restriction=Povoli\u0165 z\u00E1pisy do s\u00FAborov (NEODPOR\u00DA\u010CA SA)
+OptionPanel.execute_scripts_without_write_restriction.tooltip=<html><body>Ak va\u0161e Groovy skripty vy\u017Eaduj\u00FA pr\u00E1va na z\u00E1pis do s\u00FAboru (z\u00E1pis, mazanie(!)),<br>mus\u00EDte t\u00FAto mo\u017Enos\u0165 povoli\u0165. <br>Norm\u00E1lne sa sp\u00FA\u0161\u0165aj\u00FA s pr\u00E1vom na \u010D\u00EDtanie.<br>Bu\u010Fte v\u0161ak opatrn\u00ED, preto\u017Ee z\u00E1\u0161kodn\u00EDcke skripty m\u00F4\u017Eu po\u0161kodi\u0165 v\u00E1\u0161 po\u010D\u00EDta\u010D!</bod [...]
+OptionPanel.experimental_file_locking_on=Experiment\u00E1lne zamykanie s\u00FAborov
 OptionPanel.experimental_file_locking_on.tooltip=<html>Experiment\u00E1lna vlastnos\u0165</html>
-OptionPanel.export_icons_in_html=Exportuj ikony v HTML
+OptionPanel.export_icons_in_html=Exportova\u0165 ikony v HTML
 OptionPanel.export_icons_in_html.tooltip=<html>\u010Ci by mali HTML s\u00FAbory exportovan\u00E9 z programu Freeplane obsahova\u0165 ikony. Probl\u00E9m s ikonami je, \u017Ee sa v exportovanom HTML \u010Dasto nen\u00E1jdu linky na ikony.</html>
+OptionPanel.exported_image_resolution_dpi=Rozl\u00ED\u0161enie exportovan\u00E9ho obr\u00E1zka (v DPI)
 OptionPanel.Files=S\u00FAbory
 OptionPanel.first=Prv\u00FD
+OptionPanel.fit_to_viewport=Prisp\u00F4sob obr\u00E1zok pozadia oknu
+OptionPanel.fold_on_click_inside=Zba\u013E po kliknut\u00ED dovn\u00FAtra
 OptionPanel.foldingsymbolwidth=\u0160\u00EDrka symbolu zbalenia
 OptionPanel.foldingsymbolwidth.tooltip=<html>\u0160\u00EDrka kolieska ozna\u010Duj\u00FAceho zbalenie</html>
+OptionPanel.fork=Vetva
+OptionPanel.format_locale=Miestne nastavenia pre form\u00E1ty
+OptionPanel.format_locale.tooltip=Miestne nastavenia pre form\u00E1tovanie a spracovanie d\u00E1tumu a \u010Dasu
+OptionPanel.formula_disable_caching=Zak\u00E1za\u0165 vyrovn\u00E1vaciu pam\u00E4\u0165 pre vyhodnocovanie vzorcov
+OptionPanel.formula_disable_plugin=Zak\u00E1za\u0165 vyhodnocovanie vzorcov
 OptionPanel.fr=Fr
 OptionPanel.gl=Gl[translate me]
+OptionPanel.goto_note_end_on_edit=Presun\u00FA\u0165 kurzor na koniec pozn\u00E1mky
+OptionPanel.grid_size=Ve\u013Ekos\u0165 rozostupu mrie\u017Eky
+OptionPanel.groovy_editor_font=P\u00EDsmo pre editor jazyka Groovy so zv\u00FDraz\u0148ovan\u00EDm syntaxe
+OptionPanel.groovy_editor_font.tooltip=Pou\u017Eite 'Dialog' alebo 'Monospaced' ak potrebujete Unicode znaky!
+OptionPanel.groovy_editor_font_size=Ve\u013Ekos\u0165 p\u00EDsma pre editor jazyka Groovy so zv\u00FDraz\u0148ovan\u00EDm syntaxe
 OptionPanel.gtk=Gtk
+OptionPanel.hide_edge=Skry\u0165 spoj
+OptionPanel.hide_single_end_connectors=Skry\u0165 prepojenia s jedn\u00FDm koncom
+OptionPanel.highlight_formulas=Zv\u00FDrazni\u0165 vzorce
+OptionPanel.horizontal=Vodorovne
 OptionPanel.hr=Hr
 OptionPanel.HTML=HTML
 OptionPanel.html_export_based_on_headings=Pod\u013Ea hlavi\u010Dky
@@ -673,253 +1124,844 @@ OptionPanel.html_export_fold_currently_folded=Zba\u013E moment\u00E1lne zbalen\u
 OptionPanel.html_export_folding=Balenie pri exporte do HTML
 OptionPanel.html_export_no_folding=Bez balenia
 OptionPanel.hu=Hu
+OptionPanel.ic_disable=Zak\u00E1za\u0165
+OptionPanel.ic_file=Pou\u017Ei\u0165 disk
+OptionPanel.ic_ram=V RAM
 OptionPanel.icon=Ikona
 OptionPanel.icon.tooltip=Ak sa pou\u017Eije, uzol bude ma\u0165 pr\u00E1ve t\u00FAto ikonu.
+OptionPanel.icon_size=Ve\u013Ekos\u0165 ikony
+OptionPanel.icons.list=Zoznam zobrazen\u00FDch \u0161tandardn\u00FDch ikon
+OptionPanel.icons.list.tooltip=Tu m\u00F4\u017Eete zoradi\u0165 alebo zak\u00E1za\u0165 \u0161tandardn\u00E9 ikony. Tieto ikony musia by\u0165 oddelen\u00E9 pomocou ';' (bodko\u010Diarka).
 OptionPanel.id=Id[translate me]
+OptionPanel.IGNORE=Nerobi\u0165 ni\u010D
+OptionPanel.il__enter_confirms_by_default=Enter predvolene potvrdzuje
+OptionPanel.image_cache=pre obr\u00E1zky
+OptionPanel.indentationUsesTabsInTextOutput=Vo v\u00FDstupnom texte pou\u017Eite tabul\u00E1tory
 OptionPanel.it=It
-OptionPanel.ja=Ja
+OptionPanel.ja=Japonsky
+OptionPanel.JoinNodesAction.textSeparators=Odde\u013Eova\u010D textu
+OptionPanel.key_type_action=Pri stla\u010Den\u00ED kl\u00E1vesy
 OptionPanel.Keystrokes=Kl\u00E1vesy
-OptionPanel.ko=Kr
+OptionPanel.kn=Kannadsky / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
+OptionPanel.ko=K\u00F3rejsky
+OptionPanel.label_font_family=Rodina p\u00EDsem
 OptionPanel.label_font_size=Ve\u013Ekos\u0165 p\u00EDsma
 OptionPanel.language=Jazyk
-OptionPanel.language.tooltip=<html>Toto je jazyk, ktor\u00FD by mal program pou\u017E\u00EDva\u0165. 'automatic' sa pok\u00FAsi na\u010D\u00EDta\u0165 jazyk aktu\u00E1lneho pou\u017E\u00EDvate\u013Ea. </html>
+OptionPanel.language.tooltip=<html>Toto je jazyk, ktor\u00FD by mal program pou\u017E\u00EDva\u0165. Pri nastaven\u00ED 'Automaticky' sa pok\u00FAsi na\u010D\u00EDta\u0165 jazyk aktu\u00E1lneho pou\u017E\u00EDvate\u013Ea. </html>
 OptionPanel.last=Posledn\u00FD
 OptionPanel.last_opened_list_length=D\u013A\u017Eka naposledy otvoren\u00E9ho zoznamu
-OptionPanel.links=Linky
-OptionPanel.links.tooltip=<html>Nastav\u00ED linky bu\u010F na relat\u00EDvne alebo absol\u00FAtne</html>
-OptionPanel.load_folding=On Load[translate me]
-OptionPanel.load_last_map=Automaticky otvor posledn\u00FA mapu
-OptionPanel.load_last_map.tooltip=<html>Ke\u010F program Freeplane \u0161tartuje, automaticky na\u010D\u00EDta naposledy otvoren\u00FA mapu, ak je toto zapnut\u00E9.</html>
+OptionPanel.latex_disable_editor=Zak\u00E1za\u0165 editor jazyka LaTeX so zv\u00FDraz\u0148ovan\u00EDm syntaxe
+OptionPanel.latex_disable_editor.tooltip=Skontrolujte toto ak m\u00E1te probl\u00E9my s editorom jazyka LaTeX
+OptionPanel.latex_editor_font=P\u00EDsmo pre editor jazyka LaTeX so zv\u00FDraz\u0148ovan\u00EDm syntaxe
+OptionPanel.latex_editor_font.tooltip=Pou\u017Eite 'Dialog' alebo 'Monospaced' ak potrebujete Unicode znaky!
+OptionPanel.latex_editor_font_size=Ve\u013Ekos\u0165 p\u00EDsma pre editor jazyka LaTeX so zv\u00FDraz\u0148ovan\u00EDm syntaxe
+OptionPanel.latex_macros=Spolo\u010Dn\u00E9 makr\u00E1 LaTeX-u
+OptionPanel.layout_map_on_text_change=Aktualizuj rozlo\u017Eenie mapy po\u010Das \u00FAprav
+OptionPanel.layout_map_on_text_change.tooltip=Zak\u00E1za\u0165 pre lep\u0161\u00ED v\u00FDkon
+OptionPanel.linear=Priamka
+OptionPanel.links=Odkazy
+OptionPanel.links.tooltip=<html>Nastav\u00ED odkazy bu\u010F na relat\u00EDvne alebo absol\u00FAtne</html>
+OptionPanel.load_folding=Pri na\u010D\u00EDtan\u00ED
+OptionPanel.load_folding_from_map_default_fold_all=Na\u010D\u00EDta\u0165 z mapy alebo zbali\u0165 v\u0161etko
+OptionPanel.load_folding_from_map_default_unfold_all=Na\u010D\u00EDta\u0165 z mapy alebo rozbali\u0165 v\u0161etko
+OptionPanel.load_last_map=Automaticky otvori\u0165 posledn\u00FA mapu
+OptionPanel.load_last_map.tooltip=<html>Ke\u010F program Freeplane \u0161tartuje, na\u010D\u00EDta automaticky naposledy otvoren\u00FA mapu, ak je toto za\u0161krtnut\u00E9.</html>
+OptionPanel.load_last_maps=Na\u010D\u00EDta\u0165 v\u0161etky posledn\u00E9 mapy
 OptionPanel.lookandfeel=V\u00FDzor a spr\u00E1vanie
+OptionPanel.lookandfeel.scaleuifonts=Meni\u0165 ve\u013Ekos\u0165 p\u00EDsem pou\u017E\u00EDvate\u013Esk\u00E9ho rozhrania
+OptionPanel.lookandfeel.scaleuifonts.tooltip=U\u017Eito\u010Dn\u00E9 pre monitory s vysok\u00FDm rozl\u00ED\u0161en\u00EDm
+OptionPanel.lookandfeel.tooltip=<html>T\u00E9my vzh\u013Eadu, ktor\u00E9 je mo\u017Eno pou\u017Ei\u0165. Podporovan\u00E9 s\u00FA t\u00E9my 'metal','windows','motif', 'gtk', t\u00E9ma 'mac' je dostupn\u00E1 len na MacOS. Predvolen\u00E9 znamen\u00E1, \u017Ee je pou\u017Eit\u00E1 prednastaven\u00E1 t\u00E9ma. Ak chcete prida\u0165 va\u0161u vlastn\u00FA t\u00E9mu vzh\u013Eadu, vlo\u017Ete sem pros\u00EDm n\u00E1zov triedy a uistite sa, \u017Ee s\u00FA na\u010D\u00EDtan\u00E9 zodpovedaj\u0 [...]
 OptionPanel.lt=Lt
-OptionPanel.max_node_width=Max \u0161\u00EDrka uzla
+OptionPanel.markClones=Vykes\u013Eova\u0165 klonovacie zna\u010Dky
+OptionPanel.markSelectedClones=Vykres\u013Eova\u0165 klonovacie zna\u010Dky pre v\u00FDber
+OptionPanel.max_displayed_node_count=Maxim\u00E1lny po\u010Det zobrazen\u00FDch uzlov
+OptionPanel.max_image_width=Maxim\u00E1lna po\u010Diato\u010Dn\u00E1 \u0161\u00EDrka obr\u00E1zka
+OptionPanel.max_image_width.tooltip=Nov\u00E9 obr\u00E1zky bud\u00FA zmen\u0161en\u00E9 na t\u00FAto \u0161\u00EDrku
+OptionPanel.max_menu_item_count=Maxim\u00E1lny po\u010Det polo\u017Eiek menu
+OptionPanel.max_menu_item_count.tooltip=Obmedz\u00ED po\u010Det polo\u017Eiek pre jedno podmenu, aspo\u0148 10
+OptionPanel.max_node_width=Maxim\u00E1lna \u0161\u00EDrka uzla
 OptionPanel.max_node_width.tooltip=<html>\u0160tandardn\u00E1 maxim\u00E1lna \u0161\u00EDrka uzla v pixeloch</html>
+OptionPanel.max_shortened_text_length=Maxim\u00E1lna \u0161\u00EDrka skr\u00E1ten\u00E9ho textu
+OptionPanel.menuItemFontSize=Ve\u013Ekos\u0165 p\u00EDsma pre polo\u017Eku menu
 OptionPanel.metal=Kov
+OptionPanel.min_node_width=Minim\u00E1lna \u0161\u00EDrka uzla
+OptionPanel.monitor_size_inches=Ve\u013Ekos\u0165 monitora (v palcoch)
 OptionPanel.motif=Motif
+OptionPanel.narrow_hexagon=\u00DAzky \u0161es\u0165uholn\u00EDk
 OptionPanel.nb=Nb[translate me]
+OptionPanel.never_save_folding=Nikdy
+OptionPanel.neverShowSurvey=Nikdy nezobrazova\u0165 ot\u00E1zky, prieskumy a tipy
 OptionPanel.nl=Nl
 OptionPanel.nn=Nn
-OptionPanel.nodebackgroundcolor=Farba pozadia uzla
-OptionPanel.nodecolor=Farba uzla
-OptionPanel.nodefontbold=Tu\u010Dn\u00E9 p\u00EDsmo
+OptionPanel.nodebackgroundcolor=Pozadie
+OptionPanel.nodebackgroundcolor.tooltip=Pozadie uzla, ke\u010F nie je vybran\u00FD.
+OptionPanel.nodecolor=Text
+OptionPanel.nodecolor.tooltip=Farba textu uzla, ke\u010F nie je vybran\u00FD.
+OptionPanel.nodefontbold=Hrub\u00E9
+OptionPanel.nodefonthyperlink=Odkaz
 OptionPanel.nodefontitalic=Kurz\u00EDva
-OptionPanel.nodefontname=P\u00EDsmo uzla
-OptionPanel.nodefontsize=P\u00EDsmo uzla
-OptionPanel.nodetext=Text uzla
+OptionPanel.nodefontname=Rodina p\u00EDsem
+OptionPanel.nodefontsize=Ve\u013Ekos\u0165 p\u00EDsma
+OptionPanel.nodeformat=Form\u00E1t
+OptionPanel.nodeformat.tooltip=<html>Nahradzovanie a/alebo form\u00E1tovanie textu:<ul><li><em>Roz\u0161\u00EDrenie \u0161abl\u00F3ny</em> (<tt>%s</tt> je p\u00F4vodn\u00FD text), napr. <tt>V\u00DDSTRAHA: %s</tt><li><em>Form\u00E1tovanie d\u00E1tumov a \u010D\u00EDsel</em> - vi\u010F pr\u00EDklady vo v\u00FDberovom poli</ul></html>
+OptionPanel.nodenumbering=\u010C\u00EDslovanie uzlov
+OptionPanel.nodenumbering.tooltip=Prid\u00E1 do textu uzla poradov\u00E9 \u010D\u00EDslo (napr. 1.3.1).
+OptionPanel.nodeshape=Tvar uzla
+OptionPanel.nodetext=Text jadra
+OptionPanel.nodetext.tooltip=Tu m\u00F4\u017Eete zada\u0165 text uzla. Ak bude pou\u017Eit\u00FD tak\u00FDto vzor, predch\u00E1dzaj\u00FAci text bude odstr\u00E1nen\u00FD.
 OptionPanel.nothing=Ni\u010D
-OptionPanel.number_of_different_files_for_automatic_save=Po\u010Det r\u00F4znych s\u00FAborov pri automatickom ukladan\u00ED
+OptionPanel.number_format=\u0160tandardn\u00FD form\u00E1t \u010D\u00EDsla
+OptionPanel.number_format.tooltip=Vzor obsahuj\u00FAci '#' pre volite\u013En\u00E9, alebo '0' pre povinn\u00E9 \u010D\u00EDslice. Pr\u00EDklady: "0.00", "0.0%", "$#.00", "#0"
+OptionPanel.number_of_different_files_for_automatic_save=Po\u010Det r\u00F4znych s\u00FAborov pre automatick\u00E9 ukladanie
+OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> po\u010Det n r\u00F4znych s\u00FAborov pre ukladanie mapy. Prv\u00E9 automatick\u00E9 ulo\u017Eenie bude do prv\u00E9ho s\u00FAboru at\u010F. a\u017E do n+1 ulo\u017Eenia, ktor\u00E9 sa znovu ulo\u017E\u00ED do prv\u00E9ho s\u00FAboru (cyklicky)</html>
+OptionPanel.oc=Okcit\u00E1nsky
 OptionPanel.OK=Ulo\u017E
+OptionPanel.org.freeplane.plugin.bugreport=Politika
+OptionPanel.org.freeplane.plugin.bugreport.allowed=Odosla\u0165 v\u017Edy
+OptionPanel.org.freeplane.plugin.bugreport.ask=Zobrazi\u0165 dial\u00F3g hl\u00E1senia
+OptionPanel.org.freeplane.plugin.bugreport.denied=Neodosiela\u0165 nikdy
+OptionPanel.org.freeplane.plugin.bugreport.userid=Volite\u013En\u00FD identifik\u00E1tor k odoslaniu
+OptionPanel.outline_hgap=Vodorovn\u00E1 vzdialenos\u0165
+OptionPanel.outline_vgap=Zvisl\u00E1 vzdialenos\u0165
+OptionPanel.oval=Ov\u00E1l
+OptionPanel.paint_connectors_behind=Vykres\u013Eova\u0165 prepojenia za uzlami
+OptionPanel.parse_data=Rozozn\u00E1va\u0165 \u010D\u00EDseln\u00FD vstup a vstup d\u00E1tumu a \u010Dasu
+OptionPanel.parse_data.tooltip=Pok\u00FAsi\u0165 sa analyzova\u0165 vstupy typu d\u00E1tum, d\u00E1tum-\u010Das a \u010D\u00EDslo a pou\u017Ei\u0165 \u0161tandardn\u00E9 form\u00E1ty. Pr\u00EDklady: 100,000.00, 12/31, 12/31/99, 1999-12-31 a 1999-12-31 23:59
+OptionPanel.parse_formulas=Rozpozna\u0165 vzorce
+OptionPanel.parse_formulas.tooltip=Analyzova\u0165 vzorce v uzloch za\u010D\u00EDnaj\u00FAcich s '=': Vi\u010F http://www.freeplane.org/wiki/index.php/Formulas.
+OptionPanel.parse_latex=Rozpozna\u0165 LaTeX
+OptionPanel.parse_latex.tooltip=Rozozn\u00E1va\u0165 vzorce LaTeX pod\u013Ea form\u00E1tu alebo predpony: Vi\u010F http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
+OptionPanel.PASTE_HTML=Vlo\u017Ei\u0165 ako HTML
+OptionPanel.PASTE_PLAIN_TEXT=Vlo\u017Ei\u0165 ako neform\u00E1tovan\u00FD text
+OptionPanel.pasteImagesFromFiles=Vlo\u017Ei\u0165 obr\u00E1zky zo s\u00FAborov
+OptionPanel.pasteImagesFromFiles.tooltip=Vlo\u017Ei\u0165 obr\u00E1zok, ak je do mapy pretiahnut\u00FD s\u00FAbor s obr\u00E1zkom
+OptionPanel.path_property_may_not_be_empty=Vlastnos\u0165 cesty nem\u00F4\u017Ee by\u0165 pr\u00E1zdna! Zmeny boli vr\u00E1ten\u00E9 nasp\u00E4\u0165.
 OptionPanel.patternname=N\u00E1zov
 OptionPanel.patternname.tooltip=Jedine\u010Dn\u00FD n\u00E1zov vzoru
 OptionPanel.pl=Pl
 OptionPanel.placenewbranches=Umiestni nov\u00E9 vetvy
 OptionPanel.placenewbranches.tooltip=<html>Kam umiestni\u0165 nov\u00E9 vetvy. Mo\u017En\u00E9 hodnoty s\u00FA 'first' (ako prv\u00E9) a 'last' (ako posledn\u00E9)</html>
+OptionPanel.plugin.tooltip=Z\u00E1suvn\u00E9 moduly mimo jadra.
+OptionPanel.plugins=Z\u00E1suvn\u00E9 moduly
+OptionPanel.Presentation=Prezent\u00E1cia
+OptionPanel.presentation.combineAll=Skombinova\u0165 v\u0161etky prezent\u00E1cie
+OptionPanel.presentation.exportDirectory=n\u00E1zov adres\u00E1ra pre export prezent\u00E1cie
+OptionPanel.presentation.maxDropBoxRowCount=Maxim\u00E1lny po\u010Det riadkov v drop-down boxe
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Pou\u017Eije sa na prezent\u00E1ciu a v\u00FDber sn\u00EDmkov
+OptionPanel.presentation.processesEscapeKey=Kl\u00E1vesa ESCAPE ukon\u010D\u00ED prezent\u00E1ciu
+OptionPanel.presentation.processesNavigationKeys=Naviga\u010Dn\u00E9 kl\u00E1vesy ovl\u00E1daj\u00FA prezent\u00E1ciu
+OptionPanel.presentation.slideDisplaysAllNodes=Rozbali\u0165 automaticky v\u0161etky sn\u00EDmkov\u00E9 uzly
+OptionPanel.presentation.slowMotion=Pomal\u00FD pohyb
+OptionPanel.presentation.switchToFullScreen=Aktivova\u0165 zobrazenie na cel\u00FA obrazovku
+OptionPanel.presentation.switchToSpotlight=Aktivova\u0165 bodov\u00E9 svetlo
+OptionPanel.presentation.zoom=Pou\u017Ei\u0165 zmenu mierky mapy
+OptionPanel.printonwhitebackground=<html>Biele pozadie pre tla\u010D</html>
+OptionPanel.printonwhitebackground.tooltip=<html>V\u017Edy pou\u017Ei\u0165 biele pozadie pre tla\u010D</html>
 OptionPanel.pt_BR=Pt BR
 OptionPanel.pt_PT=Pt PT
+OptionPanel.RECT=Obd\u013A\u017Enik
+OptionPanel.rectangle=Obd\u013A\u017Enik
 OptionPanel.relative=Relat\u00EDvne
-OptionPanel.ru=Ru
+OptionPanel.remind_type_of_new_nodes.tooltip=<html>"Sp\u00FDta\u0165 sa" sa v\u00E1s op\u00FDta (pou\u017Ei\u0165 v pr\u00EDpade pochybnost\u00ED).<br>"\u00C1no" zobraz\u00ED editor na form\u00E1tovanie textu.<br>"Nie" zobraz\u00ED editor pre neform\u00E1tovan\u00FD text.</html>
+OptionPanel.remind_use_rich_text_in_new_nodes=Pou\u017Ei\u0165 form\u00E1tovan\u00FD text pre vlo\u017Een\u00E9 uzly
+OptionPanel.remindersBlink=Pripomienky blikaj\u00FA
+OptionPanel.remindersShowNotifications=Pripomienky zobrazia vyskakovacie okn\u00E1 s upozornen\u00EDm
+OptionPanel.remindersStandardDelay=Posunutie pripomienky
+OptionPanel.remove_notes_without_question=Odstra\u0148ova\u0165 pozn\u00E1mky bez op\u00FDtania?
+OptionPanel.remove_notes_without_question.tooltip=Ak je za\u0161krtnut\u00E9, pozn\u00E1mky prisl\u00FAchaj\u00FAce k vybran\u00FDm uzlom bud\u00FA odstra\u0148ovan\u00E9 bez potvrdzovania. M\u00F4\u017Ee to zapr\u00ED\u010Dini\u0165 startu inform\u00E1ci\u00ED, ak d\u00F4jde k ne\u00FAmyseln\u00E9mu uklepnutiu.
+OptionPanel.resources_use_default_font_for_notes_too=Pou\u017Ei\u0165 predvolen\u00E9 p\u00EDsmo aj pre pozn\u00E1mky
+OptionPanel.resources_use_margin_top_zero_for_notes=Odstr\u00E1ni\u0165 z pozn\u00E1mok horn\u00FD okraj
+OptionPanel.revision_color=Farba rev\u00EDzie
+OptionPanel.revision_color.tooltip=Farba pozadia pre zmenen\u00E9 uzly.
+OptionPanel.ROUND_RECT=Zaoblen\u00FD obd\u013A\u017Enik
+OptionPanel.ru=Rusky
+OptionPanel.save_folding=Ulo\u017Ei\u0165 zba\u013Eovanie
+OptionPanel.save_folding_if_map_is_changed=Ak je mapa zmenen\u00E1
+OptionPanel.save_last_visited_node=Uklada\u0165 posledn\u00FA poz\u00EDciu mapy
+OptionPanel.save_modification_times=Uklada\u0165 \u010Dasy \u00FAprav
+OptionPanel.script_classpath=Cesta k triedam skriptov: \u010Eal\u0161ie adres\u00E1re obsahuj\u00FAce triedy a/alebo s\u00FAbory JAR (vi\u010F bublinkov\u00E1 n\u00E1poveda)
+OptionPanel.script_classpath.tooltip=<html>Zoznam JAR s\u00FAborov a/alebo adres\u00E1rov pre pridanie do cesty k triedam skriptov a vzorcov.<br>Pou\u017Eite ; (Windows) alebo : (Linux, Mac) na oddelenie polo\u017Eiek.<br>V adres\u00E1roch bud\u00FA vyh\u013Eadan\u00E9 s\u00FAbory typu JAR a .class.<br>Cesty, ktor\u00E9 nie s\u00FA absol\u00FAtne, bud\u00FA pova\u017Eovan\u00E9 za relat\u00EDvne k adres\u00E1ru pou\u017E\u00EDvate\u013Ea Freeplane.<br>Ak nastav\u00EDte cestu k triedam, m [...]
+OptionPanel.script_compilation_disabled_extensions=Pr\u00EDpony s\u00FAborov, ktor\u00E9 nemaj\u00FA by\u0165 kompilovan\u00E9 (vi\u010F bublinkov\u00E1 n\u00E1poveda)
+OptionPanel.script_compilation_disabled_extensions.tooltip=<html>Ak v\u0161etky skripty dodato\u010Dne in\u0161talovan\u00E9ho jazyka (mimo<br>Groovy a JavaScript) maj\u00FA v\u0161eobecn\u00FD probl\u00E9m s kompil\u00E1ciou<br>sk\u00FAste sem prida\u0165 pr\u00EDpony s\u00FAborov (zoznam oddelen\u00FD \u010Diarkami).</html>
+OptionPanel.script_directories=Cesta pre vyh\u013Ead\u00E1vanie skriptov (vi\u010F bublinkov\u00E1 n\u00E1poveda)
+OptionPanel.script_directories.tooltip=<html>Zoznam adres\u00E1rov (dopl\u0148uj\u00FAcich "scripts").<br>Na oddelenie polo\u017Eiek pou\u017Eite ; (Windows) alebo : (Linux, Mac).<br>Cesty, ktor\u00E9 nie s\u00FA absol\u00FAtne bud\u00FA pova\u017Eovan\u00E9 za relat\u00EDvne k adres\u00E1ru pou\u017E\u00EDvate\u013Ea Freeplane.</html>
+OptionPanel.script_user_key_name_for_signing=Volite\u013En\u00FD z\u00E1stupn\u00FD n\u00E1zov pre podpisov\u00FD k\u013E\u00FA\u010D pou\u017E\u00EDvate\u013Ea
 OptionPanel.scrollbar_increment=Speed[translate me]
+OptionPanel.scrolling_speed=R\u00FDchlos\u0165 automatick\u00E9ho pos\u00FAvania mapy
+OptionPanel.scrollOnUnfold=Posun\u00FA\u0165 mapu po rozbalen\u00ED uzla
 OptionPanel.selection_method=Met\u00F3da vyberania
 OptionPanel.selection_method_by_click=Kliknut\u00EDm
 OptionPanel.selection_method_delayed=Spomalen\u00E9
 OptionPanel.selection_method_direct=Priamo
 OptionPanel.separator.accessories/plugins/AutomaticLayout.properties_PatternSeparatorName=Vzory
-OptionPanel.separator.anti_alias=Antialias
+OptionPanel.separator.anti_alias=Vyhladzovanie
 OptionPanel.separator.attributes=Atrib\u00FAty
-OptionPanel.separator.automatic_save=Automatick\u00E9 ulo\u017Eenie
+OptionPanel.separator.automatic_save=Automatick\u00E9 ukladanie
 OptionPanel.separator.behaviour=Spr\u00E1vanie
 OptionPanel.separator.browser=Prezera\u010D
+OptionPanel.separator.cache=Vyrovn\u00E1vacia pam\u00E4\u0165
+OptionPanel.separator.clones=Klony
+OptionPanel.separator.cloud=Oblak
+OptionPanel.separator.CloudControls=Oblaky
 OptionPanel.separator.commands_for_the_program=Pr\u00EDkazy programu
+OptionPanel.separator.connectors=Prepojenia
+OptionPanel.separator.data_formats=Anal\u00FDza a form\u00E1tovanie \u00FAdajov
 OptionPanel.separator.default_colors=\u0160tandardn\u00E9 farby
 OptionPanel.separator.default_fonts=\u0160tandardn\u00E9 p\u00EDsma
 OptionPanel.separator.default_styles=\u0160tandardn\u00E9 \u0161t\u00FDly
-OptionPanel.separator.EdgeControls=Hrany
-OptionPanel.separator.edit_long_node_window=Edituj dlh\u00FD uzol v okne
+OptionPanel.separator.EdgeControls=Spoje
+OptionPanel.separator.edit_long_node_window=Upravova\u0165 v dial\u00F3gu
+OptionPanel.separator.editing=Nastavenia editora
+OptionPanel.separator.export=Export
 OptionPanel.separator.files=S\u00FAbory
+OptionPanel.separator.formula=Vzorce
 OptionPanel.separator.General=V\u0161eobecn\u00E9
 OptionPanel.separator.html_export=Export do HTML
 OptionPanel.separator.html_import=Html Import[translate me]
-OptionPanel.separator.hyperlink_types=Druhy hyperliniek
+OptionPanel.separator.hyperlink_types=Typy hypertextov\u00FDch odkazov
 OptionPanel.separator.icon_properties=Ikony
+OptionPanel.separator.IconControls=Ikony
+OptionPanel.separator.icons=Ikony v "Zvoli\u0165 ikonu..."
+OptionPanel.separator.Icons=Ikony
 OptionPanel.separator.initial_map_size=Po\u010Diato\u010Dn\u00E9 rozmery mapy
+OptionPanel.separator.inline_editor=Editor uzla na mieste
+OptionPanel.separator.JoinNodesAction=Sp\u00E1janie uzlov
 OptionPanel.separator.key_typing=P\u00EDsanie z kl\u00E1vesnice
 OptionPanel.separator.language=Jazyk
+OptionPanel.separator.latex=LaTeX
+OptionPanel.separator.load=Na\u010D\u00EDta\u0165
 OptionPanel.separator.look_and_feel=V\u00FDzor a spr\u00E1vanie
+OptionPanel.separator.mouse_wheel=Koliesko my\u0161i
 OptionPanel.separator.new_node_commands=Pr\u00EDkazy na nov\u00FD uzol
 OptionPanel.separator.node_editing_commands=Pr\u00EDkazy na editovanie uzla
 OptionPanel.separator.node_navigation_commands=Pr\u00EDkazy na navig\u00E1ciu uzla
-OptionPanel.separator.NodeColors=Farby uzlov
-OptionPanel.separator.NodeFont=P\u00EDsmo uzla
+OptionPanel.separator.NodeBorder=Okraj uzla
+OptionPanel.separator.NodeColors=Farba cel\u00E9ho jadra
+OptionPanel.separator.NodeFont=P\u00EDsmo cel\u00E9ho jadra
+OptionPanel.separator.NodeShape=Tvar uzla
+OptionPanel.separator.NodeStyle=\u0160t\u00FDl uzla
+OptionPanel.separator.NodeText=Text jadra
+OptionPanel.separator.notifications=Potvrdzovania
+OptionPanel.separator.org.freeplane.plugin.bugreport=Automatick\u00E9 hl\u00E1senie ch\u00FDb
 OptionPanel.separator.other_defaults=Ostatn\u00E9 \u0161tandardn\u00E9
 OptionPanel.separator.others=Ostatn\u00E9 kl\u00E1vesov\u00E9 skratky
+OptionPanel.separator.outline_view=Zobrazenie osnovy
 OptionPanel.separator.patterns=Vzory
+OptionPanel.separator.presentation=Prezent\u00E1cia
+OptionPanel.separator.reminderOptions=Mo\u017Enosti pripomienok
+OptionPanel.separator.RichTextEditor=Editor form\u00E1tovan\u00E9ho textu
+OptionPanel.separator.root_node_appearance=Vzh\u013Ead kore\u0148ov\u00E9ho uzla
 OptionPanel.separator.save=Ulo\u017E
+OptionPanel.separator.scripting=Skriptovanie
 OptionPanel.separator.scrollbar=Scrollbar[translate me]
+OptionPanel.separator.search=Vyh\u013Ead\u00E1vanie
+OptionPanel.separator.selection_colors=Farby v\u00FDberu
 OptionPanel.separator.selection_method=Met\u00F3da vyberania
+OptionPanel.separator.single_instance_mode=Jedin\u00E1 in\u0161tancia programu
+OptionPanel.separator.size_limits=Obmedzenia ve\u013Ekosti
+OptionPanel.separator.spelling=Mo\u017Enosti kontroly pravopisu
+OptionPanel.separator.SplitToWordsAction=Delenie uzlov na slov\u00E1
+OptionPanel.separator.status=Stavov\u00FD riadok
+OptionPanel.separator.surveys=Prieskumy
+OptionPanel.separator.svg_icons=SVG ikony
+OptionPanel.separator.tooltip=Bublinkov\u00E1 n\u00E1poveda
 OptionPanel.separator.undo=Sp\u00E4\u0165
-OptionPanel.set_property_text=Zme\u0148
-OptionPanel.set_property_text.tooltip=Pr\u00E1zdne: nechyta\u0165; m\u00EDnus=zru\u0161 vlastnos\u0165 (nastav \u0161tandardn\u00E9 hodnoty); plus=zme\u0148 vlastnos\u0165
-OptionPanel.show_icon_for_attributes=Zobraz ikony vlastnost\u00ED
-OptionPanel.sk=Sk[translate me]
-OptionPanel.sl=Sl
+OptionPanel.separator.updates=Aktualiz\u00E1cie programu
+OptionPanel.set_property_text=Zmeni\u0165
+OptionPanel.set_property_text.tooltip=Za\u0161krtn\u00FA\u0165, ak chcete zmeni\u0165 t\u00FAto vlastnos\u0165 \u0161t\u00FDlu
+OptionPanel.setscript=Zmeni\u0165?
+OptionPanel.setscript.tooltip=Skript m\u00F4\u017Ee by\u0165 priraden\u00FD k \u0161t\u00FDlu.
+OptionPanel.shape_horizontal_margin=Vodorovn\u00FD okraj
+OptionPanel.shape_vertical_margin=Zvisl\u00FD okraj
+OptionPanel.sharp_bezier=Ostr\u00E1 krivka (b\u00E9zier)
+OptionPanel.sharp_linear=Ostr\u00E1 priamka
+OptionPanel.shouldCenterSmallMaps=Vystredi\u0165 mal\u00E9 mapy
+OptionPanel.show_connectors=Zobrazi\u0165 \u010Diary prepojen\u00ED
+OptionPanel.show_icon_for_attributes=Zobrazi\u0165 ikonu pre atrib\u00FAty
+OptionPanel.show_icons=Zobrazi\u0165 ikony
+OptionPanel.show_less_than_N_nodes_by_default_after_load=Na\u010D\u00EDta\u0165 z mapy, alebo rozbali\u0165 niektor\u00E9 uzly
+OptionPanel.show_node_tooltips=Zobrazi\u0165 bublinkov\u00FA n\u00E1povedu
+OptionPanel.show_note_icon_in_tooltip=Zobrazi\u0165 ikonu pozn\u00E1mky v bubline s n\u00E1pomocou
+OptionPanel.show_note_icons=Zobrazi\u0165 ikony pozn\u00E1mok
+OptionPanel.show_styles_in_tooltip=Zobrazi\u0165 \u0161t\u00FDly uzla v bublinkov\u00FDch n\u00E1poved\u00E1ch
+OptionPanel.signed_script_are_trusted=D\u00F4verova\u0165 podp\u00EDsan\u00FDm skriptom (odpor\u00FA\u010Da sa).
+OptionPanel.signed_script_are_trusted.tooltip=Ak bud\u00FA skripty podp\u00EDsan\u00E9 d\u00F4veryhodnou stranou (napr. autormi Freeplane alebo vami), bud\u00FA sp\u00FA\u0161\u0165an\u00E9 bez obmedzen\u00ED.
+OptionPanel.simplyhtml.default_paste_mode=Predvolen\u00FD re\u017Eim vkladania
+OptionPanel.single_backup_directory=Pou\u017Ei\u0165 jeden adres\u00E1r na z\u00E1lo\u017En\u00E9 s\u00FAbory
+OptionPanel.single_backup_directory.tooltip=<html> Ak maj\u00FA by\u0165 z\u00E1lo\u017En\u00E9 s\u00FAbory a s\u00FAbory automatick\u00E9ho ukladania umiestnen\u00E9 v jednom adres\u00E1ri namiesto podadres\u00E1ra v adres\u00E1ri s mapou</html>
+OptionPanel.single_backup_directory_path=Adres\u00E1r pre z\u00E1lo\u017En\u00E9 s\u00FAbory (ak je zvolen\u00E1 vy\u0161\u0161ieuveden\u00E1 mo\u017Enos\u0165)
+OptionPanel.single_backup_directory_path.tooltip=<html>Potla\u010D\u00ED predvolen\u00E9 <freeplaneuserdir>/.backup</html>
+OptionPanel.single_instance=Otv\u00E1ra\u0165 s\u00FAbory v be\u017Eiacom programe
+OptionPanel.single_instance_force=V \u017Eiadnom pr\u00EDpade nepovoli\u0165 druh\u00FA in\u0161tanciu
+OptionPanel.single_instance_force.tooltip=Nepovoli\u0165 druh\u00FA in\u0161tanciu ani ke\u010F njestvuje s\u00FAbor na na\u010D\u00EDtanie
+OptionPanel.sk=Slovensky
+OptionPanel.skip_template_selection=Presko\u010Di\u0165 dial\u00F3g pre v\u00FDber \u0161abl\u00F3ny
+OptionPanel.sl=Slovinsky
+OptionPanel.slow_scroll_selected_node=Hladko pos\u00FAva\u0165 zvolen\u00FD uzol
+OptionPanel.spelling_opt_case_sensitive=Rozli\u0161uje sa ve\u013Ekos\u0165 p\u00EDsmen
+OptionPanel.spelling_opt_ignore_all_caps_words=Ignorova\u0165 v\u0161etky slov\u00E1 p\u00EDsan\u00E9 ve\u013Ek\u00FDmi p\u00EDsmenami.
+OptionPanel.spelling_opt_ignore_capitalization=Ignorova\u0165 ve\u013Ek\u00E9 p\u00EDsmen\u00E1 na za\u010Diatku slova
+OptionPanel.spelling_opt_ignore_words_with_numbers=Ignorova\u0165 slov\u00E1 obsahuj\u00FAce \u010D\u00EDsla
+OptionPanel.spelling_opt_suggestions_limit_dialog=Maxim\u00E1lny po\u010Det n\u00E1vrhov v dial\u00F3gu
+OptionPanel.spelling_opt_suggestions_limit_menu=Maxim\u00E1lny po\u010Det n\u00E1vrhov v menu
+OptionPanel.SplitToWordsAction.auxiliaryWordList=zoznam pomocn\u00FDch slov
+OptionPanel.SplitToWordsAction.charactersAcceptedInWord=znaky v slov\u00E1ch
+OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=ponecha\u0165 p\u00F4vodn\u00FD uzol pr\u00E1zdny
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=\u010D\u00EDslo uzla v riadku
+OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=uklada\u0165 p\u00F4vodn\u00FD text ako podrobnosti
+OptionPanel.spotlight=Bodov\u00E9 svetlo
+OptionPanel.spotlight_background_color=Pozadie bodov\u00E9ho osvetlenia
+OptionPanel.sr=Srb\u010Dina / \u0441\u0440\u043F\u0441\u043A\u0438
+OptionPanel.standard_template=\u0160tandardn\u00FD s\u00FAbor \u0161abl\u00F3ny
 OptionPanel.standardbackgroundcolor=\u0160tandardn\u00E1 farba pozadia
 OptionPanel.standardbackgroundcolor.tooltip=<html>\u0160tandardn\u00E1 farba pozadia vo form\u00E1te HTML</html>
 OptionPanel.standardcloudcolor=\u0160tandardn\u00E1 farba oblaku
-OptionPanel.standardcloudcolor.tooltip=<html>\u0160tandardn\u00E1 farba oblaku vo form\u00E1te HTML</html>
+OptionPanel.standardcloudcolor.tooltip=<html>\u0160tandardn\u00E1 farba oblaku v z\u00E1pise HTML</html>
 OptionPanel.standardcloudestyle=\u0160tandardn\u00FD \u0161t\u00FDl oblaku
-OptionPanel.standardcloudestyle.tooltip=<html>\u0160tandardn\u00FD \u0161t\u00FDl oblaku; moment\u00E1lne iba 'bezier'</html>
-OptionPanel.standardlinkcolor=\u0160tandardn\u00E1 farba linky
-OptionPanel.standardlinkcolor.tooltip=<html>\u0160tandardn\u00E1 farba linky vo form\u00E1te HTML</html>
-OptionPanel.standardlinkestyle=\u0160tandardn\u00FD \u0161t\u00FDl linky
-OptionPanel.standardlinkestyle.tooltip=<html>\u0160tandardn\u00FD \u0161t\u00FDl linky; moment\u00E1lne iba 'bezier'</html>
-OptionPanel.standardselectednodecolor=\u0160tandardn\u00E1 farba ozna\u010Den\u00E9ho uzla
-OptionPanel.standardselectednodecolor.tooltip=<html>\u0160tandardn\u00E1 farba ozna\u010Den\u00E9ho uzla vo form\u00E1te HTML (#\u010C\u010CZZMM v \u0161estn\u00E1stkov\u00FDch \u010D\u00EDslach)</html>
+OptionPanel.standardcloudestyle.tooltip=<html>\u0160tandardn\u00FD \u0161t\u00FDl oblaku.</html>
+OptionPanel.standardcloudshape=\u0160tandardn\u00FD tvar oblaku
+OptionPanel.standarddrawrectangleforselection=Zobrazi\u0165 vybran\u00E9 uzly v bublin\u00E1ch
+OptionPanel.standarddrawrectangleforselection.tooltip=<html>Ozna\u010Di\u0165 vybran\u00E9 uzly bublinou okolo.</html>
+OptionPanel.standardlinkcolor=\u0160tandardn\u00E1 farba odkazu
+OptionPanel.standardlinkcolor.tooltip=<html>\u0160tandardn\u00E1 farba odkazu v z\u00E1pise HTML</html>
+OptionPanel.standardlinkestyle=\u0160tandardn\u00FD \u0161t\u00FDl odkazu
+OptionPanel.standardlinkestyle.tooltip=<html>\u0160tandardn\u00FD \u0161t\u00FDl odkazu; moment\u00E1lne je podporovan\u00FD iba 'b\u00E9zier'</html>
+OptionPanel.standardselectednodecolor=\u0160tandardn\u00E1 farba vybran\u00E9ho uzla
+OptionPanel.standardselectednodecolor.tooltip=<html>\u0160tandardn\u00E1 farba vybran\u00E9ho uzla vo form\u00E1te HTML (#\u010C\u010CZZMM v hexa hodnot\u00E1ch)</html>
+OptionPanel.standardselectednoderectanglecolor=Farba bubliny vybran\u00E9ho uzla
+OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Farba bubliny ozna\u010Duj\u00FAcej vybran\u00E9 uzly. V HTML z\u00E1pise (#RRGGBB v hex hodnot\u00E1ch) </html>
+OptionPanel.STAR=Hviezda
+OptionPanel.statesymbolwidth=\u0160\u00EDrka symbolu stavu
+OptionPanel.structured_html_import=Importova\u0165 HTML ako \u0161trukt\u00FAru uzla
+OptionPanel.structured_icon_toolbar=\u0160trukt\u00FArovan\u00E1 li\u0161ta s ikonami
+OptionPanel.summary=S\u00FAhrn
 OptionPanel.sv=Se
-OptionPanel.time_for_automatic_save=\u010Casov\u00FD interval automatick\u00E9ho ulo\u017Eenia
-OptionPanel.time_for_automatic_save.tooltip=<html>\u010Das medzi dvoma nasleduj\u00FAcimi automatick\u00FDmi ulo\u017Eeniami (v milisekund\u00E1ch); automatick\u00E9 uklaanie sa vypne pomocou hodnoty 2000000000.</html>
+OptionPanel.text.use_ctrl_key=Pou\u017Ei\u0165 'Priradi\u0165 kl\u00E1vesov\u00FA skratku' z menu N\u00E1stroje
+OptionPanel.textalignment=Zarovnanie textu
+OptionPanel.time_for_automatic_save=\u010Casov\u00FD interval automatick\u00E9ho ukladania
+OptionPanel.time_for_automatic_save.tooltip=<html>\u010Das medzi dvoma nasleduj\u00FAcimi automatick\u00FDmi ulo\u017Eeniami (v milisekund\u00E1ch): Pre vypnutie automatick\u00E9ho ukladania nastavte toto \u010D\u00EDslo na 2000000000.</html>
 OptionPanel.time_for_delayed_selection=\u010Cas oneskorenia ozna\u010Denia
 OptionPanel.time_for_delayed_selection.tooltip=<html>Pauza pred ozna\u010Den\u00EDm uzla, ke\u010F nad n\u00EDm prech\u00E1dza my\u0161 (v milisekund\u00E1ch). Nastavte t\u00FAto hodnotu na 1, ak chcete pri prechode my\u0161ou ponad uzol hne\u010F ozna\u010Di\u0165.</html>
-OptionPanel.tr=Tr
-OptionPanel.uk_UA=Uk UA[translate me]
+OptionPanel.toolbar_icon_height=V\u00FD\u0161ka ikon v n\u00E1strojovej li\u0161te
+OptionPanel.toolTipManager.max_tooltip_height=Maxim\u00E1lna v\u00FD\u0161ka bublinkovej n\u00E1povedy uzla
+OptionPanel.toolTipManager.max_tooltip_height.tooltip=Maxim\u00E1lna v\u00FD\u0161ka bublinkovej n\u00E1povedy v pixloch.
+OptionPanel.toolTipManager.max_tooltip_width=Maxim\u00E1lna \u0161\u00EDrka bublinkovej n\u00E1povedy uzla
+OptionPanel.toolTipManager.max_tooltip_width.tooltip=Maxim\u00E1lna \u0161\u00EDrka bublinkovej n\u00E1povedy v pixloch.
+OptionPanel.tr=Turecky
+OptionPanel.uk_UA=Ukrajinsky
 OptionPanel.undefined_font=Nedefinovan\u00E9 p\u00EDsmo
 OptionPanel.undo_levels=Po\u010Det n\u00E1vratov
 OptionPanel.undo_levels.tooltip=<html>Ur\u010Duje ko\u013Eko krokov je ulo\u017Een\u00FDch, aby sa dali vr\u00E1ti\u0165 pr\u00EDkazom "Sp\u00E4\u0165".</html>
-OptionPanel.vi=Vi[translate me]
+OptionPanel.unfold_on_paste=Rozbali\u0165 uzol pri vkladan\u00ED
+OptionPanel.unfold_on_paste.tooltip=Rozbali\u0165 uzol pri vkladan\u00ED alebo pretiahnut\u00ED (drag and drop)
+OptionPanel.uniform_shape=Jednotn\u00E9
+OptionPanel.use_common_out_point_for_root_node=Spoje vych\u00E1dzaj\u00FA z jedn\u00E9ho bodu na kore\u0148ovom uzle
+OptionPanel.use_common_out_point_for_root_node.tooltip=Spoje vych\u00E1dzaj\u00FA z jedn\u00E9ho bodu na kore\u0148ovom uzle
+OptionPanel.use_svg_icons=Pou\u017E\u00EDva\u0165 SVG ikony
+OptionPanel.use_svg_icons.tooltip=<html>Ur\u010Duje kvalitu vykres\u013Eovania ikon. SVG ikony vy\u017Eaduj\u00FA viac \u010Dasu.</html>
+OptionPanel.use_tabbed_pane=Pou\u017Ei\u0165 karty
+OptionPanel.use_tabbed_pane.tooltip=Ak je zvolen\u00E9 mapy sa zobrazuj\u00FA na kart\u00E1ch (ako vo FireFox-e :-) ).
+OptionPanel.validate_classpath_needs_readaccess=Skriptovanie: Pri nastaven\u00ED cesty k triedam mus\u00EDte povoli\u0165 pr\u00EDstup k \u010D\u00EDtaniu s\u00FAborov!
+OptionPanel.validate_invalid_date_format=Neplatn\u00FD \u0161tandardn\u00FD form\u00E1t d\u00E1tumu
+OptionPanel.validate_invalid_datetime_format=Neplatn\u00FD \u0161tandardn\u00FD form\u00E1t pre d\u00E1tum-\u010Das
+OptionPanel.validate_invalid_number_format=Neplatn\u00FD \u0161tandardn\u00FD form\u00E1t \u010D\u00EDsla
+OptionPanel.validate_write_without_read=Skriptovanie: zv\u00E1\u017Ete pridanie \u010C\u00EDta\u0165/S\u00FAbor k Zapisova\u0165/S\u00FAbor.
+OptionPanel.validation_error=<html><body>Chyba(y) overenia:<p><em>{0}</em><p>Pre ich odstr\u00E1nenie zme\u0148te pros\u00EDm nastavenia.</body></html>
+OptionPanel.validation_warning=<html><body>Varovanie(a) overovania:<p><em>{0}</em></body></html>
+OptionPanel.vertical_child_gap=Rozostup mezi potomkami
+OptionPanel.vertical_child_gap.tooltip=Zvisl\u00E1 vzdialenos\u0165 mezi podriaden\u00FDmi uzlami
+OptionPanel.vi=Vietnamsky
 OptionPanel.wheel_velocity=Speed[translate me]
+OptionPanel.wheel_velocity.tooltip=Vy\u0161\u0161ia hodnota sp\u00F4sob\u00ED r\u00FDchlej\u0161\u00ED pohyb mapy pri ot\u00E1\u010Dan\u00ED kolieskom my\u0161i.
+OptionPanel.wide_hexagon=\u0160irok\u00FD \u0161es\u0165uholn\u00EDk
 OptionPanel.windows=Okn\u00E1
-OptionPanel.zh_CN=Zh CN
-OptionPanel.zh_TW=Zh
-PageAction.text=Nastavenie strany...
-PasteAction.text=Vlo\u017E
+OptionPanel.zh_CN=\u010C\u00EDnsky
+OptionPanel.zh_TW=\u010C\u00EDnsky, tradi\u010Dn\u00FD
+org.freeplane.plugin.bugreport.agree=Odosla\u0165
+org.freeplane.plugin.bugreport.always_agree=Odosla\u0165 v\u017Edy
+org.freeplane.plugin.bugreport.always_deny=Neodosiela\u0165 nikdy
+org.freeplane.plugin.bugreport.deny=Neodosiela\u0165
+org.freeplane.plugin.bugreport.dialog.title=Automatick\u00E9 hl\u00E1senie ch\u00FDb
+org.freeplane.plugin.bugreport.freeplane_team=Spr\u00E1va t\u00EDmu Freeplane
+org.freeplane.plugin.bugreport.lastreport=Obdr\u017Ean\u00E9 hl\u00E1senie
+org.freeplane.plugin.bugreport.never=Nikdy ma ne\u017Eiada\u0165 o pomoc
+org.freeplane.plugin.bugreport.question=Freeplane obsahuje automatick\u00E9 rozozn\u00E1vanie a vyh\u013Ead\u00E1vanie ch\u00FDb programu.
+org.freeplane.plugin.bugreport.report=Aktu\u00E1lne hl\u00E1senie
+org.freeplane.plugin.bugreport.wanted_bug=Vyskytla sa vn\u00FAtorn\u00E1 chyba a bola automaticky nahl\u00E1sen\u00E1.
+org.freeplane.plugin.script.NodeIdHighlighter.node_is_not_defined=Uzol {0} nie je definovan\u00FD
+out_of_memory=Nedostatok pam\u00E4te.
+overwrite_keyset_question=Prep\u00EDsa\u0165 jestvuj\u00FAcu sadu kl\u00E1vesov\u00FDch skratiek?
+PageAction.text=Nastavenie tla\u010De...
+password_is_not_ascii=Heslo nie je ASCII
+PasteAction.text=Vlo\u017Ei\u0165
+PasteAttributes.text=Vlo\u017Ei\u0165 atrib\u00FAty
 PatternNewNameProperty=Nov\u00FD vzor
 PatternToString.backgroundColor=Farba pozadia
-PatternToString.EdgeStyle=\u0160t\u00FDl hrany
-PatternToString.EdgeWidth=Hr\u00FAbka hrany
-PatternToString.FontBold=Tu\u010Dn\u00E9
+PatternToString.Child=\u0160t\u00FDl podriaden\u00E9ho uzla
+PatternToString.color=Farba
+PatternToString.EdgeColor=Farba spoja
+PatternToString.EdgeStyle=\u0160t\u00FDl spoja
+PatternToString.EdgeWidth=Hr\u00FAbka spoja
+PatternToString.FontBold=Hrub\u00E9
+PatternToString.FontItalic=Kurz\u00EDva
 PatternToString.FontName=Font Name[translate me]
 PatternToString.Icon=Ikona
 PatternToString.NodeFontSize=Ve\u013Ekos\u0165 p\u00EDsma
+periodic_formula={0} * n + {1}
+PeriodUnit.DAY=dn\u00ED
+PeriodUnit.HOUR=hod\u00EDn
+PeriodUnit.MINUTE=min\u00FAt
+PeriodUnit.MONTH=mesiacov
+PeriodUnit.WEEK=t\u00FD\u017Ed\u0148ov
+PeriodUnit.YEAR=rokov
+plugins/latex/LatexNodeHook.editorTitle=Upravi\u0165 vzorec LaTeX-u
+plugins/script_filter=Filter scriptu {0}
+plugins/script_filter_error={0} by mal vr\u00E1ti\u0165 logick\u00FA hodnotu na {1} vr\u00E1til v\u0161ak {2}
+plugins/script_filter_execute_error=Chyba vykonania {0}\npre uzol {1}:\n{2}
+plugins/ScriptEditor.cancel=Zru\u0161i\u0165 zmeny a skon\u010Di\u0165
+plugins/ScriptEditor.exit=Ulo\u017Ei\u0165 a &skon\u010Di\u0165
+plugins/ScriptEditor.FORBIDDEN_ACTION=Skripty jazyka Groovy pre Freeplane s\u00FA zak\u00E1zan\u00E9. Nasleduj\u00FAca {0,choice,0#File|1#Network|2#Exec} oper\u00E1cia je zak\u00E1zan\u00E1: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write} {2}. Toto je mo\u017En\u00E9 zmeni\u0165 v nastaveniach programu.
+plugins/ScriptEditor.menu_actions=&Akcie
 plugins/ScriptEditor.new_script=New Script[translate me]
+plugins/ScriptEditor.run=Spusti\u0165
+plugins/ScriptEditor.sign=Podp\u00EDsa\u0165 skript...
+plugins/ScriptEditor/window.Result=V\u00FDsledok:
 plugins/ScriptEditor/window.title=Script Editor[translate me]
+plugins/ScriptingEngine.illegalAccessToInternalAPI=Neopr\u00E1vnen\u00FD pr\u00EDstup k vn\u00FAtorn\u00E9mu API (package {0}). - Kontaktujte pros\u00EDm t\u00EDm Freeplane ak sa v\u00E1m zd\u00E1 skriptovacie rozhranie nedostato\u010Dn\u00E9.
 plugins/TimeList.xml_Created=Vytvoren\u00E9
 plugins/TimeList.xml_Date=D\u00E1tum
+plugins/TimeList.xml_Details=Podrobnosti
 plugins/TimeList.xml_Icons=Ikony
 plugins/TimeList.xml_Modified=Zmenen\u00E9
-plugins/TimeList.xml_Notes=Notes[translate me]
+plugins/TimeList.xml_Notes=Pozn\u00E1mky
 plugins/TimeList.xml_Text=Text
-plugins/TimeManagement.xml_appendButton=Pripoj d\u00E1tum k ozna\u010Den\u00FDm uzlom
-plugins/TimeManagement.xml_Cancel=Storno
-plugins/TimeManagement.xml_cancelButton=Storno
-plugins/TimeManagement.xml_closeButton=Zavri
-plugins/TimeManagement.xml_Export=Exportuj ozna\u010Den\u00E9 uzly
-plugins/TimeManagement.xml_Find=N\u00E1jdi
-plugins/TimeManagement.xml_Goto=Cho\u010F na
+plugins/TimeManagement.xml_appendButton=Vlo\u017Ei\u0165 d\u00E1tum do v\u00FDberu
+plugins/TimeManagement.xml_Cancel=Zru\u0161i\u0165
+plugins/TimeManagement.xml_cancelButton=Zru\u0161i\u0165
+plugins/TimeManagement.xml_closeButton=Zavrie\u0165
+plugins/TimeManagement.xml_Export=Exportova\u0165 vybran\u00E9 uzly
+plugins/TimeManagement.xml_Find=N\u00E1js\u0165
+plugins/TimeManagement.xml_Goto=Prejs\u0165 na
 plugins/TimeManagement.xml_hour=Hodina:
+plugins/TimeManagement.xml_menu_actions=Akcie
 plugins/TimeManagement.xml_minute=Min\u00FAta:
-plugins/TimeManagement.xml_reminderButton=Pripome\u0148 mi v tento d\u00E1tum
-plugins/TimeManagement.xml_reminderButton_tooltip=<html>Po stla\u010Den\u00ED sa napl\u00E1nuje \u010Dasova\u010D na dan\u00FD d\u00E1tum. Potom v\u00E1s upozorn\u00ED blikaj\u00FAca ikona.<br> Ak zavriete mapu, \u010Dasova\u010De sa znovu aktivuj\u00FA nabud\u00FAce po jej otvoren\u00ED.</html>
+plugins/TimeManagement.xml_reminderButton=Pripomen\u00FA\u0165 mi v tento d\u00E1tum
+plugins/TimeManagement.xml_reminderButton_tooltip=<html>Po stla\u010Den\u00ED sa napl\u00E1nuje \u010Dasova\u010D na dan\u00FD d\u00E1tum. Potom v\u00E1s upozorn\u00ED blikaj\u00FAca ikona.<br> Ak zavriete mapu, \u010Dasova\u010De sa znovu aktivuj\u00FA po jej op\u00E4tovnom otvoren\u00ED.</html>
 plugins/TimeManagement.xml_reminderNode_tooltip=Napl\u00E1novan\u00E1 pripomienka na {0,date} {0,time}.
+plugins/TimeManagement.xml_remindLaterButton=Pripomen\u00FA\u0165 nesk\u00F4r
+plugins/TimeManagement.xml_remindLaterButton_tooltip=Pripomen\u00FA\u0165 nesk\u00F4r
 plugins/TimeManagement.xml_removeReminderButton=Odstr\u00E1\u0148 pripomienku
 plugins/TimeManagement.xml_removeReminderButton_tooltip=Odstr\u00E1\u0148 v\u0161etky pripomienky spojen\u00E9 s ozna\u010Den\u00FDmi uzlami.
-plugins/TimeManagement.xml_Replace=Nahra\u010F
-plugins/TimeManagement.xml_Replace_All=Nahra\u010F v\u0161etko
-plugins/TimeManagement.xml_Replace_Selected=Nahra\u010F ozna\u010Den\u00E9
+plugins/TimeManagement.xml_Replace=Nahradi\u0165
+plugins/TimeManagement.xml_Replace_All=Nahradi\u0165 v\u0161etko
+plugins/TimeManagement.xml_Replace_Selected=Nahradi\u0165 vybran\u00E9
 plugins/TimeManagement.xml_Select=Vyber
 plugins/TimeManagement.xml_todayButton=Dnes
-plugins/TimeManagement.xml_WindowTitle=Riadenie \u010Dasu
+plugins/TimeManagement.xml_WindowTitle=Spravova\u0165 \u010Das
+plugins/TimeManagement.xml_WindowTitle_All_Nodes=N\u00E1js\u0165 a nahradi\u0165
 preferences=Nastavenia
-PrintDirectAction.text=Tla\u010D...
+presentation=Prezent\u00E1cia
+presentation.combineAll=Skombinova\u0165 v\u0161etky prezent\u00E1cie
+print_preview_title=N\u00E1h\u013Ead tla\u010De
+PrintAction.text=Tla\u010Di\u0165 mapu...
+PrintDirectAction.text=Tla\u010Di\u0165
 printing_settings=Mierka tla\u010De
 PrintPreviewAction.text=Uk\u00E1\u017Eka tla\u010De...
-PropertyAction.text=Nastavenia...
-QuitAction.text=Ukon\u010Di
+program_terminates=Vn\u00FAtorn\u00E1 chyba, program sa ukon\u010D\u00ED.
+progress=Ikona priebehu (%)
+PropertyAction.dialog=Nastavenia
+PropertyAction.text=Nastavenia ...
+QuickFilterAction.text=R\u00FDchle filtrovanie
+QuickFindAction.BACK.text=N\u00E1js\u0165 predch\u00E1dzaj\u00FAci
+QuickFindAction.FORWARD.text=N\u00E1js\u0165 \u010Fal\u0161\u00ED
+QuickFindAllAction.text=Vybra\u0165 v\u0161etky zodpovedaj\u00FAce uzly
+QuickHighlightAction.text=Zv\u00FDrazni\u0165 v\u0161etky zodpovedaj\u00FAce uzly
+QuitAction.text=Ukon\u010Di\u0165 Freeplane
 read_only=Iba na \u010D\u00EDtanie
+ReadScriptError.text=Chyba \u010D\u00EDtania skriptu
+really_convert_to_current_version=<html>T\u00E1to mapa bola vytvoren\u00E1 star\u0161ou verziou Freeplane. <br>M\u00F4\u017Ee by\u0165 skonvertovan\u00E1 (odpor\u00FA\u010Da sa)? <br>(Inak bude na\u010D\u00EDtan\u00E1 tak ako je, ale bez z\u00E1ruky.) </html>
+really_cut_node=Skuto\u010Dne vystrihn\u00FA\u0165 uzol/uzly?
+really_execute_script=Skuto\u010Dne chcete spusti\u0165 skripty obsiahnut\u00E9 v tejto mape? Mohli by po\u0161kodi\u0165 v\u00E1\u0161 po\u010D\u00EDta\u010D.
+really_remove_node=Skuto\u010Dne zmaza\u0165 uzol/uzly?
+really_remove_notes=Skuto\u010Dne odstr\u00E1ni\u0165 pozn\u00E1mku(y)?
+ReapplyFilterAction.text=Opakova\u0165 filtrovanie
+red=\u010Cerven\u00E1
+RedefineStyleAction.text=Predefinova\u0165 \u0161t\u00FDl
 RedoAction.text=Znova
-RedoFilterAction.text=Znova
-ReminderHookAction.text=Odstr\u00E1\u0148 pripomienku
-ReminderHookAction.tooltip=Odstr\u00E1ni pozn\u00E1mku z uzla
+RedoFilterAction.text=Znova filtrovanie
+regular_expressions=Regul\u00E1rne v\u00FDrazy
+ReminderHookAction.text=Odstr\u00E1ni\u0165 pripomienku
+ReminderHookAction.tooltip=Odstr\u00E1ni pripomienku z uzla.
+reminderNotification=Upozornenie pripomienky
+remove_file_from_list_on_error=S\u00FAbor {0} sa nepodarilo otvori\u0165. Odstr\u00E1ni\u0165 ho zo zoznamu naposledy otvoren\u00FDch s\u00FAborov?
+remove_shortcut_question=Nahradi\u0165 kl\u00E1vesov\u00FA skratku?
+RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Obnovi\u0165 zbalen\u00E9 uzly
+RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Povol\u00ED zba\u013Eovanie pre ka\u017Ed\u00FD uzol
 RemoveAllIconsAction.text=Odstr\u00E1\u0148 v\u0161etky ikony
+RemoveConnectorAction.text=Odstr\u00E1ni\u0165 prepojenie
+RemoveEncryption.text=Odstr\u00E1ni\u0165 heslo
+RemoveFormatAction.text=Odstr\u00E1ni\u0165 form\u00E1tovanie
+RemoveIcon_0_Action.text=Odstr\u00E1ni\u0165 prv\u00FA ikonu
 RemoveIconAction.text=Odstr\u00E1\u0148 posledn\u00FA ikonu
+RemoveNoteAction.text=Odstr\u00E1ni\u0165 pozn\u00E1mku
+RemoveNoteAction.tooltip=<html>Odstr\u00E1ni obsah pozn\u00E1mky z nieko\u013Ek\u00FDch pozn\u00E1mok.</html>
+rename=P&remenova\u0165
 repair_link=Oprav linku
-repair_link_question=Nem\u00F4\u017Eem na\u010D\u00EDta\u0165 linkovan\u00FA mapu. Oprav\u00EDte linku ru\u010Dne?
-replace=Nahra\u010F
-ResetNodeLocationAction.text=Vr\u00E1\u0165 poz\u00EDciu
+repair_link_question=Ned\u00E1 sa na\u010D\u00EDta\u0165 odkazovan\u00E1 mapa. Opravi\u0165 odkaz manu\u00E1lne?
+replace=Nahradi\u0165
+replace_shortcut_question=T\u00E1to kl\u00E1vesov\u00E1 skratka je v s\u00FA\u010Dasnosti priraden\u00E1 k\n  {0}.\nNahradi\u0165 toto priradenie?
+replace_shortcut_title=Nahradi\u0165 kl\u00E1vesov\u00FA skratku?
+ReportBugAction.text=Nahl\u00E1si\u0165 chybu
+RequestFeatureAction.text=Po\u017Eiada\u0165 o funk\u010Dnos\u0165
+reset_to_default=Pou\u017Ei\u0165 predvolen\u00FD
+ResetNodeLocationAction.text=Obnovi\u0165 poz\u00EDciu uzla
+ResetStyleAction.text=Obnovi\u0165 \u0161t\u00FDl uzla
+RevertAction.text=Obnovi\u0165 z miestnej hist\u00F3rie
+RevisionPluginAction.text=Zmeni\u0165 farbu pozadia rev\u00EDzi\u00ED
+save=Ulo\u017Ei\u0165
 save_failed=Nepodarilo sa ulo\u017Ei\u0165 mapu {0}.
-save_unsaved=Ulo\u017Ei\u0165 nasleduj\u00FAcu mapu my\u0161lienok? :
-SaveAction.text=Ulo\u017E
-SaveAll.text=Ulo\u017E v\u0161etky
-SaveAll.tooltip=Ulo\u017E\u00ED v\u0161etky otvoren\u00E9 mapy.
-SaveAsAction.text=Ulo\u017E ako...
+save_unsaved=Ulo\u017Ei\u0165 nasleduj\u00FAcu my\u0161lienkov\u00FA mapu?
+save_unsaved_styles=Ulo\u017Ei\u0165 \u0161t\u00FDly?
+SaveAcceleratorPresetsAction.text=Ulo\u017Ei\u0165 sadu kl\u00E1vesov\u00FDch skratiek...
+SaveAction.text=Ulo\u017Ei\u0165 mapu
+SaveAction_readonlyMsg=T\u00E1to mapa je len na \u010D\u00EDtanie. Pre jej ulo\u017Eenie pros\u00EDm pou\u017Eite 'S\u00FAbor->Ulo\u017Ei\u0165 mapu ako...'.
+SaveAction_readonlyTitle=Pokus o ulo\u017Eenie mapy ur\u010Denej len na \u010D\u00EDtanie
+SaveAll.text=Ulo\u017Ei\u0165 v\u0161etky m&apy
+SaveAll.tooltip=Ulo\u017E\u00ED v\u0161etky otvoren\u00E9 mapy
+SaveAs_toReadonlyMsg={0} je len na \u010D\u00EDtanie. Ulo\u017Ete to pros\u00EDm do in\u00E9ho s\u00FAboru.
+SaveAs_toReadonlyTitle=Pokus o ulo\u017Eenie do s\u00FAboru ozna\u010Den\u00E9ho len na \u010D\u00EDtanie
+SaveAsAction.text=Ulo\u017Ei\u0165 mapu ako...
 saved=Ulo\u017Een\u00E9
+saving_canceled=Ukladanie zru\u0161en\u00E9
+scanners_not_loaded=Skenery sa nedaj\u00FA na\u010D\u00EDta\u0165, s\u00FAbor je po\u0161koden\u00FD
 scheme_evaluate=Vyhodno\u0165!
+script_execution_disabled=Sp\u00FA\u0161\u0165anie skriptov je zak\u00E1zan\u00E9, vi\u010F N\u00E1stroje/Nastavenia/Z\u00E1suvn\u00E9 moduly
+ScriptEditor.text=Upravi\u0165 skript...
+ScriptEditor.tooltip=Umo\u017En\u00ED p\u00EDsa\u0165 v\u00E4\u010D\u0161ie skripty vo Freeplane.
+ScriptEditorPanel.changed_cancel=Skripty boli zmenen\u00E9. Skuto\u010Dne chcete zahodi\u0165 tieto zmeny?
+scripting=Skripty
+scripting_api_generator_legend=Legenda
+scripting_api_generator_proxy=Proxy
+scripting_api_generator_title=Skriptovacie API
+scripting_api_generator_utilities=Pom\u00F4cky
+scripting_api_generator_web=Webov\u00E9 zdroje
+ScriptsRunToggleAction.ON_SELECTED_NODE.text=Spusti\u0165 skripty na v\u0161etk\u00FDch vybran\u00FDch uzloch
+ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=Spusti\u0165 skripty na vybran\u00FDch uzloch rekurz\u00EDvne
+ScriptsRunToggleAction.ON_SINGLE_NODE.text=Spusti\u0165 skripty na jednom vybranom uzle
 select_favorites_folder=Vyberte adres\u00E1r, kde sa nach\u00E1dzaj\u00FA va\u0161e ob\u013E\u00FAben\u00E9 polo\u017Eky
+select_file_export_to=Vybra\u0165 s\u00FAbor, do ktor\u00E9ho sa bude exportova\u0165
 select_folder_for_importing=Vyberte adres\u00E1r na import
-SelectAllAction.text=Ozna\u010D v\u0161etky vidite\u013En\u00E9
-SelectBranchAction.text=Ozna\u010D vidite\u013En\u00FA vetvu
+select_icon=Vybra\u0165 ikonu
+select_menu_item_dialog=Vybra\u0165 polo\u017Eku menu
+select_menu_item_root_node=Menu
+select_template=Vybra\u0165 \u0161abl\u00F3nu
+SelectAllAction.text=Vybra\u0165 v\u0161etky vidite\u013En\u00E9 uzly
+SelectBranchAction.text=Vybra\u0165 vidite\u013En\u00FA vetvu
+SelectedPasteAction.text=Vlo\u017Ei\u0165 ako...
 selection_method_by_click=Ozna\u010Dte jednoduch\u00FDm kliknut\u00EDm
 selection_method_delayed=Spomalen\u00E9 automatick\u00E9 ozna\u010Dovanie
 selection_method_direct=Ozna\u010Dte uk\u00E1zan\u00EDm
+SelectNoteAction.text=Prepn\u00FA\u0165 editor pozn\u00E1mky
+SelectNoteAction.tooltip=Prepn\u00FA\u0165 sa z/do panelu s pozn\u00E1mkou
+set_accelerator_on_next_click_helpmessage=Pre vytvorenie novej kl\u00E1vesovej skratky kliknite na po\u017Eadovan\u00FD pr\u00EDkaz v menu.
+SetAccelerator.dialogTitle=Prira\u010Fovanie kl\u00E1vesov\u00FDch skratiek
+SetAccelerator.keystrokeDetected=Kombin\u00E1cia kl\u00E1ves ''{0}'' nie je priraden\u00E1 k \u017Eiadnej polo\u017Eke menu.
+SetAcceleratorOnNextClickAction.text=Priradi\u0165 kl\u00E1vesov\u00FA skratku
+SetAlwaysUnfoldedNodeFlagsAction.tooltip=Zabr\u00E1ni zbaleniu aktu\u00E1lne rozbalen\u00FDch uzlov
 SetImageByFileChooserAction.text=Obr\u00E1zok (vyberte s\u00FAbor alebo linku)...
-SetLinkByFileChooserAction.text=Hyperlinka (vyberte s\u00FAbor)...
-SetLinkByTextFieldAction.text=Hyperlinka (zadajte text)...
-ShowAllAttributesAction.text=Uk\u00E1\u017E v\u0161etky atrib\u00FAty
-ShowAncestorsAction.text=Uk\u00E1\u017E predkov
-ShowAttributeDialogAction.text=Spr\u00E1vca atrib\u00FAtov
-ShowDescendantsAction.text=Uk\u00E1\u017E potomkov
-ShowFilterToolbarAction.text=Filter Toolbar[translate me]
-ShowSelectedAttributesAction.text=Uk\u00E1\u00FD ozna\u010Den\u00E9 atrib\u00FAty
-simplyhtml.boldName=bold[translate me]
+SetLinkAnchorAction.text=Nastavi\u0165 kotvu odkazu
+SetLinkAnchorAction.tooltip=<html>nastavi\u0165 zvolen\u00FD uzol ako kotvu pre pr\u00EDpad<br/>vytv\u00E1rania miestnych alebo glob\u00E1lnych odkazov.
+SetLinkByFileChooserAction.text=Prida\u0165 hypertextov\u00FD odkaz (v\u00FDberom)...
+SetLinkByTextFieldAction.text=Prida\u0165 alebo upravi\u0165 hypertextov\u00FD odkaz (manu\u00E1lne)...
+SetNodeLink.text=Nastvi\u0165 odkaz uzla...
+SetNoteWindowPosition.bottom.text=Dolu
+SetNoteWindowPosition.left.text=V\u013Eavo
+SetNoteWindowPosition.right.text=Vpravo
+SetNoteWindowPosition.top.text=Hore
+SetShortenerStateAction.text=Minimalizova\u0165 uzol
+sf_login_required=Je potrebn\u00E9 prihl\u00E1senie do Source Forge. Pokra\u010Dova\u0165?
+ShowAllAttributesAction.text=Zobrazi\u0165 v\u0161etky atrib\u00FAty
+ShowAncestorsAction.text=Zobrazi\u0165 predkov
+ShowAttributeDialogAction.text=Spr\u00E1vca atrib\u00FAtov...
+ShowDescendantsAction.text=Zobrazi\u0165 potomkov
+ShowFilterToolbarAction.text=Li\u0161ta filtrov
+ShowFirstSlideAction.text=Prv\u00FD sn\u00EDmok
+ShowFirstSlideAndStartPresentationAction.text=Spusti\u0165 prezent\u00E1ciu od za\u010Diatku
+ShowFormatPanel.text=Panel n\u00E1strojov
+ShowFormatPanel.tooltip=Zobraz\u00ED dial\u00F3g, v ktorom je mo\u017En\u00E9 naraz upravova\u0165 atrib\u00FAty uzla aj spoja.
+ShowHideNoteAction.text=Zobrazi\u0165 panel s pozn\u00E1mkou
+ShowHideNoteAction.tooltip=Ponech\u00E1 panel s pozn\u00E1mkou zobrazen\u00FD alebo skryt\u00FD.
+ShowLastSlideAction.text=Posledn\u00FD sn\u00EDmok
+ShowNextChildAction.text=Zobrazi\u0165 nasleduj\u00FAceho potomka
+ShowNextSlideAction.text=\u010Eal\u0161\u00ED sn\u00EDmok
+ShowNotesInMapAction.text=Zobrazi\u0165 pozn\u00E1mky v mape
+ShowPreviousSlideAction.text=Predch\u00E1dzaj\u00FAci sn\u00EDmok
+ShowSelectedAttributesAction.text=Zobrazi\u0165 zvolen\u00E9 atrib\u00FAty
+ShowSelectionAsRectangleAction.text=Obd\u013A\u017Enikov\u00FD v\u00FDber
+simplyhtml.aboutFrameTitle=O tejto aplik\u00E1cii
+simplyhtml.aboutLabel=O SimplyHTML...
+simplyhtml.alignCenter=na stred
+simplyhtml.alignLabel=Zarovnanie:
+simplyhtml.alignLeft=na\u013Eavo
+simplyhtml.alignRight=napravo
+simplyhtml.allCellsRangeLabel=v\u0161etky bunky
+simplyhtml.allOccurrencesReplaced=V\u0161etky v\u00FDskyty nahraden\u00E9
+simplyhtml.appendTableColLabel=Prida\u0165 st\u013Apec
+simplyhtml.appendTableRowLabel=Prida\u0165 riadok
+simplyhtml.applyCellAttrLabel=Pou\u017Ei\u0165 na
+simplyhtml.backgroundLabel=Pozadie:
+simplyhtml.blackFontColorLabel=\u010Cierna
+simplyhtml.blueFontColorLabel=Modr\u00E1
+simplyhtml.boldItalicName=hrub\u00E1 kurz\u00EDva
+simplyhtml.boldName=hrub\u00E9
+simplyhtml.borderColorLabel=Farba:
 simplyhtml.borderWidthLabel=\u0160\u00EDrka
-simplyhtml.cancelBtnName=Storno
+simplyhtml.bottomLabel=dolu:
+simplyhtml.cancelBtnName=Zru\u0161i\u0165
+simplyhtml.cellBorderTabLabel=Ohrani\u010Denia
 simplyhtml.cellGenTabLabel=V\u0161eobecn\u00E9
-simplyhtml.close=Zavri
-simplyhtml.closeBtnName=Zavri
-simplyhtml.copyLabel=Kop\u00EDruj
-simplyhtml.cutLabel=Vystrihni
+simplyhtml.cellMarginTabLabel=Okraj
+simplyhtml.cellPanelTitle=Form\u00E1t bunky
+simplyhtml.clearFormatLabel=Odstr\u00E1ni\u0165 form\u00E1tovanie
+simplyhtml.clearFormatTip=Odstr\u00E1ni\u0165 form\u00E1tovanie
+simplyhtml.close=Zavrie\u0165
+simplyhtml.closeBtnName=Zavrie\u0165
+simplyhtml.colorLabel=Farba
+simplyhtml.copyLabel=Kop\u00EDrova\u0165
+simplyhtml.copyTip=kop\u00EDrova\u0165
+simplyhtml.cTagNameHead1=Nadpis 1
+simplyhtml.cTagNameHead2=Nadpis 2
+simplyhtml.cTagNameHead3=Nadpis 3
+simplyhtml.cTagNameHead4=Nadpis 4
+simplyhtml.cTagNameHead5=Nadpis 5
+simplyhtml.cTagNameHead6=Nadpis 6
+simplyhtml.cTagNameLink=Odkaz
+simplyhtml.cTagNameOL=\u010C\u00EDslovan\u00FD zoznam
+simplyhtml.cTagNamePara=Odstavec
+simplyhtml.cTagNameUL=Ne\u010D\u00EDslovan\u00FD zoznam
+simplyhtml.cutLabel=Vystrihn\u00FA\u0165
+simplyhtml.cutTip=vystrihn\u00FA\u0165
+simplyhtml.decreaseFontSizeLabel=Men\u0161ie
 simplyhtml.defaultDocName=Untitled[translate me]
-simplyhtml.editLabel=Edituj
-simplyhtml.effectLabel=Effect[translate me]
-simplyhtml.fontBoldLabel=Tu\u010Dn\u00E9
+simplyhtml.deleteTableColLabel=Zmaza\u0165 st\u013Apec
+simplyhtml.deleteTableRowLabel=Zmaza\u0165 riadok
+simplyhtml.docTitleQuery=Nastavi\u0165 nadpis na:
+simplyhtml.docTitleTitle=Upravi\u0165 nadpis dokumentu
+simplyhtml.editLabel=Upravi\u0165
+simplyhtml.effectLabel=Efekt
+simplyhtml.familyLabel=Rodina
+simplyhtml.findNext=N\u00E1js\u0165 \u010Fal\u0161ie...
+simplyhtml.findReplaceDialogTitle=N\u00E1js\u0165 a nahradi\u0165
+simplyhtml.findReplaceLabel=N\u00E1js\u0165 a nahradi\u0165
+simplyhtml.findReplaceTip=N\u00E1js\u0165 a nahradi\u0165
+simplyhtml.fontBoldLabel=Hrub\u00E9
+simplyhtml.fontBoldTip=prepn\u00FA\u0165 hrub\u00E9 zap/vyp
+simplyhtml.fontColorLabel=Farba textu
+simplyhtml.fontColorTip=Farba textu
+simplyhtml.fontDialogTitle=Form\u00E1tova\u0165 p\u00EDsmo
 simplyhtml.fontItalicLabel=Kurz\u00EDva
+simplyhtml.fontItalicTip=prepn\u00FA\u0165 kurz\u00EDvu zap/vyp
+simplyhtml.fontLabel=P\u00EDsmo...
 simplyhtml.fontTabLabel=P\u00EDsmo
-simplyhtml.fontUnderlineLabel=Pod\u010Diarkni
+simplyhtml.fontTip=Form\u00E1tova\u0165 p\u00EDsmo...
+simplyhtml.fontUnderlineLabel=Pod\u010Diarknutie
+simplyhtml.fontUnderlineTip=prepn\u00FA\u0165 pod\u010Diarknutie zap/vyp
+simplyhtml.foregroundLabel=Popredie:
+simplyhtml.formatLabel=Form\u00E1tova\u0165
+simplyhtml.formatListLabel=Zoznam...
+simplyhtml.formatListTip=zmeni\u0165 form\u00E1t zoznamu
+simplyhtml.formatParaLabel=Odstavec...
+simplyhtml.formatParaTip=Zmeni\u0165 form\u00E1tovanie odstavca
+simplyhtml.formatTableLabel=Tabu\u013Eka...
+simplyhtml.formatTableTip=Form\u00E1tova\u0165 tabu\u013Eku
+simplyhtml.greenFontColorLabel=Zelen\u00E1
 simplyhtml.helpLabel=Pomoc
+simplyhtml.htmlTabTitle=HTML k\u00F3d
+simplyhtml.imageFileDesc=S\u00FAbory obr\u00E1zkov
+simplyhtml.increaseFontSizeLabel=V\u00E4\u010D\u0161ie
+simplyhtml.insertTableColLabel=Vlo\u017Ei\u0165 st\u013Apec
+simplyhtml.insertTableLabel=Tabu\u013Eka...
+simplyhtml.insertTableMsg=Ko\u013Eko st\u013Apcov?
+simplyhtml.insertTableRowLabel=Vlo\u017Ei\u0165 riadok
+simplyhtml.insertTableTitle=Vlo\u017Ei\u0165 tabu\u013Eku
+simplyhtml.italicName=kurz\u00EDva
+simplyhtml.layoutTabTitle=Norm\u00E1lny poh\u013Ead
+simplyhtml.leftLabel=v\u013Eavo:
+simplyhtml.listDialogTitle=Form\u00E1tova\u0165 zoznam
+simplyhtml.listIndentTitle=Odsadenie:
+simplyhtml.listPosInside=vn\u00FAtri
+simplyhtml.listPositionLabel=Umiestnenie:
+simplyhtml.listPosOutside=vonku
+simplyhtml.listTypeCircle=okr\u00FAhla odr\u00E1\u017Eka
+simplyhtml.listTypeDecimal=1.,2.,3.,4.
+simplyhtml.listTypeDisc=symbol s\u00FAboru ako odr\u00E1\u017Eka
+simplyhtml.listTypeLabel=Typ:
+simplyhtml.listTypeLowerAlpha=a.,b.,c.,d.
+simplyhtml.listTypeLowerRoman=i.,ii.,iii.,iv.
+simplyhtml.listTypeNone=\u017Eiadne
+simplyhtml.listTypeSquare=\u0161tvorcov\u00E1 odr\u00E1\u017Eka
+simplyhtml.listTypeUpperAlpha=A.,B.,C.,D.
+simplyhtml.listTypeUpperRoman=I.,II.,III.,IV.
+simplyhtml.marginLabel=Vonkaj\u0161\u00ED
+simplyhtml.matchApproximately=Porovn\u00E1va\u0165 pribli\u017Ene
+simplyhtml.matchApproximately.tooltip=<html>\u010Ci povoli\u0165 aj pribli\u017En\u00E9 porovn\u00E1vanie,<br/>napr. vyh\u013Ead\u00E1vanie 'kon\u00E1r' najde aj 'kor\u00E1n'.</html>
+simplyhtml.matchCase=Rozli\u0161ova\u0165 mal\u00E9 a ve\u013Ek\u00E9 p\u00EDsmen\u00E1
+simplyhtml.matchCase.tooltip=\u010Ci sa m\u00E1 v pr\u00EDpade zhody re\u0161pektova\u0165 ve\u013Ekos\u0165 p\u00EDsmen.
+simplyhtml.newStyleDefaultName=nov\u00FD \u0161t\u00FDl
+simplyhtml.nextTableCellLabel=\u010Eal\u0161ia bunka
+simplyhtml.noLineLabel=\u017Eiadne
+simplyhtml.noMoreOccurrencesFound=nen\u00E1jden\u00FD \u017Eiaden (\u010Fal\u0161\u00ED) v\u00FDskyt
 simplyhtml.okBtnName=OK
-simplyhtml.pasteLabel=Vlo\u017E
-simplyhtml.plainName=plain[translate me]
+simplyhtml.paddingLabel=Vn\u00FAtorn\u00FD
+simplyhtml.paraAlignCenterLabel=Zarovna\u0165 na stred
+simplyhtml.paraAlignCenterTip=Nastavi\u0165 zarovnanie odstavca na stred
+simplyhtml.paraAlignLeftLabel=Zarovna\u0165 na\u013Eavo
+simplyhtml.paraAlignLeftTip=Nastavi\u0165 zarovnanie odstavca na\u013Eavo
+simplyhtml.paraAlignRightLabel=Zarovna\u0165 napravo
+simplyhtml.paraAlignRightTip=Nastavi\u0165 zarovnanie odstavca napravo
+simplyhtml.paraStyleDialogTitle=\u0160t\u00FDl odstavca
+simplyhtml.paraTabLabel=Odstavec
+simplyhtml.pasteHTMLLabel=Vlo\u017Ei\u0165 HTML
+simplyhtml.pasteLabel=Vlo\u017Ei\u0165
+simplyhtml.pastePlainTextLabel=Vlo\u017Ei\u0165 neform\u00E1tovan\u00FD text
+simplyhtml.pasteTip=vlo\u017Ei\u0165
+simplyhtml.plainName=norm\u00E1lne
+simplyhtml.previewLabel=N\u00E1h\u013Ead
+simplyhtml.previewText=N\u00E1h\u013Ead textu
+simplyhtml.prevTableCellLabel=Predch\u00E1dzaj\u00FAca bunka
+simplyhtml.printLabel=Tla\u010Di\u0165...
+simplyhtml.redFontColorLabel=\u010Cerven\u00E1
 simplyhtml.redoLabel=Znova
+simplyhtml.redoTip=znovu
+simplyhtml.removeFontColorLabel=Odstr\u00E1ni\u0165 farbu
+simplyhtml.replace=Nahradi\u0165...
 simplyhtml.replaceAll=V\u0161etky
+simplyhtml.replaceDone=Hotovo
 simplyhtml.replaceNo=Nie
+simplyhtml.replaceThisQuery=nahradi\u0165 tento v\u00FDskyt
+simplyhtml.replaceWith=Nahradi\u0165 s:
 simplyhtml.replaceYes=\u00C1no
+simplyhtml.rightLabel=vpravo:
+simplyhtml.searchDown.tooltip=Preh\u013Eada\u0165 zhora dolu.
+simplyhtml.searchFromStart=H\u013Eada\u0165 od za\u010Diatku
+simplyhtml.searchFromStart.tooltip=Za\u010Dne preh\u013Ead\u00E1va\u0165 od vrchu namiesto od poz\u00EDcie kurzora.
+simplyhtml.searchUp=H\u013Eada\u0165 smerom nahor
+simplyhtml.searchUp.tooltip=Preh\u013Eada\u0165 zdola nahor.
+simplyhtml.selectAllLabel=Vybra\u0165 v\u0161etko
+simplyhtml.selectedFontColorLabel=Vybran\u00E1 farba p\u00EDsma
+simplyhtml.sizeLabel=Ve\u013Ekos\u0165
+simplyhtml.standardStyleName=\u0161tandardn\u00FD
+simplyhtml.strikeLabel=Pre\u0161krtnutie
 simplyhtml.styleLabel=\u0160t\u00FDl
-simplyhtml.uLineLabel=Pod\u010Diarkni
+simplyhtml.styleNameInputText=N\u00E1zov nov\u00E9ho \u0161t\u00FDlu?
+simplyhtml.styleNameInputTitle=Ulo\u017Ei\u0165 \u0161t\u00FDl
+simplyhtml.tableBgColLabel=Farba pozadia:
+simplyhtml.tableDialogTitle=Form\u00E1tova\u0165 tabu\u013Eku
+simplyhtml.tableLabel=Tabu\u013Eka
+simplyhtml.tablePanelTitle=Form\u00E1t tabu\u013Eky
+simplyhtml.tableWidthLabel=\u0160\u00EDrka:
+simplyhtml.textIndentLabel=Odsadenie:
+simplyhtml.textToFind=H\u013Eadan\u00FD text:
+simplyhtml.thisCellRangeLabel=t\u00E1to bunka
+simplyhtml.thisColRangeLabel=tento st\u013Apec
+simplyhtml.thisRowRangeLabel=tento riadok
+simplyhtml.toggleBulletsLabel=Zoznam s odr\u00E1\u017Ekami zap/vyp
+simplyhtml.toggleBulletsTip=zoznam s odr\u00E1\u017Ekami zap/vyp
+simplyhtml.toggleNumbersLabel=\u010C\u00EDslovan\u00FD zoznam zap/vyp
+simplyhtml.toggleNumbersTip=\u010D\u00EDslovan\u00FD zoznam zap/vyp
+simplyhtml.topLabel=hore:
+simplyhtml.uLineLabel=Pod\u010Diarknutie
 simplyhtml.undoLabel=Sp\u00E4\u0165
+simplyhtml.undoTip=sp\u00E4\u0165
+simplyhtml.valignBaseline=na z\u00E1kladn\u00FA \u010Diaru
+simplyhtml.valignBottom=nadol
+simplyhtml.valignLabel=Zvisl\u00E9 zarovnanie:
+simplyhtml.valignMiddle=na stred
+simplyhtml.valignTop=nahor
+slide.at_center.tooltip=v strede
+slide.content=Obsah sn\u00EDmku
+slide.descendants=Zobrazi\u0165 potomkov
+slide.filter=Filter
+slide.first=Prv\u00FD
+slide.last=Posledn\u00FD
+slide.next=\u010Eal\u0161\u00ED
+slide.nofilter=Bez filtra
+slide.on_the_left.tooltip=na\u013Eavo
+slide.placenode=Umiestni\u0165 vybran\u00FD uzol
+slide.placenode.tooltip=ke\u010F je sn\u00EDmka prezentovan\u00E1
+slide.present=Spusti\u0165
+slide.presentation=Prezent\u00E1cia
+slide.presentations=Prezent\u00E1cie
+slide.previous=Predch\u00E1dzaj\u00FAci
+slide.setfilter=Nastavi\u0165 filter
+slide.setfilter.tooltip=Nastavi\u0165 alebo odstr\u00E1ni\u0165 filter, ktor\u00FD bude pou\u017Eit\u00FD pri zobrazen\u00ED sn\u00EDmku
+slide.setfoldingstate=Nastavi\u0165 zba\u013Eovanie
+slide.setfoldingstate.tooltip=Obnovi\u0165 aktu\u00E1lne zba\u013Eovanie, ke\u010F sa sn\u00EDmok zobraz\u00ED
+slide.setzoom=Nastavi\u0165 pribl\u00ED\u017Eenie
+slide.setzoom.tooltip=Nastavi\u0165 alebo odstr\u00E1ni\u0165 pribl\u00ED\u017Eenie mapy pou\u017Eit\u00E9 pri zobrazen\u00ED sn\u00EDmku
+slide.showancestors=Zobrazi\u0165 predkov
+slide.showonlyselected=Zobrazi\u0165 len zvolen\u00E9 uzly
+slide.showonlyselected.tooltip=Skry\u0165 ostatn\u00E9 uzly ke\u010F sa sn\u00EDmok zobraz\u00ED
+slide.slides=Sn\u00EDmky
+slide.stop=Zastavi\u0165
+SortNodes.text=Zoradi\u0165 potomkov
+SortNodes.tooltip=Abecedne zorad\u00ED v\u0161etk\u00FDch potomkov uzla.
 split=&Rozde\u013E
+StartPresentationAction.text=Spusti\u0165 prezent\u00E1ciu
+StartPresentationOrShowNextSlideAction.text=Spusti\u0165 prezent\u00E1ciu/\u010Eal\u0161\u00ED sn\u00EDmok
+StopPresentationAction.text=Zastavi\u0165 prezent\u00E1ciu
 style=\u0160t\u00FDl
+styledialog.cancel.text=Zru\u0161i\u0165
+styles=\u0160t\u00FDl&y
+styles.important=D\u00F4le\u017Eit\u00E9
+styles.subsubtopic=Podpodt\u00E9ma
+styles.subtopic=Podt\u00E9ma
+styles.topic=T\u00E9ma
+styles_background_html=\n <html>\n <head>\n </head>\n <body>\n <table width="800" style="text-align: left; vertical-align: top">\n <tr valign="top">\n <th>\n <div style="margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; margin-left: 0pt; text-align: center; font-weight: bold">\n O tejto sade st\u00FDlov\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n Tento \u0161tandard bol vyvinut\u00FD po jeden\u00E1stich rokoch pedagogick\u00E9ho v\u0 [...]
+summary_not_possible=Pre aktu\u00E1lny v\u00FDber sa ned\u00E1 vytvori\u0165 s\u00FAhrnn\u00FD uzol
 svg=SVG[translate me]
-TimeListAction.text=Zobraz zoznam pl\u00E1nova\u010Da \u010Dasu...
-TimeListAction.tooltip=Zobraz v\u0161etky napl\u00E1novan\u00E9 \u010Dasy a zodpovedaj\u00FAce uzly.
-TimeManagementAction.text=Zobraz kalend\u00E1r...
-TimeManagementAction.tooltip=<html>Zobraz\u00ED kalend\u00E1rov\u00FD modul od Kai Toedter.</html>
+template_dir=\u0160tandardn\u00E9 \u0161abl\u00F3ny
+TextAlignAction.CENTER.text=Vystreden\u00FD text
+TextAlignAction.DEFAULT.text=Predvolen\u00FD
+TextAlignAction.LEFT.text=Text zarovnan\u00FD na\u013Eavo
+TextAlignAction.RIGHT.text=Text zarovnan\u00FD napravo
+TextChangeHotKeyAction.text=Nastavi\u0165 kl\u00E1vesov\u00FA skratku pre zmenu textu
+TimeListAction.text=Spravova\u0165 \u00FAlohy...
+TimeListAction.tooltip=Zobraz\u00ED v\u0161etky napl\u00E1novan\u00E9 \u010Dasy a zodpovedaj\u00FAce uzly.
+TimeManagementAction.text=Spravova\u0165 \u010Das...
+TimeManagementAction.tooltip=<html>Zobraz\u00ED modul kalend\u00E1ra od Kai Toedter.</html>
+TimePeriodUnits.days=dn\u00ED
+TimePeriodUnits.hours=hod\u00EDn
+TimePeriodUnits.minutes=min\u00FAt
+TimePeriodUnits.ms=milisek\u00FAnd
+TimePeriodUnits.seconds=sek\u00FAnd
+TimePeriodUnits.weeks=t\u00FD\u017Ed\u0148ov
 ToggleChildrenFoldedAction.text=Rozba\u013E / Zba\u013E deti
-ToggleFBarAction.text=F-Bar[translate me]
+ToggleDetailsAction.text=Skry\u0165 podrobnosti
+ToggleFBarAction.text=Li\u0161ta funk\u010Dn\u00FDch kl\u00E1ves
 ToggleFoldedAction.text=Prepni zbalen\u00E9
-ToggleLeftToolbarAction.text=Prepni \u013Eav\u00E9 menu
-ToggleMenubarAction.text=Prepni menu
-ToggleToolbarAction.text=Prepni n\u00E1strojov\u00FA li\u0161tu
+ToggleFullScreenAction.text=Na cel\u00FA obrazovku
+ToggleLeftToolbarAction.text=Li\u0161ta ikon
+ToggleMenubarAction.text=Li\u0161ta menu
+ToggleScrollbarsAction.text=Skrolovacie li\u0161ty
+ToggleStatusAction.text=Stavov\u00FD riadok
+ToggleToolbarAction.text=N\u00E1strojov\u00E1 li\u0161ta
 undefined_error=Nastava ne\u010Dakan\u00E1 chyba. Pros\u00EDm pok\u00FAste sa nahl\u00E1si\u0165 chybov\u00FA spr\u00E1vu.
-underline=Pod\u010Diarkni
+underline=Pod\u010Diarknu\u0165
+UnderlineAction.text=Pod\u010Diarknu\u0165
 underlined=Pod\u010Diarknut\u00E9
 UndoAction.text=Sp\u00E4\u0165
-UndoFilterAction.text=Sp\u00E4\u0165
+UndoFilterAction.text=Sp\u00E4\u0165 filtrovanie
 unfold=Rozba\u013E
 UnfoldAllAction.text=Rozba\u013E v\u0161etky
 UnfoldAllAction.tooltip=<html>Rozbal\u00ED ozna\u010Den\u00FD uzol a v\u0161etky jeho poduzly.</html>
 UnfoldOneLevelAction.text=Rozba\u013E jednu \u00FArove\u0148
-UnfoldOneLevelAction.tooltip=<html>Rozbal\u00ED ozna\u010Den\u00E9 uzly o jednu \u00FArove\u0148.</html>
+UnfoldOneLevelAction.tooltip=Rozbal\u00ED vybran\u00E9 uzly o jednu \u00FArove\u0148.
+UpdateCheckAction.text=Skontrolova\u0165 aktualiz\u00E1cie
+updater.goToDownload=Prejs\u0165 na s\u0165ahovanie
 url_error=Toto URL je nespr\u00E1vne zap\u00EDsan\u00E9!
 url_load_error=Neviem na\u010D\u00EDta\u0165 mapu z URL:
-UsePlainTextAction.text=Pou\u017Ei\u0165 hol\u00FD text
+UsePlainTextAction.text=Pou\u017Ei\u0165 neform\u00E1tovan\u00FD text
 user_config_folder=Adres\u00E1r pre konfigur\u00E1ciu pou\u017E\u00EDvate\u013Ea: {0}
 user_defined_filters=Filtre definovan\u00E9 pou\u017E\u00EDvate\u013Eom
 user_defined_scale=Mierka definovan\u00E1 po&u\u017E\u00EDvate\u013Eom
diff --git a/freeplane/resources/translations/Resources_sl.properties b/freeplane/resources/translations/Resources_sl.properties
index ddf3223..f042fdc 100644
--- a/freeplane/resources/translations/Resources_sl.properties
+++ b/freeplane/resources/translations/Resources_sl.properties
@@ -4,7 +4,7 @@ acceleratorPresets=Prednastavitev tipk za bli\u017Enjico
 accelerators_loading_error=Ne morem nalo\u017Eiti bli\u017Enjice na tipkovnici iz {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=Spremeni obliko vozli\u0161\u010D
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Spremeni vzorec
-accessories/plugins/EncryptNode.properties_0=Izberi geslo za \u0161ifrirano vozli\u0161\u010De
+accessories/plugins/EncryptNode.properties_0=Izberi geslo za za\u0161\u010Diteno (\u0161ifrirano) vozli\u0161\u010De
 accessories/plugins/EncryptNode.properties_1=Gesli se ne ujemata ali pa sta prekratki.
 accessories/plugins/EncryptNode.properties_2=Vnesi geslo:
 accessories/plugins/EncryptNode.properties_3=Ponovno vnesi geslo:
@@ -12,41 +12,73 @@ accessories/plugins/EncryptNode.properties_4=Vnesi svoje geslo.
 accessories/plugins/EncryptNode.properties_5=<html>Zapomnite si, da je mo\u010D \u0161ifriranja<br> odvisna povsem od kvalitete va\u0161ega gesla.
 accessories/plugins/EncryptNode.properties_6=V redu
 accessories/plugins/EncryptNode.properties_7=Prekli\u010Di
-accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Preklapljate lahko le stanje \u0161ifriranja \u0161ifrirnega na\u010Dina. Prosim vstavite tak\u0161no vozli\u0161\u010De s pomo\u010Djo menija orodja.
+accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Preklapljate lahko le stanje \u0161ifriranja \u0161ifriranega na\u010Dina. Prosim, vstavite tak\u0161no vozli\u0161\u010De s pomo\u010Djo menija orodja.
 accessories/plugins/EncryptNode.properties_select_me=Izberi za nadaljevanje!
 accessories/plugins/EncryptNode.properties_wrong_password=Geslo ni pravilno.
 accessories/plugins/Export_JavaWebStart.text=Java Web Start ...
-accessories/plugins/Export_JavaWebStart.tooltip=Izvozi miselni vzorec za java web start.
+accessories/plugins/Export_JavaWebStart.tooltip=Izvozi miselni vzorec kot java web start.
 accessories/plugins/ExportWithTWiki.text=TWiki ...
 accessories/plugins/ExportWithTWiki.tooltip=Izvozi miselni vzorec kot dokument TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=To je uniformna metoda izvoza z uporabo skript XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Program\u010Dek v Javi ...
-accessories/plugins/ExportWithXSLT_Applet.tooltip=Izvozi miselni vzorec kot program\u010Dek za brskalnik v javi.
-accessories/plugins/ExportWithXSLT_HTML.text=XHTML (razli\u010Dica JavaScript) ...
-accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (razli\u010Dica klikalne slike vzorca) ...
+accessories/plugins/ExportWithXSLT_Applet.tooltip=Izvozi miselni vzorec, kot program\u010Dek za brskalnik v javi.
+accessories/plugins/ExportWithXSLT_HTML.text=Kot XHTML (razli\u010Dica JavaScript) ...
+accessories/plugins/ExportWithXSLT_HTML3.text=Kot XHTML (razli\u010Dica klikalne slike vzorca) ...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Viri iz vozli\u0161\u010Da RESOURCES v datoteko TaskJuggler ...
-accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Izvozi vire iz vozli\u0161\u010Da RESOURCES v modul Taskjuggler. </html>
-accessories/plugins/ExportWithXSLT_TASKSTJI.text=Opravilo iz vozli\u0161\u010Da TASKS v datoteko TaskJuggler ...
-accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Izvozi opravila iz vozli\u0161\u010Da TASKS v modul Taskjuggler. </html>
+accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Izvozi vire iz vozli\u0161\u010Da VIRI v modul Taskjuggler.  </html>
+accessories/plugins/ExportWithXSLT_TASKSTJI.text=Opravki iz vozli\u0161\u010Da TASKS v datoteko TaskJuggler ...
+accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Izvozi vire iz vozli\u0161\u010Da VIRI v modul Taskjuggler. </html>
+action_keystroke_in_use_error=Zaporedje pritisnjenih tipk {0} katero \u017Eelite uporabiti za dejanje {1} je \u017Ee v uporabi za dejanje {2}
 active=Aktiven
+actual_map_styles=Pogojni slogi miselnih vzorcev, ki se uporabljajo za vozli\u0161\u010De
+actual_node_styles=Pogojni slogi vozli\u0161\u010Da, ki se uporabljajo za vozli\u0161\u010De
 add=&Dodaj
 AddConnectorAction.text=Pove\u017Ei
+AddElementaryConditionAction.text=Dodaj
+AddExecutionLinkAction.text=Dodaj hiperpovezavo za izvedbo OS ukaza ...
 AddLocalLinkAction.text=Dodaj krajevno hiperpovezavo
 AddMenuItemLinkAction.text=Dodaj hiperpovezavo na to\u010Dko menija ...
+AddOnDetailsPanel.authored.by=Od {0}
 AddOnDetailsPanel.header.function=Funkcija
 AddOnDetailsPanel.header.menu=Lokacija menija
 AddOnDetailsPanel.header.shortcut=Bli\u017Enjica
 AddOnDetailsPanel.homepage=Doma\u010Da stran:
 addons.installer.canceled=Namestitev preklicana
+addons.installer.confirm.licence=<html><body><h1>Licenca</h1>{0}<p><p><em>Ali sprejemate to licenco?</em></p></body></html>
 addons.installer.failed=Namestitev ni uspela: {0}
-addons.installer.freeplaneversion.format.error=Oblika napake v {0} (vrednost:{1})
+addons.installer.freeplaneversion.format.error=Oblika napake v {0} (vrednost: {1})
 addons.installer.html.script=Telo skripta ne sme biti oblikovano kot HTML
 addons.installer.install=Namestitev
 addons.installer.invalid.keyboard.shortcut=Neveljavna bli\u017Enjica {0}.
 addons.installer.licence.unchanged=Licenca je nespremenjena
 addons.installer.map.structure=Napaka v strukturi mape: {0}
+addons.installer.missing.child.nodes=Manjkajo\u010De podrejeno vozli\u0161\u010De: {0}
+addons.installer.missing.permission.attribute=Skript {0}: manjka dovoljenje za atribute {1}
+addons.installer.missing.properties=Manjkajo\u010De lastnosti: {0}
+addons.installer.missing.translation=Manjkajo\u010D prevod od {0} za jezik {1}
 addons.installer.no.scripts=Skript ni bilo mogo\u010De najti
+addons.installer.no.zipdata=Niso najdeni stisnjeni podatki (zip)
+addons.installer.nonstandard.permissions=Skript zahteva naslednja dovoljenja, ki trenutno niso omogo\u010Dena: {0}.\nJih \u017Eelite dodati v standardna dovoljenja?
+addons.installer.one.child.expected=Pri\u010Dakovan je natan\u010Dno en podrejen {0}, vendar je dobil {1}.
+addons.installer.script.name.suffix=Ime skripta {0} nima kon\u010Dnice, kot je ".groovy"
+addons.installer.script.no.execution_mode=Noben "execution_mode" atribut ni definiran za {0}
+addons.installer.script.no.menulocation=Noben "menuLocation" atribut ni definiran za {0}
+addons.installer.script.no.menutitle=Noben "menuTitleKey" atribut ni definiran za {0}
+addons.installer.script.no.permissions=Nobena dovoljenja niso definirana za {0}
+addons.installer.success=Namestitev uspe\u0161na.\nNov dodatek bo na voljo po ponovnem zagonu.
+addons.installer.success.update=Posodobitev iz {0} na {1} je bila uspe\u0161na.\nNekatere funkcije bodo na voljo \u0161ele po ponovnem zagonu.
+addons.installer.title=Nadgradnja dodatka
+addons.installer.too.new=Trenutna Freeplane razli\u010Dica {0} je preve\u010D nova. Ta dodatek podpira najve\u010D {1}
+addons.installer.too.old=Trenutna Freeplane razli\u010Dica {0} je prestara. Ta dodatek potrebuje najmanj {1}
+addons.installer.unknown.deinstallation.rules=Neznana pravila za odstranitev {0}
 addons.installer.update=Nadgradnja na verzijo {0}
+addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Namestite le dodatke iz virov, ki jim zaupate. Zlonamerna programska oprema lahko povzro\u010Di \u0161kodo na podatkih ali kr\u0161i zasebnost.</strong></body></html>
+addons.site=http://freeplane.sourceforge.net/addons/
+AddStyleAttributes.text=Atributi iz sloga
+AddStyleAttributes.tooltip=Dodajanje atributov iz sloga vozli\u0161\u010Da
+AllMapsNodeListAction.text=Iskanje in zamenjava v vseh miselnih vzorcih
+always=Vedno
+AlwaysUnfoldedNodeAction.text=Vedno razpleteno vozli\u0161\u010De (nastavi/ponastavi)
 antialias_all=Pogladi robove vsega
 antialias_edges=Pogladi le robove
 antialias_none=Ne gladi robov
@@ -55,24 +87,32 @@ ApplyAction.text=Uporabi
 ApplyFormatPlugin.text=Spremeni obliko ...
 ApplyFormatPlugin.tooltip=Predstavi pogovorno okno, v katerem lahko naenkrat spremenite atribute vozli\u0161\u010Da in robov.
 ApplyNoFilteringAction.text=Brez filtriranja
+ApplySelectedViewConditionAction.text=Filtriraj izbrana vozli\u0161\u010Da
+ApplyToVisibleAction.text=Velja za filtrirana vozli\u0161\u010Da
 as_parent=Kot star\u0161
-AssignAttributesAction.text=Najdi in zamenjaj atribute ...
+AskForHelp.text=Vpra\u0161aj za pomo\u010D na forumu
+AssignAttributesAction.text=Dodeli atribute ...
 attribute_delete=Izbri\u0161i vse vrednosti
 attribute_delete_value=Izbri\u0161i to vrednost
 attribute_font_size_tooltip=Velikost pisave atributa
 attribute_list_box_label_text=Obstoje\u010De vrednosti
+attribute_name=Ime atributa
+attribute_name_or_value=Ime atributa ali vrednost
 attribute_replace=Zamenjaj z
 attribute_top=Vse znane atribute za nalo\u017Eene miselne vzorce
+attribute_value=Vrednost atributa
+attributes_AddAttributeAction.text=Dodaj atribut v pogovornem oknu ...
 attributes_adding_empty_attribute_error=Za ime atributa ni mogo\u010De uporabiti praznega niza
 attributes_all=Vsi atributi
+attributes_assign_dialog=Raz\u0161irjen urednik atributov
 attributes_attribute=Atributi
 attributes_close=Zapri
 attributes_deselect_all=ni\u010D
-attributes_dialog_title=Upravljavec atributov
+attributes_dialog_title=Upravljalec atributov
 attributes_edit=Uredi
 attributes_edit_tooltip=Uredi mno\u017Eico
-attributes_for_selected=izbrana vozli\u0161\u010Da
-attributes_for_visible=vsa vidna vozli\u0161\u010Da
+attributes_for_selected=Izbrana vozli\u0161\u010Da
+attributes_for_visible=Vsa vidna vozli\u0161\u010Da
 attributes_import=&Uvozi
 attributes_import_tooltip=Uvozi atribute iz drugih nalo\u017Eenih miselnih vzorcev
 attributes_no_import_candidates_found=Ni najdenih novih atributov
@@ -83,111 +123,254 @@ attributes_popup_hide=Skrij
 attributes_popup_new=Nov atribut
 attributes_popup_optimal_width=Optimalna \u0161irina
 attributes_popup_up=Navzgor
-attributes_refresh=osve\u017Ei
+attributes_refresh=Osve\u017Ei
 attributes_RemoveAllAttributesAction.text=Odstrani vse atribute
 attributes_RemoveFirstAttributeAction.text=Odstrani prvi atribut
 attributes_RemoveLastAttributeAction.text=Odstrani zadnji atribut
 attributes_restricted_attributes_tooltip=Omeji mno\u017Eico atributov
 attributes_restricted_values_tooltip=Omeji mno\u017Eico vrednosti za trenutne atribute
-attributes_restriction=omejena mno\u017Eica
+attributes_restriction=Omejena mno\u017Eica
 attributes_select_all=vse
-attributes_select_all_tooltip=Izberi/odzna\u010Di vse
+attributes_select_all_tooltip=Izberi / razberi vse
 attributes_show=Poka\u017Ei
 attributes_skip_root=Presko\u010Di korensko vozli\u0161\u010De
 attributes_visible=Vidno
 attributes_visible_tooltip=Vidno
+automatic_layout=Samodejna postavitev
+automatic_layout_disabled=onemogo\u010Deno
 automatically_save_message=Miselni vzorec je bil samodejno shranjen (z uporabo imena datoteke {0}) ...
+AutomaticEdgeColor.FOR_BRANCHES=za veje
+AutomaticEdgeColor.FOR_COLUMNS=za stolpce
+AutomaticEdgeColor.FOR_LEVELS=za ravni
+AutomaticEdgeColor.ON_BRANCH_CREATION=ustvarjen na veji
+AutomaticEdgeColorHookAction.text=Samodejna barva roba
+AutomaticLayout.ALL=za vsa vozli\u0161\u010Da
+AutomaticLayout.HEADINGS=za nedopustna vozli\u0161\u010Da
+AutomaticLayout.level=Raven {0}
 AutomaticLayout.level.root=Koren
 AutomaticLayoutAction.text=Samodejna postavitev
 AutomaticLayoutAction.tooltip=<html>Popravi izgled miselnega vzorca. <br>Prva stopnja je \u010Drna, druga modra itn.</html>
+AutomaticLayoutControllerAction.ALL.text=za vsa vozli\u0161\u010Da
+AutomaticLayoutControllerAction.COLUMNS.text=za stolpce
+AutomaticLayoutControllerAction.HEADINGS.text=za nedopustna vozli\u0161\u010Da
+AutomaticLayoutControllerAction.null.text=onemogo\u010Deno
 BackAction.text=Nazaj
 BackAction.tooltip=Sko\u010Di nazaj v izbrani verigi
 background=Ozadje
 bitmaps=Bitne slike
+black=\u010Crno
 BlinkingNodeHookAction.text=Utripajo\u010Di na\u010Din
 BlinkingNodeHookAction.tooltip=<html>S tem pri\u010Dne vozli\u0161\u010De utripati. Vendar bodite pozorni. Ne povezujte ga s preve\u010D vozli\u0161\u010Di in <strong> ne z drugimi samodejnimi oblikovanji k istemu vozli\u0161\u010Du</strong></html>
+blue=Modra
 BoldAction.text=Krepko
 boldify_branch=Okrepi
 branch=Veja
 browse=Brskanje ...
 calendar_attributes_panel=Koledar in atributi
 calendar_panel=Koledar
+can_not_clone_encrypted_node=\u0160ifrirana vozli\u0161\u010Da ni mogo\u010De klonirati
+can_not_connect_to_info_server=Ne morem se povezati na informacijski stre\u017Enik
+can_not_delete_predefined_style=Ne morem izbrisati vnaprej dolo\u010Den slog
+can_not_delete_root_style=Ne morem izbrisati korenski slog
+can_not_delete_style_group=Ne morem izbrisati skupinski slog
+can_not_encrypt_cloned_node=Ne morem \u0161ifrirati klonirana vozli\u0161\u010Da
+can_not_save_key_set=Bli\u017Enji\u010Dne tipke ni mogo\u010De shraniti
 cancel=Razveljavi
 CancelAction.text=Razveljavi
-cannot_add_parent_diff_parents=Vsa vozli\u0161\u010Da morajo imeti istega nadrejenega za uporabo te funkcije.
+cannot_add_parent_diff_parents=Vsa vozli\u0161\u010Da morajo imeti istega star\u0161a za uporabo te funkcije.
 cannot_add_parent_to_root=Korenskega vozli\u0161\u010Da ni mo\u017Eno dodati k novemu nadrejenemu.
 cannot_delete_root=Korenskega vozli\u0161\u010Da ni mo\u017Eno izbrisati ali izrezati.
 cannot_join_nodes_with_children=Vozli\u0161\u010D ni mogo\u010De zdru\u017Eiti z otroci
+cannot_move_into_child_node=Ne morem se premakniti v podrejeno vozli\u0161\u010De
 cannot_move_to_child=Vozli\u0161\u010Da ni mo\u017Eno premakniti k enemu njegovih otrok.
 CenterAction.text=Sredinski
 ChangeConnectorArrowsAction.backward.text=Nazaj
+ChangeConnectorArrowsAction.both.text=Nari\u0161i pu\u0161\u010Dico naprej in nazaj
 ChangeConnectorArrowsAction.forward.text=Naprej
+ChangeConnectorArrowsAction.none.text=Noben
+ChangeConnectorArrowsAction.text=Spremeni konektor pu\u0161\u010Dice
 ChangeConnectorShapeAction.CUBIC_CURVE.text=Krivulja
+ChangeConnectorShapeAction.EDGE_LIKE.text=Simuliraj rob
+ChangeConnectorShapeAction.LINE.text=\u010Crta
+ChangeConnectorShapeAction.LINEAR_PATH.text=Linearna pot
 ChangeNodeLevelLeftsAction.text=Vozli\u0161\u010De na levi
-ChangeNodeLevelLeftsAction.tooltip=Tisti levo od korenskega(ih) vozli\u0161\u010D(a) je/so zamaknjeni navzdol. Postane(jo) otroci svojega gornjega bratskega vozli\u0161\u010Da. Tisti desno od korenskega(ih) vozli\u0161\u010D(a) so zamaknjeni navzgor. Neposredno ob korenu vozli\u0161\u010Da zamenjajo strani.
+ChangeNodeLevelLeftsAction.tooltip=Tisti levo od korenskega(ih) vozli\u0161\u010D(a) je/so zamaknjeni navzdol. Postane(jo) podrejeni svojemu gornjemu nadrejenemu vozli\u0161\u010Du. Tisti desno od korenskega(ih) vozli\u0161\u010D(a) so zamaknjeni navzgor. Neposredno ob korenu vozli\u0161\u010Da zamenjajo strani.
 ChangeNodeLevelRightsAction.text=Vozli\u0161\u010De na desni
-ChangeNodeLevelRightsAction.tooltip=Tisti desno od korenskega(ih) vozli\u0161\u010D(a) je/so zamaknjeni navzdol. Postane(jo) otroci svojega gornjega bratskega vozli\u0161\u010Da. Tisti levo od korenskega(ih) vozli\u0161\u010D(a) so zamaknjeni navzgor. Neposredno ob korenu vozli\u0161\u010Da zamenjajo strani.
+ChangeNodeLevelRightsAction.tooltip=Tisti desno od korenskega(ih) vozli\u0161\u010D(a) je/so zamaknjeni navzdol. Postane(jo) podrejeni svojemu gornjemu nadrejenemu vozli\u0161\u010Du. Tisti levo od korenskega(ih) vozli\u0161\u010D(a) so zamaknjeni navzgor. Neposredno ob korenu vozli\u0161\u010Da zamenjajo strani.
 choose_cloud_color=Izberi barvo obla\u010Dka:
-choose_edge_color=Izberi barvo roba
-choose_node_background_color=Izberi barvo ozadja vozli\u0161\u010Da:
+choose_edge_color=Izberi barvo robu
+choose_map_background_color=Izberi barvo ozadja zemljevida
+choose_node_background_color=Izberite barvo ozadja vozli\u0161\u010Da:
 choose_node_color=Izberi barvo vozli\u0161\u010Da:
+ClearLinkAnchorAction.text=Obri\u0161i povezavo sidra
+ClearLinkAnchorAction.tooltip=<html>po\u010Disti predhodno nastavljeno sidro vozli\u0161\u010Da</html>
+CloneAction.text=Prilepi klon
 close_btn=&Zapri
-CloudAction.text=Obla\u010Dek
+CloseAction.text=Zapri trenutni miselni vzorec
+CloseAllMapsAction.text=Zapri vse miselne vzorce
+CloseAllOtherMapsAction.text=Zapri vse ostale miselne vzorce
+cloud_shapes=Oblike oblakov
+CloudAction.text=Dodaj / odstrani obla\u010Dek (privzeto)
 CloudColorAction.text=Barva obla\u010Dka ...
+CloudShapeAction.ARC.text=Lok
+CloudShapeAction.RECT.text=Pravokotnik
+CloudShapeAction.ROUND_RECT.text=Zaobljeni pravokotnik
+CloudShapeAction.STAR.text=Zvezda
+collection.copy.presentation=Kopiraj predstavitev
+collection.copy.slide=Kopiraj diapozitiv
+collection.delete=Izbri\u0161i
+collection.down=Navzdol
+collection.move=Premakni
+collection.moveTo=Premik na polo\u017Eaj
 collection.new.presentation=Nova prezentacija
+collection.new.slide=Nov diapozitiv
+collection.up=Navzgor
 ColorProperty.ResetColor=Ponastavi barvo
 combined=Zdru\u017Eeno
+condition=Stanje
 confirmation=Potrditev
-connector=Connector[translate me]
-connector_label=Connector Label[translate me]
+connector=Spojka
+connector_arrows=Konektor pu\u0161\u010Dic
+connector_label=Etiketa spojke
+connector_lines=\u010Crte spojke
+connector_shapes=Oblike spojke
+ConnectorColorAction.text=Barva spojke \u2026
+controls=Nadzor
+ConvertCloneToIndependentNodeAction.text=Odstrani klon
+copy_name={0} (kopija)
 CopyAction.text=Kopiraj
-CreationModificationPluginAction.text=Prika\u017Ei \u010Dase sprememb
+CopyAction.tooltip=Kopiraj izbrano vejo
+CopyAttributes.text=Kopiraj atribute
+CopyIDAction.text=Kopiraj ID vozli\u0161\u010Da
+CopyMapStylesAction.text=Kopiraj stil miselnega vzorca od \u2026
+CopyNodeURIAction.text=Kopiraj URL vozli\u0161\u010Da
+copyright=Copyright \u00A9 2000-2017 Freeplane ekipa in drugi
+CopySingleAction.text=Kopiraj vozli\u0161\u010De (enojno)
+CopySingleAction.tooltip=Kopiraj samo izbrano vozli\u0161\u010De
+CopyStyleExtensionsAction.text=Kopiraj raz\u0161iritve iz vozli\u0161\u010Da sloga
+corrupt_map=Vsebina miselnega vzorca je po\u0161kodovana
+CreateConjunctConditionAction.text=In
+CreateDisjunctConditionAction.text=Ali
+CreateNotSatisfiedConditionAction.text=Ne
+CreationModificationPluginAction.text=Prika\u017Ei \u010Das spremembe
 CreationModificationPluginAction.tooltip=<html>Ta funkcija bele\u017Ei nastanek vozli\u0161\u010Da in \u010Dase spreminjanja.</html>
+current_dir=Miselni vzorci
 CutAction.text=Izre\u017Ei
 decrease_branch_font_size=Manj\u0161a pisava
 DecreaseNodeFontAction.text=Manj\u0161a pisava
-DefaultColorAction.text=Privzete barve
+default=privzeto
+defaultAuxiliaryWordList=a, the, od
+DefaultColorAction.text=Privzeta barva
+defaultstyle.attributes=Atributi
+defaultstyle.details=Podrobnosti
+defaultstyle.floating=Plavajo\u010De vozli\u0161\u010De
+defaultstyle.note=Opomba
 delete=izbri\u0161i
 delete_child=Izbri\u0161i vozli\u0161\u010De
 DeleteAction.text=Odstrani vozli\u0161\u010De
 DeleteConditionAction.text=Izbri\u0161i
+DeleteDetailsAction.text=Odstrani podrobnosti vozli\u0161\u010Da
+DeleteLevelStyleAction.text=Odstrani raven sloga
+DeleteStyleAction.text=Odstrani slog
+DeleteUserStyleAction.text=Odstrani uporabni\u0161ko definiran slog
+dialect_info.app=Datoteka miselnega vzorca {0} je bila ustvarjena s programom {1}.
+dialect_info.later_version=Datoteka miselnega vzorca {0} je bila ustvarjena z novej\u0161o razli\u010Dico tega programa.
+dialect_info.unknownApp=Datoteka miselnega vzorca {0} je bila ustvarjena z neznanim programom.
+dialect_info.unknownURL=Njegova spletna stran ni znana.
+dialect_info.url=Obi\u0161\u010Dite spletno stran programa {0} za ve\u010D informacij.
+dialect_info.warning=Freeplane lahko odpre, prika\u017Ee ali shrani nepravilno.
+DirectHtmlFlavorHandler=HTML kot eno samo vozli\u0161\u010De
 DocumentationAction.text=Dokumentacija
+down=N&avzdol
+DownConditionAction.text=Navzdol
+download=Prenos
+dropped_file_error=Ni bilo mogo\u010De odpreti padajo\u010De datoteko(e). Razlog: {0}
 edge=Obroba
+edge_is_formatted_by_style=Format roba je pod nadzorom sloga. Uredite s tem povezane sloge, \u010De je treba.
 edge_style=Slog roba
 edge_width=\u0160irina roba
+edge_widths=\u0160irina roba
 EdgeColorAction.text=Barva obrobe ...
+EdgeProperties=Lastnosti roba
 EdgeStyleAction.bezier.text=Bezier
-EdgeStyleAction.horizontal.text=Horizontal[translate me]
+EdgeStyleAction.bezier.tooltip=<html>Prika\u017Ei rob kot gladko krivuljo.</html>
+EdgeStyleAction.hide_edge.text=Skrij rob
+EdgeStyleAction.hide_edge.tooltip=<html>Za izbrana vozli\u0161\u010Da prika\u017Ei rob kot<br>pik\u010Dasto \u010Drto. V nasprotnem primeru skrij rob.</html>
+EdgeStyleAction.horizontal.text=Vodoravno
+EdgeStyleAction.horizontal.tooltip=<html>Uporabi pravokotne ravne \u010Drte za robove.</html>
 EdgeStyleAction.linear.text=Linearno
+EdgeStyleAction.linear.tooltip=<html>Prika\u017Ei rob kot ravno \u010Drto.</html>
 EdgeStyleAction.sharp_bezier.text=ostro Bezier
+EdgeStyleAction.sharp_bezier.tooltip=<html>Prika\u017Ei rob kot gladko krivuljo z ostrimi konci.</html>
 EdgeStyleAction.sharp_linear.text=ostro linearno
+EdgeStyleAction.sharp_linear.tooltip=<html>Prika\u017Ei rob kot ravno \u010Drto z ostrimi konci.</html>
 EdgeStyleAsParentAction.text=Kot star\u0161
+EdgeStyleAsParentAction.tooltip=<html>Uporabi slog robov mati\u010Dnega vozli\u0161\u010Da.</html>[zastarelo]
 EdgeWidthAction_width_parent.text=Nadrejen
 EdgeWidthAction_width_thin.text=Tanek
 edit=&Uredi
 edit.decision=Urejevalnik HTML
 edit.edit_rich_text=\u017Delite uporabiti oblikovanje, kot je krepko in le\u017Ee\u010De?
+edit_details=Uredi podrobnosti vozli\u0161\u010Da
+edit_end_label=<html>Spojka<br>etiketa
+edit_label_font_family=Pisava
+edit_label_font_size=Velikost pisave
 edit_link_manually=Ro\u010Dno uredi hiperpovezavo ...
-edit_long_node=Edit Long Node[translate me]
-edit_middle_label=Edit Middle Label[translate me]
-edit_target_label=Edit Target Label[translate me]
+edit_long_node=Uredi jedro vozli\u0161\u010Da v pogovornem oknu
+edit_middle_label=<html>Sredina<br>etiketa
+edit_note=Uredi bele\u017Eko
+edit_source_label=<html>Vir<br>etiketa
+edit_target_label=<html>Cilj<br>etiketa
+edit_transparency_label=Motnost
+edit_width_label=\u0160irina
 EditAction.text=Uredi vozli\u0161\u010De
 EditAttributesAction.text=Uredi atribute
+EditDetailsAction.text=Uredi podrobnosti vozli\u0161\u010Da v vrsti
+EditDetailsInDialogAction.text=Uredi podrobnosti vozli\u0161\u010Da v pogovornem oknu
+editEdgeColors=Uredi barvo roba
 EditFilterAction.text=Uredi
 EditLongAction.text=Uredi dolgo vozli\u0161\u010De
+EditNoteInDialogAction.text=Uredi bele\u017Eko v pogovornem oknu
+EditScript=Uredi skript ...
 EditStylesAction.text=Uredi stil
+EncryptedMap.text=Nov za\u0161\u010Diten (\u0161ifriran) miselni vzorec ...
 EncryptedMap.tooltip=Ustvari nov \u0161ifriran miselni vzorec
+encryption=\u0160ifriranje
 enter_base_url=Prilepljene bodo relativne povezave. Prosim, vnesite osnovni URL.
+enter_command=Vnesi ukaz
+enter_condition_name=Vnesi novo ime stanja
 enter_confirms=Tipka &Enter potrdi
-EnterPassword.text=Preklopi \u0161ifrirano / ne\u0161ifrirano
+enter_keyset_name=Navedite ime za zbirko bli\u017Enjic na tipkovnici
+enter_map_url=Vnesi URL miselnega vzorca
+enter_new_style_name=Vnesi novo ime sloga
+enter_node_id=Vnesi ID vozli\u0161\u010Da
+enter_zoom=Vnesi pove\u010Davo
+EnterPassword.text=Vnesi geslo
 error=Napaka
 error_applying_template=Napaka pri uveljavljanju predloge XSL.
 error_creating_directory=Imenika za izvoz ni mogo\u010De ustvariti.
+error_in_template=Napaka v privzeti predlogi miselnega vzorca {0}. Poskusite odstraniti to datoteko.
+errornumber={0} napake
+ExecuteScript.available_modes_tooltip={0} je na voljo za
 ExecuteScript.script=Skript
+ExecuteScriptError.text=Napaka pri izvajanju skript:\n{0}
+ExecuteScriptForAllNodes.text=Izvedi vse skripte
+ExecuteScriptForSelectionAction.text=Izvedi skript izbranega vozli\u0161\u010Da
+ExecuteScriptOnSelectedNode.text=Izvedi {0} na vseh izbranih vozli\u0161\u010Dih
+ExecuteScriptOnSelectedNodeRecursively.text=Izvedi {0} na izbranih vozli\u0161\u010Dih rekurzivno
+ExecuteScriptOnSingleNode.text=Izvedi {0} na enem izbranem vozli\u0161\u010Du
+ExecuteScripts.noScriptsAvailable=Ni na voljo
+ExecuteScripts.text=Skripti
+ExecuteScriptSecurityError.text=Med izvajanjem skripte je pri\u0161lo do napake: {0}
+export_failed=Izvoz ni uspel
+export_using_xslt=Freeplane izvoz
 ExportAction.text=Izvozi miselni vzorec \u2026
+ExportAllPresentationsAction.text=Izvozi vse predstavitve kot PNG slike
+ExportBranchAction.text=Premakni vejo k novemu miselnemu vzorcu \u2026
 ExportBranchToHTMLAction.text=Razvejaj kot HTML
 exported_file={0} datoteka
-ExportPdf.text=PDF ...
+ExportPdf.text=Kot PDF ...
+ExportPresentationAction.text=Izvozi sedanjo predstavitev v PNG sliko
 ExportSvg.text=Kot SVG ...
 ExportToHTMLAction.text=Kot HTML
 ExportToImage.jpg.text=JPEG ...
@@ -195,35 +378,112 @@ ExportToImage.png.text=PNG ...
 ExportToOoWriter.text=Dokument Open Office Writer ...
 ExportToOoWriter.tooltip=Neprepognjena vozli\u0161\u010Da oblikujejo strukturo, prepognjena vozli\u0161\u010Da pa vsebino dokumenta.
 extension_menu=Fizi\u010Dni slog
+ExternalImage_popupMenu_Change=Spremeni ...
+ExternalImage_popupMenu_Open=Odpri v pregledovalniku
+ExternalImage_popupMenu_Remove=Odstrani
+ExternalImage_popupMenu_ResetZoom=Ponastavi zumiranje
+ExternalImageAddAction.text=Dodaj sliko ...
+ExternalImageChangeAction.text=Spremeni sliko ...
+ExternalImageRemoveAction.text=Odstrani sliko
+ExtractLinkFromTextAction.text=Pretvarjanje povezave znotraj besedila
+ExtractLinkFromTextAction.tooltip=Nastavi hiperpovezavo iz naslova v besedilu vozli\u0161\u010Da
 extras=&Orodja
-f_button_unassigned=<no action>[translate me]
+f_button_unassigned=<brez akcije>
 FaqOpenURLAction.text=Pogosto zastavljena vpra\u0161anja (FAQ)
 file=&Datoteka
 file_already_exists=Datoteka {0} \u017Ee obstaja. Jo \u017Eelite prepisati?
+file_not_accessible=Datoteka {0} ni dostopna
 file_not_found=Datoteke {0} ni mo\u010D najti
-filter=F&ilter
-filter_add=dodaj
+FileListFlavorHandler=Povezave do datotek
+FileProperties_BranchLeafCount=\u0160tevilo kon\u010Dnih vozli\u0161\u010D v izbranih vejah:
+FileProperties_BranchNodeCount=\u0160tevilo vozli\u0161\u010D v izbranih vejah:
+FileProperties_ChangesSinceLastSave=Spremembe od zadnjega shranjevanja:
+FileProperties_FileName=Ime datoteke:
+FileProperties_FileSaved=Shranjena datoteka:
+FileProperties_FileSize=Velikost datoteke:
+FileProperties_MainBranchCount=\u0160tevilo glavnih vej:
+FileProperties_NeverSaved=Nikoli shranjeno
+FileProperties_NodeChildCount=\u0160tevilo podrejenih izbranega vozli\u0161\u010Da:
+FileProperties_NodeSelectionCount=\u0160tevilo izbranih vozli\u0161\u010D:
+FileProperties_TotalFilteredCount=\u0160tevilo vozli\u0161\u010D, ki izpolnjujejo filter:
+FileProperties_TotalLeafCount=Skupno \u0161tevilo listnih vozli\u0161\u010D:
+FileProperties_TotalNodeCount=Skupno \u0161tevilo vozli\u0161\u010D:
+FilePropertiesAction.text=Statistika miselnih vzorcev ...
+FileRevisionsDialog.cancel=&Razveljavi
+FileRevisionsDialog.file_last_modified=\u010Casovni \u017Eig
+FileRevisionsDialog.file_name=Datoteka
+FileRevisionsDialog.file_size=Bajti
+FileRevisionsDialog.open=&Odpri
+FileRevisionsDialog.open.tooltip=Odpri datoteko, tudi \u010De je morda zastarela
+FileRevisionsDialog.question=Najdeni popravki od {0}
+FileRevisionsDialog.restore=Obn&ovi
+FileRevisionsDialog.restore.tooltip=Zamenjaj {0} za {1}
+FileRevisionsDialog.title=Datote\u010Dne revizije
+filter=&Filter
+filter_add=&Dodaj
 filter_and=&In
+filter_any_text=Jedro, podrobnosti ali bele\u017Eka
+filter_clone_snapshot=Shranjeni kloni izbora
+filter_clones=Kloni izbora
 filter_conditions=Filtri
 filter_contains=Vsebuje
+filter_created_after=Ustvarjeno po
+filter_created_before=Ustvarjeno pred
 filter_delete=izbri\u0161i
-filter_dialog=Sestavljavec filtrov
+filter_details=Podrobnosti
+filter_dialog=Sestavljalec filtrov
 filter_does_not_exist=ne obstaja
 filter_edit_description=Uredi seznam filtrov
 filter_enter_value=Vnesi vrednost
+filter_even_level=Vozli\u0161\u010Da iz razli\u010Dnih ravni
 filter_exist=obstaja
 filter_icon=Ikona
 filter_is_equal_to=je enako
 filter_is_not_equal_to=ni enako
+filter_leaf=Listno vozli\u0161\u010De
+filter_link=Hiperpovezava
+filter_match_approximately=&Pribli\u017Een
+filter_match_approximately_tooltip=<html>Dolo\u010Da, ali je iskanje pri iskanju podobnih izrazov dovoljeno pri ocenjevanju merila filtriranja,<br/>npr. iskanje 'datotek' najde tudi 'datoteke'.</html>
+filter_match_case=Ujemanje &primera
+filter_match_case_tooltip=Omogo\u010Di razlikovanje malih in velikih \u010Drk s primerjavo.
+filter_modified_after=Spremenjen po
+filter_modified_before=Spremenjen pred
 filter_no_filtering=Brez filtriranja
 filter_node=besedilo vozli\u0161\u010Da
+filter_node_level=Raven vozli\u0161\u010Da
 filter_not=&Ne
+filter_note=Opomba
+filter_odd_level=Celo raven vozli\u0161\u010Da
 filter_or=&Ali
+filter_parent=Mati\u010Dno besedilo
+filter_periodic_level=Periodi\u010Dno
+filter_priority=Prednost
+filter_regexp_matches=Se ujema z regularnimi izrazi
+filter_reminder=Opomnik
+filter_reminder_after=na\u010Drtovan po
+filter_reminder_before=na\u010Drtovan pred
+filter_reminder_executed=\u017Ee izvedeno
+filter_reminder_later=na\u010Drtovan kasneje
+filter_root=Korensko vozli\u0161\u010De
+filter_script=Filter skripta
 filter_select=&Izberi
 filter_selected_node_view=Trenutno izbrana vozli\u0161\u010Da
+filter_selected_node_view_snapshot=Shrani izbor
+filter_style=Slog
+filter_time=Datumski filter
+FilterCondition=Pogoji za filter
+filterConditions=Uporabni\u0161ko dolo\u010Deni filtri
+filterConditions.noActions=Ni imenovanih filtrov
+filters_not_loaded=Filtra ni bilo mogo\u010De nalo\u017Eiti, ker je datoteka po\u0161kodovana
+find=Najdi
 find_what=Najdi niz
-FindAction.text=Najdi ...
+FindAction.text=&Najdi ...
+FindNextAction.text=Najdi naslednje
+FindPreviousAction.text=Najdi prej\u0161nje
+fit_background_to_page=Prilagodi sliko ozadja eni strani
 fit_map_to_page=Prilagodi velikosti ene strani
+fit_map_to_page_height=Prilagodi &vi\u0161ino eni strani
+fit_map_to_page_width=Prilagodi &\u0161irino eni strani
 FitToPage.text=Prilagodi velikosti strani
 FitToPage.tooltip=Prilagodi zoom tako, da celoten miselni vzorec sodi v trenutno okno.
 fold=Prepogni
@@ -231,25 +491,37 @@ FoldAllAction.text=Prepogni vse
 FoldAllAction.tooltip=<html>Prepogne izbrana vozli\u0161\u010Da in vse njihove otroke.</html>
 FoldOneLevelAction.text=Prepogni eno stopnjo
 FoldOneLevelAction.tooltip=<html>Prepogne izbrana vozli\u0161\u010Da za eno stopnjo.</html>
+follow_clone=Znotraj ''{0}''
 follow_graphical_link=Pojdi na ''{0}''
-FollowLinkAction.text=Follow Link[translate me]
+FollowLinkAction.text=Spremljaj povezavo
 font=Pisava
 FontFamilyAction.text=dru\u017Eina pisav
 FontSizeAction.text=velikost pisave
 format=O&blika
+format_invalid_pattern=Vzorec ni veljaven
+format_menu_cloud_shapes=Dodaj oblak ali slog spremembe
 format_menu_edge_styles=Slogi robov
 format_menu_edge_widths=\u0160irine robov
+format_panel=Oblika
 FormatCopy.text=Kopiraj obliko
 FormatCopy.tooltip=<html>Kopira obliko vozli\u0161\u010Da.</html>
 FormatPaste.text=Prilepi obliko
 FormatPaste.tooltip=<html>Prilepi obliko vozli\u0161\u010Da.</html>
+formats_not_loaded=Formati ne morejo biti nalo\u017Eeni, ker je datoteka pokvarjena
+formula.error.attributeValueIsNull=Vrednost atributa ''{0}'' je po vrednotenju ni\u010D.
+formula.error.circularReference=Kro\u017Ena referenca: formula v vozli\u0161\u010Du ''{0}'' se sklicuje.
+formula.EvaluateAllAction.text=Oceni vse
+formula.EvaluateAllAction.tooltip=Oceni vse formule na trenutnem miselnem vzorcu
+formula.menuname=Formule
+formula_editor=Uredi formulo
 ForwardAction.text=Naprej
 ForwardAction.tooltip=Sko\u010Di naprej v izbrani verigi
+FreeNodeAction.text=Prosto postavljeno vozli\u0161\u010De (nastavitev/ponastavitev)
 Freeplane.progress.buildScreen=Zaslon gradnje ...
 Freeplane.progress.createController=Ustvarjanje kontrolnika ...
 Freeplane.progress.createInitialMode=Ustvarjanje za\u010Detnega na\u010Dina ...
 Freeplane.progress.endStartup=Dokon\u010Danje zagona.
-Freeplane.progress.gettingPreferenceDirectories=Pridobivanje nastavitev miselnih vzorcev ...
+Freeplane.progress.gettingPreferenceDirectories=Pridobivanje prednostnih imenikov ...
 Freeplane.progress.gettingPreferences=Pridobivanje nastavitev ...
 Freeplane.progress.loadMaps=Nalaganje miselnih vzorcev ...
 Freeplane.progress.propagateLookAndFeel=Uveljavljanje videza in ob\u010Dutka ...
@@ -259,7 +531,11 @@ Freeplane.progress.updateLookAndFeel=Posodabljanje videza in ob\u010Dutka ...
 freeplane_reverted=Freeplane_Preobrnjeno_
 FreeplaneHelpStarter.text=Pomo\u010D ...
 FreeplaneHelpStarter.tooltip=Raz\u0161irjena pomo\u010D Freeplane
+GettingStartedAction.text=Vadnica
+goto=Pojdi na
+goto.noActions=Ni ciljnih vozli\u0161\u010D
 GotoLinkNodeAction.text=Pojdi na povezavo
+GotoNodeAction.text=Pojdi na vozli\u0161\u010De z ID-jem ...
 GrabKeyDialog.common.cancel=Prekli\u010Di
 GrabKeyDialog.common.ok=V redu
 GrabKeyDialog.grab-key.assigned-to=Dodeljeno k
@@ -268,39 +544,54 @@ GrabKeyDialog.grab-key.clear=Po\u010Disti
 GrabKeyDialog.grab-key.remove=Odstrani
 GrabKeyDialog.grab-key.remove-ask=Ste prepri\u010Dani, da ho\u010Dete odstraniti to akcijo tipke?
 GrabKeyDialog.grab-key.title=Vnesi novo tipko
+green=Zeleno
 help=&Pomo\u010D
+HideableAction.tooltip=<html>Ozna\u010Di ozadje vsakega spremenjenega vozli\u0161\u010Da.</html>
 HideAllAttributesAction.text=Skrij vse atribute
+HierarchicalIcons2Action.text=Poka\u017Ei prese\u010Di\u0161\u010De podrejenih ikon
 HierarchicalIconsAction.text=Prika\u017Ei ikone hierarhi\u010Dno
 HierarchicalIconsAction.tooltip=\u010Ce ima kateri od otrok/vnukov ikono, to ikono prika\u017Ee tudi v majhni obliki.
-HotKeyInfoAction.text=Key Reference[translate me]
-html_export_based_on_headings=HTML izvoz - Glede na naslove
+hot_keys=Bli\u017Enji\u010Dne tipke
+hot_keys_table=Tabela bli\u017Enji\u010Dnih tipk
+HotKeyInfoAction.text=Razpored bli\u017Enji\u010Dnih tipk
+html_export_based_on_headings=Izvoz HTML - Glede na naslove
 html_export_fold_all=Izvoz HTML - Prepogni vse
 html_export_fold_currently_folded=Izvoz HTML - Prepogni trenutno prepognjene
 html_export_no_folding=Izvoz HTML - Brez prepogibanja
+html_problem=<html>Ne morem narediti html<br><br>{0}
 icon_0%=0%
 icon_100%=100%
 icon_25%=25%
 icon_50%=50%
 icon_75%=75%
-icon_attach=Poglej tukaj
+icon_addition=Dodajanje
+icon_attach=Poglej sem
+icon_audio=Zvok
 icon_back=Nazaj
 icon_bee=Freeplane
 icon_bell=Zapomni si
 icon_bookmark=Izvrstno
-icon_broken-line=Broken[translate me]
+icon_broken-line=Prekinjeno
 icon_button_cancel=Ni v redu
 icon_button_ok=V redu
 icon_calendar=Datum
+icon_checked=Preverjeno
 icon_clanbomber=Nevarno
-icon_closed=No Entry[translate me]
-icon_decrypted=Unlocked[translate me]
+icon_clock=\u010Cas
+icon_clock2=Opomnik
+icon_closed=Ni vstopa
+icon_decrypted=Odklenjeno
 icon_desktop_new=Ne pozabi
+icon_division=Deljenje
 icon_down=Navzdol
+icon_edit=Izbolj\u0161aj
+icon_encrypted=Zaklenjeno
+icon_executable=Izvedljivo
 icon_family=Dru\u017Eina
-icon_fema=Females[translate me]
-icon_female1=Female1[translate me]
-icon_female2=Female2[translate me]
-icon_females=Females[translate me]
+icon_fema=Mo\u0161ki & \u017Eenska
+icon_female1=\u017Denska1
+icon_female2=\u017Denska2
+icon_females=\u017Denske
 icon_flag=Rde\u010Da zastavica
 icon_flag-black=\u010Crna zastavica
 icon_flag-blue=Modra zastavica
@@ -308,6 +599,7 @@ icon_flag-green=Zelena zastavica
 icon_flag-orange=Oran\u017Ena zastavica
 icon_flag-pink=Ro\u017Enata zastavica
 icon_flag-yellow=Rumena zastavica
+icon_folder=Mapa
 icon_forward=Naprej
 icon_freemind_butterfly=FreeMind
 icon_full-0=Brez prioritete
@@ -320,181 +612,438 @@ icon_full-6=6. prioriteta
 icon_full-7=7. prioriteta
 icon_full-8=8. prioriteta
 icon_full-9=9. prioriteta
-icon_go=Green Traffic Light[translate me]
+icon_go=Zelena prometna lu\u010D
 icon_gohome=Domov
+icon_group=Skupina
 icon_help=Vpra\u0161anje
-icon_hourglass=Waiting[translate me]
+icon_hourglass=\u010Cakanje
+icon_icon_not_found=Ikona ni bila najdena
 icon_idea=Ideja
-icon_info=Info[translate me]
+icon_image=Slika
+icon_info=Informacije
+icon_internet=Medomre\u017Eje
+icon_internet_warning=Medmre\u017Eno opozorilo
 icon_kaddressbook=Telefon
-icon_kmail=E-Mail[translate me]
+icon_kmail=E-po\u0161ta
 icon_knotify=Glasba
 icon_korn=Po\u0161tni nabiralnik
 icon_ksmiletris=Sre\u010Den sem
+icon_launch=Zagon
 icon_licq=Krasno
-icon_list=List[translate me]
+icon_list=Seznam
 icon_Mail=Po\u0161ta
-icon_male1=Male1[translate me]
-icon_male2=Male2[translate me]
-icon_males=Males[translate me]
+icon_male1=Mo\u0161ki1
+icon_male2=Mo\u0161ki2
+icon_males=Mo\u0161ki
 icon_menu=&Ikona
 icon_messagebox_warning=Pomembno
+icon_mindmap=Miselni vzorec
+icon_multiplication=Mno\u017Eenje
+icon_narrative=Pripoved
+icon_negative=Negativno
+icon_neutral=Nevtralno
 icon_password=Klju\u010D
 icon_pencil=Za izbolj\u0161ati
 icon_penguin=Linux
-icon_prepare=Yellow Traffic Light[translate me]
-icon_smiley-neutral=No Mind[translate me]
+icon_positive=Pozitivno
+icon_prepare=Rumena prometna lu\u010D
+icon_revision=Revizija
+icon_revision-green=Revizija zeleno
+icon_revision-pink=Revizija roza
+icon_revision-red=Revizija rde\u010Do
+icon_smiley-angry=Jezen
+icon_smiley-neutral=Brez mnenja
+icon_smiley-oh=Presenetljiv
 icon_smily_bad=Mi ni sme\u0161no
 icon_stop=Ustavi
+icon_stop-sign=Zaustavi
+icon_subtraction=Od\u0161teti
+icon_unchecked=Ni ozna\u010Deno
 icon_up=Navzgor
+icon_user_icon=Uporabni\u0161ke ikone
+icon_very_negative=Zelo negativno
+icon_very_positive=Zelo pozitivno
 icon_video=Video
 icon_wizard=\u010Carovnija
 icon_xmag=Potrebna je razprava
 icon_yes=Pomembno
-IconGroupPopupAction.arrows.text=Arrows[translate me]
-IconGroupPopupAction.docs_folders.text=Docs & Folders[translate me]
-IconGroupPopupAction.numbers.text=Numbers[translate me]
-IconGroupPopupAction.office.text=Office[translate me]
-IconGroupPopupAction.signs.text=Signs[translate me]
-IconGroupPopupAction.smiley.text=Smiley[translate me]
+IconGroupPopupAction.arrows.text=Pu\u0161\u010Dice
+IconGroupPopupAction.docs_folders.text=Dokumenti & mape
+IconGroupPopupAction.flags.text=Zastave
+IconGroupPopupAction.math.text=Matematika
+IconGroupPopupAction.media.text=Mediji
+IconGroupPopupAction.miscellaneous.text=Raznoter
+IconGroupPopupAction.nature.text=Narava
+IconGroupPopupAction.numbers.text=\u0160tevilke
+IconGroupPopupAction.office.text=Urad
+IconGroupPopupAction.people.text=Ljudje
+IconGroupPopupAction.rating.text=Ocena
+IconGroupPopupAction.signs.text=Znaki
+IconGroupPopupAction.smiley.text=Sme\u0161ko
+IconGroupPopupAction.time.text=\u010Cas
+IconGroupPopupAction.user.text=Uporabni\u0161ke ikone
+IconProgressExtended10Action.text=Raz\u0161irjeni napredek 10%
+IconProgressExtended10Action.tooltip=<html>Doda indikator napredka s pove\u010Danjem za 10%, z dvojnim levim klikom.<br>Ctrl + dvojni levi klik mi\u0161ke zmanj\u0161a/odstrani indikator napredka.</html>
+IconProgressExtended25Action.text=Raz\u0161irjeni napredek 25%
+IconProgressExtended25Action.tooltip=<html>Doda indikator napredka s pove\u010Danjem za 25%, z dvojnim levim klikom.<br> Ctrl + dvojni levi klik zmanj\u0161a/ odstrani indikator napredka.</html>
+IconProgressIconDownAction.text=Napredek navzdol
+IconProgressIconDownAction.tooltip=Zmanj\u0161aj/ vstavi/ odstrani ikono napredka (100% -> 75% -> 50% -> 25% -> 0% -> odstrani).
+IconProgressIconUpAction.text=Napredek navzgor
+IconProgressIconUpAction.tooltip=Pove\u010Daj/ vstavi ikono napredka (0% -> 25% -> 50% -> 75% -> 100% + OK).
+IconProgressRemoveAction.text=Odstrani napredek
+IconProgressRemoveAction.tooltip=Odstrani ikone napredka in raz\u0161irjeno ikono napredka.
+icons=Ikone
 IconSelectionPlugin.text=Izberi ikono ...
 IconSelectionPlugin.tooltip=<html>Tukaj lahko izberete ikono z uporabo podokna.</html>
+image_covertLink=Pretvori povezavo v sliko
+ImageFlavorHandler=Slika (uporabi lo\u010Deno datoteko)
 import=U&voz
 import_linked_branch_no_link=Izbrano vozli\u0161\u010De nima nobene povezave za uvoz.
 ImportAction.text=Uvozi miselni vzorec
+ImportBranchAction.text=Veja ...
+ImportExplorerFavoritesAction.text=Favoriti raziskovalca \u2026
 ImportFolderStructureAction.text=Struktura map ...
+ImportLinkedBranchAction.text=Povezana veja
+ImportLinkedBranchWithoutRootAction.text=Povezana veja brez korenine ...
 ImportMindmanagerFiles.text=Miselni vzorec MindManager X5 ...
 ImportXmlFile.text=Uvoz xml datoteke
 increase_branch_font_size=Ve\u010Dja pisava
 IncreaseNodeFontAction.text=Ve\u010Dja pisava
+internal_error_tooltip=Pojavile so se notranje napake. Kliknite, da odprete najnovej\u0161o datoteko dnevnika log.0 za ve\u010D informacij.
+invalid_export_file=Neveljavno ime datoteke izvoza
+invalid_file_msg=Datoteke ni bilo mogo\u010De najti za {0}
+invalid_uri=Neveljaven URI {0}
+invalid_url=Ni bilo mogo\u010De ustvariti veljavnega URL-ja
+invalid_url_msg=Ni mogo\u010De ustvariti veljavnega URL-ja za {0}
 ItalicAction.text=Le\u017Ee\u010De
-italicise_branch=Zale\u017Ei
+italicise_branch=Le\u017Ee\u010De
 java_version=Razli\u010Dica Jave: {0}
+JoinNodesAction.separator.format=Spoji vozli\u0161\u010Da z "{0}"
+lastOpenedMaps=Zadnje odprte datoteke
+lastOpenedMaps.noActions=Nobenih miselnih vzorcev ni v zgodovini
+latex_editor=Uredi LaTeX formulo
+LatexDeleteLatexAction.text=Odstrani LaTeX formulo
 LatexEditLatexAction.text=Uredi LaTeX formulo ...
+LatexInsertLatexAction.msg1=<html>Posku\u0161ate vstaviti <i>zapu\u0161\u010Deno</i> LaTeX formulo.<br/>Nov na\u010Din ustvarjanja LaTeX besedila/formule je opisan na tej strani:</html>
+LatexInsertLatexAction.msg2=<html>Skratka: <ul><li>uporabi "\\\\latex " predpono v tekstu vozli\u0161\u010Du ali</li><li><i>Pogled-> Orodna plo\u0161\u010Da</i>, potem <i>Osnovno besedilo->Format->Latex</i></li></ul></html>
 LatexInsertLatexAction.text=Dodaj LaTeX formulo ...
+latexPatternFormat=LaTeX
 LengthUnits.cm=cm
+LengthUnits.in=in
 LengthUnits.mm=mm
 LengthUnits.pt=pt
 LengthUnits.px=px
 less_than_two_selected_nodes=Izbrati morate vsaj dve vozli\u0161\u010Di, da bi dobili povezave.
+license=Licenca: GPL 2 ali novej\u0161a
+license_text=<html>Ta program je prosta programska oprema; ki se lahko deli in/ali<br>spreminja pod pogoji, kot je navedeno v GNU General Public License<br>katero je objavil Free Software Foundation; ali razli\u010Dica 2<br>licence ali (po va\u0161i izbiri) katero koli kasnej\u0161o razli\u010Dico.<br><br>Ta program je narejen v upanju, da bi bil koristen,<br>vendar BREZ GARANCIJE; celo brez implicitne garancije<br>PRIMERNOSTI ZA PRODAJO ali PRIMERNOSTI ZA DOLO\u010CEN NAMEN.  Glej<br>GN [...]
+link_error=Napa\u010Dna povezava "{0}" ni nalo\u017Eena
 link_not_available_any_more=Povezava ni ve\u010D veljavna. Medtem je bilo vozli\u0161\u010De \u017Ee izbrisano.
 link_not_found=Povezave {0} ni mogo\u010De najti.
+links=Povezava
 load=&Nalo\u017Ei
+load_accelerator_presets=Nalo\u017Ei
+load_accelerator_presets.noActions=Ni prednastavitev
+LoadAcceleratorPresetsAction.textPatterns.text=Tekstovni vzorci
 locking_failed_by_open=Zaklep miselnega vzorca {0} ni uspel. Odpiranje samo za branje.
-locking_failed_by_save_as=Zaklep miselnega vzorca {0} ni uspel. Dejanje shranjevanja je bilo prekinjeno.
+locking_failed_by_save_as=Zaklep miselnega vzorca {0} ni uspel. Dejanje shranjevanja kot je bilo prekinjeno.
 locking_old_lock_removed=Miselni vzorec {0} je zaklenil uporabnik {1}. Zaklep je bil odstranjen, saj je star.
 long_node_changed_cancel=Spremenili ste vozli\u0161\u010De. \u017Delite zavre\u010Di spremembe?
 long_node_changed_submit=Spremenili ste vozli\u0161\u010De. \u017Delite shraniti spremembe?
 lots_of_links_warning=Ustvarili boste veliko povezav z istim vozli\u0161\u010Dem. Resni\u010Dno \u017Eelite ustvariti te povezave?
+main_menu=Meni
+main_resource_directory=Viri namestitve: {0}
+MainView.errorUpdateText=Napaka pri nastavljanju besedila za naslednji vnos: {0}.
+MakeLinkFromAnchorAction.text=Pove\u017Ei povezavo s sidrom
+MakeLinkFromAnchorAction.tooltip=<html>ustvari lokalno ali globalno povezavo iz<br/>sidra vozli\u0161\u010Da do izbranega vozli\u0161\u010Da</html>
+MakeLinkToAnchorAction.text=Pove\u017Ei povezavo s sidrom
+MakeLinkToAnchorAction.tooltip=<html>ustvari lokalno ali globalno povezavo iz<br/>izbranega sidra vozli\u0161\u010Da do izbranega vozli\u0161\u010Da</html>
+ManageAddOnsAction.text=Dodatki
+ManageAddOnsDialog.activate=Aktiviraj
+ManageAddOnsDialog.activation.success={0} se bo aktiviral po ponovnem zagonu.
+ManageAddOnsDialog.authored.by=od {0}
+ManageAddOnsDialog.cannot.activate=Ni mogo\u010De aktivirati: {0} je \u017Ee aktiven.
+ManageAddOnsDialog.cannot.configure=Ne morem konfigurirati {0}.
+ManageAddOnsDialog.cannot.deactivate=Ne morete dezaktivirati: {0} ni aktiven.
+ManageAddOnsDialog.cannot.deinstall=Deinstalacije ni mogo\u010De odstraniti {0}.
+ManageAddOnsDialog.configure=Konfiguriraj
+ManageAddOnsDialog.deactivate=Dezaktiviraj
+ManageAddOnsDialog.deactivation.success={0} bo dezaktiviran po ponovnem zagonu.
+ManageAddOnsDialog.deinstall=Odstrani
+ManageAddOnsDialog.deinstallation.success={0} bo odstranjen po ponovnem zagonu.
+ManageAddOnsDialog.error=Napaka pri namestitvi: {0}.
+ManageAddOnsDialog.install=&Namesti
+ManageAddOnsDialog.install.from.known.location=Namesti dodatke z znane lokacije
+ManageAddOnsDialog.install.tooltip=Tukaj vnesi URL namestitvene datoteke dodatka
+ManageAddOnsDialog.map.not.opened=Miselni vzorec {0} se ne zdi odprt.
+ManageAddOnsDialog.really.deinstall=Res \u017Eelite odstraniti {0}?
+ManageAddOnsDialog.search=Iskanje dodatkov
+ManageAddOnsDialog.search.file=Iskanje
+ManageAddOnsDialog.select.tooltip=Izberi datoteko
+ManageAddOnsDialog.status.downloading=Prenos datoteke ...
+ManageAddOnsDialog.status.installing=Namestitev dodatka ...
+ManageAddOnsDialog.status.success=Uspe\u0161no je bil name\u0161\u010Den {0}.
+ManageAddOnsDialog.tab.install=Iskanje in namestitev
+ManageAddOnsDialog.tab.install.tooltip=Poi\u0161\u010Di in namesti nove dodatke
+ManageAddOnsDialog.tab.manage=Dodatki
 ManageAddOnsDialog.tab.manage.themes=Teme
+ManageAddOnsDialog.tab.manage.themes.tooltip=Upravljanje name\u0161\u010Denih tem
+ManageAddOnsDialog.tab.manage.tooltip=Upravljanje name\u0161\u010Denih dodatkov
+ManageAddOnsDialog.visit.addon.page=Obi\u0161\u010Di stran z dodatki ...
+ManageConditionalStylesAction.text=Upravljaj pogojne sloge za miselne vzorce
+ManageNodeConditionalStylesAction.text=Upravljaj pogojne sloge za vozli\u0161\u010Da
 map_already_exists=Miselni vzorec \u017Ee obstaja. Ga \u017Eelite prepisati?
+map_background=Ozadje miselnega vzorca
+map_background_image=Slika ozadja
 map_corrupted=Miselni vzorec je okvarjen. Si \u017Eelite ogledati podrobnosti?
+map_load_error=Ni bilo mogo\u010De nalo\u017Eiti miselnega vzorca {0}
 map_locked_by_open=Miselni vzorec {0} je \u017Ee urejevan s strani uporabnika {1}. Odpiranje samo za branje.
 map_locked_by_save_as=Miselni vzorec {0} je \u017Ee urejevan s strani uporabnika {1}. Akcija Shrani kot je prekinjena.
 map_not_saved=Miselni vzorec prej ni bil shranjen.
+MapBackgroundClearAction.text=Po\u010Disti
+MapBackgroundColorAction.text=Barva ozadja
+MapBackgroundImageAction.text=Slika ozadja ...
+maps=Miselni vzorci
+MaxNodeWidth.text=Nastavite najve\u010Djo \u0161irino vozli\u0161\u010Da
+menu_applyStyle=Uporabi slog
 menu_attributes=&Atributi
+menu_clouds=Oblaki
+menu_copy=Kopiraj
+menu_coreFormat=Jedro vozli\u0161\u010Da
+menu_details=Podrobnosti
+menu_displayAttributes=Atributi vozli\u0161\u010Da
+menu_encryption=Za\u0161\u010Dita z geslom
+menu_error=Napaka v uporabni\u0161ko definirani strukturi menija {0}:\n{1}\nPrekinitev
+menu_extensions=Raz\u0161iritve vozli\u0161\u010Da
+menu_group=Skupina vozli\u0161\u010D
+menu_hoverView=Nasveti za orodje
+menu_iconByCategory=Kategorije ikon...
+menu_iconView=Ikone
+menu_image=Image
 menu_insert=Vs&tavi
-menu_latex_formula=LaTeX formula
+menu_latex_formula=Formula LaTeX
+menu_manageStyles=&Upravljaj sloge
+menu_moveNode=Premakni in razvrstiti
+menu_newNode=Novo vozli\u0161\u010De
+menu_node=Vozli\u0161\u010De
+menu_node_features=Funkcije vozli&\u0161\u010Da
 menu_nodes=&Vozli\u0161\u010Da
+menu_nodeView=Jedro vozli\u0161\u010Da
+menu_noteView=Opombe
+menu_openmaps=Miselni vzorci
+menu_remove_icons=Odstrani ikone
+menu_removeAttribute=Odstrani atribute
+menu_select=Izberi
+menu_time=Upravljanje \u010Dasa
+menu_title=Jedro vozli\u0161\u010Da
+menu_viewmode=Ogled nastavitev
+MenuUtils.invalid_menuitem={0} ni veljavna klju\u010Dna to\u010Dka v meniju.
 mindmap=Miselni vzorec
+MindMapNodesFlavorHandler=Hierarhija vozli\u0161\u010D
 mindmaps=&Miselni vzorci
 mindmaps_desc=Miselni vzorci (*.mm)
 mindmaps_filter_desc=Filtri (*.mmfilter)
-mode_Browse=Browse Mode[translate me]
-mode_File=File Mode[translate me]
-mode_MindMap=MindMap Mode[translate me]
+MinNodeWidth.text=Nastavite najmanj\u0161o \u0161irino vozli\u0161\u010Da
+mode_Browse=Na\u010Din brskanja
+mode_File=Na\u010Din datoteke
+mode_MindMap=Na\u010Din miselni vzorec
 mode_na=Na\u010Din ni na voljo
 mode_status=Na\u010Din spremenjen v na\u010Din {0}
+mode_StyleMap=Urejanje sloga
 mode_title=Freeplane - {0}
 modes=Na\u010Dini
-ModesMenuAction.Browse.text=Map Browser[translate me]
-ModesMenuAction.File.text=File Explorer[translate me]
-ModesMenuAction.MindMap.text=Mind Map Editor[translate me]
+ModesMenuAction.Browse.text=Brskalnik miselnih vzorcev
+ModesMenuAction.File.text=Raziskovalec datotek
+ModesMenuAction.MindMap.text=Urednik miselnih vzorcev
 most_recent_files=Zadnje odprte datoteke
+MoveAction.text=Premakni
+MoveSelectedNodeAction.CENTER.text=Sredi\u0161\u010De izbranega vozli\u0161\u010Da
+MoveSelectedNodeAction.EAST.text=Premakni izbrano vozli\u0161\u010De v desno
+MoveSelectedNodeAction.WEST.text=Premakni izbrano vozli\u0161\u010De v levo
 MoveToRootAction.text=Premakni k korenskemu vozli\u0161\u010Du
+NameConditionAction.text=Nastavi ime
 navigate=Krmar
 NavigationNextMapAction.text=Naslednji vzorec
 NavigationPreviousMapAction.text=Prej\u0161nji vzorec
 new=&Novo
+new_map_from_user_templates.text=Nov miselni vzorec iz predloge ...
 new_mindmap=Nov miselni vzorec
 new_node=Novo vomgpidpipidzli\u0161\u010De
 new_node_as_sibling_not_possible_for_the_root=Novo vozli\u0161\u010De kot bratsko ni mo\u017Eno kot korensko vozli\u0161\u010De
+new_version_available=Nova razli\u010Dica ''{0}'' je na voljo
 NewChildAction.text=Novo otro\u0161ko vozli\u0161\u010De
 NewerFileRevisionsFoundDialog.cancel=&Presko\u010Di
+NewerFileRevisionsFoundDialog.cancel.tooltip=Ne odpri te datoteke
+NewerFileRevisionsFoundDialog.file_last_modified=\u010Casovni \u017Eig
+NewerFileRevisionsFoundDialog.file_name=Datoteka
+NewerFileRevisionsFoundDialog.file_size=Bajti
+NewerFileRevisionsFoundDialog.open=&Odpri
+NewerFileRevisionsFoundDialog.open.tooltip=Odpri datoteko, tudi \u010De je morda zastarela
+NewerFileRevisionsFoundDialog.question=Najdeno je novo \u0161tevilo popravkov {0}!
+NewerFileRevisionsFoundDialog.restore=Obn&ovi
+NewerFileRevisionsFoundDialog.restore.tooltip=Zamenjaj {0} za {1}
+NewerFileRevisionsFoundDialog.title=Najdene so novej\u0161e revizije datotek!
+NewFreeNodeAction.text=Novo plavajo\u010De vozli\u0161\u010De
+NewLevelStyleAction.text=Dodaj slog nivoja
+newmap.install.addon.question={0} zdi se, da je dodatni paket\nAli ga \u017Eelite namestiti?\n(Izberite "Ne" za normalno odpiranje.)
+newmap.install.addon.title=Namestim dodatke?
 NewMapAction.text=Nov miselni vzorec
+NewMapViewAction.text=Nov pogled miselnega vzorca
 NewParentNode.text=Novo nadrejeno vozli\u0161\u010De
 NewParentNode.tooltip=<html>Vsi izbrani bodo poslani k novemu nadrejenemu.</html>
-NewPreviousSiblingAction.text=Novo predhodno bratsko vozli\u0161\u010De
-NewSiblingAction.text=Novo bratsko vozli\u0161\u010De
+NewPreviousSiblingAction.text=Vozli\u0161\u010De novega prej\u0161njega sorojenca
+NewSiblingAction.text=Vozli\u0161\u010De novega sorojenca
+NewSummaryAction.text=Novo zbirno vozli\u0161\u010De (izbrana vozli\u0161\u010Da)
+NewUserStyleAction.text=Novi slog iz izbora
+NextNodeAction.BACK.text=Pojdi na prej\u0161nje vozli\u0161\u010De
+NextNodeAction.BACK_N_FOLD.text=Pojdi na prej\u0161nje vozli\u0161\u010De (zlo\u017Eeno)
+NextNodeAction.FORWARD.text=Pojdi na naslednje vozli\u0161\u010De
+NextNodeAction.FORWARD_N_FOLD.text=Pojdi na naslednje vozli\u0161\u010De (zlo\u017Eeno)
+NextPresentationItemAction.text=Odpri naslednjo predstavitveno postavko (zlo\u017Eeno)
 no=Ne
+no_copy_attributes_before_paste_attributes=Atributov ne morete prilepiti, dokler jih ne kopirate.
+NO_FORMAT=Besedilo
 no_format_copy_before_format_paste=Oblike ne morete prilepiti, \u010De je niste prej kje kopirali.
 no_found_from=<html>"{0}" ni mogo\u010De najti v "{1}".</html>
+no_more_found_from=<html>Nobeden ni <u>{0}</u> najden iz "{1}".</html>
 no_previous_find=Ni bilo zadetkov od prej.
+no_styles_found_in_map=V miselnem vzorcu ni bilo mogo\u010De najti slogov
+no_translation_strings_found=Noben niz za prevod ni najden
 node=Vozli\u0161\u010De
 node_changed_discard_changes=Spremenili ste vozli\u0161\u010De. \u017Delite zavre\u010Di spremembe?
+node_is_write_protected=Ciljno vozli\u0161\u010De je za\u0161\u010Diteno pred pisanjem.
 node_location_help=Vleka spremeni polo\u017Eaj vozli\u0161\u010Da, ctrl+vleka spremeni razdalje, dvoklik in ctrl+dvoklik ponastavi vozli\u0161\u010De.
+node_popup_scripting=Skripti
+node_selector=Izbira vozli\u0161\u010Da
+node_selector_message=Dvokliknite, \u010De \u017Eelite izbrati vozli\u0161\u010De
+node_styles=Stili vozli\u0161\u010Da
 NodeBackgroundColorAction.text=Barva ozadja vozli\u0161\u010Da ...
 NodeColorAction.text=Barva vozli\u0161\u010Da ...
 NodeColorBlendAction.text=Zlij barvo
 NodeDownAction.text=Vozli\u0161\u010De navzdol
+NodeExtensions.EditNodeExtensions=Uredi raz\u0161iritve vozli\u0161\u010D
+NodeExtensions.RemoveNodeExtensions=Odstrani raz\u0161iritve vozli\u0161\u010D
 NodeListAction.text=Najdi in zamenjaj ...
 NodeListAction.tooltip=Poka\u017Ei vsa vozli\u0161\u010Da kot iskalni seznam s filtrom lastnosti.
 NodeShapeAction.bubble.text=Mehur\u010Dek
+NodeShapeAction.fork.text=Razvejaj
+NodeShapeAction.narrow_hexagon.text=Ozki \u0161esterokotnik
+NodeShapeAction.oval.text=Ovalen
+NodeShapeAction.rectangle.text=Pravokotnik
+NodeShapeAction.wide_hexagon.text=\u0160irok \u0161esterokotnik
 NodeUpAction.text=Vozli\u0161\u010De navzgor
 nonboldify_branch=Razveljavi krepko
 nonitalicise_branch=Razveljavi le\u017Ee\u010De
 normal=Obi\u010Dajno
+not_saved_for_image_error=Miselni vzorec mora biti shranjen, preden lahko nastavite sliko z izbirnikom datotek
 not_saved_for_link_error=Miselni vzorec mora biti shranjen, preden lahko nastavite povezavo z izbirnikom datotek
+note_window_location=Polo\u017Eaj opombe
+notes=Opomba
+NotFoldingNextPresentationItemAction.text=Odpri naslednjo predstavitveno postavko
+NotificationOptions.CLOSE=Zapri
+NotificationOptions.REMIND_ME_LATER=Opomni me kasneje
+NotificationOptions.REMOVE_REMINDER=Odstrani opomnik
+NotificationOptions.SELECT_NODE=Pojdi na opomnik
 ok=&V redu
 OKAction.text=V redu
+OnlineReference.text=Spletna dokumentacija
+open_asMindMap=Miselni vzorec
 OpenAction.text=Odpri shranjen miselni vzorec ...
-OpenPathAction.text=Open File[translate me]
+OpenFreeplaneSiteAction.text=Doma\u010Da stran Freeplane
+OpenMapsAddLocation.text=Dodaj lokacijo OpenMaps ...
+OpenMapsRemoveLocation.text=Odstrani lokacijo OpenMaps
+OpenMapsViewLocation.text=Ogled lokacije OpenMaps ...
+OpenPathAction.text=Odpri datoteko
+OpenURLMapAction.text=Odpri miselni vzorec iz URL-ja ...
+OpenUserDirAction.text=Odpri uporabni\u0161ki imenik
 option_changes_may_require_restart=Da bi videli u\u010Dinek spremenjenih nastavitev, morate najverjetneje ponovno zagnati Freeplane.
 OptionalDontShowMeAgainDialog.cancel=&Ne
 OptionalDontShowMeAgainDialog.dontShowAgain=&Ne spra\u0161uj ve\u010D.
 OptionalDontShowMeAgainDialog.ok=&Da
 OptionalDontShowMeAgainDialog.rememberMyDescision=&Zapomni si moj odgovor.
-OptionPanel.absolute=absolutne
+OptionPanel.absolute=Absoluten
 OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Samodejni vzorci postavitve
+OptionPanel.ADD_CHILD=Dodaj podrejeno vozli\u0161\u010De
+OptionPanel.ADD_SIBLING=Dodaj vozli\u0161\u010De sorojenca
+OptionPanel.addons=Dodatki
+OptionPanel.af=Afri\u0161ko
+OptionPanel.always_fold_all_after_load=Prepogni vse
+OptionPanel.always_load_last_maps=Nalo\u017Ei zadnje in nove miselne vzorce
+OptionPanel.always_load_last_maps.tooltip=Odprite zadnje datoteke, dolo\u010Dene z zgornjimi mo\u017Enostmi, za\u010Denjajo\u010D z izbrano FP datoteko.
+OptionPanel.always_save_folding=Vedno
+OptionPanel.always_save_folding_state=Vedno shrani spremembe stanja zlaganja
+OptionPanel.always_save_folding_state.tooltip=\u010Ce je ozna\u010Deno, vsako zlaganje naredi miselni vzorec uporabljen in vas opominja, da ga shranite.
+OptionPanel.always_show_less_than_N_nodes_after_load=Razpni nekaj vozli\u0161\u010D
+OptionPanel.always_unfold_all_after_load=Razpostri vse
 OptionPanel.antialias=Glajenje
-OptionPanel.antialias.tooltip=<html>Dolo\u010Da kvaliteto vzorca. Ve\u010D glajenja zahteva ve\u010D \u010Dasa.</html>
+OptionPanel.antialias.tooltip=<html>Dolo\u010Di kvaliteto miselnega vzorca. Ve\u010D glajenja zahteva ve\u010D \u010Dasa.</html>
 OptionPanel.antialias_all=Pogladi robove vsega
 OptionPanel.antialias_edges=Pogladi le robove
 OptionPanel.antialias_none=brez glajenja
-OptionPanel.Appearance=Videz
+OptionPanel.antialias_svg=Zgladi SVG
+OptionPanel.antialias_svg.tooltip=<html>Dolo\u010Da kakovost SVG upodabljanja. Ve\u010D glajenja potrebuje ve\u010D \u010Dasa.</html>
+OptionPanel.Appearance=Izgled
+OptionPanel.approximate_search_threshold=Prag za pribli\u017Eno ujemanje
+OptionPanel.approximate_search_threshold.tooltip=<html>Prag za pribli\u017Eno ujemanje<br/><font size="2">see http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(ve\u010Dja kot je vrednost o\u017Eja je dovoljena \u0161irina<br/>\u0161irine za rezultate iskanja)</html>
 OptionPanel.ar=Arab\u0161\u010Dina / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
+OptionPanel.ARC=Lok
 OptionPanel.as_parent=kot star\u0161
 OptionPanel.ask=Vpra\u0161aj
 OptionPanel.automatic=samodejno
 OptionPanel.automaticFormat_level=Samodejni slogi postavitve
 OptionPanel.automaticFormat_level1=Oblika korenskega vozli\u0161\u010Da
 OptionPanel.automaticFormat_level2=Oblika vozli\u0161\u010D 1. ravni
+OptionPanel.backup_file_number=\u0160tevilo shranjenih varnostnih kopij
 OptionPanel.Behaviour=Vedenje
-OptionPanel.bezier=Bezier[translate me]
+OptionPanel.bezier=Gladko ukrivljen (bezier)
+OptionPanel.border_color=Barva
+OptionPanel.border_color_matches_edge_color=Uporabi barvo roba
+OptionPanel.border_dash=Vrsta mejne \u010Drte
+OptionPanel.border_dash_matches_edge_dash=Uporabi tip vrstice robov
+OptionPanel.border_width=\u0160irina \u010Drte
+OptionPanel.border_width_matches_edge_width=Uporabi \u0161irino roba
 OptionPanel.bubble=mehur\u010Dek
+OptionPanel.ca=Katalonski, Valencian / Catal\u00E0
 OptionPanel.Cancel=Prekli\u010Di
+OptionPanel.center_selected_node=Centriraj izbrano vozli\u0161\u010De samodejno
+OptionPanel.check_updates_automatically=Preveri za posodobitve pri zagonu programa
 OptionPanel.childpattern=Vzorec otroka
-OptionPanel.childpattern.tooltip=Izbrani vzorec bo uporabljen na vseh otrocih.
+OptionPanel.childpattern.tooltip=Izbrani vzorec bo uporabljen na vseh podrejenih.
 OptionPanel.clear_all_setters=Preklopi vse
 OptionPanel.clear_all_setters.tooltip=Omogo\u010Di ali onemogo\u010Di vse ozna\u010Dbe sprememb.
-OptionPanel.cloud=Cloud[translate me]
+OptionPanel.cloud=Oblak
+OptionPanel.cloudcolor=Barva obla\u010Dka
+OptionPanel.cloudshape=Oblika obla\u010Dka
 OptionPanel.combined=Zdru\u017Eeno
+OptionPanel.compare_as_number=Primerjaj kot \u0161tevilke
+OptionPanel.connector_arrows=Konektor pu\u0161\u010Dic
+OptionPanel.connector_dash=Vrsta linije
 OptionPanel.convert_to_current_version=<html>Samodejno pretvori miselne vzorce iz starej\u0161ih razli\u010Dic Freeplane <br>v trenutno razli\u010Dico?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Samo zelo obse\u017Ene miselne vzorce, ki ne potrebujejo pretvorbe <br>(to je izvedensko mnenje), lahko odprete brez pretvorbe.</html>
+OptionPanel.copyFormatToNewSibling=Kopiraj format k novim sorojencem
+OptionPanel.copyFormatToNewSiblingIncludesIcons=Kopiraj format z ikonami
 OptionPanel.cs=\u010Ce\u0161\u010Dina / \u010Desky
 OptionPanel.cut_nodes_without_question=\u017Delite izrezati vozli\u0161\u010Da brez potrditve?
-OptionPanel.cut_nodes_without_question.tooltip=\u010Ce je to polje potrjeno, bodo vozli\u0161\u010Da izrezana brez potrditve. \u010Ce pritisnete gumb nenamerno, lahko povzro\u010Dite izgubo informacij.
+OptionPanel.cut_nodes_without_question.tooltip=\u010Ce je to polje potrjeno, bodo vozli\u0161\u010Da izrezana brez potrditve. \u010Ce gumb pritisnete nenamerno, lahko povzro\u010Dite izgubo informacij.
+OptionPanel.cut_out_pictures_when_pasting_html=Odstrani slike iz HTML-ja
 OptionPanel.da=Dan\u0161\u010Dina / dansk
+OptionPanel.date_format=Standardni format datuma
+OptionPanel.date_format.tooltip=Eden ali drugi SHORT, MEDIUM, LONG ali FULL ali podoben vzorec "MM/dd/yyyy"
+OptionPanel.datetime_format=Standardni format datuma in \u010Dasa
+OptionPanel.datetime_format.tooltip=Eden ali drugi <datestyle>,<timestyle> (s SHORT, MEDIUM, LONG ali FULL kot slog) ali celoten vzorec, kot je "M/d/yyyy hh:mm"
 OptionPanel.de=Nem\u0161\u010Dina / Deutsch
 OptionPanel.default=privzeto
-OptionPanel.default_browser_command_mac=Privzeti ukaz brskalnika za Mac
+OptionPanel.default_attribute_key_column_width=Standardna \u0161irina klju\u010Da atributa
+OptionPanel.default_attribute_value_column_width=Standardna \u0161irina vrednosti atributa
+OptionPanel.default_browser_command_mac=Privzeti ukaz brskalnika - Mac
 OptionPanel.default_browser_command_mac.tooltip=<html> in MAC: (hvala, Nick!)</html>
-OptionPanel.default_browser_command_other_os=Privzeti ukaz brskalnika za druge OS
+OptionPanel.default_browser_command_other_os=Privzeti ukaz brskalnika - drugi OS
 OptionPanel.default_browser_command_other_os.tooltip=<html> To je tipi\u010Dno za Linux:</html>
 OptionPanel.default_browser_command_windows_9x=Privzeti ukaz brskalnika za Windows 9x
 OptionPanel.default_browser_command_windows_9x.tooltip=<html>Za Windows (znaki "" so obvezni zaradi povezav, ki vsebujejo "=" v svojem naslovu URL).</html>
 OptionPanel.default_browser_command_windows_nt=Privzeti ukaz brskalnika za Windows NT
 OptionPanel.default_browser_command_windows_nt.tooltip=<html>Za Windows (znaki "" so obvezni zaradi povezav, ki vsebujejo "=" v svojem naslovu URL).</html>
+OptionPanel.default_charset=Nabor znakov
+OptionPanel.default_save_dir=Privzeti imenik za shranjevanje
 OptionPanel.Defaults=Privzeto
 OptionPanel.delete_automatic_saves_at_exit=Ob izhodu izbri\u0161i samodejno shranjeno
 OptionPanel.delete_automatic_saves_at_exit.tooltip=<html> \u010Ce naj bodo datoteke samodejno izbrisane ob normalnem zaprtju programa Freeplane, nastavite to spremenljivko na true (resni\u010Dno).</html>
@@ -502,13 +1051,21 @@ OptionPanel.delete_nodes_without_question=\u017Delite izbrisati vozli\u0161\u010
 OptionPanel.delete_nodes_without_question.tooltip=\u010Ce je to polje potrjeno, se vozli\u0161\u010Da izbri\u0161ejo brez potrditve. Povzro\u010Dite lahko izgubo podatkov, \u010De nehote pritisnete gumb.
 OptionPanel.disable_cursor_move_paper=Onemogo\u010Di premikanje podlage s kazalko
 OptionPanel.disable_cursor_move_paper.tooltip=<html>Ne prika\u017Ei kazalke 'premakni' med vleko papirja.</html>
-OptionPanel.display_node_id=Display node ID[translate me]
+OptionPanel.display_inline_editor_for_all_new_nodes=Prika\u017Ei preprost urejevalnik besedila za vsa nova vozli\u0161\u010Da
+OptionPanel.display_node_id=Prika\u017Ei ID vozli\u0161\u010Da
 OptionPanel.edgecolor=Barva robov
 OptionPanel.edgecolor.tooltip=Lastnost roba star\u0161evskega vozli\u0161\u010Da (velja tudi za vsa otro\u0161ka vozli\u0161\u010Da)
+OptionPanel.edgedash=Vrsta vrstice robov
 OptionPanel.edgestyle=Slog robov
 OptionPanel.edgestyle.tooltip=Lastnost roba star\u0161evskega vozli\u0161\u010Da (velja tudi za vsa otro\u0161ka vozli\u0161\u010Da)
 OptionPanel.edgewidth=\u0160irina robov
 OptionPanel.edgewidth.tooltip=Lastnost roba star\u0161evskega vozli\u0161\u010Da (velja tudi za vsa otro\u0161ka vozli\u0161\u010Da)
+OptionPanel.EDIT_CURRENT=Prepi\u0161i vsebino
+OptionPanel.edit_on_double_click=Uredi z dvojnim klikom
+OptionPanel.editor_extra_width=Korak dodatne \u0161irine
+OptionPanel.editor_extra_width.tooltip=<html>Dolo\u010Di \u0161tevilo slikovnih pik, da okrepite \u0161irino vozli\u0161\u010Da, \u010De besedilo raz\u0161irja trenutno \u0161irino.</html>
+OptionPanel.el=Gr\u0161ki / \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
+OptionPanel.el__buttons_above=Gumbi na vrhu
 OptionPanel.el__enter_confirms_by_default=Tipka Enter potrdi izbiro
 OptionPanel.el__max_default_window_height=Privzeta maksimalna vi\u0161ina okna
 OptionPanel.el__max_default_window_width=Privzeta maksimalna \u0161irina okna
@@ -519,20 +1076,45 @@ OptionPanel.en=Angle\u0161\u010Dina / English
 OptionPanel.Environment=Okolje
 OptionPanel.es=\u0160pan\u0161\u010Dina, Kastilj\u0161\u010Dina / espa\u00F1ol, castellano
 OptionPanel.et=Eston\u0161\u010Dina / eesti, eesti keel
+OptionPanel.eu=Baskov\u0161\u010Dina
 OptionPanel.execute_scripts_without_asking=Skripti naj bodo izvedeni brez potrditve
-OptionPanel.execute_scripts_without_asking.tooltip=<html>Skripti Freeplane so sposobni izvesti poljubno dejanje na va\u0161em ra\u010Dunalniku. <br>Zato ni pametno izvajati skript, katerih varnosti ne morete oceniti.</html>
+OptionPanel.execute_scripts_without_asking.tooltip=<html>Skripti Freeplane so sposobni izvesti poljubno dejanje na va\u0161em ra\u010Dunalniku. <br>Zato ni dobro izvajati skript, katerih varnosti ne morete oceniti.</html>
+OptionPanel.execute_scripts_without_exec_restriction=Dovoli izvesti druge aplikacije (NI priporo\u010Dljivo)
+OptionPanel.execute_scripts_without_exec_restriction.tooltip=<html><body>\u010Ce va\u0161 Groovy skript potrebuje da izvede posebne druge aplikacije (kot je brskalnik), ne da bi vas vpra\u0161al(!),<br>potem morate omogo\u010Diti to mo\u017Enost. <br>Toda skrbno jo uporabljajte, saj lahko zlonamerni skripti po\u0161kodujejo va\u0161 ra\u010Dunalnik!</body></html>
+OptionPanel.execute_scripts_without_file_restriction=Dovoli datote\u010Dne bralne operacije (NI priporo\u010Dljivo)
+OptionPanel.execute_scripts_without_file_restriction.tooltip=<html><body>\u010Ce va\u0161 Groovy skript potrebuje dostop do branja (odpiranje, zapiranje, branje),<br>potem morate omogo\u010Diti to mo\u017Enost. <br>Toda skrbno jo uporabljajte, saj lahko zlonamerni skripti po\u0161kodujejo va\u0161 ra\u010Dunalnik!</body></html>
+OptionPanel.execute_scripts_without_network_restriction=Dovoli upravljanje omre\u017Enih virov (NI priporo\u010Dljivo)
+OptionPanel.execute_scripts_without_network_restriction.tooltip=<html><body>\u010Ce va\u0161 Groovy skript potrebuje posebna omre\u017Ena dejanja,<br>potem morate omogo\u010Diti to mo\u017Enost. <br>Toda skrbno jo uporabljajte, saj lahko zlonamerni skripti razkrijejo va\u0161e skrivnosti!</body></html>
+OptionPanel.execute_scripts_without_write_restriction=Dovoli operacijo pisanja za datoteko (NI priporo\u010Dljivo)
+OptionPanel.execute_scripts_without_write_restriction.tooltip=<html><body>\u010Ce potrebuje va\u0161 Groovy skript dostop do datotek (pisanje, brisanje(!)),<br>potem morate omogo\u010Diti to mo\u017Enost. <br>Obi\u010Dajno se uporablja za dostop do branja.<br>Toda uporabite ga previdno, saj lahko zlonamerni skripti po\u0161kodujejo ra\u010Dunalnik!</body></html>
 OptionPanel.experimental_file_locking_on=Poskusno zaklepanje datotek
 OptionPanel.experimental_file_locking_on.tooltip=<html> Eksperimentalne mo\u017Enosti</html>
 OptionPanel.export_icons_in_html=Izvozi ikone v HTML
 OptionPanel.export_icons_in_html.tooltip=<html> Dolo\u010Dite, \u010De naj izvo\u017Eeni HTML iz Freeplane-a vsebuje ikone. Te\u017Eava z ikonami je, da povezave z ikonami v izvo\u017Eenem HTML pogosto ne delujejo.</html>
+OptionPanel.exported_image_resolution_dpi=Izvozna lo\u010Dljivost slike (v DPI)
 OptionPanel.Files=Datoteke
 OptionPanel.first=kot prve
+OptionPanel.fit_to_viewport=Prilagodi sliko ozadja velikosti okna
+OptionPanel.fold_on_click_inside=Zlo\u017Ei s klikom
 OptionPanel.foldingsymbolwidth=\u0160irina simbola prepogibanja
 OptionPanel.foldingsymbolwidth.tooltip=<html>\u0160irina krogca, ki ozna\u010Duje prepognjenost drevesa.</html>
-OptionPanel.fork=Fork[translate me]
+OptionPanel.fork=Razvejaj
+OptionPanel.format_locale=Lokalno oblikovanje
+OptionPanel.format_locale.tooltip=Nastavitev lokalizacije za oblikovanje in raz\u010Dlenjevanje podatkov
+OptionPanel.formula_disable_caching=Onemogo\u010Di pomnilnik za izra\u010Dun formule
+OptionPanel.formula_disable_plugin=Onemogo\u010Di pomnilnik za izra\u010Dun formule
 OptionPanel.fr=Franco\u0161\u010Dina / Fran\u00E7ais
 OptionPanel.gl=Galicij\u0161\u010Dina / Galego
+OptionPanel.goto_note_end_on_edit=Premakni kazalec bele\u017Eke na konec
+OptionPanel.grid_size=Velikost vrzeli mre\u017Ee
+OptionPanel.groovy_editor_font=Pisava za urejevalnik sintakse Groovy Syntax
+OptionPanel.groovy_editor_font.tooltip=Uporabi 'Dialog' ali 'Monospaced', \u010De potrebujete unicode znake!
+OptionPanel.groovy_editor_font_size=Velikost pisave za urejevalnik sintakse Groovy Syntax
 OptionPanel.gtk=Gtk
+OptionPanel.hide_edge=Skrij rob
+OptionPanel.hide_single_end_connectors=Skrij enojne konce
+OptionPanel.highlight_formulas=Ozna\u010Di formule
+OptionPanel.horizontal=Vodoravno
 OptionPanel.hr=Hrva\u0161\u010Dina / hrvatski
 OptionPanel.HTML=HTML
 OptionPanel.html_export_based_on_headings=glede na naslove
@@ -541,59 +1123,172 @@ OptionPanel.html_export_fold_currently_folded=prepogni trenutno prepognjene
 OptionPanel.html_export_folding=Prepogibanje pri izvozu v HTML
 OptionPanel.html_export_no_folding=brez prepogibanja
 OptionPanel.hu=Mad\u017Ear\u0161\u010Dina / Magyar
+OptionPanel.ic_disable=Onemogo\u010Di
+OptionPanel.ic_file=Uporaba diska
+OptionPanel.ic_ram=V RAM-u
 OptionPanel.icon=Ikona
 OptionPanel.icon.tooltip=\u010Ce je polje ozna\u010Deno, bo imelo vozli\u0161\u010De natanko to ikono.
 OptionPanel.icon_size=Velikost ikone
-OptionPanel.id=Id[translate me]
+OptionPanel.icons.list=Seznam prikazanih standardnih ikon
+OptionPanel.icons.list.tooltip=Tukaj lahko naredite lastno razporeditev ikon ali omogo\u010Dite prikaza ikon. Ikone je treba lo\u010Diti z ';'.
+OptionPanel.id=Indonezij\u0161\u010Dina / Bahasa Indonesia
+OptionPanel.IGNORE=Ne delaj ni\u010Desar
+OptionPanel.il__enter_confirms_by_default=Tipka Enter potrdi izbiro
+OptionPanel.image_cache=za slike
+OptionPanel.indentationUsesTabsInTextOutput=Uporabi jezi\u010Dke v izpisu besedila
 OptionPanel.it=Italijan\u0161\u010Dina / Italiano
 OptionPanel.ja=Japon\u0161\u010Dina / \u65E5\u672C\u8A9E
+OptionPanel.JoinNodesAction.textSeparators=Besedilno lo\u010Dilo
+OptionPanel.key_type_action=Vnos preko tipkovnice
 OptionPanel.Keystrokes=Bli\u017Enjice
+OptionPanel.kn=Kannada / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=Korej\u0161\u010Dina / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
-OptionPanel.label_font_family=Font Family[translate me]
+OptionPanel.label_font_family=Dru\u017Eina pisav
 OptionPanel.label_font_size=Velikost pisave
 OptionPanel.language=Jezik
-OptionPanel.language.tooltip=<html>To je jezik, ki naj bo uporabljen v programu. 'samodejno' sku\u0161a nalo\u017Eiti trenutni uporabni\u0161ki jezik. </html>
+OptionPanel.language.tooltip=<html>To je jezik, ki naj bo uporabljen v programu. Postavka 'samodejno' sku\u0161a nalo\u017Eiti trenutni uporabni\u0161ki jezik. </html>
 OptionPanel.last=kot zadnje
 OptionPanel.last_opened_list_length=Dol\u017Eina nazadnje odprtih datotek
+OptionPanel.latex_disable_editor=Onemogo\u010Di urejevalnik poudarkov sintakse LaTeX
+OptionPanel.latex_disable_editor.tooltip=Omogo\u010Dite to mo\u017Enost, \u010De imate te\u017Eave z urejevalnikom LaTeX
+OptionPanel.latex_editor_font=Pisava za urejevalnik sintakse LaTeX
+OptionPanel.latex_editor_font.tooltip=Uporabi 'Dialog' ali 'Monospaced', \u010De potrebujete unicode znake!
+OptionPanel.latex_editor_font_size=Velikost pisave za urejevalnik sintakse LaTeX
+OptionPanel.latex_macros=Splo\u0161ni makroji LaTeX
+OptionPanel.layout_map_on_text_change=Posodobi miselni vzorec med urejanjem
+OptionPanel.layout_map_on_text_change.tooltip=Onemogo\u010Di za bolj\u0161o u\u010Dinkovitost
 OptionPanel.linear=linearno
 OptionPanel.links=Povezave
 OptionPanel.links.tooltip=<html>Nastavitev povezav kot relativnih ali absolutnih.</html>
-OptionPanel.load_folding=On Load[translate me]
+OptionPanel.load_folding=Pri obremenitvi
+OptionPanel.load_folding_from_map_default_fold_all=Nalo\u017Ei iz miselnega vzorca ali prepogni vse
+OptionPanel.load_folding_from_map_default_unfold_all=Nalo\u017Ei iz miselnega vzorca ali razvij vse
 OptionPanel.load_last_map=Samodejno odpri zadnji odprti miselni vzorec
 OptionPanel.load_last_map.tooltip=<html>Ko se Freeplane za\u017Eene, samodejno odpre nazadnje odprti miselni vzorec.</html>
+OptionPanel.load_last_maps=Vstavi vse zadnje zemljevide
 OptionPanel.lookandfeel=Izgled in ob\u010Dutek
-OptionPanel.lookandfeel.tooltip=<html>Izgled in ob\u010Dutek, ki naj bo uporabljen. 'meal','windows','motif', 'gtk' so podprti, 'mac' je na voljo le na MacOS. 'privzeto' pomeni, da je uporabljen privzeti izgled in ob\u010Dutek. \u010Ce \u017Eelite nastaviti svoj lasten L&F, prosimo vnesite ime razreda tukaj in zagotovite, da je/so ustrezna/e datoteka/e jar nalo\u017Eena/e. \u010Ce so z izgledom in ob\u010Dutkom problemi, potem tukaj izberite 'ni\u010D'. To deluje za program\u010Dke.</html>
+OptionPanel.lookandfeel.scaleuifonts=Lestvica UI pisav
+OptionPanel.lookandfeel.scaleuifonts.tooltip=Uporabno za monitorje visoke lo\u010Dljivosti
+OptionPanel.lookandfeel.tooltip=<html>Izgled & ob\u010Dutek, ki naj bo uporabljen. 'metal','windows','motif', 'gtk' so podprti, 'mac' je na voljo le na MacOS. Privzeto pomeni, da je uporabljen privzeti izgled in ob\u010Dutek. \u010Ce \u017Eelite nastaviti svoj lasten I&O, potem prosim vnesite ime razreda in zagotovite, da je/so ustrezna/e datoteka/e jar nalo\u017Eena/e. \u010Ce so z izgledom in ob\u010Dutkom problemi, potem izberite 'ni\u010D'. To deluje za program\u010Dke.</html>
 OptionPanel.lt=Litov\u0161\u010Dina / kalba
+OptionPanel.markClones=Pobarvaj oznake klona
+OptionPanel.markSelectedClones=Ozna\u010Devanje klonov barv za izbiro
+OptionPanel.max_displayed_node_count=Najve\u010Dje \u0161tevilo prikazanih vozli\u0161\u010D
+OptionPanel.max_image_width=Najve\u010Dja za\u010Detna \u0161irina slike
+OptionPanel.max_image_width.tooltip=Nove slike so zmanj\u0161ane na tej \u0161irini
+OptionPanel.max_menu_item_count=Najve\u010Dje \u0161tevilo elementov menija
+OptionPanel.max_menu_item_count.tooltip=Omejitev \u0161tevila, \u010De so predmeti v enem podmeniju, vsaj 10
 OptionPanel.max_node_width=Najve\u010Dja \u0161irina vozli\u0161\u010Da
 OptionPanel.max_node_width.tooltip=<html>Privzeta najve\u010Dja \u0161irina vozli\u0161\u010Da v pikslih.</html>
+OptionPanel.max_shortened_text_length=Najve\u010Dja skraj\u0161ana \u0161irina besedila
+OptionPanel.menuItemFontSize=Velikost pisave menija
 OptionPanel.metal=Metal
+OptionPanel.min_node_width=Najmanj\u0161a \u0161irina vozli\u0161\u010Da
+OptionPanel.monitor_size_inches=Velikost monitorja (palcev)
 OptionPanel.motif=Motif
-OptionPanel.nb=Nb[translate me]
+OptionPanel.narrow_hexagon=Ozki \u0161esterokotnik
+OptionPanel.nb=Norve\u0161ki Bokm\u00E5l / Norsk bokm\u00E5l
+OptionPanel.never_save_folding=Nikoli
+OptionPanel.neverShowSurvey=Nikoli ne poka\u017Ei vpra\u0161anj, anket in nasvetov
 OptionPanel.nl=Nizozemski, Flamski / Nederlands, Vlaams
-OptionPanel.nn=norve\u0161ki Nynorsk
+OptionPanel.nn=Norve\u0161\u010Dina Nynorsk / Norsk nynorsk
 OptionPanel.nodebackgroundcolor=Barva ozadja vozli\u0161\u010Da
+OptionPanel.nodebackgroundcolor.tooltip=Ozadje vozli\u0161\u010Da, kadar ni izbrano.
 OptionPanel.nodecolor=Barva vozli\u0161\u010Da
+OptionPanel.nodecolor.tooltip=Barva besedila vozli\u0161\u010Da, \u010De ni izbran.
 OptionPanel.nodefontbold=Krepka pisava
+OptionPanel.nodefonthyperlink=Hiperpovezava
 OptionPanel.nodefontitalic=Le\u017Ee\u010Da pisava
 OptionPanel.nodefontname=Pisava vozli\u0161\u010Da
 OptionPanel.nodefontsize=Pisava vozli\u0161\u010Da
+OptionPanel.nodeformat=Oblika
+OptionPanel.nodeformat.tooltip=<html>Zamenjava besedila in/ali oblikovanje:<ul><li><em> Raz\u0161iritev predlog</em> (<tt>%s</tt> je izvirno besedilo), npr. <tt>POZOR: %s</tt><li><em>Oblikovanje datumov in \u0161tevilk</em> - oglejte si primere v izbirnem polju</ul></html>
+OptionPanel.nodenumbering=\u0160tevil\u010Denje vozli\u0161\u010D
+OptionPanel.nodenumbering.tooltip=Dodaj serijsko \u0161tevilko (npr. 1.3.1) k besedilu vozli\u0161\u010Da.
+OptionPanel.nodeshape=Oblika vozli\u0161\u010Da
 OptionPanel.nodetext=Besedilo voli\u0161\u010Da
+OptionPanel.nodetext.tooltip=Tukaj lahko dolo\u010Dite besedilo vozli\u0161\u010Da. Prvotno besedilo se zavr\u017Ee, ko se uporabi ta vzorec.
 OptionPanel.nothing=ni\u010D
+OptionPanel.number_format=Standardna oblika \u0161tevilk
+OptionPanel.number_format.tooltip=Vzorec, ki vsebuje '#' za neobvezno ali '0' za obvezne \u0161tevke. Primeri: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=\u0160tevilo datotek samodejnega shranjevanja
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> \u0161tevilo n razli\u010Dnih datotek, v katere se shranjujejo miselni vzorci.  Prvo samodejno shranjevanje se izvede v prvo datoteko itn. do n+1-shranjevanja, ki se spet izvede v prvo datoteko (cikli\u010Dno).</html>
+OptionPanel.oc=Okcitan\u0161\u010Dina
 OptionPanel.OK=Shrani
+OptionPanel.org.freeplane.plugin.bugreport=Pravilnik
+OptionPanel.org.freeplane.plugin.bugreport.allowed=Vedno po\u0161lji
+OptionPanel.org.freeplane.plugin.bugreport.ask=Poka\u017Ei pogovorno okno poro\u010Dila
+OptionPanel.org.freeplane.plugin.bugreport.denied=Nikoli ne po\u0161lji
+OptionPanel.org.freeplane.plugin.bugreport.userid=Izbirni identifikator, ki ga \u017Eelite poslati
+OptionPanel.outline_hgap=Vodoravni razmik
+OptionPanel.outline_vgap=Navpi\u010Dni razmik
+OptionPanel.oval=Ovalen
+OptionPanel.paint_connectors_behind=Pobarvaj konektorje za vozli\u0161\u010Da
+OptionPanel.parse_data=Prepoznaj vnos \u0161tevilk, datuma in \u010Dasa
+OptionPanel.parse_data.tooltip=Poskusite raz\u010Dleniti podatke o datumu, datumu-\u010Dasu in \u0161tevilu, ter uporabiti standardne formate. Primeri: 100,000.00, 12/31, 12/31/99, 1999-12-31 in 1999-12-31 23:59
+OptionPanel.parse_formulas=Prepoznaj formule
+OptionPanel.parse_formulas.tooltip=Raz\u010Dleni formule na vozli\u0161\u010Dih, ki se za\u010Dnejo z '=': Glej http://www.freeplane.org/wiki/index.php/Formulas.
+OptionPanel.parse_latex=Prepoznaj LaTeX
+OptionPanel.parse_latex.tooltip=Prepoznaj formule LaTeX po obliki ali predponi: Glej http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
+OptionPanel.PASTE_HTML=Prilepi kot HTML
+OptionPanel.PASTE_PLAIN_TEXT=Prilepi kot navadno besedilo
+OptionPanel.pasteImagesFromFiles=Prilepi sliko iz datoteke
+OptionPanel.pasteImagesFromFiles.tooltip=Vstavi sliko, \u010De je slikovna datoteka spu\u0161\u010Dena v miselni vzorec
+OptionPanel.path_property_may_not_be_empty=Lastnost poti morda ni prazna! Spremembe so bile razveljavljene.
 OptionPanel.patternname=Ime
 OptionPanel.patternname.tooltip=Unikatno ime vzorca
 OptionPanel.pl=Polj\u0161\u010Dina / polski
 OptionPanel.placenewbranches=Postavi nove veje
-OptionPanel.placenewbranches.tooltip=<html>Kam naj bodo postavljene nove veje. Veljavne vrednosti so 'prve' in 'zadnje' </html>
+OptionPanel.placenewbranches.tooltip=<html>Kam naj bodo postavljene nove veje. Veljavne vrednosti so 'prva' in 'zadnja' </html>
+OptionPanel.plugin.tooltip=Vti\u010Dniki niso prilo\u017Eeni.
+OptionPanel.plugins=Vti\u010Dniki
+OptionPanel.Presentation=Predstavitev
+OptionPanel.presentation.combineAll=Zdru\u017Ei vse predstavitve
+OptionPanel.presentation.exportDirectory=izvo\u017Eeno ime predstavitvenega imenika
+OptionPanel.presentation.maxDropBoxRowCount=Najve\u010Dje \u0161tevilo vrstic v spustnem polju
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Velja za predstavitev in slide selectors
+OptionPanel.presentation.processesEscapeKey=Tipka ESCAPE kon\u010Duje predstavitev
+OptionPanel.presentation.processesNavigationKeys=Navigacijske tipke nadzorujejo predstavitev
+OptionPanel.presentation.slideDisplaysAllNodes=Samodejno razgrni vsa drsna vozli\u0161\u010Da
+OptionPanel.presentation.slowMotion=Po\u010Dasni posnetek
+OptionPanel.presentation.switchToFullScreen=Aktiviraj celoten zaslon
+OptionPanel.presentation.switchToSpotlight=Aktiviraj reflektor
+OptionPanel.presentation.zoom=Uporabi pove\u010Davo miselnega vzorca
 OptionPanel.printonwhitebackground=<html>Belo ozadje pri tiskanju</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Vedno uporabi belo ozadje za tiskanje</html>
 OptionPanel.pt_BR=Portugal\u0161\u010Dina (Brazilija) / Portugu\u00EAs (Brasil)
 OptionPanel.pt_PT=Portugal\u0161\u010Dina (Portugalska) / Portugu\u00EAs (Portugal)
-OptionPanel.relative=relativne
+OptionPanel.RECT=Pravokotnik
+OptionPanel.rectangle=Pravokotnik
+OptionPanel.relative=Relativen
+OptionPanel.remind_type_of_new_nodes.tooltip=<html>"Vpra\u0161aj" vas bo vpra\u0161al (uporabi se v dvomih).<br>"Da" prika\u017Ee rich text urejevalnik besedil.<br>"Ne" prika\u017Ee navadni urejevalnik besedil.</html>
+OptionPanel.remind_use_rich_text_in_new_nodes=Uporabi obogateno besedilo za prilepljena vozli\u0161\u010Da
+OptionPanel.remindersBlink=Opomniki utripajo
+OptionPanel.remindersShowNotifications=Opomniki prikazujejo pojavna obvestila
+OptionPanel.remindersStandardDelay=Zakasnitev opomnika
+OptionPanel.remove_notes_without_question=Odstranim zapiske brez vpra\u0161anja?
+OptionPanel.remove_notes_without_question.tooltip=\u010Ce je to potrditveno polje nastavljeno, se opombe, ki pripadajo izbranim vozli\u0161\u010Dem, odstranijo brez potrditve. To lahko povzro\u010Di izgubo informacij, \u010De nismo pazljivi pri brisanju.
+OptionPanel.resources_use_default_font_for_notes_too=Uporabi privzeto pisavo za bele\u017Eke
+OptionPanel.resources_use_margin_top_zero_for_notes=Odstrani vrhnji rob za bele\u017Eke
+OptionPanel.revision_color=Barva revizije
+OptionPanel.revision_color.tooltip=Barva ozadja za spremenjena vozli\u0161\u010Da.
+OptionPanel.ROUND_RECT=Zaobljeni pravokotnik
 OptionPanel.ru=Ru\u0161\u010Dina / \u0420\u0443\u0441\u0441\u043A\u0438\u0439
-OptionPanel.scrollbar_increment=Speed[translate me]
+OptionPanel.save_folding=Shrani prepogibanje
+OptionPanel.save_folding_if_map_is_changed=\u010Ce je miselni vzorec spremenjen
+OptionPanel.save_last_visited_node=Shrani zadnji polo\u017Eaj v miselnem vzorcu
+OptionPanel.save_modification_times=Shrani \u010Das spremembe
+OptionPanel.script_classpath=Skriptni classpath: Dodatni imenik, ki vsebuje razrede in/ali JAR (glej opis orodja)
+OptionPanel.script_classpath.tooltip=<html>Seznam JAR-ov in/ali imenikov, ki jih \u017Eelite dodati na classpath skripte in formule.<br>Uporaba; (Windows) ali : (Linux, Mac) za lo\u010Devanje vnosov.<br>Imeniki bodo pregledani za JAR in za datoteke .class.<br>Poti, ki niso absolutne, se obravnavajo glede na uporabni\u0161ki imenik Freeplane.<br>\u010Ce nastavite classpath, potem morate tudi dovoliti dostop do branja!</html>
+OptionPanel.script_compilation_disabled_extensions=Raz\u0161iritve datotek ne smejo biti zbrane (glejte opis orodja)
+OptionPanel.script_compilation_disabled_extensions.tooltip=<html>\u010Ce imajo vsi skripti dodatnega jezika (razen<br>Groovy in JavaScript) splo\u0161ne te\u017Eava pri sestavljanju<br>potem poskusite dodati raz\u0161iritev datoteke tukaj (seznam lo\u010Den z vejico).</html>
+OptionPanel.script_directories=Pot iskanja za skripte (glejte opis orodja)
+OptionPanel.script_directories.tooltip=<html>Seznam imenikov (poleg "scriptov").<br> Uporaba; (Windows) ali : (Linux, Mac) da lo\u010Dite vnose.<br>Poti, ki niso absolutne, se obravnavajo glede na uporabni\u0161ki imenik Freeplane.</html>
+OptionPanel.script_user_key_name_for_signing=Izbirni vzdevek zasebnega klju\u010Da za podpisovanje skript
+OptionPanel.script_user_key_name_for_signing.tooltip=<html>\u010Ce \u017Eelite podpisati svoje skripte, potem vnesite vzdevek za klju\u010D. <br>Pri\u010Dakuje se, da se bo klju\u010D preselil v privzeti klju\u010D. <br>Geslo tajnega klju\u010Da klju\u010Da mora sovpadati z geslom za klju\u010De (to je privzeto).</html>
+OptionPanel.scrollbar_increment=Hitrost
+OptionPanel.scrolling_speed=Samodejna hitrost pomika miselnega vzorca
+OptionPanel.scrollOnUnfold=Po razvijanju vozli\u0161\u010Da se pomakni po miselnem vzorcu
 OptionPanel.selection_method=Metoda izbire
 OptionPanel.selection_method.tooltip=<html> z naslednjim preklopnikom lahko omogo\u010Dite/onemogo\u010Dite shemo zakasnjenega izbiranja. Samodejne mo\u017Enosti. Teh ne spreminjajte, saj bodo ne glede na to shranjene v auto.properties.</html>
 OptionPanel.selection_method_by_click=s klikom
@@ -605,53 +1300,127 @@ OptionPanel.separator.attributes=Atributi
 OptionPanel.separator.automatic_save=Samodejno shranjevanje
 OptionPanel.separator.behaviour=Vedenje
 OptionPanel.separator.browser=Brskalnik
+OptionPanel.separator.cache=Predpomnilnik
+OptionPanel.separator.clones=Kloni
+OptionPanel.separator.cloud=Oblak
+OptionPanel.separator.CloudControls=Oblaki
 OptionPanel.separator.commands_for_the_program=Ukazi programa
-OptionPanel.separator.connectors=Connectors[translate me]
+OptionPanel.separator.connectors=Konektorji
+OptionPanel.separator.data_formats=Oblikovanje podatkov in raz\u010Dlenjevanje
 OptionPanel.separator.default_colors=Privzete barve
 OptionPanel.separator.default_fonts=Privzete pisave
 OptionPanel.separator.default_styles=Privzeti slogi
 OptionPanel.separator.EdgeControls=Robovi
 OptionPanel.separator.edit_long_node_window=Uredi dolgo okno vozli\u0161\u010Da
+OptionPanel.separator.editing=Nastavitve urejevalnika
+OptionPanel.separator.export=Izvozi
 OptionPanel.separator.files=Datoteke
+OptionPanel.separator.formula=Formule
 OptionPanel.separator.General=Splo\u0161no
 OptionPanel.separator.html_export=HTML izvoz
 OptionPanel.separator.html_import=HTML uvoz
 OptionPanel.separator.hyperlink_types=Vrste hiperpovezav
 OptionPanel.separator.icon_properties=Ikone
+OptionPanel.separator.IconControls=Ikone
 OptionPanel.separator.icons=Ikone v "Izberi ikono ..."
+OptionPanel.separator.Icons=Ikone
 OptionPanel.separator.initial_map_size=Za\u010Detna velikost miselnega vzorca
-OptionPanel.separator.inline_editor=In-line node editor[translate me]
+OptionPanel.separator.inline_editor=Urejevalnik vozli\u0161\u010D
+OptionPanel.separator.JoinNodesAction=Pridru\u017Eitev vozli\u0161\u010D
 OptionPanel.separator.key_typing=Tipkanje
 OptionPanel.separator.language=Jezik
+OptionPanel.separator.latex=LaTeX
+OptionPanel.separator.load=Nalo\u017Ei
 OptionPanel.separator.look_and_feel=Izgled in ob\u010Dutek
 OptionPanel.separator.mouse_wheel=Mi\u0161kin kole\u0161\u010Dek
 OptionPanel.separator.new_node_commands=Ukazi novega vozli\u0161\u010Da
 OptionPanel.separator.node_editing_commands=Ukazi urejanja vozli\u0161\u010Da
 OptionPanel.separator.node_navigation_commands=Ukazi krmarjenja vozli\u0161\u010Da
+OptionPanel.separator.NodeBorder=Obroba vozli\u0161\u010Da
 OptionPanel.separator.NodeColors=Barve vozli\u0161\u010Da
 OptionPanel.separator.NodeFont=Pisava vozli\u0161\u010Da
+OptionPanel.separator.NodeShape=Oblika vozli\u0161\u010Da
+OptionPanel.separator.NodeStyle=Slog vozli\u0161\u010Da
+OptionPanel.separator.NodeText=Besedilo voli\u0161\u010Da
 OptionPanel.separator.notifications=Potrditve
+OptionPanel.separator.org.freeplane.plugin.bugreport=Samodejno poro\u010Dilo o hro\u0161\u010Du
 OptionPanel.separator.other_defaults=Druge privzete vrednosti
 OptionPanel.separator.others=Druge tipke za bli\u017Enjice
+OptionPanel.separator.outline_view=Orisni pogled
 OptionPanel.separator.patterns=Vzorci
+OptionPanel.separator.presentation=Predstavitev
+OptionPanel.separator.reminderOptions=Mo\u017Enosti opomnika
+OptionPanel.separator.RichTextEditor=Rich-Text urejevalnik
 OptionPanel.separator.root_node_appearance=Videz korenskega vozli\u0161\u010Da
 OptionPanel.separator.save=Shrani
+OptionPanel.separator.scripting=Dovoljenja za izvajanje skript
+OptionPanel.separator.scrollbar=Drsni trak
+OptionPanel.separator.search=Iskanje
 OptionPanel.separator.selection_colors=Barve izbora
 OptionPanel.separator.selection_method=Metoda izbire
+OptionPanel.separator.single_instance_mode=Posamezen programski primer
+OptionPanel.separator.size_limits=Omejitve velikosti
+OptionPanel.separator.spelling=Mo\u017Enosti preverjanja \u010Drkovanja
+OptionPanel.separator.SplitToWordsAction=Razdelitev vozli\u0161\u010Da z besedami
+OptionPanel.separator.status=Statusna vrstica
+OptionPanel.separator.surveys=Ankete
+OptionPanel.separator.svg_icons=SVG ikone
+OptionPanel.separator.tooltip=Nasveti za orodja
 OptionPanel.separator.undo=Razveljavi
+OptionPanel.separator.updates=Nadgradnja programa
 OptionPanel.set_property_text=Spremeni
-OptionPanel.set_property_text.tooltip=Empty: Don't touch; Minus=Remove property (set default values); Plus=Spremeni lastnost
+OptionPanel.set_property_text.tooltip=Preverite, ali \u017Eelite spremeniti lastnost sloga
 OptionPanel.setscript=Spremenim?
-OptionPanel.setscript.tooltip=Skripti lahko dodelite slog.
+OptionPanel.setscript.tooltip=Skriptu lahko dodelite slog.
+OptionPanel.shape_horizontal_margin=Vodoraven rob
+OptionPanel.shape_vertical_margin=Navpi\u010Den rob
 OptionPanel.sharp_bezier=ostro bezier
 OptionPanel.sharp_linear=ostro linearno
+OptionPanel.shouldCenterSmallMaps=Sredi\u0161\u010De majhnih zemljevidov
+OptionPanel.show_connectors=Poka\u017Ei \u010Drte konektorjev
 OptionPanel.show_icon_for_attributes=Poka\u017Ei ikono za atribute
+OptionPanel.show_icons=Prika\u017Ei ikone
+OptionPanel.show_less_than_N_nodes_by_default_after_load=Nalo\u017Ei iz mape ali odpri nekaj vozli\u0161\u010D
+OptionPanel.show_node_tooltips=Nasveti za orodje za prikaz
+OptionPanel.show_note_icon_in_tooltip=V orodni vrstici prika\u017Ei ikono opombe
+OptionPanel.show_note_icons=Prika\u017Ei ikone bele\u017Ek
+OptionPanel.show_styles_in_tooltip=Prika\u017Ei sloge vozli\u0161\u010D v nasvetih za orodja
+OptionPanel.signed_script_are_trusted=Zaupanja vredne podpisane skripte (priporo\u010Deno).
+OptionPanel.signed_script_are_trusted.tooltip=\u010Ce skripte podpi\u0161e zaupanja vredna stranka (npr. avtorji Freeplane ali sami), se le ta izvaja brez omejitev.
+OptionPanel.simplyhtml.default_paste_mode=Privzeti na\u010Din lepljenja
+OptionPanel.single_backup_directory=Uporabite en sam imenik za varnostne datoteke
+OptionPanel.single_backup_directory.tooltip=<html> \u010Ce je treba datoteke za varnostno kopiranje in samodejno shranjevanje vstaviti v en sam imenik, namesto v pod-imenik v imeniku miselnega vzorca</html>
+OptionPanel.single_backup_directory_path=Imenik za varnostno kopiranje (\u010De je izbrana mo\u017Enost zgoraj)
+OptionPanel.single_backup_directory_path.tooltip=<html>Preglasi privzeto <freeplaneuserdir>/.backup</html>
+OptionPanel.single_instance=Odpri datoteke v teko\u010Dem primeru
+OptionPanel.single_instance_force=Izogibaj se drugemu primeru v kakr\u0161nem koli primeru
+OptionPanel.single_instance_force.tooltip=Izogibaj se drugemu primeru, tudi \u010De datoteka ni nalo\u017Eena
 OptionPanel.sk=Slova\u0161\u010Dina / sloven\u010Dina
+OptionPanel.skip_template_selection=Presko\u010Di pogovorno okno za izbiro predlog
 OptionPanel.sl=Sloven\u0161\u010Dina / sloven\u0161\u010Dina
+OptionPanel.slow_scroll_selected_node=Pomakni izbrano vozli\u0161\u010De gladko
+OptionPanel.spelling_opt_case_sensitive=Razlikovanje malih in velikih \u010Drk
+OptionPanel.spelling_opt_ignore_all_caps_words=Prezri besede pisane z velikimi \u010Drkami.
+OptionPanel.spelling_opt_ignore_capitalization=Prezri velike \u010Drke na za\u010Detku besede
+OptionPanel.spelling_opt_ignore_words_with_numbers=Prezri besede s \u0161tevilkami
+OptionPanel.spelling_opt_suggestions_limit_dialog=Najve\u010Dje \u0161tevilo predlogov v pogovornem oknu
+OptionPanel.spelling_opt_suggestions_limit_menu=Najve\u010Dje \u0161tevilo predlogov v meniju
+OptionPanel.SplitToWordsAction.auxiliaryWordList=seznam pomo\u017Enih besed
+OptionPanel.SplitToWordsAction.charactersAcceptedInWord=\u0161tevilo znakov v besedi
+OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=pusti originalno vozli\u0161\u010De prazno
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=\u0161tevilo vozli\u0161\u010D v vrstici
+OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=shrani izvirno besedilo kot podrobnosti
+OptionPanel.spotlight=Reflektor
+OptionPanel.spotlight_background_color=Barva ozadja reflektorja
+OptionPanel.sr=Srb\u0161\u010Dina / \u0441\u0440\u043F\u0441\u043A\u0438
+OptionPanel.standard_template=Standardna datoteka predlog
+OptionPanel.standardbackgroundcolor=Standardna barva ozadja
 OptionPanel.standardbackgroundcolor.tooltip=<html>Standardna barva ozadja v zapisu html </html>
+OptionPanel.standardcloudcolor=Standardna barva obla\u010Dka
 OptionPanel.standardcloudcolor.tooltip=<html>Standardna barva obla\u010Dka v zapisu html </html>
 OptionPanel.standardcloudestyle=Slog obla\u010Dka
-OptionPanel.standardcloudestyle.tooltip=<html>Standardni slog obla\u010Dka. Trenutno je podprt le 'bezier'.</html>
+OptionPanel.standardcloudestyle.tooltip=<html>Standardni slog obla\u010Dka.</html>
+OptionPanel.standardcloudshape=Standardna oblika obla\u010Dka
 OptionPanel.standarddrawrectangleforselection=Prika\u017Ei izbrana vozli\u0161\u010Da v obla\u010Dkih
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Ozna\u010Di izbrana vozli\u0161\u010Da z obsegajo\u010Dim obla\u010Dkom.</html>
 OptionPanel.standardlinkcolor=Barva povezave
@@ -659,33 +1428,77 @@ OptionPanel.standardlinkcolor.tooltip=<html>Standardna barva povezave v zapisu h
 OptionPanel.standardlinkestyle=Slog povezave
 OptionPanel.standardlinkestyle.tooltip=<html>Standardni slog povezave. Trenutno je podprt le 'bezier'.</html>
 OptionPanel.standardselectednodecolor=Barva izbranega vozli\u0161\u010Da
-OptionPanel.standardselectednodecolor.tooltip=<html>Standardna barva vozli\u0161\u010Da, \u010De je izbran. V zapisu HTML (#RRGGBB v \u0161estnajsti\u0161kih vrednostih) </html>
+OptionPanel.standardselectednodecolor.tooltip=<html>Standardna barva vozli\u0161\u010Da, \u010De je izbrano. V zapisu HTML (#RRGGBB v \u0161estnajsti\u0161kih vrednostih) </html>
 OptionPanel.standardselectednoderectanglecolor=Barva izbranega obla\u010Dka vozli\u0161\u010Da
 OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Barva obla\u010Dka, ki ozna\u010Duje izbrana vozli\u0161\u010Da. V zapisu html (#RRGGBB v \u0161estnajsti\u0161kih vrednostih) </html>
+OptionPanel.STAR=Zvezda
+OptionPanel.statesymbolwidth=\u0160irina simbola stanja
+OptionPanel.structured_html_import=Uvozi HTML kot strukturo vozli\u0161\u010D
+OptionPanel.structured_icon_toolbar=Strukturirana orodna vrstica ikon
+OptionPanel.summary=Povzetek
 OptionPanel.sv=\u0160ved\u0161\u010Dina / svenska
+OptionPanel.text.use_ctrl_key=Uporabi 'Dolo\u010Di bli\u017Enjico' v meniju Orodja
+OptionPanel.textalignment=Poravnava besedila
 OptionPanel.time_for_automatic_save=Interval samodejnega shranjevanja
-OptionPanel.time_for_automatic_save.tooltip=<html> \u010Cas med dvema zaporednima samodejnima shranjevalnima akcijama (v ms): za onemogo\u010Ditev samodejnega shranjevanja to vrednost nastavite na 2000000000.</html>
+OptionPanel.time_for_automatic_save.tooltip=<html> \u010Cas med dvema zaporednima samodejnima shranjevalnima akcijama (v ms): za onemogo\u017Eitev samodejnega shranjevanja to vrednost nastavite na 2000000000.</html>
 OptionPanel.time_for_delayed_selection=\u010Cas za zakasnjeno izbiro
-OptionPanel.time_for_delayed_selection.tooltip=<html> \u010Casovna zakasnitev izbire vozli\u0161\u010D, ko je mi\u0161ka prek (v ms). Spremenite to vrednost na 1, \u010De \u017Eelite neposredno izbiro ob prekritju z mi\u0161ko.</html>
+OptionPanel.time_for_delayed_selection.tooltip=<html> \u010Casovna zakasnitev izbire vozli\u0161\u010D, ko je mi\u0161ka preko (v ms). Spremenite to vrednost na 1, \u010De \u017Eelite neposredno izbiro ob prekritju z mi\u0161ko.</html>
+OptionPanel.toolbar_icon_height=Vi\u0161ina ikone orodne vrstice
+OptionPanel.toolTipManager.dismissDelay=Ne upo\u0161tevaj odlog, ms
+OptionPanel.toolTipManager.initialDelay=Za\u010Deten odlog, ms
+OptionPanel.toolTipManager.max_tooltip_height=Maksimalna vi\u0161ina okenca nasveta
+OptionPanel.toolTipManager.max_tooltip_height.tooltip=Maksimalna vi\u0161ina okenca nasveta v to\u010Dkah.
+OptionPanel.toolTipManager.max_tooltip_width=Maksimalna \u0161irina okenca nasveta
 OptionPanel.toolTipManager.max_tooltip_width.tooltip=Privzeta \u0161irina okenca nasveta v slikovnih to\u010Dkah.
+OptionPanel.toolTipManager.reshowDelay=Znova prika\u017Ei, ms
 OptionPanel.tr=Tur\u0161\u010Dina / T\u00FCrk\u00E7e
 OptionPanel.uk_UA=Ukrajin\u0161\u010Dina / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
 OptionPanel.undefined_font=Nedolo\u010Dena pisava
 OptionPanel.undo_levels=Ravni razveljavitve
-OptionPanel.undo_levels.tooltip=<html>Dolo\u010Di, koliko korakov je shranjenih, da jih lahko razveljavite z "Razveljavi".</html>
+OptionPanel.undo_levels.tooltip=<html>Dolo\u010Da, koliko korakov je shranjenih, da jih lahko razveljavite z "Razveljavi".</html>
 OptionPanel.unfold_on_paste=Razpostri vozli\u0161\u010De ob lepljenju
 OptionPanel.unfold_on_paste.tooltip=Razpostri vozli\u0161\u010De ob lepljenju ali povleci-in-spusti
+OptionPanel.uniform_shape=Enakomeren
 OptionPanel.use_common_out_point_for_root_node=Robovi se za\u010Dnejo v eni to\u010Dki v korenskem vozli\u0161\u010Du
 OptionPanel.use_common_out_point_for_root_node.tooltip=Robovi se za\u010Dnejo v eni to\u010Dki v korenskem vozli\u0161\u010Du
+OptionPanel.use_svg_icons=Uporabi SVG ikone
+OptionPanel.use_svg_icons.tooltip=<html>Dolo\u010Di kakovost prikaza ikon. Ikone SVG potrebujejo ve\u010D \u010Dasa.</html>
 OptionPanel.use_tabbed_pane=Uporabi zavihke
 OptionPanel.use_tabbed_pane.tooltip=Ob izboru naj bodo miselni vzorci prikazani v zavihkih (kot v Firefoxu :-) ).
+OptionPanel.validate_classpath_needs_readaccess=Izvajanje skript: Pri nastavljanju razredne poti morate omogo\u010Diti dostop do branja v datotekah!
+OptionPanel.validate_invalid_date_format=Neveljaven standardni format datuma
+OptionPanel.validate_invalid_datetime_format=Neveljavna standardna oblika datuma - \u010Dasa
+OptionPanel.validate_invalid_number_format=Neveljavna oblika standardne \u0161tevilke
+OptionPanel.validate_write_without_read=Izvajanje skript: omogo\u010Dite branje in pisanje za datoteke.
+OptionPanel.validation_error=<html><body>Potrditev napak(e):<p><em>{0}</em><p>Prosim, spremenite nastavitve, da odpravite napako(e).</body></html>
+OptionPanel.validation_warning=<html><body>Potrditev napak(e):<p><em>{0}</em></body></html>
+OptionPanel.vertical_child_gap=Razmik med podrejenimi vozli\u0161\u010Di
+OptionPanel.vertical_child_gap.tooltip=Navpi\u010Dna razdalja med podrejenimi vozli\u0161\u010Di
+OptionPanel.vi=Vietnam\u0161\u010Dina / Ti\u1EBFng Vi\u1EC7t
 OptionPanel.wheel_velocity=Odzivnost
 OptionPanel.wheel_velocity.tooltip=Vi\u0161ja vrednost povzro\u010Di hitrej\u0161e premike mi\u0161kinega kole\u0161\u010Dcka po vzorcu.
+OptionPanel.wide_hexagon=\u0160irok \u0161esterokotnik
 OptionPanel.windows=Windows
 OptionPanel.zh_CN=Kitaj\u0161\u010Dina, poenostavljena / \u7B80\u4F53\u5B57
 OptionPanel.zh_TW=Kitaj\u0161\u010Dina, tradicionalna / \u7E41\u9AD4\u5B57
+org.freeplane.plugin.bugreport.agree=Po\u0161lji
+org.freeplane.plugin.bugreport.always_agree=Vedno po\u0161lji
+org.freeplane.plugin.bugreport.always_deny=Nikoli ne po\u0161lji
+org.freeplane.plugin.bugreport.deny=Ne po\u0161lji
+org.freeplane.plugin.bugreport.dialog.title=Samodejno poro\u010Dilo o hro\u0161\u010Du
+org.freeplane.plugin.bugreport.freeplane_team=Sporo\u010Dilo ekipe Freeplane
+org.freeplane.plugin.bugreport.lastreport=Prejeto poro\u010Dilo
+org.freeplane.plugin.bugreport.never=Nikoli me ne prosi za pomo\u010D
+org.freeplane.plugin.bugreport.question=Freeplane ima vgrajen samodejni sistem za spremljanje napak.
+org.freeplane.plugin.bugreport.report=Trenutno poro\u010Dilo
+org.freeplane.plugin.bugreport.wanted_bug=Pojavila se je interna napaka in samodejno je bilo poslano poro\u010Dilo o napaki.
+org.freeplane.plugin.script.NodeIdHighlighter.node_is_not_defined=Vozli\u0161\u010De {0} ni definirano
+out_of_memory=Zmanjkalo je spomina.
+overwrite_keyset_question=Prepi\u0161em obstoje\u010Di nabor klju\u010Dev?
 PageAction.text=Nastavitev strani ...
+password_is_not_ascii=Geslo ni ASCII
 PasteAction.text=Prilepi
+PasteAttributes.text=Prilepi atribute
 PatternNewNameProperty=Nov vzorec
 PatternToString.backgroundColor=Barva ozadja
 PatternToString.Child=Slog otro\u0161kega vozli\u0161\u010Da
@@ -699,15 +1512,29 @@ PatternToString.FontName=Ime pisave
 PatternToString.Icon=Ikona
 PatternToString.NodeFontSize=Velikost pisave
 periodic_formula={0} * n + {1}
+PeriodUnit.DAY=dnevi
+PeriodUnit.HOUR=ure
+PeriodUnit.MINUTE=minute
+PeriodUnit.MONTH=meseci
+PeriodUnit.WEEK=tedni
+PeriodUnit.YEAR=leta
+plugins/latex/LatexNodeHook.editorTitle=Uredi LaTeX formulo
+plugins/script_filter=Filter za skripte {0}
+plugins/script_filter_error={0} bi moral vrniti boolean rezultat na {1}, vendar je vrnil {2}
+plugins/script_filter_execute_error=Napaka pri izvajanju {0}\nza vozli\u0161\u010De {1}:\n{2}
 plugins/ScriptEditor.cancel=&Prekli\u010Di
 plugins/ScriptEditor.exit=I&zhod
+plugins/ScriptEditor.FORBIDDEN_ACTION=Freeplane groovy skripti so omejeni. Naslednje {0,choice,0#File|1#Network|2#Exec} operacije so prepovedane: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write} {2}. To lahko spremenite v nastavitvah programa.
 plugins/ScriptEditor.menu_actions=&Dejanja
 plugins/ScriptEditor.new_script=Nov skript
 plugins/ScriptEditor.run=&Za\u017Eeni
+plugins/ScriptEditor.sign=Podpisovanje skript ...
 plugins/ScriptEditor/window.Result=Rezultat:
-plugins/ScriptEditor/window.title=Urejevalnik skript
+plugins/ScriptEditor/window.title=Urejevalnik skriptov
+plugins/ScriptingEngine.illegalAccessToInternalAPI=Nezakonit dostop do notranjega API-ja (paket {0}). - Obrnite se na ekipo Freeplane, \u010De skriptni API ni dovolj zmogljiv.
 plugins/TimeList.xml_Created=Ustvarjeno
 plugins/TimeList.xml_Date=Datum
+plugins/TimeList.xml_Details=Podrobnosti
 plugins/TimeList.xml_Icons=Ikone
 plugins/TimeList.xml_Modified=Spremenjeno
 plugins/TimeList.xml_Notes=Opombe
@@ -723,9 +1550,11 @@ plugins/TimeManagement.xml_hour=Ura:
 plugins/TimeManagement.xml_menu_actions=Dejanja
 plugins/TimeManagement.xml_minute=Minuta:
 plugins/TimeManagement.xml_reminderButton=Spomni me na ta dan
-plugins/TimeManagement.xml_reminderButton_tooltip=<html>Ob pritisku se za\u017Eene \u010Dasovno od\u0161tevanje na dani datum. Utripajo\u010De ikone opozarjajo na iztek \u010Dasa.<br>\u010Ce zaprete miselni vzorec, se od\u0161tevanje reaktivira naslednji\u010D, ko odprete miselni vzorec.</html>
-plugins/TimeManagement.xml_reminderNode_onlyOneDate=<html>Trenutno je morda lahko le en opomnik na vozli\u0161\u010De. <br>Trenutni opomnik je na\u010Drtovan ob {0,date} {0,time}, va\u0161a izbira je bila {1,date} {1,time}. <br><br>\u017Delite spremeniti opomnilni \u010Das vozli\u0161\u010Da (DA) <br>ali \u017Eelite ohraniti starega (NE)?</html>
+plugins/TimeManagement.xml_reminderButton_tooltip=<html>Ob pritisku se za\u017Eene \u010Dasovno od\u0161tevanje na dani datum. Utripajo\u010De ikone opozarjajo na iztek \u010Dasa.<br>\u010Ce zaprete miselni vzorec, se od\u0161tevanje reaktivira, ko naslednji\u010D odprete miselni vzorec.</html>
+plugins/TimeManagement.xml_reminderNode_onlyOneDate=<html>Trenutno je lahko le en opomnik na vozli\u0161\u010De. <br>Trenutni opomnik je na\u010Drtovan ob {0,date} {0,time}, va\u0161a izbira je bila {1,date} {1,time}. <br><br>\u017Delite spremeniti opomnilni \u010Das vozli\u0161\u010Da (DA) <br>ali \u017Eelite ohraniti starega (NE)?</html>
 plugins/TimeManagement.xml_reminderNode_tooltip=Opomnik na\u010Drtovan za {0,date} {0,time}.
+plugins/TimeManagement.xml_remindLaterButton=Spomni kasneje
+plugins/TimeManagement.xml_remindLaterButton_tooltip=Spomni kasneje
 plugins/TimeManagement.xml_removeReminderButton=Odstrani opomnik
 plugins/TimeManagement.xml_removeReminderButton_tooltip=Ostrani vse opomnike, povezane z izbranimi vozli\u0161\u010Di.
 plugins/TimeManagement.xml_Replace=Zamenjaj
@@ -733,60 +1562,150 @@ plugins/TimeManagement.xml_Replace_All=Zamenjaj vse
 plugins/TimeManagement.xml_Replace_Selected=Zamenjaj izbrano
 plugins/TimeManagement.xml_Select=Izberi
 plugins/TimeManagement.xml_todayButton=Danes
+plugins/TimeManagement.xml_WindowTitle=Upravljanje \u010Dasa
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Najdi & zamenjaj
 preferences=Nastavitve
+presentation=Predstavitev
+presentation.combineAll=Zdru\u017Ei vse predstavitve
 print_preview_title=Predogled tiskanja
+PrintAction.text=Natisni miselni vzorec ...
 PrintDirectAction.text=Natisni
 printing_settings=Umerjanje tiskanja
 PrintPreviewAction.text=Predogled tiskanja ...
-PropertyAction.dialog=Preferences[translate me]
+program_terminates=Notranja napaka, program se zaklju\u010Di.
+progress=Ikona napredka (%)
+PropertyAction.dialog=Nastavitve
 PropertyAction.text=Nastavitve ...
+QuickFilterAction.text=Hitri filter
+QuickFindAction.BACK.text=Najdi prej\u0161nje
+QuickFindAction.FORWARD.text=Najdi naslednje
+QuickFindAllAction.text=Izberi vsa ujemajo\u010Da se vozli\u0161\u010Da
+QuickHighlightAction.text=Poudari vsa ujemajo\u010Da se vozli\u0161\u010Da
+QuitAction.text=Izhod
 read_only=Samo za branje
+ReadScriptError.text=Napaka pri branju skripta
 really_convert_to_current_version=<html>Ta miselni vzorec je nastal s staro razli\u010Dico programa Freeplane. <br>Ga \u017Eelite pretvoriti (priporo\u010Deno)? <br>(Sicer bo obravnavan tak, kakr\u0161en je, brez zagotovil.) </html>
 really_cut_node=Resni\u010Dno \u017Eelite izrezati vozli\u0161\u010Da?
-really_execute_script=Resni\u010Dno \u017Eelite izvesti skript, ki je vklju\u010Den v ta miselni vzorec? Mogo\u010De je, da bo \u0161kodil va\u0161emu ra\u010Dunalniku.
+really_execute_script=Resni\u010Dno \u017Eelite izvesti skripte, vklju\u010Dene v ta miselni vzorec? Mogo\u010De je, da lahko \u0161kodijo va\u0161emu ra\u010Dunalniku.
 really_remove_node=Resni\u010Dno \u017Eelite izbrisati vozli\u0161\u010Da?
+really_remove_notes=Ali odstranim opombo?
+ReapplyFilterAction.text=Ponovno aktiviraj delovanje filtra
+red=Rde\u010Da
+RedefineStyleAction.text=Ponovno dolo\u010Di slog
 RedoAction.text=Ponovi
 RedoFilterAction.text=Ponovi
+regular_expressions=Redni izrazi
 ReminderHookAction.text=Odstrani opomnik
 ReminderHookAction.tooltip=Odstrani opomnik z vozli\u0161\u010Da.
+reminderNotification=Obvestilo opomnika
+remove_file_from_list_on_error=Datoteka {0} ni odprta. Ali jo \u017Eelite odstraniti iz seznama zadnjih odprtih datotek?
+remove_shortcut_question=Zamenjam bli\u017Enjico?
+RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Ponastavi razpletena vozli\u0161\u010Da
+RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Omogo\u010Di zlaganje za vsako vozli\u0161\u010De
 RemoveAllIconsAction.text=Odstrani vse ikone
+RemoveConnectorAction.text=Odstrani priklju\u010Dek
+RemoveEncryption.text=Odstrani geslo
+RemoveFormatAction.text=Odstrani format
+RemoveIcon_0_Action.text=Odstrani prvo ikono
 RemoveIconAction.text=Odstrani zadnjo ikono
 RemoveNoteAction.text=Odstrani opombe
 RemoveNoteAction.tooltip=<html>Odstrani vsebino opomb tudi ve\u010D opomb hkrati.</html>
+rename=&Preimenuj
 repair_link=Popravi povezavo
 repair_link_question=Povezanega miselnega vzorca ni mo\u017Eno nalo\u017Eiti. \u017Delite popraviti povezavo ro\u010Dno?
 replace=Zamenjaj
-reset_to_default=Use default[translate me]
+replace_shortcut_question=Ta bli\u017Enjica na tipkovnici je trenutno dodeljena\n  {0}.\nZamenjam to dodelitev?
+replace_shortcut_title=Zamenjam bli\u017Enjico?
+ReportBugAction.text=Prijavi napako
+RequestFeatureAction.text=Zahtevajte funkcijo
+reset_to_default=Uporabi privzeto
+ResetNodeLocationAction.text=Ponastavi polo\u017Eaj vozli\u0161\u010Da
+ResetStyleAction.text=Ponastavi slog vozli\u0161\u010Da
+RevertAction.text=Obnovi iz lokalne zgodovine
+RevisionPluginAction.text=Sprememba revizije barvnega ozadja
+save=&Shrani
 save_failed=Poskus shranjevanja miselnega vzorca {0} ni uspel.
 save_unsaved=\u017Delite shraniti naslednji miselni vzorec?
+save_unsaved_styles=Shranim stile?
+SaveAcceleratorPresetsAction.text=Shrani zbirko ...
+SaveAction.text=&Shrani miselni vzorec
+SaveAction_readonlyMsg=Ta miselni vzorec je samo za branje. \u010Ce \u017Eelite shraniti ta miselni vzorec, potem uporabite 'Datoteka-> Shrani miselni vzorec kot ...'.
+SaveAction_readonlyTitle=Poskus shranjevanja miselnega vzorca samo za branje
 SaveAll.text=Shrani &vse miselne vzorce
 SaveAll.tooltip=Shrani vse odprte miselne vzorce
+SaveAs_toReadonlyMsg={0} je samo za branje. Prosimo, shranite v drugo datoteko.
+SaveAs_toReadonlyTitle=Poskus shranjevanja datoteke samo za branje
 SaveAsAction.text=Shrani miselni vzorec kot ...
 saved=Shranjeno
+saving_canceled=Shranjevanje preklicano
+scanners_not_loaded=Opti\u010Dno prebrane datoteke so po\u0161kodovane in jih ni bilo mogo\u010De nalo\u017Eiti
 scheme_evaluate=Ovrednoti!
+script_execution_disabled=Izvedba skriptov je onemogo\u010Dena, glejte Orodja/Nastavitve/Vti\u010Dniki
 ScriptEditor.text=Uredi skript ...
-ScriptEditor.tooltip=Omogo\u010Da pisanje ve\u010Djih skript v okviru Freeplane-a.
+ScriptEditor.tooltip=Omogo\u010Da pisanje ve\u010Djih skriptov v okviru Freeplane-a.
 ScriptEditorPanel.changed_cancel=Skripti so bili spremenjeni. Res \u017Eelite opustiti te spremembe?
-select_favorites_folder=Izberi mapo, v kateri se nahajajo va\u0161i priljubljeni
+scripting=Skripti
+scripting_api_generator_legend=Legenda
+scripting_api_generator_proxy=Proxy
+scripting_api_generator_title=Skriptni API
+scripting_api_generator_utilities=Pripomo\u010Dki
+scripting_api_generator_web=Spletni viri
+ScriptsRunToggleAction.ON_SELECTED_NODE.text=Izvedi skripte na vseh izbranih vozli\u0161\u010Dih
+ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=Izvedi skripte na izbranih vozli\u0161\u010Dih, rekurzivno
+ScriptsRunToggleAction.ON_SINGLE_NODE.text=Izvedi skripte na enem izbranem vozli\u0161\u010Du
+select_favorites_folder=Izberite mapo, v kateri se nahajajo va\u0161i priljubljeni
+select_file_export_to=Izberi datoteko za izvoz v
 select_folder_for_importing=Izberi mapo za uvoz
+select_icon=Izberi ikono
+select_menu_item_dialog=Izberi element menija
+select_menu_item_root_node=Meni
+select_template=Izberi predlogo
+SelectAllAction.text=Izberi vsa vidna vozli\u0161\u010Da
+SelectBranchAction.text=Izberi vidno vejo
+SelectedPasteAction.text=Prilepi kot ...
 selection_method_by_click=Enkrat klikni za izbiro
 selection_method_delayed=Zakasnjena samodejna izbira
 selection_method_direct=Poka\u017Ei izbiro
 SelectNoteAction.text=Preklopi urejanje opombe
 SelectNoteAction.tooltip=Preklopi na ustrezno okno z opombe
+set_accelerator_on_next_click_helpmessage=\u010Ce \u017Eelite ustvariti novo bli\u017Enji\u010Dno tipko, v meniju kliknite \u017Eeleni ukaz.
+SetAccelerator.dialogTitle=Dodelitev bli\u017Enji\u010Dne tipke
+SetAccelerator.keystrokeDetected=Zaporedje pritisnjenih tipk ''{0}'' ni dodeljeno nobenemu elementu menija.
+SetAcceleratorOnNextClickAction.text=Dodeli bli\u017Enji\u010Dno tipko
+SetAlwaysUnfoldedNodeFlagsAction.text=Ohrani nerazvita vozli\u0161\u010Da
+SetAlwaysUnfoldedNodeFlagsAction.tooltip=Prepre\u010Di zlaganje trenutno razvitih vozli\u0161\u010D
 SetImageByFileChooserAction.text=Slika (izbirnik datotek ali povezava) ...
+SetLinkAnchorAction.text=Nastavi sidro povezave
+SetLinkAnchorAction.tooltip=<html>nastavi izbrano vozli\u0161\u010De kot sidro za prihodnje<br/>ustvarjanje lokalnih ali globalnih povezav.
+SetLinkAnchorAction.tooltip_anchored=<html>nastavi izbrano vozli\u0161\u010De kot sidro za prihodnje<br/>ustvarjanje lokalnih ali globalnih povezav. Current anchor:<br/>{0}
 SetLinkByFileChooserAction.text=Hiperpovezava (izbirnik datotek) ...
 SetLinkByTextFieldAction.text=Hiperpovezava (polje z besedilom) ...
+SetNodeLink.text=Nastavi povezavo vozli\u0161\u010Da ...
+SetNoteWindowPosition.bottom.text=Spodaj
+SetNoteWindowPosition.left.text=Levo
+SetNoteWindowPosition.right.text=Desno
+SetNoteWindowPosition.top.text=Zgoraj
+SetShortenerStateAction.text=Zmanj\u0161aj vozli\u0161\u010De
+sf_login_required=Potrebna je prijava na Source Forge. Nadaljujem?
 ShowAllAttributesAction.text=Poka\u017Ei vse atribute
-ShowAncestorsAction.text=poka\u017Ei prednike
+ShowAncestorsAction.text=Poka\u017Ei prednike
 ShowAttributeDialogAction.text=Upravljavec atributov ...
-ShowFilterToolbarAction.text=Filter Toolbar[translate me]
+ShowDescendantsAction.text=Poka\u017Ei potomce
+ShowFilterToolbarAction.text=Orodna vrstica filtra
+ShowFirstSlideAction.text=Prvi diapozitiv
+ShowFirstSlideAndStartPresentationAction.text=Za\u017Eeni predstavitev od za\u010Detka
+ShowFormatPanel.text=Orodna plo\u0161\u010Da
+ShowFormatPanel.tooltip=Predstavi pogovorno okno, v katerem lahko naenkrat spremenite atribute vozli\u0161\u010Da in robov.
 ShowHideNoteAction.text=Okno opombe
 ShowHideNoteAction.tooltip=Okno opomb se pojavi oz. izgine.
+ShowLastSlideAction.text=Zadnji diapozitiv
+ShowNextChildAction.text=Poka\u017Ei naslednjega podrejenega
+ShowNextSlideAction.text=Naslednja prosojnica
+ShowNotesInMapAction.text=Prika\u017Ei opise na zemljevidu
+ShowPreviousSlideAction.text=Prej\u0161nja prosojnica
 ShowSelectedAttributesAction.text=Poka\u017Ei izbrane atribute
 ShowSelectionAsRectangleAction.text=Pravokotni izbor
-simplyhtml.aboutFrameTitle=O programu
+simplyhtml.aboutFrameTitle=O tej aplikaciji
 simplyhtml.aboutLabel=O programu SimplyHTML ...
 simplyhtml.alignCenter=sredinska
 simplyhtml.alignLabel=Poravnava:
@@ -798,6 +1717,8 @@ simplyhtml.appendTableColLabel=Dodaj stolpec
 simplyhtml.appendTableRowLabel=Dodaj vrstico
 simplyhtml.applyCellAttrLabel=Uporabi za
 simplyhtml.backgroundLabel=Ozadje:
+simplyhtml.blackFontColorLabel=\u010Crno
+simplyhtml.blueFontColorLabel=Modra
 simplyhtml.boldItalicName=krepko le\u017Ee\u010De
 simplyhtml.boldName=krepko
 simplyhtml.borderColorLabel=Barva:
@@ -827,6 +1748,7 @@ simplyhtml.cTagNamePara=Odstavek
 simplyhtml.cTagNameUL=Neo\u0161tevil\u010Den seznam
 simplyhtml.cutLabel=Izre\u017Ei
 simplyhtml.cutTip=Izre\u017Ei
+simplyhtml.decreaseFontSizeLabel=Manj\u0161e
 simplyhtml.defaultDocName=Neimenovano
 simplyhtml.deleteTableColLabel=Izbri\u0161i stolpec
 simplyhtml.deleteTableRowLabel=Izbri\u0161i vrstico
@@ -841,6 +1763,8 @@ simplyhtml.findReplaceLabel=Najdi in zamenjaj
 simplyhtml.findReplaceTip=Najdi in zamenjaj
 simplyhtml.fontBoldLabel=Krepko
 simplyhtml.fontBoldTip=Vklju\u010Di/izklju\u010Di krepko pisavo
+simplyhtml.fontColorLabel=Barva besedila
+simplyhtml.fontColorTip=Barva besedila
 simplyhtml.fontDialogTitle=Oblikovanje pisave
 simplyhtml.fontItalicLabel=Le\u017Ee\u010De
 simplyhtml.fontItalicTip=Vklju\u010Di/izklju\u010Di le\u017Ee\u010Do pisavo
@@ -857,9 +1781,11 @@ simplyhtml.formatParaLabel=Odstavek ...
 simplyhtml.formatParaTip=Spremeni obliko odstavka
 simplyhtml.formatTableLabel=Tabela ...
 simplyhtml.formatTableTip=Oblikovanje tabele
+simplyhtml.greenFontColorLabel=Zeleno
 simplyhtml.helpLabel=Pomo\u010D
 simplyhtml.htmlTabTitle=Pogled kode HTML
 simplyhtml.imageFileDesc=Datoteke slik
+simplyhtml.increaseFontSizeLabel=Ve\u010Dji
 simplyhtml.insertTableColLabel=Vstavi stolpec
 simplyhtml.insertTableLabel=Tabela ...
 simplyhtml.insertTableMsg=Koliko stolpcev?
@@ -884,7 +1810,10 @@ simplyhtml.listTypeSquare=kvadratna oznaka
 simplyhtml.listTypeUpperAlpha=A.,B.,C.,D.
 simplyhtml.listTypeUpperRoman=I.,II.,III.,IV.
 simplyhtml.marginLabel=Zunanja
+simplyhtml.matchApproximately=Pribli\u017Eno ujemanje
+simplyhtml.matchApproximately.tooltip=<html>Dolo\u010Da, ali je iskanje pri iskanju podobnih izrazov dovoljeno pri ocenjevanju merila filtriranja,<br/>npr. iskanje 'datotek' najde tudi 'datoteke'.</html>
 simplyhtml.matchCase=Razlikuj male/velike \u010Drke
+simplyhtml.matchCase.tooltip=Omogo\u010Di razlikovanje malih in velikih \u010Drk s primerjavo.
 simplyhtml.newStyleDefaultName=nov slog
 simplyhtml.nextTableCellLabel=Naslednja celica
 simplyhtml.noLineLabel=brez
@@ -899,14 +1828,19 @@ simplyhtml.paraAlignRightLabel=Poravnaj desno
 simplyhtml.paraAlignRightTip=Odstavku dolo\u010Di desno poravnavo
 simplyhtml.paraStyleDialogTitle=Slog odstavka
 simplyhtml.paraTabLabel=Odstavek
+simplyhtml.pasteHTMLLabel=Prilepi HTML
 simplyhtml.pasteLabel=Prilepi
+simplyhtml.pastePlainTextLabel=Prilepi navadno besedilo
 simplyhtml.pasteTip=Prilepi
 simplyhtml.plainName=navadno
 simplyhtml.previewLabel=Predogled
 simplyhtml.previewText=Predogled besedila
 simplyhtml.prevTableCellLabel=Prej\u0161nja celica
+simplyhtml.printLabel=Natisni ...
+simplyhtml.redFontColorLabel=Rde\u010Da
 simplyhtml.redoLabel=Ponovi
 simplyhtml.redoTip=ponovi
+simplyhtml.removeFontColorLabel=Odstrani barvo
 simplyhtml.replace=Zamenjaj ...
 simplyhtml.replaceAll=vse
 simplyhtml.replaceDone=Opravljeno
@@ -916,9 +1850,13 @@ simplyhtml.replaceWith=Zamenjaj z:
 simplyhtml.replaceYes=Da
 simplyhtml.rightLabel=desno:
 simplyhtml.searchDown=I\u0161\u010Di proti koncu
+simplyhtml.searchDown.tooltip=Iskanje od zgoraj navzdol.
 simplyhtml.searchFromStart=I\u0161\u010Di od za\u010Detka
+simplyhtml.searchFromStart.tooltip=Za\u010Dni iskati na vrhu in ne na polo\u017Eaju kazalca.
 simplyhtml.searchUp=I\u0161\u010Di proti zacetku
+simplyhtml.searchUp.tooltip=Iskanje od spodaj navzgor.
 simplyhtml.selectAllLabel=Izberi vse
+simplyhtml.selectedFontColorLabel=Barva izbrane pisave
 simplyhtml.sizeLabel=Velikost
 simplyhtml.standardStyleName=navaden
 simplyhtml.strikeLabel=Pre\u010Drtano
@@ -952,27 +1890,126 @@ simplyhtml.valignLabel=Navpi\u010Dna poravnava:
 simplyhtml.valignMiddle=sredinska
 simplyhtml.valignTop=na vrh
 simplyhtml.wholeWordsOnly=Samo cele besede
-SortNodes.tooltip=Razvrsti vse otroke vozli\u0161\u010Da po abecedi.
+simplyhtml.wholeWordsOnly.tooltip=Omeji ujemanja na cele besede.
+slide.add=Dodaj
+slide.add.tooltip=Na diapozitiv dodaj trenutno izbrana vozli\u0161\u010Da
+slide.at_center.tooltip=na sredi\u0161\u010De
+slide.content=Vsebina diapozitiva
+slide.descendants=Poka\u017Ei potomce
+slide.edge=na rob
+slide.filter=Filter
+slide.first=kot prve
+slide.last=kot zadnje
+slide.next=Naslednji
+slide.nofilter=Brez filtriranja
+slide.on_the_left.tooltip=na levi
+slide.on_the_right.tooltip=na levi
+slide.placenode=Polo\u017Eaj izbranega vozli\u0161\u010Da
+slide.placenode.tooltip=ko je prikazan diapozitiv
+slide.present=Za\u010Dni predstavitev
+slide.presentation=Predstavitev
+slide.presentations=Prezentacije
+slide.previous=Prej\u0161nji
+slide.remove=Odstrani
+slide.remove.tooltip=Odstrani trenutno izbrana vozli\u0161\u010Da iz diapozitiva
+slide.select=Izberi
+slide.select.tooltip=Izberi drsna vozli\u0161\u010Da na zemljevidu
+slide.set=Nastavi
+slide.set.tooltip=Naredi trenutno izbrana vozli\u0161\u010Da kot vsebino diapozitiva
+slide.setfilter=Nastavi filter
+slide.setfilter.tooltip=Nastavi ali odstrani filter, ki ga \u017Eelite uporabiti, ko je prikazan diapozitiv
+slide.setfoldingstate=Nastavi zlaganje
+slide.setfoldingstate.tooltip=Obnovi trenutni preklop, ko je prikazan diapozitiv
+slide.setzoom=Nastavi zumiranje
+slide.setzoom.tooltip=Nastavi ali odstrani pove\u010Davo miselnega vzorca, ki se uporablja, ko je prikazan diapozitiv
+slide.showancestors=Poka\u017Ei prednike
+slide.showonlyselected=Prika\u017Ei samo izbrana vozli\u0161\u010Da
+slide.showonlyselected.tooltip=Skrij druga vozli\u0161\u010Da, ko je prikazan diapozitiv
+slide.slides=Diapozitivi
+slide.stop=Zaustavi
+SortNodes.text=Razvrsti podrejene
+SortNodes.tooltip=Razvrsti vsa podrejena vozli\u0161\u010Da po abecedi.
 split=&Razdeli
+SplitConditionAction.text=Razdeli
 SplitNode.text=Razdeli vozli\u0161\u010De
 SplitNode.tooltip=<html>Vozli\u0161\u010De je razdeljeno</html>
+SplitToWordsAction.text=Razdeli z {0} besedami v vrstico
+STANDARD_FORMAT=Standard
+StartPresentationAction.text=Za\u017Eeni predstavitev
+StartPresentationOrShowNextSlideAction.text=Za\u017Eeni predstavitev/Naslednja prosojnica
+stop_processing=Zaustavi
+StopPresentationAction.text=Zaustavi predstavitev
+StringFlavorHandler=Obi\u010Dajno besedilo kot hierarhija vozli\u0161\u010Da
+StructuredHtmlFlavorHandler=HTML kot hierarhija vozli\u0161\u010Da
 style=Slog
-svg=SVG[translate me]
+style_already_exists=Stil \u017Ee obstaja.
+styledialog.cancel.text=Prekli\u010Di
+styledialog.ok.text=V redu
+styles=Sl&ogi
+styles.AutomaticLayout=Samodejna postavitev
+styles.connection=Povezanost
+styles.date=Datum
+styles.definition=Definicija
+styles.description=Opis
+styles.floating_node=Plavajo\u010De vozli\u0161\u010De
+styles.idea=Ideja
+styles.important=Pomembno
+styles.key=Klju\u010D
+styles.list=Seznam
+styles.needs_action=Potrebno je ukrepanje
+styles.note=Opomba
+styles.ok=V redu
+styles.pending=V teku
+styles.predefined=Vnaprej dolo\u010Deni slogi
+styles.question=Vpra\u0161anje
+styles.quotation=Citat
+styles.root_node=Slogi
+styles.subsubtopic=Pod-podtema
+styles.subtopic=Podtema
+styles.topic=Tema
+styles.user-defined=Uporabni\u0161ko definirani slogi
+styles.website=Spletna stran
+styles_background_html=\n <html>\n <head>\n </head>\n <body>\n <table width="800" style="text-align: left; vertical-align: top">\n <tr valign="top">\n <th>\n <div style="margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; margin-left: 0pt; text-align: center; font-weight: bold">\n O tem slogu\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n Ta standard je bil razvit po 11 letih pedago\u0161kih raziskav o tem, kako narediti proces znanja la\ [...]
+styles_menu=Razpolo\u017Eljivi slogi
+submenu_keystroke_in_use_error=Zaporedje pritisnjenih tipk {0} ni mogo\u010De uporabiti za podmeni {1}. Zaporedje pritisnjenih tipk je odstranjeno.
+summary_nodes=Povzetki vozli\u0161\u010D
+summary_not_possible=Za trenutno izbiranje ni mogo\u010De ustvariti povzetka vozli\u0161\u010Da
+svg=SVG
+template_dir=Standardne predloge
+TextAlignAction.CENTER.text=Sredinsko besedilo
+TextAlignAction.DEFAULT.text=Privzeto
+TextAlignAction.LEFT.text=Levo poravnano besedilo
+TextAlignAction.RIGHT.text=Desno poravnano besedilo
+textalignment=Poravnava besedila
+TextChangeHotKeyAction.text=Nastavi bli\u017Enji\u010Dno tipko za spreminjanje besedila
 TimeListAction.text=Prika\u017Ei seznam \u010Dasovnega na\u010Drtovalca ...
 TimeListAction.tooltip=Prika\u017Ee vse na\u010Drtovane \u010Dase in ustrezajo\u010Da vozli\u0161\u010Da.
 TimeManagementAction.text=Prika\u017Ei koledar ...
 TimeManagementAction.tooltip=<html>Prika\u017Ee koledarski modul, avtor Kai Toedter.</html>
+TimePeriodUnits.days=dnevi
+TimePeriodUnits.hours=ure
+TimePeriodUnits.minutes=minute
 TimePeriodUnits.ms=ms
 TimePeriodUnits.seconds=sekunde
+TimePeriodUnits.weeks=tedni
 ToggleChildrenFoldedAction.text=(Raz)postri otroke
-ToggleFBarAction.text=F-Bar[translate me]
+ToggleDetailsAction.text=Skrij podrobnosti
+ToggleFBarAction.text=F-vrstica
 ToggleFoldedAction.text=Preklopi prepognjene
-ToggleFullScreenAction.text=Full screen mode[translate me]
+ToggleFullScreenAction.text=Celozaslonski na\u010Din
 ToggleLeftToolbarAction.text=Drugotna vrstica
 ToggleMenubarAction.text=Menijska vrstica
+ToggleScrollbarsAction.text=Drsni trakovi
+ToggleStatusAction.text=Prika\u017Ei vrstico stanja
 ToggleToolbarAction.text=Orodna vrstica
+TranslatedElement.BORDER=Besedilo na meji
+TranslatedElement.TEXT=Besedilo
+TranslatedElement.TOOLTIP=Orodni namig
+uiTextChanger.originalTextIsNotDefined=Izvirno besedilo ni definirano
+uiTextChanger.replaceText=Zamenjaj besedilo uporabni\u0161kega vmesnika
 undefined_error=Pri\u0161lo je do nepri\u010Dakovane napake. Prosim poskusite oddati poro\u010Dilo o hro\u0161\u010Du.
 underline=Pod\u010Drtano
+UnderlineAction.text=Pod\u010Drtano
 underlined=Pod\u010Drtano
 UndoAction.text=Razveljavi
 UndoFilterAction.text=Razveljavi
@@ -981,17 +2018,43 @@ UnfoldAllAction.text=Razpostri vse
 UnfoldAllAction.tooltip=<html>Razpostre izbrana vozli\u0161\u010Da in vse njihove otroke.</html>
 UnfoldOneLevelAction.text=Razprostri za eno stopnjo
 UnfoldOneLevelAction.tooltip=Razprostre izbrana vozli\u0161\u010Da za eno stopnjo.
-updatecheckdialog=Update Check Dialog[translate me]
+unparsedLatexPatternFormat=LaTeX za izvoz
+up=&Navzgor
+UpConditionAction.text=Navzgor
+update_failed=Posodabljanje ni uspelo s sporo\u010Dilom {0}
+UpdateCheckAction.text=Preveri za posodobitve
+updatecheckdialog=Pogovorno okno za posodobitve
+updater.component=Komponenta
+updater.goToDownload=Pojdi na prenos
+updater.version.installed=Name\u0161\u010Dena razli\u010Dica
+updater.version.latest=Najnovej\u0161a razli\u010Dica
+updater.version.noUpdateUrl=Za ta dodatek ni posodobljenega URL-ja ali doma\u010De strani.
+updater.version.unknown=neznano
+updater.version.unreachable=Nedosegljiv vir:
+updater.viewChangelog=Prika\u017Ei spremembo zapisa
 url_error=Ta URL je nepravilno oblikovan!
 url_load_error=Ni mogo\u010De nalo\u017Eiti miselnega vzorca z URL:
+url_open_error=URL-ja {0} ni bilo mogo\u010De odpreti.
+used_in_menu=Te bli\u017Enjice ni mogo\u010De nastaviti, uporablja se kot bli\u017Enjica v meniju.
 UsePlainTextAction.text=Uporabi navadno besedilo
+user_config_folder=Mapa za uporabni\u0161ko konfiguracijo: {0}
+user_defined_filters=Uporabni\u0161ko dolo\u010Deni filtri
+user_defined_scale=&Uporabni\u0161ko dolo\u010Dena lestvica
 user_defined_zoom=Uporabni\u0161ko dolo\u010Deno
 user_defined_zoom_status_bar=Spreminjanje pogleda na uporabni\u0161ko dolo\u010Deno vrednost {0}%.
+user_icon=Uporabni\u0161ka ikona "{0}"
+user_template_dir=Uporabni\u0161ke predloge
 user_zoom=Faktor pove\u010Dave tiskanja (0.0 - 2.0):
+userScripts=Skripti
+value_format=Dolo\u010Di vrednost formatu
+version_up_to_date=\u017De uporabljate najnovej\u0161o razli\u010Dico programa
 view=&Pogled
+ViewLayoutTypeAction.OUTLINE.text=Orisni pogled
+web_resources=Spletni viri
 WebDocuAction.text=Spletna dokumentacija
 WhatsNewAction.text=Kaj je novega v Freeplane 1.5.x
 width=\u0160irina
+wrong_regexp=Napa\u010Den regularni izraz "{0}", napaka {1}
 xslt_export.html=HTML dokument
 xslt_export.latex=Latex dokument
 xslt_export.latexbook=Latex knjiga
@@ -1000,6 +2063,8 @@ xslt_export.ms_excel=Microsoft Excel 2003 XML
 xslt_export.ms_project=Microsoft Project 2003 XML
 xslt_export.ms_word=Microsoft Word 2003 XML
 xslt_export.text=Golo besedilo
+xslt_export_not_possible=Freeplane XSLT izvoz ni mogo\u010D
 yes=Da
+zoom=Zumiranje
 ZoomInAction.text=Pove\u010Daj
 ZoomOutAction.text=Pomanj\u0161aj
diff --git a/freeplane/resources/translations/Resources_sv.properties b/freeplane/resources/translations/Resources_sv.properties
index d1938e0..09dabfd 100644
--- a/freeplane/resources/translations/Resources_sv.properties
+++ b/freeplane/resources/translations/Resources_sv.properties
@@ -245,7 +245,7 @@ EnterPassword.text=V\u00E4xla mellan krypterad/okrypterad
 error=Fel
 error_applying_template=Fel vid anv\u00E4ndning av XSL mall.
 error_creating_directory=Kan inte skapa mapp f\u00F6r export.
-ExecuteScriptError.text=Fel vid skriptk\u00F6rningen.\nSe loggfilen f\u00F6r detaljer.
+ExecuteScriptError.text=Fel vid k\u00F6rning av skript:\n{0}
 ExecuteScriptForAllNodes.text=K\u00F6r alla skript
 ExecuteScriptForSelectionAction.text=K\u00F6r valda grenars skript
 ExecuteScriptOnSelectedNode.text=K\u00F6r {0} p\u00E5 alla valda grenar
@@ -331,7 +331,7 @@ FoldAllAction.tooltip=<html>D\u00F6lj markerade grenar och alla undergrenar.</ht
 FoldOneLevelAction.text=D\u00F6lj en niv\u00E5
 FoldOneLevelAction.tooltip=<html>D\u00F6lj markerade grenar en niv\u00E5.</html>
 follow_graphical_link=G\u00E5 till:
-FollowLinkAction.text=\u00D6ppna hyperl\u00E4nk:
+FollowLinkAction.text=F\u00F6lj l\u00E4nk
 font=Teckensnitt
 FontFamilyAction.text=Teckensnitt
 FontSizeAction.text=Teckenstorlek
diff --git a/freeplane/resources/translations/Resources_tr.properties b/freeplane/resources/translations/Resources_tr.properties
index a3f40e0..e56e08a 100644
--- a/freeplane/resources/translations/Resources_tr.properties
+++ b/freeplane/resources/translations/Resources_tr.properties
@@ -67,6 +67,7 @@ addons.installer.success.update={0} {1} ba\u015Far\u0131l\u0131 g\u00FCncelle\u0
 addons.installer.title=Eklenti y\u00FCkleyicisi
 addons.installer.too.new=Mevcut Freeplane s\u00FCr\u00FCm\u00FC {0} \u00E7ok yeni
 addons.installer.too.old={0} ge\u00E7erli Freeplane s\u00FCr\u00FCm\u00FC \u00E7ok eski. Bu ihtiya\u00E7lar en az {1}
+addons.installer.unknown.deinstallation.rules=Bilinmeyen kald\u0131rma kural\u0131 {0}
 addons.installer.update={0}s\u00FCr\u00FCm\u00FCnden g\u00FCncelleme
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Yaln\u0131zca g\u00FCvendi\u011Finiz kaynaklardan eklentileri y\u00FCklemeniz gerekir</strong></body></html>
 addons.site=http://freeplane.sourceforge.net/addons/
@@ -144,7 +145,7 @@ AutomaticLayout.ALL=t\u00FCm d\u00FC\u011F\u00FCmler i\u00E7in
 AutomaticLayout.HEADINGS=Ayr\u0131lmayan d\u00FC\u011F\u00FCmler i\u00E7in
 AutomaticLayout.level=D\u00FCzey {0}
 AutomaticLayout.level.root=K\u00F6k
-AutomaticLayoutAction.text=Otomatik Plan
+AutomaticLayoutAction.text=Seviye stillerini uygula
 AutomaticLayoutAction.tooltip=<html> Haritan\u0131n plan\u0131n\u0131 tamir eder. <br>\u0130lk seviye siyah, ikincisi mavi, vb.</html>
 AutomaticLayoutControllerAction.ALL.text=t\u00FCm d\u00FC\u011F\u00FCmler i\u00E7in
 AutomaticLayoutControllerAction.COLUMNS.text=s\u00FCtunlar i\u00E7in
@@ -152,38 +153,117 @@ AutomaticLayoutControllerAction.HEADINGS.text=Ayr\u0131lmayan d\u00FC\u011F\u00F
 AutomaticLayoutControllerAction.null.text=devre d\u0131\u015F\u0131
 BackAction.text=Geri
 background=Arkaplan
+black=Siyah
 BlinkingNodeHookAction.text=Yan\u0131p S\u00F6nen D\u00FC\u011F\u00FCm
 BlinkingNodeHookAction.tooltip=<html>Bu, d\u00FC\u011F\u00FCm\u00FC yan\u0131p s\u00F6ner hale getirir. Ama dikkatli olun. \u00C7ok fazla d\u00FC\u011F\u00FCmde ve <strong>di\u011Fer otomatik bi\u00E7imlendirmelerle birlikte bunu kullanmay\u0131n</strong></html>
+blue=Blue
 BoldAction.text=Koyu
 boldify_branch=Dal\u0131 koyula\u015Ft\u0131r
 branch=Dal
+browse=G\u00F6zat...
+calendar_attributes_panel=Takvim ve nitelikler
+calendar_panel=Takvim
+can_not_clone_encrypted_node=\u015Eifreli d\u00FC\u011F\u00FCmleri kopyalama yapamazs\u0131n\u0131z
+can_not_connect_to_info_server=Bilgi sunucusuna ba\u011Flan\u0131lam\u0131yor
+can_not_delete_predefined_style=\u00D6nceden tan\u0131mlanm\u0131\u015F stil silinemiyor
+can_not_delete_root_style=K\u00F6k stili silemezsiniz
+can_not_delete_style_group=Stil grubu silemezsiniz
+can_not_encrypt_cloned_node=Klonlanm\u0131\u015F d\u00FC\u011F\u00FCmler \u015Fifreleme yap\u0131lam\u0131yor
+can_not_save_key_set=K\u0131sayol tu\u015Fu seti kaydedilemiyor
 cancel=\u0130ptal
 CancelAction.text=\u0130ptal
 cannot_add_parent_diff_parents=Bu i\u015Flevin \u00E7al\u0131\u015Fmas\u0131 i\u00E7in b\u00FCt\u00FCn d\u00FC\u011F\u00FCmlerin ayn\u0131 ebeveyne sahip olmas\u0131 gerekir.
 cannot_add_parent_to_root=K\u00F6k d\u00FC\u011F\u00FCm\u00FC yeni bir ebeveyne eklenemez.
+cannot_delete_root=K\u00F6k d\u00FC\u011F\u00FCm silinemez veya kesilemez.
 cannot_join_nodes_with_children=\u00C7ocuklu d\u00FC\u011F\u00FCmler birle\u015Ftirilemez
+cannot_move_into_child_node=\u00C7ocuk d\u00FC\u011F\u00FCm\u00FCne ta\u015F\u0131nam\u0131yor
 cannot_move_to_child=D\u00FC\u011F\u00FCm \u00E7ocuklar\u0131ndan birine ta\u015F\u0131namad\u0131.
 CenterAction.text=Ortala
 ChangeConnectorArrowsAction.backward.text=Geri
+ChangeConnectorArrowsAction.both.text=Ileri ve geri oklar\u0131 \u00E7iz
 ChangeConnectorArrowsAction.forward.text=\u0130leri
+ChangeConnectorArrowsAction.none.text=Yok
+ChangeConnectorArrowsAction.text=Ba\u011Flay\u0131c\u0131 Oklar\u0131n\u0131 De\u011Fi\u015Ftir
+ChangeConnectorShapeAction.CUBIC_CURVE.text=E\u011Fri
+ChangeConnectorShapeAction.EDGE_LIKE.text=Kenar sim\u00FClasyonu
+ChangeConnectorShapeAction.LINE.text=\u00C7izgi
+ChangeConnectorShapeAction.LINEAR_PATH.text=Do\u011Frusal yol
+ChangeNodeLevelLeftsAction.text=d\u00FC\u011F\u00FCm\u00FC ta\u015F\u0131 (Ebeveynlerin karde\u015Fleri)
+ChangeNodeLevelRightsAction.text=D\u00FC\u011F\u00FCm\u00FC (karde\u015Fler \u00E7ocuk) Ta\u015F\u0131
 choose_cloud_color=Bulut Rengini De\u011Fi\u015Ftir:
 choose_edge_color=S\u0131n\u0131r Rengi Se\u00E7
+choose_map_background_color=Harita arka plan rengini se\u00E7in
 choose_node_background_color=D\u00FC\u011F\u00FCm Arkaplan Rengini Se\u00E7:
 choose_node_color=D\u00FC\u011F\u00FCm Rengini Se\u00E7in:
-CloseAction.text=Kapat
+ClearLinkAnchorAction.text=Ba\u011Flant\u0131 k\u00F6pr\u00FCs\u00FCn\u00FC temizle
+CloneAction.text=Yap\u0131\u015Ft\u0131r klon
+close_btn=&Kapat
+CloseAction.text=Ge\u00E7erli haritay\u0131 kapat
+CloseAllMapsAction.text=T\u00FCm haritalar\u0131 kapat
+CloseAllOtherMapsAction.text=Di\u011Fer t\u00FCm haritalar\u0131 kapat
+cloud_shapes=Bulut \u015Fekilleri
 CloudAction.text=Bulut
 CloudColorAction.text=Bulut rengi...
+CloudShapeAction.RECT.text=Dikd\u00F6rtgen
+CloudShapeAction.ROUND_RECT.text=Yuvarlak dikd\u00F6rtgen
+CloudShapeAction.STAR.text=Y\u0131ld\u0131z
+collection.copy.presentation=Sunuyu kopyala
+collection.copy.slide=Slayd\u0131 kopyala
+collection.delete=Sil
+collection.down=A\u015Fa\u011F\u0131
+collection.move=Ta\u015F\u0131
+collection.moveTo=Pozisyona ta\u015F\u0131
+collection.new.presentation=Yeni sunum
+collection.new.slide=Yeni Slayt
+collection.up=Yukar\u0131
 ColorProperty.ResetColor=Rengi S\u0131f\u0131rla
 combined=Birle\u015Fik
-CopyAction.text=Kopyala
+condition=Ko\u015Ful
+confirmation=Onay
+connector=Ba\u011Flay\u0131c\u0131
+connector_arrows=Ba\u011Flay\u0131c\u0131 oklar
+connector_label=Ba\u011Flay\u0131c\u0131 etiketi
+connector_lines=Ba\u011Flay\u0131c\u0131 \u00E7izgiler
+connector_shapes=Ba\u011Flay\u0131c\u0131 \u015Fekiller
+ConnectorColorAction.text=Konekt\u00F6r rengi ...
+controls=Kontroller
+copy_name=(Kopya) {0}
+CopyAction.text=Kopya
+CopyAttributes.text=Nitelikleri kopyala
+CopyIDAction.text=D\u00FC\u011F\u00FCm ID kopyala
+CopyMapStylesAction.text=Harita stilini kopyala ...
+CopyNodeURIAction.text=Kopya d\u00FC\u011F\u00FCm\u00FCn URI
+copyright=Copyright \u00A9 2000-2017 Freeplane tak\u0131m\u0131 ve di\u011Ferleri
 CopySingleAction.text=Birini Kopyala
-CreationModificationPluginAction.text=De\u011Fi\u015Ftirme Zamanlar\u0131n\u0131 G\u00F6ster
+CopySingleAction.tooltip=Yaln\u0131zca se\u00E7ilen d\u00FC\u011F\u00FCm\u00FC kopyala
+CopyStyleExtensionsAction.text=Stil d\u00FC\u011F\u00FCm\u00FCnden uzant\u0131lar\u0131 kopyala
+corrupt_map=Harita i\u00E7eri\u011Fi bozuk
+CreateConjunctConditionAction.text=Ve
+CreateDisjunctConditionAction.text=Veya
+CreateNotSatisfiedConditionAction.text=De\u011Fil
+CreationModificationPluginAction.text=De\u011Fi\u015Fiklik zamanlar\u0131n\u0131 g\u00F6r\u00FCnt\u00FCle
 CreationModificationPluginAction.tooltip=<html>Bu i\u015Flev d\u00FC\u011F\u00FCm yap\u0131m ve de\u011Fi\u015Ftirme zamanlarini takip eder.</html>
+current_dir=Haritalar
 CutAction.text=Kes
 decrease_branch_font_size=Yaz\u0131tipini K\u00FC\u00E7\u00FClt
 DecreaseNodeFontAction.text=Yaz\u0131tipini K\u00FC\u00E7\u00FClt
+default=Varsay\u0131lan
+DefaultColorAction.text=Varsay\u0131lan renk
+defaultstyle.attributes=\u00D6znitelikleri
+defaultstyle.details=Ayr\u0131nt\u0131lar
+defaultstyle.floating=Y\u00FCzen d\u00FC\u011F\u00FCm
+defaultstyle.note=Not
+delete=&Sil
 delete_child=D\u00FC\u011F\u00FCm\u00FC Sil
 DeleteAction.text=D\u00FC\u011F\u00FCm\u00FC Kald\u0131r
+DeleteConditionAction.text=Sil
+DeleteDetailsAction.text=D\u00FC\u011F\u00FCm ayr\u0131nt\u0131lar\u0131n\u0131 kald\u0131r
+DeleteLevelStyleAction.text=D\u00FCzey stilini kald\u0131r
+DeleteStyleAction.text=Stili kald\u0131r
+DeleteUserStyleAction.text=Kullan\u0131c\u0131 tan\u0131ml\u0131 stili kald\u0131r
+dialect_info.app=Zihin harita dosyas\u0131 {0}, program {1} ile olu\u015Fturuldu.
+dialect_info.later_version={0} zihin haritas\u0131 dosyas\u0131 bu program baz\u0131 sonraki bir s\u00FCr\u00FCm\u00FC ile olu\u015Fturulmu\u015F.
+dialect_info.unknownApp=Zihin harita dosyas\u0131 {0} bilinmeyen program taraf\u0131ndan olu\u015Fturuldu.
 DocumentationAction.text=Belgeler
 edge=S\u0131n\u0131r
 edge_style=S\u0131n\u0131r Bi\u00E7emi
diff --git a/freeplane/resources/translations/Resources_uk_UA.properties b/freeplane/resources/translations/Resources_uk_UA.properties
index 52c95b9..4e3826a 100644
--- a/freeplane/resources/translations/Resources_uk_UA.properties
+++ b/freeplane/resources/translations/Resources_uk_UA.properties
@@ -73,7 +73,7 @@ addons.installer.too.old=\u041F\u043E\u0442\u043E\u0447\u043D\u0430 \u0432\u0435
 addons.installer.unknown.deinstallation.rules=\u041D\u0435\u0432\u0456\u0434\u043E\u043C\u0456 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u0432\u0438\u0434\u0430\u043B\u0435\u043D\u043D\u044F {0}
 addons.installer.update=\u041E\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044F \u0437 \u0432\u0435\u0440\u0441\u0456\u0457 {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">\u0414\u043E\u0434\u0430\u0442\u043A\u0438 \u0441\u043B\u0456\u0434 \u0432\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u044E\u0432\u0430\u0442\u0438 \u043B\u0438\u0448\u0435 \u0437 \u0434\u043E\u0432\u0456\u0440\u0435\u043D\u0438\u0445 \u0434\u0436\u0435\u0440\u0435\u043B. \u0428\u043A\u0456\u0434\u043B\u0438\u0432\u0456 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0438 \u043C\u043E\u0436\u0443\u0442\u044C \u043 [...]
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=\u0414\u043E\u0434\u0430\u0442\u0438 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0438 \u0441\u0442\u0438\u043B\u044E
 AddStyleAttributes.tooltip=\u0414\u043E\u0434\u0430\u0442\u0438 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0438 \u0437 \u0437\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u0443 \u0441\u0442\u0438\u043B\u044E
 AllMapsNodeListAction.text=\u0417\u043D\u0430\u0439\u0442\u0438 \u0456 \u0437\u0430\u043C\u0456\u043D\u0438\u0442\u0438 \u0443 \u0432\u0441\u0456\u0445 \u043A\u0430\u0440\u0442\u0430\u0445
@@ -209,6 +209,8 @@ ClearLinkAnchorAction.tooltip=<html>\u043E\u0447\u0438\u0441\u0442\u0438\u0442\u
 CloneAction.text=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043A\u043B\u043E\u043D
 close_btn=&\u0417\u0430\u043A\u0440\u0438\u0442\u0438
 CloseAction.text=\u0417\u0430\u043A\u0440\u0438\u0442\u0438 \u043F\u043E\u0442\u043E\u0447\u043D\u0443 \u043A\u0430\u0440\u0442\u0443
+CloseAllMapsAction.text=\u0417\u0430\u043A\u0440\u0438\u0442\u0438 \u0432\u0441\u0456 \u043A\u0430\u0440\u0442\u0438
+CloseAllOtherMapsAction.text=\u0417\u0430\u043A\u0440\u0438\u0442\u0438 \u0440\u0435\u0448\u0442\u0443 \u043A\u0430\u0440\u0442
 cloud_shapes=\u0424\u043E\u0440\u043C\u0438 \u0445\u043C\u0430\u0440
 CloudAction.text=\u0414\u043E\u0434\u0430\u0442\u0438 / \u0432\u0438\u043B\u0443\u0447\u0438\u0442\u0438 \u0445\u043C\u0430\u0440\u0443 (\u0442\u0438\u043F\u043E\u0432\u0443)
 CloudColorAction.text=\u041A\u043E\u043B\u0456\u0440 \u0445\u043C\u0430\u0440\u043A\u0438...
@@ -216,6 +218,8 @@ CloudShapeAction.ARC.text=\u0414\u0443\u0433\u0430
 CloudShapeAction.RECT.text=\u041F\u0440\u044F\u043C\u043E\u043A\u0443\u0442\u043D\u0438\u043A
 CloudShapeAction.ROUND_RECT.text=\u0417\u0430\u043E\u043A\u0440\u0443\u0433\u043B\u0435\u043D\u0438\u0439 \u043F\u0440\u044F\u043C\u043E\u043A\u0443\u0442\u043D\u0438\u043A
 CloudShapeAction.STAR.text=\u0417\u0456\u0440\u043A\u0430
+collection.copy.presentation=\u0421\u043A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044E
+collection.copy.slide=\u0421\u043A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u0441\u043B\u0430\u0439\u0434
 collection.delete=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
 collection.down=\u0412\u043D\u0438\u0437
 collection.move=\u041F\u0435\u0440\u0435\u043C\u0456\u0441\u0442\u0438\u0442\u0438
@@ -235,6 +239,7 @@ connector_shapes=\u0424\u043E\u0440\u043C\u0438 \u0437'\u0454\u0434\u043D\u0443\
 ConnectorColorAction.text=\u041A\u043E\u043B\u0456\u0440 \u0437'\u0454\u0434\u043D\u0443\u0432\u0430\u0447\u0430...
 controls=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043A\u0435\u0440\u0443\u0432\u0430\u043D\u043D\u044F
 ConvertCloneToIndependentNodeAction.text=\u0412\u0456\u0434'\u0454\u0434\u043D\u0430\u0442\u0438 \u043A\u043B\u043E\u043D
+copy_name={0} (\u043A\u043E\u043F\u0456\u044F)
 CopyAction.text=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438
 CopyAction.tooltip=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0443 \u0433\u0456\u043B\u043A\u0443
 CopyAttributes.text=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0438
@@ -360,6 +365,8 @@ ExecuteScripts.noScriptsAvailable=\u041D\u0435 \u0434\u043E\u0441\u0442\u0443\u0
 ExecuteScripts.text=\u0421\u043A\u0440\u0438\u043F\u0442\u0438
 ExecuteScriptSecurityError.text=\u041F\u0456\u0434 \u0447\u0430\u0441 \u0432\u0438\u043A\u043E\u043D\u0430\u043D\u043D\u044F \u0441\u043A\u0440\u0438\u043F\u0442\u0443 \u0432\u0438\u043D\u0438\u043A\u043B\u0430 \u043F\u043E\u043C\u0438\u043B\u043A\u0430: {0}
 export_failed=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u043D\u0435 \u0432\u0434\u0430\u043B\u043E\u0441\u044C
+export_pdf_text=Portable Document Format (PDF)
+export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Freeplane \u0435\u043A\u0441\u043F\u043E\u0440\u0442
 ExportAction.text=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u043A\u0430\u0440\u0442\u0443...
 ExportAllPresentationsAction.text=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u0432\u0441\u0456 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457 \u0432 \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F \u0444\u043E\u0440\u043C\u0430\u0442\u0443 PNG
@@ -854,6 +861,8 @@ ModesMenuAction.MindMap.text=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u
 most_recent_files=\u041D\u0435\u0434\u0430\u0432\u043D\u0456 \u0444\u0430\u0439\u043B\u0438
 MoveAction.text=\u041F\u0435\u0440\u0435\u043C\u0456\u0441\u0442\u0438\u0442\u0438
 MoveSelectedNodeAction.CENTER.text=\u0426\u0435\u043D\u0442\u0440\u0443\u0432\u0430\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u0439 \u0432\u0443\u0437\u043E\u043B
+MoveSelectedNodeAction.EAST.text=\u041F\u0435\u0440\u0435\u043C\u0456\u0441\u0442\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u0439 \u0432\u0443\u0437\u043E\u043B \u0432\u043F\u0440\u0430\u0432\u043E
+MoveSelectedNodeAction.WEST.text=\u041F\u0435\u0440\u0435\u043C\u0456\u0441\u0442\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u0439 \u0432\u0443\u0437\u043E\u043B \u0432\u043B\u0456\u0432\u043E
 MoveToRootAction.text=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043E \u043A\u043E\u0440\u0435\u043D\u044F
 NameConditionAction.text=\u0417\u0430\u0434\u0430\u0442\u0438 \u043D\u0430\u0437\u0432\u0443
 navigate=\u041F\u0435\u0440\u0435\u043C\u0456\u0449\u0435\u043D\u043D\u044F
@@ -920,6 +929,7 @@ NodeExtensions.RemoveNodeExtensions=\u0412\u0438\u043B\u0443\u0447\u0438\u0442\u
 NodeListAction.text=\u0406\u0441\u0442\u043E\u0440\u0456\u044F...
 NodeListAction.tooltip=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u0432\u0441\u0456 \u0432\u0443\u0437\u043B\u0438 \u044F\u043A \u0441\u043F\u0438\u0441\u043E\u043A \u0437 \u043F\u043E\u0448\u0443\u043A\u043E\u043C \u0456 \u0444\u0456\u043B\u044C\u0442\u0440\u043E\u043C.
 NodeShapeAction.bubble.text=\u0411\u0443\u043B\u044C\u0431\u0430\u0448\u043A\u0430
+NodeShapeAction.fork.text=\u041B\u0456\u043D\u0456\u044F
 NodeShapeAction.narrow_hexagon.text=\u0412\u0443\u0437\u044C\u043A\u0438\u0439 \u0448\u0435\u0441\u0442\u0438\u043A\u0443\u0442\u043D\u0438\u043A
 NodeShapeAction.oval.text=\u041E\u0432\u0430\u043B
 NodeShapeAction.rectangle.text=\u041F\u0440\u044F\u043C\u043E\u043A\u0443\u0442\u043D\u0438\u043A
@@ -1137,6 +1147,7 @@ OptionPanel.ja=\u042F\u043F\u043E\u043D\u0441\u044C\u043A\u0430 / \u65E5\u672C\u
 OptionPanel.JoinNodesAction.textSeparators=\u0420\u043E\u0437\u0434\u0456\u043B\u044E\u0432\u0430\u0447 \u0442\u0435\u043A\u0441\u0442\u0443
 OptionPanel.key_type_action=\u041F\u0440\u0438 \u043D\u0430\u0431\u043E\u0440\u0456 \u0442\u0435\u043A\u0441\u0442\u0443
 OptionPanel.Keystrokes=\u041A\u043B\u0430\u0432\u0456\u0448\u0456
+OptionPanel.kn=\u041A\u0430\u043D\u043D\u0430\u0434\u0430 / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=\u041A\u043E\u0440\u0435\u0439\u0441\u044C\u043A\u0430 / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=\u0413\u0430\u0440\u043D\u0456\u0442\u0443\u0440\u0430
 OptionPanel.label_font_size=\u0420\u043E\u0437\u043C\u0456\u0440 \u0441\u0438\u043C\u0432\u043E\u043B\u0456\u0432
@@ -1208,6 +1219,7 @@ OptionPanel.number_format=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D
 OptionPanel.number_format.tooltip=\u0428\u0430\u0431\u043B\u043E\u043D, \u0449\u043E \u043C\u0456\u0441\u0442\u0438\u0442\u044C '#' \u0434\u043B\u044F \u043C\u043E\u0436\u043B\u0438\u0432\u0438\u0445 \u0430\u0431\u043E '0' \u0434\u043B\u044F \u043E\u0431\u043E\u0432'\u044F\u0437\u043A\u043E\u0432\u0438\u0445 \u0446\u0438\u0444\u0440. \u041F\u0440\u0438\u043A\u043B\u0430\u0434\u0438: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=\u0427\u0438\u0441\u043B\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043D\u0438\u0445 \u0432\u0435\u0440\u0441\u0456\u0439
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> \u0422\u0456\u043B\u044C\u043A\u0438 \u0437\u0430\u0434\u0430\u043D\u0435 \u0447\u0438\u0441\u043B\u043E \u0432\u0435\u0440\u0441\u0456\u0439 \u0431\u0443\u0434\u0443\u0442\u044C \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043D\u0456, \u0432\u0441\u0456 \u043F\u043E\u043F\u0435\u0440\u0435\u0434\u043D\u0456 \u0432\u0435\u0440\u0441\u0456\u0457 \u0432\u0456\u0434\u0434\u0430\u043B\u044F\u0442\u0438\u043C\u0443\u0442\u [...]
+OptionPanel.oc=\u041E\u043A\u0441\u0438\u0442\u0430\u043D\u0441\u044C\u043A\u0430
 OptionPanel.OK=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438
 OptionPanel.org.freeplane.plugin.bugreport=\u041F\u043E\u043B\u0456\u0442\u0438\u043A\u0430
 OptionPanel.org.freeplane.plugin.bugreport.allowed=\u0417\u0430\u0432\u0436\u0434\u0438 \u043D\u0430\u0434\u0441\u0438\u043B\u0430\u0442\u0438
@@ -1246,6 +1258,7 @@ OptionPanel.presentation.processesNavigationKeys=\u041A\u0435\u0440\u0443\u0432\
 OptionPanel.presentation.slideDisplaysAllNodes=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0440\u043E\u0437\u0433\u043E\u0440\u0442\u0430\u0442\u0438 \u0432\u0441\u0456 \u0432\u0443\u0437\u043B\u0438 \u0441\u043B\u0430\u0439\u0434\u0430
 OptionPanel.presentation.slowMotion=\u041F\u043E\u0432\u0456\u043B\u044C\u043D\u0438\u0439 \u0440\u0443\u0445
 OptionPanel.presentation.switchToFullScreen=\u0410\u043A\u0442\u0438\u0432\u0443\u0432\u0430\u0442\u0438 \u043F\u043E\u0432\u043D\u043E\u0435\u043A\u0440\u0430\u043D\u043D\u0438\u0439 \u0440\u0435\u0436\u0438\u043C
+OptionPanel.presentation.switchToSpotlight=\u0423\u0432\u0456\u043C\u043A\u043D\u0443\u0442\u0438 \u043B\u0456\u0445\u0442\u0430\u0440\u0438\u043A
 OptionPanel.presentation.zoom=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u0442\u0438 \u043C\u0430\u0441\u0448\u0442\u0430\u0431 \u043A\u0430\u0440\u0442\u0438
 OptionPanel.printonwhitebackground=<html>\u0411\u0456\u043B\u0435 \u0442\u043B\u043E \u0434\u043B\u044F \u0434\u0440\u0443\u043A\u0443</html>
 OptionPanel.printonwhitebackground.tooltip=<html>\u0417\u0430\u0432\u0436\u0434\u0438 \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0432\u0430\u0442\u0438 \u0431\u0456\u043B\u0435 \u0442\u043B\u043E \u043F\u0456\u0434 \u0447\u0430\u0441 \u0434\u0440\u0443\u043A\u0443</html>
@@ -1358,6 +1371,7 @@ OptionPanel.separator.SplitToWordsAction=\u041F\u043E\u0434\u0456\u043B \u0432\u
 OptionPanel.separator.status=\u0420\u044F\u0434\u043E\u043A \u0441\u0442\u0430\u043D\u0443
 OptionPanel.separator.surveys=\u041E\u0433\u043B\u044F\u0434\u0438
 OptionPanel.separator.svg_icons=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438 SVG
+OptionPanel.separator.tooltip=\u041F\u0456\u0434\u043A\u0430\u0437\u043A\u0438
 OptionPanel.separator.undo=\u0421\u043A\u0430\u0441\u0443\u0432\u0430\u0442\u0438
 OptionPanel.separator.updates=\u041E\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044F \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0438
 OptionPanel.set_property_text=\u0417\u043C\u0456\u043D\u0438\u0442\u0438
@@ -1369,9 +1383,12 @@ OptionPanel.shape_vertical_margin=\u0412\u0435\u0440\u0442\u0438\u043A\u0430\u04
 OptionPanel.sharp_bezier=\u0413\u043E\u0441\u0442\u0440\u0430 \u043A\u0440\u0438\u0432\u0430 (\u0411\u0435\u0437\u044C\u0454)
 OptionPanel.sharp_linear=\u0413\u043E\u0441\u0442\u0440\u0430 \u043F\u0440\u044F\u043C\u0430
 OptionPanel.shouldCenterSmallMaps=\u0426\u0435\u043D\u0442\u0440\u0443\u0432\u0430\u0442\u0438 \u043C\u0430\u043B\u0456 \u043A\u0430\u0440\u0442\u0438
+OptionPanel.show_connectors=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u0437'\u0454\u0434\u043D\u0443\u0432\u0430\u043B\u044C\u043D\u0456 \u043B\u0456\u043D\u0456\u0457
 OptionPanel.show_icon_for_attributes=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438 \u0434\u043B\u044F \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0456\u0432
+OptionPanel.show_icons=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438
 OptionPanel.show_less_than_N_nodes_by_default_after_load=\u0417\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0438\u0442\u0438 \u0437 \u043A\u0430\u0440\u0442\u0438 \u0430\u0431\u043E \u0440\u043E\u0437\u0433\u043E\u0440\u043D\u0443\u0442\u0438 \u0434\u0435\u044F\u043A\u0456 \u0432\u0443\u0437\u043B\u0438
 OptionPanel.show_node_tooltips=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043F\u0456\u0434\u043A\u0430\u0437\u043A\u0438
+OptionPanel.show_note_icon_in_tooltip=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0443 \u043F\u0440\u0438\u043C\u0456\u0442\u043A\u0438 \u0432 \u043F\u0456\u0434\u043A\u0430\u0437\u0446\u0456
 OptionPanel.show_note_icons=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438 \u0434\u043B\u044F \u043F\u0440\u0438\u043C\u0456\u0442\u043E\u043A
 OptionPanel.show_styles_in_tooltip=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u0441\u0442\u0438\u043B\u0456 \u0432\u0443\u0437\u043B\u0456\u0432 \u0443 \u043F\u0456\u0434\u043A\u0430\u0437\u043A\u0430\u0445
 OptionPanel.signed_script_are_trusted=\u0414\u043E\u0432\u0456\u0440\u044F\u0442\u0438 \u043F\u0456\u0434\u043F\u0438\u0441\u0430\u043D\u0438\u043C \u0441\u043A\u0440\u0438\u043F\u0442\u0430\u043C (\u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u043E\u0432\u0430\u043D\u043E).
@@ -1387,7 +1404,7 @@ OptionPanel.single_instance_force.tooltip=\u0423\u043D\u0438\u043A\u0430\u0442\u
 OptionPanel.sk=\u0421\u043B\u043E\u0432\u0430\u0446\u044C\u043A\u0430 / sloven\u010Dina
 OptionPanel.skip_template_selection=\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u0438 \u0434\u0456\u0430\u043B\u043E\u0433 \u0432\u0438\u0431\u043E\u0440\u0443 \u0448\u0430\u0431\u043B\u043E\u043D\u0430
 OptionPanel.sl=\u0421\u043B\u043E\u0432\u0435\u043D\u0441\u044C\u043A\u0430 / sloven\u0161\u010Dina
-OptionPanel.slow_scroll_selected_node=\u041F\u043E\u0432\u0456\u043B\u044C\u043D\u0435 \u043F\u0440\u043E\u043A\u0440\u0443\u0447\u0443\u0432\u0430\u043D\u043D\u044F \u0434\u043E \u0432\u0438\u0431\u0440\u0430\u043D\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430
+OptionPanel.slow_scroll_selected_node=\u041F\u043B\u0430\u0432\u043D\u0438\u0439 \u043F\u0435\u0440\u0435\u0445\u0456\u0434 \u0434\u043E \u0432\u0438\u0431\u0440\u0430\u043D\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430
 OptionPanel.small_bubble=\u041C\u0430\u043B\u0430 \u0431\u0443\u043B\u044C\u0431\u0430\u0448\u043A\u0430
 OptionPanel.small_wide_hexagon=\u041C\u0430\u043B\u0438\u0439 \u0448\u0435\u0441\u0442\u0438\u043A\u0443\u0442\u043D\u0438\u043A
 OptionPanel.spelling_opt_case_sensitive=\u0427\u0443\u0442\u043B\u0438\u0432\u0456\u0441\u0442\u044C \u0434\u043E \u0440\u0435\u0433\u0456\u0441\u0442\u0440\u0443
@@ -1401,6 +1418,8 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=\u0437\u043D\u0430\u043A
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=\u0437\u0430\u043B\u0438\u0448\u0438\u0442\u0438 \u043F\u043E\u0447\u0430\u0442\u043A\u043E\u0432\u0438\u0439 \u0432\u0443\u0437\u043E\u043B \u043F\u043E\u0440\u043E\u0436\u043D\u0456\u043C
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=\u0447\u0438\u0441\u043B\u043E \u0432\u0443\u0437\u043B\u0456\u0432 \u0443 \u0440\u044F\u0434\u043A\u0443
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=\u0437\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u043F\u043E\u0447\u0430\u0442\u043A\u043E\u0432\u0438\u0439 \u0442\u0435\u043A\u0441\u0442 \u044F\u043A \u043F\u043E\u0434\u0440\u043E\u0431\u0438\u0446\u0456
+OptionPanel.spotlight=\u041B\u0456\u0445\u0442\u0430\u0440\u0438\u043A
+OptionPanel.spotlight_background_color=\u041A\u043E\u043B\u0456\u0440 \u0442\u043B\u0430 \u0434\u043B\u044F \u043B\u0456\u0445\u0442\u0430\u0440\u0438\u043A\u0430
 OptionPanel.sr=\u0421\u0435\u0440\u0431\u0441\u044C\u043A\u0430 / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u0444\u0430\u0439\u043B \u0448\u0430\u0431\u043B\u043E\u043D\u0443
 OptionPanel.standardbackgroundcolor=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u043A\u043E\u043B\u0456\u0440 \u0442\u043B\u0430
@@ -1559,6 +1578,7 @@ PrintAction.text=\u041D\u0430\u0434\u0440\u0443\u043A\u0443\u0432\u0430\u0442\u0
 PrintDirectAction.text=\u041D\u0430\u0434\u0440\u0443\u043A\u0443\u0432\u0430\u0442\u0438
 printing_settings=\u041C\u0430\u0441\u0448\u0442\u0430\u0431 \u0434\u0440\u0443\u043A\u0443
 PrintPreviewAction.text=\u041F\u0435\u0440\u0435\u0433\u043B\u044F\u0434 \u0434\u0440\u0443\u043A\u0443...
+program_terminates=\u0412\u043D\u0443\u0442\u0440\u0456\u0448\u043D\u044F \u043F\u043E\u043C\u0438\u043B\u043A\u0430. \u041F\u0440\u043E\u0433\u0440\u0430\u043C\u0430 \u0437\u0443\u043F\u0438\u043D\u044F\u0454\u0442\u044C\u0441\u044F.
 progress=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0430 \u043F\u043E\u0441\u0442\u0443\u043F\u0443 (%)
 PropertyAction.dialog=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F
 PropertyAction.text=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F ...
@@ -1617,7 +1637,7 @@ SaveAcceleratorPresetsAction.text=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u04
 SaveAction.text=&\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u043A\u0430\u0440\u0442\u0443
 SaveAction_readonlyMsg=\u0426\u044F \u043A\u0430\u0440\u0442\u0430 \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u043B\u0438\u0448\u0435 \u0434\u043B\u044F \u0447\u0438\u0442\u0430\u043D\u043D\u044F. \u0414\u043B\u044F \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043D\u043D\u044F \u0441\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u0439\u0442\u0435\u0441\u044C \u043A\u043E\u043C\u0430\u043D\u0434\u043E\u044E '\u0424\u0430\u0439\u043B->\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u04 [...]
 SaveAction_readonlyTitle=\u0421\u043F\u0440\u043E\u0431\u0430 \u0437\u0430\u043F\u0438\u0441\u0443 \u043A\u0430\u0440\u0442\u0438, \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u043E\u0457 \u043B\u0438\u0448\u0435 \u0434\u043B\u044F \u0447\u0438\u0442\u0430\u043D\u043D\u044F
-SaveAll.text=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 &\u0432\u0441\u0456 \u0432\u0456\u0434\u043A\u0440\u0438\u0442\u0456 \u043A\u0430\u0440\u0442\u0438
+SaveAll.text=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 &\u0432\u0441\u0456 \u043A\u0430\u0440\u0442\u0438
 SaveAll.tooltip=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0432\u0441\u0456 \u0432\u0456\u0434\u043A\u0440\u0438\u0442\u0456 \u043A\u0430\u0440\u0442\u0438
 SaveAs_toReadonlyMsg={0} \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u043B\u0438\u0448\u0435 \u0434\u043B\u044F \u0447\u0438\u0442\u0430\u043D\u043D\u044F. \u0417\u0431\u0435\u0440\u0435\u0436\u0456\u0442\u044C \u0434\u043E \u0456\u043D\u0448\u043E\u0433\u043E \u0444\u0430\u0439\u043B\u0443.
 SaveAs_toReadonlyTitle=\u0421\u043F\u0440\u043E\u0431\u0430 \u0437\u0430\u043F\u0438\u0441\u0443 \u0444\u0430\u0439\u043B\u0443, \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u043E\u0433\u043E \u043B\u0438\u0448\u0435 \u0434\u043B\u044F \u0447\u0438\u0442\u0430\u043D\u043D\u044F
@@ -1657,7 +1677,7 @@ SelectNoteAction.tooltip=\u041F\u0435\u0440\u0435\u043C\u0438\u043A\u0430\u043D\
 set_accelerator_on_next_click_helpmessage=\u0429\u043E\u0431 \u0441\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u043D\u043E\u0432\u0435 \u0441\u043F\u043E\u043B\u0443\u0447\u0435\u043D\u043D\u044F \u043A\u043B\u0430\u0432\u0456\u0448, \u043A\u043B\u0430\u0446\u043D\u0456\u0442\u044C \u043A\u043E\u043C\u0430\u043D\u0434\u0443 \u0432 \u043C\u0435\u043D\u044E.
 SetAccelerator.dialogTitle=\u041F\u0440\u0438\u0437\u043D\u0430\u0447\u0435\u043D\u043D\u044F \u0441\u043F\u043E\u043B\u0443\u0447\u0435\u043D\u044C \u043A\u043B\u0430\u0432\u0456\u0448
 SetAccelerator.keystrokeDetected=\u041A\u043B\u0430\u0432\u0456\u0448\u0430 "{0}" \u043D\u0435 \u043F\u0440\u0438\u0437\u043D\u0430\u0447\u0435\u043D\u0430 \u0436\u043E\u0434\u043D\u043E\u043C\u0443 \u0435\u043B\u0435\u043C\u0435\u043D\u0442\u0443 \u043C\u0435\u043D\u044E.
-SetAcceleratorOnNextClickAction.text=\u041F\u0440\u0438\u0437\u043D\u0430\u0447\u0438\u0442\u0438 \u0441\u043F\u043E\u043B\u0443\u0447\u0435\u043D\u043D\u044F \u043A\u043B\u0430\u0432\u0456\u0448...
+SetAcceleratorOnNextClickAction.text=\u041F\u0440\u0438\u0437\u043D\u0430\u0447\u0438\u0442\u0438 \u0441\u043F\u043E\u043B\u0443\u0447\u0435\u043D\u043D\u044F \u043A\u043B\u0430\u0432\u0456\u0448
 SetAlwaysUnfoldedNodeFlagsAction.text=\u0417\u0430\u043B\u0438\u0448\u0438\u0442\u0438 \u0440\u043E\u0437\u0433\u043E\u0440\u043D\u0443\u0442\u0456 \u0432\u0443\u0437\u043B\u0438
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=\u0417\u0430\u043F\u043E\u0431\u0456\u0433\u0430\u0454 \u0437\u0433\u043E\u0440\u0442\u0430\u043D\u043D\u044E \u0440\u043E\u0437\u0433\u043E\u0440\u043D\u0443\u0442\u0438\u0445 \u0437\u0430\u0440\u0430\u0437 \u0432\u0443\u0437\u043B\u0456\u0432
 SetImageByFileChooserAction.text=\u0417\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F \u0437\u0430 \u0432\u0438\u0431\u043E\u0440\u043E\u043C \u0430\u0431\u043E \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F\u043C...
diff --git a/freeplane/resources/xslt/opml2mm.xsl b/freeplane/resources/xslt/opml2mm.xsl
index 55ac8f1..3f80e8c 100644
--- a/freeplane/resources/xslt/opml2mm.xsl
+++ b/freeplane/resources/xslt/opml2mm.xsl
@@ -69,4 +69,4 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/freeplane/resources/xslt/xml2mm.xsl b/freeplane/resources/xslt/xml2mm.xsl
index 0695988..4160914 100644
--- a/freeplane/resources/xslt/xml2mm.xsl
+++ b/freeplane/resources/xslt/xml2mm.xsl
@@ -145,4 +145,4 @@
 </xsl:template>
 
 </xsl:stylesheet>
-	
+	
\ No newline at end of file
diff --git a/freeplane/signjar.gradle b/freeplane/signjar.gradle
index 7f7e433..0d2c056 100644
--- a/freeplane/signjar.gradle
+++ b/freeplane/signjar.gradle
@@ -6,50 +6,29 @@ if (signJarProperties.exists())
     props.load(new FileInputStream(signJarProperties))
 }
 
-task signViewerJarTsa {
-    onlyIf { props['signjar.alias'] && props['signjar.tsaurl'] }
-    doLast {
-        def freeplaneViewerJar = files(viewerJar).getSingleFile()
-        ant.signjar(jar: freeplaneViewerJar,
-            alias: props['signjar.alias'],
-            keystore: props['signjar.keystore'],
-            storetype: props['signjar.storetype'],
-            storepass: props['signjar.storepass'],
-            keypass: props['signjar.keypass'],
-            tsaurl: props['signjar.tsaurl'])
-    }
+task signViewerJar(type: Exec) {
+    onlyIf { props['signjar.cardpass'] }
+    def freeplaneViewerJar = files(viewerJar).getSingleFile()
+	commandLine 'jarsigner', '-keystore',  'NONE', '-tsa', props['signjar.tsaurl'],
+		'-storetype', 'PKCS11', '-providerClass', 'sun.security.pkcs11.SunPKCS11',
+		'-providerArg', props['signjar.cfg'], '-storepass',  props['signjar.cardpass'], 
+		'-certchain', props['signjar.certchain'],
+		freeplaneViewerJar, props['signjar.owner']
     dependsOn viewerJar
 }
 
-task signSvgJarTsa {
-	onlyIf { props['signjar.alias'] && props['signjar.tsaurl'] }
-	doLast {
-		def svgJar = file('lib/kitfox-svg-salamander-1.1.1-p1.jar')
-		ant.signjar(jar: svgJar,
-			alias: props['signjar.alias'],
-			keystore: props['signjar.keystore'],
-			storetype: props['signjar.storetype'],
-			storepass: props['signjar.storepass'],
-			keypass: props['signjar.keypass'],
-			tsaurl: props['signjar.tsaurl'])
-	}
-}
-
-task signViewerJarNoTsa {
-    onlyIf { props['signjar.alias'] && !props['signjar.tsaurl'] }
-    doLast {
-        def freeplaneViewerJar = files(viewerJar).getSingleFile()
-        ant.signjar(jar: freeplaneViewerJar,
-            alias: props['signjar.alias'],
-            keystore: props['signjar.keystore'],
-            storetype: props['signjar.storetype'],
-            storepass: props['signjar.storepass'],
-            keypass: props['signjar.keypass'])
-    }
+task signSvgJar(type: Exec) {
+	onlyIf { props['signjar.cardpass'] }
+	def svgJar = file('lib/kitfox-svg-salamander-1.1.1-p1.jar')
+	commandLine 'jarsigner', '-keystore',  'NONE', '-tsa', props['signjar.tsaurl'],
+		'-storetype', 'PKCS11', '-providerClass', 'sun.security.pkcs11.SunPKCS11',
+		'-providerArg', props['signjar.cfg'], '-storepass',  props['signjar.cardpass'], 
+		'-certchain', props['signjar.certchain'],
+		svgJar, props['signjar.owner']
 }
 
 task doNotSignViewerJar {
-    onlyIf { !props['signjar.alias'] }
+    onlyIf { !props['signjar.cardpass'] }
     doLast {
         println('No ' + rootDir.path + '/freeplane/signjar.properties found')
         println('Applet is NOT signed!')
@@ -59,6 +38,5 @@ task doNotSignViewerJar {
 }
 
 // exactly one of three is always enabled (see above)!
-copyOSGiJars.dependsOn signViewerJarTsa
-copyOSGiJars.dependsOn signViewerJarNoTsa
+copyOSGiJars.dependsOn signViewerJar
 copyOSGiJars.dependsOn doNotSignViewerJar
diff --git a/freeplane/src/main/java/com/thebuzzmedia/imgscalr/AsyncScalr.java b/freeplane/src/main/java/com/thebuzzmedia/imgscalr/AsyncScalr.java
index a115a91..819ef82 100644
--- a/freeplane/src/main/java/com/thebuzzmedia/imgscalr/AsyncScalr.java
+++ b/freeplane/src/main/java/com/thebuzzmedia/imgscalr/AsyncScalr.java
@@ -567,4 +567,4 @@ public class AsyncScalr {
 			return thread;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/com/thebuzzmedia/imgscalr/Scalr.java b/freeplane/src/main/java/com/thebuzzmedia/imgscalr/Scalr.java
index 124f764..21a3d31 100644
--- a/freeplane/src/main/java/com/thebuzzmedia/imgscalr/Scalr.java
+++ b/freeplane/src/main/java/com/thebuzzmedia/imgscalr/Scalr.java
@@ -2242,4 +2242,4 @@ public class Scalr {
 		 */
 		return src;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/io/xml/LocalEntityResolver.java b/freeplane/src/main/java/org/freeplane/core/io/xml/LocalEntityResolver.java
index 7234d58..9c584ab 100644
--- a/freeplane/src/main/java/org/freeplane/core/io/xml/LocalEntityResolver.java
+++ b/freeplane/src/main/java/org/freeplane/core/io/xml/LocalEntityResolver.java
@@ -12,4 +12,4 @@ final class LocalEntityResolver extends XMLEntityResolver {
 	        throws XMLParseException {
 		throw new XMLParseException("External entities are not allowed");
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanelBuilder.java b/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanelBuilder.java
index eb29c8b..0eed184 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanelBuilder.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanelBuilder.java
@@ -64,7 +64,6 @@ public class OptionPanelBuilder {
 		private final Vector<?> displayedItems;
 		private final String name;
 		private int verticalMargin;
-		private ListCellRenderer<?> renderer;
 		@SuppressWarnings("rawtypes")
 		private Class enumClass;
 
@@ -73,7 +72,6 @@ public class OptionPanelBuilder {
 			this.displayedItems = displayedItems;
 			this.name = name;
 			verticalMargin = 0;
-			renderer = null;
 		}
 
 		public IPropertyControl createControl() {
@@ -81,8 +79,6 @@ public class OptionPanelBuilder {
 			final ComboProperty comboProperty = enumClass != null ? ComboProperty.of(name, enumClass) : new ComboProperty(name, choices, displayedItems);
 			if(verticalMargin > 0)
 				comboProperty.setVerticalMargin(verticalMargin);
-			if(renderer != null)
-				comboProperty.setRenderer(renderer);
 			return comboProperty;
 		}
 
@@ -91,11 +87,6 @@ public class OptionPanelBuilder {
 			return this;
 		}
 
-		public ComboPropertyCreator withListCellRenderer(ListCellRenderer<?> createRenderer) {
-			this.renderer = createRenderer;
-			return this;
-		}
-
 		public ComboPropertyCreator withEnum(Class<?> enumClass) {
 			this.enumClass = enumClass;
 			return this;
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/ActionEnabler.java b/freeplane/src/main/java/org/freeplane/core/ui/ActionEnabler.java
index 75afcee..37335fc 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/ActionEnabler.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/ActionEnabler.java
@@ -25,4 +25,4 @@ public class ActionEnabler implements PropertyChangeListener {
 			component.setEnabled(action.isEnabled());
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/ButtonModelStateChangeListenerForProperty.java b/freeplane/src/main/java/org/freeplane/core/ui/ButtonModelStateChangeListenerForProperty.java
index 2e9e1dd..53c189d 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/ButtonModelStateChangeListenerForProperty.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/ButtonModelStateChangeListenerForProperty.java
@@ -19,4 +19,4 @@ public class ButtonModelStateChangeListenerForProperty implements ChangeListener
 		ButtonModel buttonModel = (ButtonModel)e.getSource();
 		ResourceController.getResourceController().setProperty(propertyName, buttonModel.isSelected());
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/ColoredIconCreator.java b/freeplane/src/main/java/org/freeplane/core/ui/ColoredIconCreator.java
index 3575608..2d89ee0 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/ColoredIconCreator.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/ColoredIconCreator.java
@@ -55,4 +55,4 @@ public class ColoredIconCreator{
 		else
 			return originalImage;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/DelegatingPopupMenuListener.java b/freeplane/src/main/java/org/freeplane/core/ui/DelegatingPopupMenuListener.java
index 93f7d56..868291c 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/DelegatingPopupMenuListener.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/DelegatingPopupMenuListener.java
@@ -32,4 +32,4 @@ class DelegatingPopupMenuListener implements PopupMenuListener {
 	public void popupMenuWillBecomeVisible(final PopupMenuEvent e) {
 		listener.popupMenuWillBecomeVisible(newEvent());
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/LengthUnits.java b/freeplane/src/main/java/org/freeplane/core/ui/LengthUnits.java
index dfcc2f2..6ad52e0 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/LengthUnits.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/LengthUnits.java
@@ -42,4 +42,4 @@ public enum LengthUnits implements Convertible{
 		static public Quantity<LengthUnits> fromStringInPt(String value){
 			return Quantity.fromString(value, px).in(pt);
 		}
-	}
+	}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitter.java b/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitter.java
index 37d5c83..bdd9547 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitter.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitter.java
@@ -137,4 +137,4 @@ public class MenuSplitter{
 		addMenuComponent(menu, component, menu.getPopupMenu().getComponentCount());
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitterConfiguration.java b/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitterConfiguration.java
index 6199d24..8b0d0c7 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitterConfiguration.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitterConfiguration.java
@@ -11,4 +11,4 @@ public class MenuSplitterConfiguration {
 	public static void setMaximumRowCount(JComboBox c){
 		c.setMaximumRowCount(MAX_MENU_ITEM_COUNT);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/MouseInsideListener.java b/freeplane/src/main/java/org/freeplane/core/ui/MouseInsideListener.java
index 7fa9dd7..71dac00 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/MouseInsideListener.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/MouseInsideListener.java
@@ -77,4 +77,4 @@ public class MouseInsideListener extends MouseAdapter implements MouseMotionList
 	public void disconnect() {
 		recursivelyRemoveMouseInsideListener(c);
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/TimePeriodUnits.java b/freeplane/src/main/java/org/freeplane/core/ui/TimePeriodUnits.java
index 9358646..9dc8a79 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/TimePeriodUnits.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/TimePeriodUnits.java
@@ -36,4 +36,4 @@ public enum TimePeriodUnits implements Convertible{
 			return factor;
 		}
 		
-	}
+	}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/ActionToggleButtonModel.java b/freeplane/src/main/java/org/freeplane/core/ui/components/ActionToggleButtonModel.java
index 4e20289..9309a3e 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/ActionToggleButtonModel.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/ActionToggleButtonModel.java
@@ -47,4 +47,4 @@ class ActionToggleButtonModel extends JToggleButton.ToggleButtonModel {
     }
 	
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledStyleSheet.java b/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledStyleSheet.java
index df59d7b..ba3faf7 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledStyleSheet.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledStyleSheet.java
@@ -40,6 +40,8 @@ public class ScaledStyleSheet extends StyleSheet{
     }
 
 	private float getFontScaleFactor(AttributeSet a) {
+		if(a == null)
+			return UITools.FONT_SCALE_FACTOR;
 		final Object attribute = a.getAttribute(CSS.Attribute.FONT_SIZE);
 		if(attribute == null)
 			return UITools.FONT_SCALE_FACTOR;
@@ -58,4 +60,4 @@ public class ScaledStyleSheet extends StyleSheet{
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/image/BigBufferedImage.java b/freeplane/src/main/java/org/freeplane/core/ui/image/BigBufferedImage.java
index 5d440b3..4784c9a 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/image/BigBufferedImage.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/image/BigBufferedImage.java
@@ -18,13 +18,13 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.lang.reflect.Method;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.HashSet;
 import java.util.Hashtable;
 
-import sun.nio.ch.DirectBuffer;
-
+import org.freeplane.core.util.LogUtils;
 
 public class BigBufferedImage extends BufferedImage {
 
@@ -32,7 +32,7 @@ public class BigBufferedImage extends BufferedImage {
 	public static final int MAX_PIXELS_IN_MEMORY = 50 * 1024 * 1024;
 
     public static BufferedImage create(int width, int height, int imageType){
-    	if(width * height > MAX_PIXELS_IN_MEMORY)
+    	if(width * height > 0)
 			try {
 				final File tempDir = new File(TMP_DIR);
 				return createBigBufferedImage(tempDir, width, height, imageType);
@@ -207,25 +207,34 @@ public class BigBufferedImage extends BufferedImage {
 		private void disposeNow(final MappedByteBuffer[] disposedBuffer) {
 			FileDataBufferDeleterHook.undisposedBuffers.remove(this);
 			if(disposedBuffer != null) {
-				for(MappedByteBuffer b : disposedBuffer) {
-					((DirectBuffer) b).cleaner().clean();
-				}
-				for(RandomAccessFile file : accessFiles) {
-					try {
-						file.close();
-					} catch (IOException e) {
-						e.printStackTrace();
+				try {
+					for(MappedByteBuffer b : disposedBuffer) {
+						final Method method = b.getClass().getMethod("cleaner");
+						method.setAccessible(true);
+						final Object cleaner = method.invoke(b);
+						final Method method2 = cleaner.getClass().getMethod("clean");
+						method2.setAccessible(true);
+						method2.invoke(cleaner);
 					}
-				}
-				accessFiles = null;
-				for(File file : files) {
-					file.delete();
+					for(RandomAccessFile file : accessFiles) {
+						try {
+							file.close();
+						} catch (IOException e) {
+							e.printStackTrace();
+						}
+					}
+					accessFiles = null;
+					for(File file : files) {
+						file.delete();
+					}
+				} catch (Exception e) {
+					LogUtils.severe(e);	
 				}
 				files = null;
 				new File(path).delete();
 				path = null;
 			}
 		}
-		
+
     }
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/FreeplaneResourceAccessor.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/FreeplaneResourceAccessor.java
index ce4a9d7..06195f4 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/FreeplaneResourceAccessor.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/FreeplaneResourceAccessor.java
@@ -36,4 +36,4 @@ public class FreeplaneResourceAccessor implements ResourceAccessor {
 	public String getText(String key, String defaultValue) {
 		return TextUtils.getText(key, defaultValue);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/ActionSelectListener.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/ActionSelectListener.java
index 6ef84fc..e555044 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/ActionSelectListener.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/ActionSelectListener.java
@@ -16,4 +16,4 @@ public class ActionSelectListener implements EntryPopupListener {
 
 	public void childEntriesHidden(final Entry target) {
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/EntriesForAction.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/EntriesForAction.java
index ce0f4aa..ab50da2 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/EntriesForAction.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/EntriesForAction.java
@@ -36,4 +36,4 @@ public class EntriesForAction implements IEntriesForAction {
 		final Collection<Entry> collection = entryMap.get(action);
 		return collection != null ? collection : Collections.<Entry> emptyList();
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/ChildEntryFilter.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/ChildEntryFilter.java
index 73205d6..9a972f6 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/ChildEntryFilter.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/ChildEntryFilter.java
@@ -15,4 +15,4 @@ public abstract class ChildEntryFilter implements EntryVisitor {
 		return shouldRemove(entry);
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/ChildEntryRemover.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/ChildEntryRemover.java
index 46ae5e0..ed9eeb2 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/ChildEntryRemover.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/ChildEntryRemover.java
@@ -11,4 +11,4 @@ class ChildEntryRemover implements EntryVisitor {
     public boolean shouldSkipChildren(Entry entry) {
     	return true;
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/EmptyEntryVisitor.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/EmptyEntryVisitor.java
index 0b4f518..f8c07d1 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/EmptyEntryVisitor.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/EmptyEntryVisitor.java
@@ -9,4 +9,4 @@ public class EmptyEntryVisitor implements EntryVisitor {
 	public boolean shouldSkipChildren(Entry entry) {
 		return false;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/EntryNavigatorFactory.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/EntryNavigatorFactory.java
index db373c9..425b6c3 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/EntryNavigatorFactory.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/EntryNavigatorFactory.java
@@ -30,4 +30,4 @@ public class EntryNavigatorFactory{
 			entryNavigator.addAlias(words[0], words[1]);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/IllegalEntryVisitor.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/IllegalEntryVisitor.java
index f286549..7949856 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/IllegalEntryVisitor.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/IllegalEntryVisitor.java
@@ -10,4 +10,4 @@ public class IllegalEntryVisitor implements EntryVisitor {
 	public boolean shouldSkipChildren(Entry entry) {
 		return false;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/NullResourceAccessor.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/NullResourceAccessor.java
index 8fe1c00..29815cc 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/NullResourceAccessor.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/NullResourceAccessor.java
@@ -32,4 +32,4 @@ class NullResourceAccessor implements ResourceAccessor {
 	public String getText(String name, String defaultValue) {
 		return defaultValue;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/SkippingEntryVisitor.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/SkippingEntryVisitor.java
index 0556c6b..bafed7c 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/SkippingEntryVisitor.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/SkippingEntryVisitor.java
@@ -9,4 +9,4 @@ public class SkippingEntryVisitor implements EntryVisitor {
 	public boolean shouldSkipChildren(Entry entry) {
 		return true;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/SubtreeProcessor.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/SubtreeProcessor.java
index 9f8d284..0cc3789 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/SubtreeProcessor.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/generic/SubtreeProcessor.java
@@ -54,4 +54,4 @@ public class SubtreeProcessor implements EntryPopupListener {
 		destroyChildren(entry);
 		buildChildren(entry);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/JComponentRemover.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/JComponentRemover.java
index 34f686d..549ee46 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/JComponentRemover.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/JComponentRemover.java
@@ -39,4 +39,4 @@ public class JComponentRemover implements EntryVisitor{
 		return false;
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuIconScaling.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuIconScaling.java
index 412e4a8..bb9d5b5 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuIconScaling.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuIconScaling.java
@@ -21,4 +21,4 @@ class MenuIconScaling {
 			actionComponent.setIcon(imageIconFactory.getScaledIcon(icon, iconHeight));
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/PopupMenuListenerForEntry.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/PopupMenuListenerForEntry.java
index c3cea90..1687b5e 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/PopupMenuListenerForEntry.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/PopupMenuListenerForEntry.java
@@ -51,4 +51,4 @@ class PopupMenuListenerForEntry implements PopupMenuListener{
 	@Override
 	public void popupMenuCanceled(PopupMenuEvent e) {
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/textchanger/TranslatedElement.java b/freeplane/src/main/java/org/freeplane/core/ui/textchanger/TranslatedElement.java
index 61f52e2..d35fe5b 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/textchanger/TranslatedElement.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/textchanger/TranslatedElement.java
@@ -15,4 +15,4 @@ public enum TranslatedElement {
 	public String getTitleKey() {
 		return "TranslatedElement." + name();
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/util/ClassLoaderFactory.java b/freeplane/src/main/java/org/freeplane/core/util/ClassLoaderFactory.java
index 344881f..1332927 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/ClassLoaderFactory.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/ClassLoaderFactory.java
@@ -45,4 +45,4 @@ public class ClassLoaderFactory {
 	    }
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/util/DelayedRunner.java b/freeplane/src/main/java/org/freeplane/core/util/DelayedRunner.java
index 3259563..42ff7d6 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/DelayedRunner.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/DelayedRunner.java
@@ -22,4 +22,4 @@ public class DelayedRunner {
 			});
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/util/Pair.java b/freeplane/src/main/java/org/freeplane/core/util/Pair.java
index e8ecf2c..5e2d978 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/Pair.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/Pair.java
@@ -49,4 +49,4 @@ public class Pair<U, V> {
 		return "Pair [first=" + first + ", second=" + second + "]";
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/core/util/TypeReference.java b/freeplane/src/main/java/org/freeplane/core/util/TypeReference.java
index fac08f8..b4b10c0 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/TypeReference.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/TypeReference.java
@@ -113,4 +113,4 @@ public class TypeReference{
 	public static String decode(final String spec) {
         return HtmlUtils.unescapeHTMLUnicodeEntity(spec);
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/DashVariant.java b/freeplane/src/main/java/org/freeplane/features/DashVariant.java
index 7a6fff5..c16f432 100644
--- a/freeplane/src/main/java/org/freeplane/features/DashVariant.java
+++ b/freeplane/src/main/java/org/freeplane/features/DashVariant.java
@@ -31,4 +31,4 @@ public enum DashVariant  implements RenderedContentSupplier<DashVariant> {
 		return new RenderedContent<DashVariant>(this, null, icon);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/MClipboardController.java b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/MClipboardController.java
index 6bffdf0..481ac26 100644
--- a/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/MClipboardController.java
+++ b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/MClipboardController.java
@@ -136,7 +136,7 @@ public class MClipboardController extends ClipboardController {
 				}
 				else
 					file = sourceFile;
-				if(! pasteImagesFromFiles || !viewerController.paste(file, target, PasteMode.valueOf(asSibling), isLeft)) {
+				if(! pasteImagesFromFiles || dropAction == DnDConstants.ACTION_LINK || !viewerController.paste(file, target, PasteMode.valueOf(asSibling), isLeft)) {
 					final MMapController mapController = (MMapController) Controller.getCurrentModeController().getMapController();
 					final NodeModel node = mapController.newNode(file.getName(), target.getMap());
 					((MLinkController) LinkController.getController()).setLinkTypeDependantLink(node, file);
diff --git a/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/TargetFileCreator.java b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/TargetFileCreator.java
index 2d43c77..0a290a3 100644
--- a/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/TargetFileCreator.java
+++ b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/TargetFileCreator.java
@@ -44,4 +44,4 @@ class TargetFileCreator {
 	private String getExtension(final String fileNameWithExtension) {
 		return fileNameWithExtension.substring(fileNameWithExtension.lastIndexOf('.') + 1);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/AutomaticEdgeColor.java b/freeplane/src/main/java/org/freeplane/features/edge/AutomaticEdgeColor.java
index c8aafc7..bf894fc 100644
--- a/freeplane/src/main/java/org/freeplane/features/edge/AutomaticEdgeColor.java
+++ b/freeplane/src/main/java/org/freeplane/features/edge/AutomaticEdgeColor.java
@@ -28,4 +28,4 @@ public class AutomaticEdgeColor implements IExtension{
 	void increaseColorCounter() {
 		colorCount++;
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/XmlImporter.java b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/XmlImporter.java
index ef9a49e..87a9a93 100644
--- a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/XmlImporter.java
+++ b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/XmlImporter.java
@@ -80,4 +80,4 @@ public class XmlImporter	{
 		mapController.newMapView(map);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/FoundNodes.java b/freeplane/src/main/java/org/freeplane/features/filter/FoundNodes.java
index 7b0c3ab..7d0b4b6 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/FoundNodes.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/FoundNodes.java
@@ -57,4 +57,4 @@ class FoundNodes implements IExtension {
 		Controller.getCurrentModeController().getMapController().select(node);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/format/IdentityPatternFormat.java b/freeplane/src/main/java/org/freeplane/features/format/IdentityPatternFormat.java
index f073dc3..f098416 100644
--- a/freeplane/src/main/java/org/freeplane/features/format/IdentityPatternFormat.java
+++ b/freeplane/src/main/java/org/freeplane/features/format/IdentityPatternFormat.java
@@ -27,4 +27,4 @@ public class IdentityPatternFormat extends PatternFormat {
     public String toString() {
         return TextUtils.getText(getPattern());
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/format/StandardPatternFormat.java b/freeplane/src/main/java/org/freeplane/features/format/StandardPatternFormat.java
index 0012229..5f1b4eb 100644
--- a/freeplane/src/main/java/org/freeplane/features/format/StandardPatternFormat.java
+++ b/freeplane/src/main/java/org/freeplane/features/format/StandardPatternFormat.java
@@ -23,4 +23,4 @@ class StandardPatternFormat extends PatternFormat {
     public String toString() {
         return TextUtils.getText(STANDARD_FORMAT_PATTERN);
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/link/ConnectorArrows.java b/freeplane/src/main/java/org/freeplane/features/link/ConnectorArrows.java
index 5ed5615..8fd1d03 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/ConnectorArrows.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/ConnectorArrows.java
@@ -31,7 +31,7 @@ public enum ConnectorArrows implements RenderedContentSupplier<ConnectorArrows>{
 		this.start = start;
 		this.end = end;
 		final URL url = ResourceController.getResourceController().getResource("/images/" + iconName);
-		icon = FreeplaneIconUtils.createSVGIcon(url);
+		icon = url != null ? FreeplaneIconUtils.createSVGIcon(url) : null;
 		text = TextUtils.getText("ChangeConnectorArrowsAction." + description + ".text");
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/link/ConnectorProperties.java b/freeplane/src/main/java/org/freeplane/features/link/ConnectorProperties.java
index 38d3cb6..f721097 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/ConnectorProperties.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/ConnectorProperties.java
@@ -220,4 +220,4 @@ class ConnectorProperties{
 		}
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/link/NodeLinks.java b/freeplane/src/main/java/org/freeplane/features/link/NodeLinks.java
index 13dda8a..592981e 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/NodeLinks.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/NodeLinks.java
@@ -217,11 +217,11 @@ public class NodeLinks implements IExtension {
 			final NodeModel linkSource = link.getSource();
 			if(linkSource.equals(node)) {
 				mapLinks.remove(link);
-				linkIterator.remove();
 				for(NodeModel newSource : node.subtreeClones()){
 					if(node != newSource && ! newSource.isDescendantOf(deletionRoot)) {
 						final NodeLinkModel cloneForSource = link.cloneForSource(newSource);
 						if(cloneForSource != null){
+							linkIterator.remove();
 							linkIterator.add(cloneForSource);
 							mapLinks.add(cloneForSource);
 							continue LINKS;
diff --git a/freeplane/src/main/java/org/freeplane/features/map/CloneEncryptedNodeException.java b/freeplane/src/main/java/org/freeplane/features/map/CloneEncryptedNodeException.java
index 6f24768..e2af10d 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/CloneEncryptedNodeException.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/CloneEncryptedNodeException.java
@@ -7,4 +7,4 @@ public class CloneEncryptedNodeException extends IllegalArgumentException{
 		super("Can not clone encrypted nodes");
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/map/FirstGroupNode.java b/freeplane/src/main/java/org/freeplane/features/map/FirstGroupNode.java
index 1cd223b..0e4846f 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/FirstGroupNode.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/FirstGroupNode.java
@@ -46,4 +46,4 @@ public class FirstGroupNode extends PersistentNodeHook implements IExtension{
 		return null;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/map/FirstGroupNodeFlag.java b/freeplane/src/main/java/org/freeplane/features/map/FirstGroupNodeFlag.java
index 623600c..5a88a7f 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/FirstGroupNodeFlag.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/FirstGroupNodeFlag.java
@@ -5,4 +5,4 @@ import org.freeplane.core.extension.IExtension;
 public class FirstGroupNodeFlag implements IExtension {
 	public static FirstGroupNodeFlag FIRST_GROUP = new FirstGroupNodeFlag();
 	private FirstGroupNodeFlag(){};
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/map/SharedNodeData.java b/freeplane/src/main/java/org/freeplane/features/map/SharedNodeData.java
index 3275d76..ef5ea50 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/SharedNodeData.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/SharedNodeData.java
@@ -101,4 +101,4 @@ public class SharedNodeData {
 	public boolean isFolded() {
 		return folded;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/map/SummaryLevels.java b/freeplane/src/main/java/org/freeplane/features/map/SummaryLevels.java
index d7294f1..a86e7de 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/SummaryLevels.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/SummaryLevels.java
@@ -143,4 +143,4 @@ public class SummaryLevels{
 		return index;
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/map/SummaryNodeFlag.java b/freeplane/src/main/java/org/freeplane/features/map/SummaryNodeFlag.java
index 160d13e..7bd01a7 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/SummaryNodeFlag.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/SummaryNodeFlag.java
@@ -5,4 +5,4 @@ import org.freeplane.core.extension.IExtension;
 public class SummaryNodeFlag implements IExtension {
 	public static SummaryNodeFlag SUMMARY = new SummaryNodeFlag();
 	private SummaryNodeFlag(){};
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/SummaryNodeMapUpdater.java b/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/SummaryNodeMapUpdater.java
index b367585..8add070 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/SummaryNodeMapUpdater.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/SummaryNodeMapUpdater.java
@@ -71,4 +71,4 @@ public class SummaryNodeMapUpdater extends AMapChangeListenerAdapter {
 			updateSummaryNodes(node);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/mindmapmode/SaveAcceleratorPresetsAction.java b/freeplane/src/main/java/org/freeplane/features/mode/mindmapmode/SaveAcceleratorPresetsAction.java
index 3cefdbf..4a29a22 100644
--- a/freeplane/src/main/java/org/freeplane/features/mode/mindmapmode/SaveAcceleratorPresetsAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/mode/mindmapmode/SaveAcceleratorPresetsAction.java
@@ -75,4 +75,4 @@ class SaveAcceleratorPresetsAction extends AFreeplaneAction {
 			UITools.errorMessage(TextUtils.getText("can_not_save_key_set"));
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeShiftXActor.java b/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeShiftXActor.java
index 52a136f..df1360a 100644
--- a/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeShiftXActor.java
+++ b/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeShiftXActor.java
@@ -59,4 +59,4 @@ final class ChangeShiftXActor implements IActor {
 	public void undo() {
 		setShiftX(node, oldShiftX);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeShiftYActor.java b/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeShiftYActor.java
index a07c599..ef925ab 100644
--- a/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeShiftYActor.java
+++ b/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeShiftYActor.java
@@ -59,4 +59,4 @@ final class ChangeShiftYActor implements IActor {
 	public void undo() {
 		setShiftY(node, oldShiftY);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeVGapActor.java b/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeVGapActor.java
index ef17761..9a3bb52 100644
--- a/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeVGapActor.java
+++ b/freeplane/src/main/java/org/freeplane/features/nodelocation/mindmapmode/ChangeVGapActor.java
@@ -58,4 +58,4 @@ final class ChangeVGapActor implements IActor {
 	public void undo() {
 		setVGap(node, oldVgap);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/NoteDialogStarter.java b/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/NoteDialogStarter.java
index 6ca57a5..0295f6c 100644
--- a/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/NoteDialogStarter.java
+++ b/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/NoteDialogStarter.java
@@ -70,4 +70,4 @@ class NoteDialogStarter{
 			mCurrentEditDialog = null;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionBoxController.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionBoxController.java
index 83929f8..626008b 100644
--- a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionBoxController.java
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionBoxController.java
@@ -240,4 +240,4 @@ class CollectionBoxController <T extends NamedElement<T>> {
 			enableUiElements();
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/EscapeKeyEventDispatcher.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/EscapeKeyEventDispatcher.java
index bd13eba..998c251 100644
--- a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/EscapeKeyEventDispatcher.java
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/EscapeKeyEventDispatcher.java
@@ -23,4 +23,4 @@ class EscapeKeyEventDispatcher implements KeyEventDispatcher {
 			return false;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementCollection.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementCollection.java
index b3ffb0f..24c84f5 100644
--- a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementCollection.java
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementCollection.java
@@ -163,10 +163,14 @@ public class NamedElementCollection<T extends NamedElement<T>> implements Iterab
 			@Override
 			public T next() {
 				if(hasNext())
-					return getElement(index++);
+					return NamedElementCollection.this.getElement(index++);
 				else
 					throw new NoSuchElementException();
 			}
+			
+			public void remove() {
+			        throw new UnsupportedOperationException("remove");
+			}
 		};
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationKeyEventDispatcher.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationKeyEventDispatcher.java
index 95d0e11..45207cf 100644
--- a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationKeyEventDispatcher.java
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationKeyEventDispatcher.java
@@ -39,4 +39,4 @@ class NavigationKeyEventDispatcher implements KeyEventDispatcher {
 		}
 		
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationKeyEventDispatcher.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationKeyEventDispatcher.java
index 9593ce0..e3ceb4f 100644
--- a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationKeyEventDispatcher.java
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationKeyEventDispatcher.java
@@ -47,4 +47,4 @@ class PresentationKeyEventDispatcher implements KeyEventDispatcher, IFreeplanePr
 		resourceController.addPropertyChangeListener(presentationKeyEventDispatcher);
 		return presentationKeyEventDispatcher;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideEditorController.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideEditorController.java
index 90bb6db..77a8679 100644
--- a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideEditorController.java
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideEditorController.java
@@ -456,4 +456,4 @@ class SlideEditorController{
 		else
 			nodePositions.clearSelection();
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/script/IScriptEditorStarter.java b/freeplane/src/main/java/org/freeplane/features/script/IScriptEditorStarter.java
index 6958750..efbb8e7 100644
--- a/freeplane/src/main/java/org/freeplane/features/script/IScriptEditorStarter.java
+++ b/freeplane/src/main/java/org/freeplane/features/script/IScriptEditorStarter.java
@@ -32,4 +32,4 @@ import org.freeplane.core.extension.IExtension;
 public interface IScriptEditorStarter extends IExtension {
 	String startEditor(String scriptInput);
 	ComboBoxEditor createComboBoxEditor(Dimension dim);
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/StyleMapModel.java b/freeplane/src/main/java/org/freeplane/features/styles/StyleMapModel.java
index 9546de7..12a5db4 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/StyleMapModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/StyleMapModel.java
@@ -36,4 +36,4 @@ class StyleMapModel extends MapModel {
     public String getTitle() {
     	return TextUtils.getText(STYLES);
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/ComboBoxRendererWithTooltip.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/ComboBoxRendererWithTooltip.java
index 174aeaf..2596c3d 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/ComboBoxRendererWithTooltip.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/ComboBoxRendererWithTooltip.java
@@ -64,4 +64,4 @@ public class ComboBoxRendererWithTooltip extends BasicComboBoxRenderer {
 			
 	    	return this;
 	    }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ChildDistanceControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ChildDistanceControlGroup.java
index ad08da4..4d4617f 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ChildDistanceControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ChildDistanceControlGroup.java
@@ -85,4 +85,4 @@ class ChildDistanceControlGroup implements ControlGroup {
 		propertyChangeListener.setStyle(node);
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroup.java
index 9268e71..a3b62df 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroup.java
@@ -31,4 +31,4 @@ interface ControlGroup{
 	String SET_RESOURCE = "set_property_text";
 	public void setStyle(NodeModel node);
 	void addControlGroup(DefaultFormBuilder formBuilder);
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroupChangeListener.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroupChangeListener.java
index 5e70623..0d8c432 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroupChangeListener.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroupChangeListener.java
@@ -86,4 +86,4 @@ abstract class ControlGroupChangeListener implements PropertyChangeListener {
 
 	}
 	abstract void setStyleOnExternalChange(NodeModel node);
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeColorControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeColorControlGroup.java
index c5eee2f..22a82c3 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeColorControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeColorControlGroup.java
@@ -80,4 +80,4 @@ class EdgeColorControlGroup implements ControlGroup {
 	public void setStyle(NodeModel node) {
 		propertyChangeListener.setStyle(node);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/GroupSeparator.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/GroupSeparator.java
index b3ae93c..771546a 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/GroupSeparator.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/GroupSeparator.java
@@ -44,4 +44,4 @@ public class GroupSeparator implements ControlGroup {
 	public void addControlGroup(DefaultFormBuilder formBuilder) {
 		new SeparatorProperty(labelKey).layout(formBuilder);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/IconSizeControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/IconSizeControlGroup.java
index b31de75..acd5d57 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/IconSizeControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/IconSizeControlGroup.java
@@ -51,4 +51,4 @@ class IconSizeControlGroup implements ControlGroup{
 	public void setStyle(NodeModel node) {
 		propertyChangeListener.setStyle(node);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MaxNodeWidthControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MaxNodeWidthControlGroup.java
index 95c8f2f..fe77351 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MaxNodeWidthControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MaxNodeWidthControlGroup.java
@@ -82,4 +82,4 @@ class MaxNodeWidthControlGroup implements ControlGroup {
 		propertyChangeListener.setStyle(node);
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MinNodeWidthControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MinNodeWidthControlGroup.java
index 5b58455..9738e5a 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MinNodeWidthControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MinNodeWidthControlGroup.java
@@ -82,4 +82,4 @@ class MinNodeWidthControlGroup implements ControlGroup {
 		propertyChangeListener.setStyle(node);
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextColumnControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextColumnControlGroup.java
index 83140c3..2aa205f 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextColumnControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextColumnControlGroup.java
@@ -44,4 +44,4 @@ public class NextColumnControlGroup implements ControlGroup {
 	public void addControlGroup(DefaultFormBuilder formBuilder) {
 		new NextColumnProperty(columns).layout(formBuilder);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextLineControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextLineControlGroup.java
index a6fd6ed..21d1b3a 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextLineControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextLineControlGroup.java
@@ -42,4 +42,4 @@ public class NextLineControlGroup implements ControlGroup {
 	public void addControlGroup(DefaultFormBuilder formBuilder) {
 		new NextLineProperty().layout(formBuilder);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeColorControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeColorControlGroup.java
index 89d7ea1..257c858 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeColorControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeColorControlGroup.java
@@ -83,4 +83,4 @@ class NodeColorControlGroup implements ControlGroup {
 	public void setStyle(NodeModel node) {
 		propertyChangeListener.setStyle(node);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeFontHyperLinkControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeFontHyperLinkControlGroup.java
index 3650659..383c274 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeFontHyperLinkControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeFontHyperLinkControlGroup.java
@@ -80,4 +80,4 @@ class NodeFontHyperLinkControlGroup implements ControlGroup {
 	}
 
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeHorizontalTextAlignmentControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeHorizontalTextAlignmentControlGroup.java
index 2caa31d..2ffd2ca 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeHorizontalTextAlignmentControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeHorizontalTextAlignmentControlGroup.java
@@ -91,4 +91,4 @@ class NodeHorizontalTextAlignmentControlGroup implements ControlGroup {
 	}
 
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeShapeControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeShapeControlGroup.java
index 3020dd8..66928ce 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeShapeControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeShapeControlGroup.java
@@ -131,4 +131,4 @@ class NodeShapeControlGroup implements ControlGroup {
 	}
 
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleControlGroup.java
index b8bde18..2ef2ef1 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleControlGroup.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleControlGroup.java
@@ -261,4 +261,4 @@ class StyleControlGroup implements ControlGroup{
 	    formBuilder.nextLine();
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleEditorPanel.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleEditorPanel.java
index 6da165e..7c74869 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleEditorPanel.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleEditorPanel.java
@@ -216,4 +216,4 @@ public class StyleEditorPanel extends JPanel {
 		});
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/text/MatchCaseNoteContainsCondition.java b/freeplane/src/main/java/org/freeplane/features/text/MatchCaseNoteContainsCondition.java
index 5c47c13..c2a3169 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/MatchCaseNoteContainsCondition.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/MatchCaseNoteContainsCondition.java
@@ -90,4 +90,4 @@ public class MatchCaseNoteContainsCondition extends ASelectableCondition {
     protected String getName() {
 	    return NAME;
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EventBuffer.java b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EventBuffer.java
index 12d1cb1..6fabf12 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EventBuffer.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EventBuffer.java
@@ -146,4 +146,4 @@ public class EventBuffer implements KeyEventDispatcher, FocusListener {
 		else
 			return null;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/ui/FrameController.java b/freeplane/src/main/java/org/freeplane/features/ui/FrameController.java
index 0eb8037..3657e3a 100644
--- a/freeplane/src/main/java/org/freeplane/features/ui/FrameController.java
+++ b/freeplane/src/main/java/org/freeplane/features/ui/FrameController.java
@@ -45,6 +45,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.swing.BorderFactory;
@@ -91,6 +92,7 @@ import org.freeplane.features.time.TimeComboBoxEditor;
  */
 abstract public class FrameController implements ViewController {
 
+	private static final double DEFAULT_SCALING_FACTOR = 0.8;
 	private static final Quantity<LengthUnits> ICON_SIZE = new Quantity<LengthUnits>(12, LengthUnits.pt);
 
 
@@ -547,8 +549,23 @@ abstract public class FrameController implements ViewController {
 
 		UIManager.put("Button.defaultButtonFollowsFocus", Boolean.TRUE);
 		
-		if(supportHidpi)
-			scaleDefaultUIFonts();
+		final ResourceController resourceController = ResourceController.getResourceController();
+
+		if (!resourceController.getBooleanProperty("hugeFontsFixed", false)) {
+			if ("100".equals(resourceController.getProperties().get(UITools.MENU_ITEM_FONT_SIZE_PROPERTY))) {
+				resourceController.getProperties().remove(UITools.MENU_ITEM_FONT_SIZE_PROPERTY);
+			}
+			resourceController.setProperty("hugeFontsFixed", true);
+		}
+
+		int lookAndFeelDefaultMenuItemFontSize = getLookAndFeelDefaultMenuItemFontSize();
+		final long defaultMenuItemSize = Math.round(lookAndFeelDefaultMenuItemFontSize * DEFAULT_SCALING_FACTOR);
+		resourceController.setDefaultProperty(UITools.MENU_ITEM_FONT_SIZE_PROPERTY, Long.toString(defaultMenuItemSize));
+
+		if(supportHidpi) {
+			double scalingFactor = calculateFontSizeScalingFactor(lookAndFeelDefaultMenuItemFontSize);
+			scaleDefaultUIFonts(scalingFactor);
+		}
 
 		// Workaround for https://bugs.openjdk.java.net/browse/JDK-8134828
 		// Scrollbar thumb disappears with Nimbus L&F
@@ -580,14 +597,37 @@ abstract public class FrameController implements ViewController {
 			UIManager.getDefaults().put("control", Color.LIGHT_GRAY);
 	}
 	
-	private static void scaleDefaultUIFonts() {
-        Set<Object> keySet = UIManager.getLookAndFeelDefaults().keySet();
+	private static int getLookAndFeelDefaultMenuItemFontSize() {
+		int lookAndFeelDefaultMenuItemFontSize = 10;
+		Font uiDefaultMenuItemFont = UIManager.getDefaults().getFont("MenuItem.font");
+		if(uiDefaultMenuItemFont != null) {
+			lookAndFeelDefaultMenuItemFontSize = uiDefaultMenuItemFont.getSize();
+		}
+		return lookAndFeelDefaultMenuItemFontSize;
+	}
+
+	final private static int UNKNOWN = -1;
+
+	private static double calculateFontSizeScalingFactor(int lookAndFeelDefaultMenuItemFontSize) {
+		final ResourceController resourceController = ResourceController.getResourceController();
+		final int userDefinedMenuItemFontSize = resourceController.getIntProperty(UITools.MENU_ITEM_FONT_SIZE_PROPERTY, UNKNOWN);
+
+		final double scalingFactor;
+		if(userDefinedMenuItemFontSize == UNKNOWN){
+			scalingFactor = DEFAULT_SCALING_FACTOR;
+		}
+		else{
+			scalingFactor = ((double)userDefinedMenuItemFontSize) / lookAndFeelDefaultMenuItemFontSize;
+		}
+		return scalingFactor;
+	}
+
+	private static void scaleDefaultUIFonts(double scalingFactor) {
+		Set<Object> keySet = UIManager.getLookAndFeelDefaults().keySet();
 		Object[] keys = keySet.toArray(new Object[keySet.size()]);
 		final UIDefaults uiDefaults = UIManager.getDefaults();
 		final UIDefaults lookAndFeelDefaults = UIManager.getLookAndFeel().getDefaults();
 		
-		double scalingFactor = calculateFontSizeScalingFactor();
-		
 		for (Object key : keys) {
 		    if (isFontKey(key)) {
 				Font font = uiDefaults.getFont(key);
@@ -599,29 +639,9 @@ abstract public class FrameController implements ViewController {
 		    }
 		
 		}
-    }
-
-	private static double calculateFontSizeScalingFactor() {
-		final int unknown = -1;
-		final int userDefinedMenuItemFontSize = ResourceController.getResourceController().getIntProperty(UITools.MENU_ITEM_FONT_SIZE_PROPERTY, unknown);
-		double scalingFactor = 0.8;
-		
-		int lookAndFeelDefaultMenuItemFontSize = 10;
-		Font uiDefaultMenuItemFont = UIManager.getDefaults().getFont("MenuItem.font");
-		if(uiDefaultMenuItemFont != null) {
-			lookAndFeelDefaultMenuItemFontSize = uiDefaultMenuItemFont.getSize();
-		}
-		
-		if(userDefinedMenuItemFontSize == unknown){
-			final long defaultMenuItemSize = Math.round(lookAndFeelDefaultMenuItemFontSize * scalingFactor);
-			ResourceController.getResourceController().setDefaultProperty(UITools.MENU_ITEM_FONT_SIZE_PROPERTY, Long.toString(defaultMenuItemSize));
-		}
-		else{
-			scalingFactor = ((double)userDefinedMenuItemFontSize) / lookAndFeelDefaultMenuItemFontSize;
-		}
-		return scalingFactor;
 	}
 
+
 	private static boolean isFontKey(Object key) {
 		return key != null && key.toString().toLowerCase().endsWith("font");
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/url/NodeAndMapReference.java b/freeplane/src/main/java/org/freeplane/features/url/NodeAndMapReference.java
index 4ac0eea..1badf2e 100644
--- a/freeplane/src/main/java/org/freeplane/features/url/NodeAndMapReference.java
+++ b/freeplane/src/main/java/org/freeplane/features/url/NodeAndMapReference.java
@@ -36,4 +36,4 @@ public class NodeAndMapReference {
 	public String getMapReference() {
 		return mapReference;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/DroppedMindMapOpener.java b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/DroppedMindMapOpener.java
index dfc3e90..8ad59e6 100644
--- a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/DroppedMindMapOpener.java
+++ b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/DroppedMindMapOpener.java
@@ -20,4 +20,4 @@ public class DroppedMindMapOpener implements Listener{
 			modeController.getMapController().newMap(url);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/FileRevisionsDialog.java b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/FileRevisionsDialog.java
index a9fa9d3..99cf9bb 100644
--- a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/FileRevisionsDialog.java
+++ b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/FileRevisionsDialog.java
@@ -159,8 +159,8 @@ class FileRevisionsDialog extends JDialog {
 			}
 
 			private boolean containsOriginalFile(JTable table, int row) {
-				FileWrapper fileHolder = (FileWrapper) table.getValueAt(row, 0);
-				return fileHolder.getFile().equals(file);
+				final Object value = table.getValueAt(row, 0);
+				return value instanceof FileWrapper && ((FileWrapper) value).getFile().equals(file);
             }
 		};
 
@@ -254,7 +254,7 @@ class FileRevisionsDialog extends JDialog {
 		final String html = HtmlUtils.plainToHTML(text);
 		final JLabel textArea = new JLabel(html);
 		textArea.setAlignmentX(0.5f);
-		textArea.setFont(new Font("Dialog", Font.BOLD, 12));
+		textArea.setFont(new Font(Font.DIALOG, Font.BOLD, 12));
 		textArea.setBorder(BorderFactory.createLineBorder(Color.BLACK));
 		return textArea;
 	}
diff --git a/freeplane/src/main/java/org/freeplane/main/application/Browser.java b/freeplane/src/main/java/org/freeplane/main/application/Browser.java
index f433c7c..4a4a53e 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/Browser.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/Browser.java
@@ -95,4 +95,4 @@ public class Browser {
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/main/application/ConnectedToMenuView.java b/freeplane/src/main/java/org/freeplane/main/application/ConnectedToMenuView.java
index c983a15..1def5be 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/ConnectedToMenuView.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/ConnectedToMenuView.java
@@ -40,4 +40,4 @@ final class ConnectedToMenuView extends View {
     protected boolean processKeyBinding(final KeyStroke ks, final KeyEvent e, final int condition, final boolean pressed) {
     	return super.processKeyBinding(ks, e, condition, pressed) || MenuKeyProcessor.INSTANCE.processKeyBinding(ks, e, condition, pressed);
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java b/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java
index d47f0f0..65328c9 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java
@@ -164,6 +164,7 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
 		try {
 			Controller controller = new Controller(applicationResourceController);
 			Controller.setCurrentController(controller);
+			Compat.macAppChanges();
 			controller.addAction(new QuitAction());
 			applicationResourceController.init();
 			LogUtils.createLogger();
@@ -226,7 +227,6 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
 			if(freeplaneSurveyProperties.mayAskUserToFillSurveys()) {
 				controller.addApplicationLifecycleListener(new SurveyStarter(freeplaneSurveyProperties, new SurveyRunner(freeplaneSurveyProperties), Math.random()));
 			}
-			Compat.macAppChanges();
 			return controller;
 		}
 		catch (final Exception e) {
diff --git a/freeplane/src/main/java/org/freeplane/main/application/MapViewDockingWindows.java b/freeplane/src/main/java/org/freeplane/main/application/MapViewDockingWindows.java
index fcabba1..021bd09 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/MapViewDockingWindows.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/MapViewDockingWindows.java
@@ -223,7 +223,7 @@ class MapViewDockingWindows implements IMapViewChangeListener {
 		contentPaneComponentProperties.setInsets(null);
 		contentPaneComponentProperties.setBorder(null);
 
-		Font tabFont = new Font("Dialog", 0, 10);
+		Font tabFont = new Font(Font.DIALOG, 0, 10);
 		tabFont = UITools.scaleFontInt(tabFont, 0.8);
 		TitledTabProperties titledTabProperties = overwrittenProperties.getTabWindowProperties().getTabProperties().getTitledTabProperties();
 		titledTabProperties.getHighlightedProperties().getComponentProperties().setFont(tabFont);
diff --git a/freeplane/src/main/java/org/freeplane/main/application/MapViewSerializer.java b/freeplane/src/main/java/org/freeplane/main/application/MapViewSerializer.java
index 4399ef1..cd216aa 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/MapViewSerializer.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/MapViewSerializer.java
@@ -123,4 +123,4 @@ class MapViewSerializer implements ViewSerializer {
 	
 
     
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/main/application/MenuKeyProcessor.java b/freeplane/src/main/java/org/freeplane/main/application/MenuKeyProcessor.java
index 2ac0b0a..69aad49 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/MenuKeyProcessor.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/MenuKeyProcessor.java
@@ -29,4 +29,4 @@ public class MenuKeyProcessor {
 	private boolean containsModifierKeyCode(final KeyStroke ks) {
 		return modifierKeyCodes.contains(ks.getKeyCode());
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/main/application/SplitPaneLayoutManagerDecorator.java b/freeplane/src/main/java/org/freeplane/main/application/SplitPaneLayoutManagerDecorator.java
index d42db49..d2941d9 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/SplitPaneLayoutManagerDecorator.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/SplitPaneLayoutManagerDecorator.java
@@ -82,4 +82,4 @@ final class SplitPaneLayoutManagerDecorator implements LayoutManager {
     public void addLayoutComponent(String name, Component comp) {
     	lm.addLayoutComponent(name, comp);
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/main/application/survey/FreeplaneSurveyProperties.java b/freeplane/src/main/java/org/freeplane/main/application/survey/FreeplaneSurveyProperties.java
index 7b5a38c..d2f231c 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/survey/FreeplaneSurveyProperties.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/survey/FreeplaneSurveyProperties.java
@@ -91,4 +91,4 @@ public class FreeplaneSurveyProperties {
 		return remindMeLaterIsActive;
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/main/mindmapmode/HttpVersionClient.java b/freeplane/src/main/java/org/freeplane/main/mindmapmode/HttpVersionClient.java
index 56f4536..06267c2 100644
--- a/freeplane/src/main/java/org/freeplane/main/mindmapmode/HttpVersionClient.java
+++ b/freeplane/src/main/java/org/freeplane/main/mindmapmode/HttpVersionClient.java
@@ -7,6 +7,8 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import javax.net.ssl.SSLHandshakeException;
+
 import org.freeplane.core.util.FreeplaneVersion;
 import org.freeplane.core.util.LogUtils;
 
@@ -38,13 +40,26 @@ class HttpVersionClient {
 		remoteVersion = null;
 		history = "";
 		successful = false;
+		initialize(url, currentVersion);
+	}
 
+	private void initialize(final URL url, final FreeplaneVersion currentVersion) {
 		try {
 			if (isPropertyUrl(url))
 			    parseProperties(url, currentVersion);
 			else
 				parseHistory(url, currentVersion);
 		}
+		catch (SSLHandshakeException ex) {
+			if (url.getProtocol().equalsIgnoreCase("https")) {
+				try {
+					URL httpUrl = new URL(url.toString().replaceFirst(url.getProtocol(), "http"));
+					initialize(httpUrl, currentVersion);
+				} catch (MalformedURLException e) {
+					LogUtils.severe(e);
+				}
+			}
+		}
 		catch (final NullPointerException e) {
 		    LogUtils.warn("problem with update check for url (" + url + ")", e);
 		}
diff --git a/freeplane/src/main/java/org/freeplane/main/mindmapmode/UpdateCheckAction.java b/freeplane/src/main/java/org/freeplane/main/mindmapmode/UpdateCheckAction.java
index 2cdea48..3df7794 100644
--- a/freeplane/src/main/java/org/freeplane/main/mindmapmode/UpdateCheckAction.java
+++ b/freeplane/src/main/java/org/freeplane/main/mindmapmode/UpdateCheckAction.java
@@ -20,6 +20,8 @@ import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 import javax.swing.SwingConstants;
 import javax.swing.Timer;
 import javax.swing.border.Border;
@@ -151,13 +153,25 @@ class UpdateCheckAction extends AFreeplaneAction {
 		}
 	}
 
+	final static private String DEFAULT_LANGUAGE = "en";
+	enum ConnectionStatus {
+		TRANSLATED("new_version_available", Locale.getDefault().getLanguage()), 
+		DEFAULT("new_version_available", DEFAULT_LANGUAGE), 
+		FAILURE("can_not_connect_to_info_server", DEFAULT_LANGUAGE);
+
+		public final String statusKey;
+		public final String language;
+		private ConnectionStatus(String statusKey, String language) {
+			this.statusKey = statusKey;
+			this.language = language;
+		}
+
+	};
+
 	private void checkForUpdates(final boolean autoRun) {
 		final Date now = new Date();
 		ResourceController.getResourceController().setProperty(LAST_UPDATE_CHECK_TIME, Long.toString(now.getTime()));
-		final Locale defaultLocale = Locale.getDefault();
-		final String language = defaultLocale.getLanguage();
-		final String DEFAULT_LANGUAGE = "en";
-		final String translatedWebUpdate = getWebUpdateUrl(language);
+		final String translatedWebUpdate = getWebUpdateUrl(ConnectionStatus.TRANSLATED.language);
 		final FreeplaneVersion localVersion = FreeplaneVersion.getVersion();
 		final HttpVersionClient translatedVersionClient = new HttpVersionClient(translatedWebUpdate, localVersion);
 		FreeplaneVersion lastTranslatedVersion = translatedVersionClient.getRemoteVersion();
@@ -166,19 +180,20 @@ class UpdateCheckAction extends AFreeplaneAction {
 		}
 		final String history;
 		final FreeplaneVersion lastVersion;
-		final boolean connectSuccessfull;
-		if (!language.equals(DEFAULT_LANGUAGE)) {
+		final ConnectionStatus connectionStatus;
+		if (!ConnectionStatus.TRANSLATED.language.equals(DEFAULT_LANGUAGE)) {
 			final String defaultWebUpdate = getWebUpdateUrl(DEFAULT_LANGUAGE);
 			final HttpVersionClient defaultVersionClient = new HttpVersionClient(defaultWebUpdate,
 			    lastTranslatedVersion);
 			lastVersion = defaultVersionClient.getRemoteVersion();
 			history = defaultVersionClient.getHistory() + translatedVersionClient.getHistory();
-			connectSuccessfull = defaultVersionClient.isSuccessful();
+			connectionStatus = translatedVersionClient.isSuccessful() ? ConnectionStatus.TRANSLATED 
+					: defaultVersionClient.isSuccessful() ? ConnectionStatus.DEFAULT : ConnectionStatus.FAILURE;
 		}
 		else {
 			lastVersion = lastTranslatedVersion;
 			history = translatedVersionClient.getHistory();
-			connectSuccessfull = translatedVersionClient.isSuccessful();
+			connectionStatus = translatedVersionClient.isSuccessful()  ? ConnectionStatus.DEFAULT : ConnectionStatus.FAILURE;
 		}
 		
 		checkForAddonsUpdates();
@@ -188,7 +203,7 @@ class UpdateCheckAction extends AFreeplaneAction {
 				if (autoRun) {
 					return;
 				}
-				showUpdateDialog(connectSuccessfull, localVersion, lastVersion, history);
+				showUpdateDialog(connectionStatus.statusKey, lastVersion, history, connectionStatus.language);
 			}
 		});
 	}
@@ -283,18 +298,7 @@ class UpdateCheckAction extends AFreeplaneAction {
 	}
 
 
-	private void showUpdateDialog(final boolean connectSuccesfull, final FreeplaneVersion localVersion,
-	                              final FreeplaneVersion newVersion, final String history) {
-		if (connectSuccesfull == false) {
-			showUpdateDialog("can_not_connect_to_info_server", newVersion, history);
-		} else {
-			showUpdateDialog("new_version_available", newVersion, history);
-		}
-		
-		return;
-	}
-
-	private int showUpdateDialog(final String info, final FreeplaneVersion freeplaneLatestVersion, final String history) {
+	private int showUpdateDialog(final String info, final FreeplaneVersion freeplaneLatestVersion, final String history, String language) {
 		
 		// dialog layout
 		// - messagePane (verticalBox)
@@ -305,6 +309,7 @@ class UpdateCheckAction extends AFreeplaneAction {
 		// |- checkbox for automatic update
 		
 		final Box messagePane = Box.createVerticalBox();
+		
 		final JLabel emptyLabel = new JLabel("");
 		
 		// grid setup
@@ -359,8 +364,6 @@ class UpdateCheckAction extends AFreeplaneAction {
 
 		JButton updateButton;
 		JButton changelogButton;
-		final Locale defaultLocale = Locale.getDefault();
-		final String language = defaultLocale.getLanguage();
 		final String translatedWebUpdate = getWebUpdateUrl(language);
 		
 		changelogButton = new JButton(TextUtils.getText("updater.viewChangelog"));
@@ -462,6 +465,13 @@ class UpdateCheckAction extends AFreeplaneAction {
 		}
 		messagePane.add(gridPane);
 		
+		if(! history.isEmpty()) {
+			final JTextArea text = new JTextArea(history);
+			text.setRows(10);
+			final JScrollPane scrollPane = new JScrollPane(text, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+			scrollPane.setBorder(BorderFactory.createEtchedBorder());
+			messagePane.add(scrollPane);
+		}
 		
 		final JLabel confLabel = new JLabel(TextUtils.getText("preferences"));
 		confLabel.setFont(boldFont);
@@ -471,6 +481,7 @@ class UpdateCheckAction extends AFreeplaneAction {
 			    .getBooleanProperty(CHECK_UPDATES_AUTOMATICALLY));
 			updateAutomatically.setAlignmentX(JLabel.LEFT_ALIGNMENT);
 		messagePane.add(updateAutomatically);
+		
 		final Object[] options;
 		options = new Object[] { TextUtils.getText("simplyhtml.closeBtnName") };
 
@@ -508,4 +519,4 @@ class UpdateCheckAction extends AFreeplaneAction {
 		}
 	};
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ImageObserverCallback.java b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ImageObserverCallback.java
index 7c15cd7..2dbe9a8 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ImageObserverCallback.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ImageObserverCallback.java
@@ -46,4 +46,4 @@ class ImageObserverCallback implements ImageObserver {
 		}
 		return true;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerBorder.java b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerBorder.java
index fb139e6..56ed642 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerBorder.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerBorder.java
@@ -41,4 +41,4 @@ import javax.swing.border.EmptyBorder;
 		component.paintImmediately(component.getWidth() - borderWidth, 0, borderWidth, component.getHeight());
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/PeriodUnit.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/PeriodUnit.java
index e303df9..9d5dc22 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/PeriodUnit.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/PeriodUnit.java
@@ -36,4 +36,4 @@ enum PeriodUnit{
 	PeriodUnit(int calendarField){
 		this.calendarField = calendarField;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/CoreTextAccessor.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/CoreTextAccessor.java
index a876543..7866492 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/CoreTextAccessor.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/CoreTextAccessor.java
@@ -44,4 +44,4 @@ class CoreTextAccessor implements TextAccessor {
 	public NodeModel getNode() {
 	    return node;
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/DateRenderer.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/DateRenderer.java
index 8273053..738409f 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/DateRenderer.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/DateRenderer.java
@@ -45,4 +45,4 @@ class DateRenderer extends DefaultTableCellRenderer {
 		}
 		setText((value == null) ? "" : formatter.format(value));
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/DetailTextAccessor.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/DetailTextAccessor.java
index f75e7d1..d1a4adf 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/DetailTextAccessor.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/DetailTextAccessor.java
@@ -46,4 +46,4 @@ class DetailTextAccessor implements TextAccessor {
 	public NodeModel getNode() {
 	    return node;
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/IconsHolder.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/IconsHolder.java
index 4d8c125..14e1b5c 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/IconsHolder.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/IconsHolder.java
@@ -63,4 +63,4 @@ class IconsHolder implements Comparable<IconsHolder> {
 	public String toString() {
 		return iconNames;
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/IconsRenderer.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/IconsRenderer.java
index 4ddcb5e..f729565 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/IconsRenderer.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/IconsRenderer.java
@@ -54,4 +54,4 @@ class IconsRenderer extends DefaultTableCellRenderer {
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NoteTextAccessor.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NoteTextAccessor.java
index 90cf34d..0e258f5 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NoteTextAccessor.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NoteTextAccessor.java
@@ -47,4 +47,4 @@ class NoteTextAccessor implements TextAccessor {
 	public NodeModel getNode() {
 	    return node;
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TextHolder.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TextHolder.java
index b6d5ecf..29b7d33 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TextHolder.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TextHolder.java
@@ -70,4 +70,4 @@ public class TextHolder implements Comparable<TextHolder> {
 	public String getText() {
 	    return textAccessor.getText();
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TextRenderer.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TextRenderer.java
index eb66bdc..4b6bfef 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TextRenderer.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TextRenderer.java
@@ -39,4 +39,4 @@ class TextRenderer extends DefaultTableCellRenderer {
 	public void setValue(final Object value) {
 		setText((value == null) ? "" : ((TextHolder) value).getUntaggedNotesText());
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/ArrowIcon.java b/freeplane/src/main/java/org/freeplane/view/swing/map/ArrowIcon.java
index b50c77b..8b18dd5 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/ArrowIcon.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/ArrowIcon.java
@@ -86,4 +86,4 @@ class ArrowIcon implements Icon{
 		g.setColor(oldColor);
     }
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/ContentPane.java b/freeplane/src/main/java/org/freeplane/view/swing/map/ContentPane.java
index eb8d01d..20b665f 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/ContentPane.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/ContentPane.java
@@ -38,4 +38,4 @@ class ContentPane extends JComponent {
 		return false;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/ContentPaneLayout.java b/freeplane/src/main/java/org/freeplane/view/swing/map/ContentPaneLayout.java
index 3e4bd68..faf606a 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/ContentPaneLayout.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/ContentPaneLayout.java
@@ -65,4 +65,4 @@ class ContentPaneLayout implements LayoutManager {
 
 	public void removeLayoutComponent(final Component comp) {
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/DetailsView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/DetailsView.java
index 609f77a..e021e2f 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/DetailsView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/DetailsView.java
@@ -47,4 +47,4 @@ final class DetailsView extends ZoomableLabel {
     }
 	
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/FoldingMark.java b/freeplane/src/main/java/org/freeplane/view/swing/map/FoldingMark.java
index 29c4ad5..fa19f05 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/FoldingMark.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/FoldingMark.java
@@ -135,4 +135,4 @@ public enum FoldingMark implements Drawable{
 		drawable.draw(g, nodeView, r);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/MapView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/MapView.java
index 20664a2..dc78867 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/MapView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/MapView.java
@@ -711,7 +711,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 	}
 
 	public Object detectCollision(final Point p) {
-		if (arrowLinkViews == null && ! showConnectors) {
+		if (arrowLinkViews == null) {
 			return null;
 		}
 		for (int i = 0; i < arrowLinkViews.size(); ++i) {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/PaintingMode.java b/freeplane/src/main/java/org/freeplane/view/swing/map/PaintingMode.java
index 2bc0da0..bed0601 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/PaintingMode.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/PaintingMode.java
@@ -25,4 +25,4 @@ package org.freeplane.view.swing.map;
  */
 enum PaintingMode {
 	CLOUDS, NODES, SELECTED_NODES, LINKS, SELECTORS
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/VerticalNodeViewLayoutStrategy.java b/freeplane/src/main/java/org/freeplane/view/swing/map/VerticalNodeViewLayoutStrategy.java
index 8c465c9..8da04e3 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/VerticalNodeViewLayoutStrategy.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/VerticalNodeViewLayoutStrategy.java
@@ -391,4 +391,4 @@ class VerticalNodeViewLayoutStrategy {
 		view.setBottomOverlap(height - heigthWithoutOverlap);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/ZoomableLabel.java b/freeplane/src/main/java/org/freeplane/view/swing/map/ZoomableLabel.java
index 31b6ee2..810bd89 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/ZoomableLabel.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/ZoomableLabel.java
@@ -269,4 +269,4 @@ public class ZoomableLabel extends JLabel {
 			return width;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/link/TextPainter.java b/freeplane/src/main/java/org/freeplane/view/swing/map/link/TextPainter.java
index 2db77b3..b42b451 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/link/TextPainter.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/link/TextPainter.java
@@ -76,4 +76,4 @@ public class TextPainter{
 		g.setColor(oldColor);
 		g.setStroke(oldStroke);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/AltCodeChecker.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/AltCodeChecker.java
index 7d9af2c..e290a90 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/AltCodeChecker.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/AltCodeChecker.java
@@ -22,4 +22,4 @@ public class AltCodeChecker {
 	static boolean isAltCode(char keyChar) {
 		return altCodes.contains(keyChar);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/DetailsViewMouseListener.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/DetailsViewMouseListener.java
index 3cdc002..36ebb25 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/DetailsViewMouseListener.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/DetailsViewMouseListener.java
@@ -133,4 +133,4 @@ public class DetailsViewMouseListener extends LinkNavigatorMouseListener {
 		nodeSelector.stopTimerForDelayedSelection();
 		nodeSelector.trackWindowForComponent(e.getComponent());
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/NodeSelector.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/NodeSelector.java
index 0c9870b..ab01eca 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/NodeSelector.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/NodeSelector.java
@@ -193,4 +193,4 @@ public class NodeSelector {
 	public void trackWindowForComponent(Component c) {
 		windowMouseTracker.trackWindowForComponent(c);
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneManager.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneManager.java
index c0d3b7d..07420b0 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneManager.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneManager.java
@@ -60,4 +60,4 @@ public class GlassPaneManager implements AncestorListener {
     	glassPane.setVisible(true);
     	SwingUtilities.getWindowAncestor(rootPane).setFocusableWindowState(false);
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneNodeSelector.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneNodeSelector.java
index 1bcdd45..eb2489b 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneNodeSelector.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneNodeSelector.java
@@ -157,4 +157,4 @@ class GlassPaneNodeSelector extends MouseAdapter implements IMouseListener{
         	e.isPopupTrigger()));
     }
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/src/test/java/org/freeplane/features/map/MapFake.java b/freeplane/src/test/java/org/freeplane/features/map/MapFake.java
index d19ced8..a1f1be6 100644
--- a/freeplane/src/test/java/org/freeplane/features/map/MapFake.java
+++ b/freeplane/src/test/java/org/freeplane/features/map/MapFake.java
@@ -72,4 +72,4 @@ public class MapFake {
 		
 	}
 
-}
+}
\ No newline at end of file
diff --git a/freeplane/viewer-resources/freeplane.properties b/freeplane/viewer-resources/freeplane.properties
index 7f6cd3d..15428f6 100644
--- a/freeplane/viewer-resources/freeplane.properties
+++ b/freeplane/viewer-resources/freeplane.properties
@@ -501,7 +501,7 @@ indentationUsesTabsInTextOutput=false
 JoinNodesAction.textSeparators={{\\n}} {{ }} {{, }}
 filter.showAncestors=true
 filter.showDescendants=false
-locales=ar,af,ca,cs,da,de,el,es,et,eu,fr,gl,hr,hu,id,it,ja,ko,lt,nb,nl,nn,pl,pt_BR,pt_PT,ru,sk,sl,sr,sv,tr,uk_UA,zh_CN,zh_TW,en
+locales=ar,af,ca,cs,da,de,el,es,et,eu,fr,gl,hr,hu,id,it,ja,ko,kn,lt,nb,nl,nn,oc,pl,pt_BR,pt_PT,ru,sk,sl,sr,sv,tr,uk_UA,zh_CN,zh_TW,en
 org.freeplane.plugin.bugreport.dialog.disabled=false
 use_svg_icons=true
 antialias_svg=true
diff --git a/freeplane/viewer-resources/images/AttributesView.svg b/freeplane/viewer-resources/images/AttributesView.svg
index ada8bb6..9ab67ef 100644
--- a/freeplane/viewer-resources/images/AttributesView.svg
+++ b/freeplane/viewer-resources/images/AttributesView.svg
@@ -14,8 +14,9 @@
    height="32"
    id="svg17560"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   viewBox="0 0 32 32">
+   inkscape:version="0.92.1 r15371"
+   viewBox="0 0 32 32"
+   sodipodi:docname="AttributesView.svg">
   <defs
      id="defs17562">
     <radialGradient
@@ -116,18 +117,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="13.265876"
-     inkscape:cx="-18.01854"
-     inkscape:cy="13.468374"
+     inkscape:zoom="6.7433331"
+     inkscape:cx="-27.532408"
+     inkscape:cy="11.939801"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1018"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1532"
+     inkscape:window-height="833"
+     inkscape:window-x="331"
+     inkscape:window-y="73"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false" />
   <metadata
      id="metadata17565">
     <rdf:RDF>
@@ -136,7 +138,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -145,104 +147,130 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g18340"
-       transform="translate(-4.8697612e-7,-3.7515049e-5)">
+       id="g4747">
       <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="M:\FreePlane_radna_mapa\images-view\showAttributes.gif.png"
-         transform="matrix(1.9817952,0,0,1.9817952,-177.26986,-1648.8823)"
-         id="g9934-1-9">
+         id="g4533"
+         transform="matrix(2,0,0,1.9818197,-0.00800525,-0.01214266)">
+        <path
+           style="color:#000000;opacity:0.93720003;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5000034"
+           d="M 0.82313555,0.25612867 H 15.185604 V 15.902902 H 0.82313555 Z"
+           id="rect12"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;opacity:0.93720003;fill:#b1b1b1;fill-rule:evenodd;stroke:#000000;stroke-width:0.11799508;stroke-linecap:round;stroke-linejoin:round"
+           d="M 8.0043695,3.581619 H 0.85773145 V 0.27250386 H 8.0043695 m 0,3.30911514 H 15.151008 V 0.27250386 H 8.0043695 L 7.9798625,3.5867026"
+           id="path14"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+           d="M 8.0043695,7.013022 H 0.85773145 V 3.7039069 H 8.0043695 m 0,3.3091151 H 15.151008 V 3.7039069 H 8.0043695 l -0.024507,3.3141987"
+           id="path16"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+           d="M 8.0043695,10.444425 H 0.85773145 V 7.1353099 H 8.0043695 m 0,3.3091151 H 15.151008 V 7.1353099 H 8.0043695 l -0.024507,3.3141991"
+           id="path18"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+           d="M 8.0043695,13.875828 H 0.85773145 V 10.566713 H 8.0043695 m 0,3.309115 H 15.151008 V 10.566713 H 8.0043695 l -0.024507,3.314199"
+           id="path20"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;opacity:0.93720003;fill:#cccccc;stroke:#000000;stroke-width:0.03117987;stroke-linecap:round;stroke-linejoin:round"
+           d="m 1.0511891,14.850177 v -0.873031 h 6.9530392 6.9530397 v 0.873031 0.873031 H 8.0042283 1.0511891 Z"
+           id="path22"
+           inkscape:connector-curvature="0" />
+        <rect
+           id="rect40"
+           x="0.0040026247"
+           y="0.080026858"
+           width="16"
+           height="16"
+           style="color:#000000;fill:none" />
         <g
-           id="g10366-7-6"
-           transform="matrix(0.7060479,0,0,0.7060479,63.01753,229.2518)">
-          <rect
-             y="854.06769"
-             x="38.699677"
-             height="22.161352"
-             width="20.342138"
-             id="rect10214-4-0"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.70816725;marker:none;enable-background:accumulate" />
+           aria-label="AAA"
+           style="font-style:normal;font-weight:normal;font-size:1.93536687px;line-height:125%;font-family:sans-serif;letter-spacing:0.77414674px;fill:#0000ff;stroke-width:0.77414674"
+           id="text4219">
+          <path
+             d="M 2.908486,6.2261734 H 2.7090903 L 2.5711198,5.833997 H 1.9625376 L 1.8245672,6.2261734 H 1.6346215 l 0.5121918,-1.40711 H 2.3962942 Z M 2.5134746,5.6733464 2.2668287,4.982549 2.0192378,5.6733464 Z"
+             style="stroke-width:0.77414674"
+             id="path4497"
+             inkscape:connector-curvature="0" />
           <path
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccccccc"
-             id="rect10216-0-5"
-             d="m 48.870745,858.77559 -10.121756,0 0,-4.68684 10.121756,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#b1b1b1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.16712102;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+             d="M 5.0056375,6.2261734 H 4.8062418 L 4.6682713,5.833997 H 4.0596892 L 3.9217187,6.2261734 H 3.731773 l 0.5121918,-1.40711 H 4.4934457 Z M 4.6106261,5.6733464 4.3639802,4.982549 4.1163894,5.6733464 Z"
+             style="stroke-width:0.77414674"
+             id="path4499"
+             inkscape:connector-curvature="0" />
           <path
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccccccc"
-             id="rect10216-8-9-2"
-             d="m 48.870745,863.63668 -10.121756,0 0,-4.68684 10.121756,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+             d="M 7.102789,6.2261734 H 6.9033933 L 6.7654228,5.833997 H 6.1568407 L 6.0188702,6.2261734 H 5.8289245 l 0.5121918,-1.40711 H 6.5905972 Z M 6.7077776,5.6733464 6.4611318,4.982549 6.2135409,5.6733464 Z"
+             style="stroke-width:0.77414674"
+             id="path4501"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           aria-label="BBB"
+           style="font-style:normal;font-weight:normal;font-size:1.89617288px;line-height:125%;font-family:sans-serif;letter-spacing:0.75846916px;fill:#008000;stroke-width:0.75846916"
+           id="text4223">
           <path
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccccccc"
-             id="rect10216-89-4-3"
-             d="m 48.870746,868.49777 -10.121757,0 0,-4.68684 10.121757,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+             d="m 10.041582,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.038887,0.078699 -0.1046231,0.1296212 -0.077773,0.061107 -0.1712851,0.087031 -0.092587,0.025924 -0.2360958,0.025924 H 9.001835 v -1.378614 h 0.4083067 q 0.1509161,0 0.2259112,0.01111 0.074995,0.01111 0.1435092,0.046293 0.075921,0.039812 0.110178,0.1027711 0.034257,0.062033 0.034257,0.1490644 0,0.098142 -0.049997,0.1675816 -0.049997,0.068514 -0.1333246,0.1101781 v 0.00741 q 0.1398057,0.028702 0.220356,0.1231401 0.0805 [...]
+             style="stroke-width:0.75846916"
+             id="path4504"
+             inkscape:connector-curvature="0" />
           <path
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccccccc"
-             id="rect10216-7-8-7"
-             d="m 48.870744,873.35886 -10.121755,0 0,-4.68684 10.121755,0 m 0,4.68684 10.121758,0 0,-4.68684 -10.121758,0 -0.03471,4.69397"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+             d="m 12.099967,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104622,0.1296212 -0.07777,0.061107 -0.171286,0.087031 -0.09259,0.025924 -0.236095,0.025924 H 11.06022 v -1.378614 h 0.408306 q 0.150916,0 0.225912,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.237 [...]
+             style="stroke-width:0.75846916"
+             id="path4506"
+             inkscape:connector-curvature="0" />
           <path
-             inkscape:connector-curvature="0"
-             id="path10281-8-1"
-             d="m 39.022949,874.74058 0,-1.23649 9.847796,0 9.847797,0 0,1.23649 0,1.2365 -9.847797,0 -9.847796,0 0,-1.2365 z"
-             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:0.04416052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-          <text
-             id="text10283-2-3"
-             y="861.82092"
-             x="40.057484"
-             style="font-style:italic;font-size:2.08346057px;fill:#0000ff;fill-opacity:1;stroke:none"
-             xml:space="preserve"><tspan
-               y="861.82092"
-               x="40.057484"
-               id="tspan10285-4-5"
-               sodipodi:role="line">Predrag</tspan></text>
-          <text
-             id="text10283-8-5-1"
-             y="866.51904"
-             x="40.350864"
-             style="font-style:italic;font-size:2.08346057px;fill:#ff0000;fill-opacity:1;stroke:none"
-             xml:space="preserve"><tspan
-               y="866.51904"
-               x="40.350864"
-               id="tspan10285-1-5-6"
-               sodipodi:role="line">Romina</tspan></text>
-          <text
-             id="text10283-86-1-0"
-             y="866.53125"
-             x="51.055748"
-             style="font-style:italic;font-size:2.08346057px;fill:#008000;fill-opacity:1;stroke:none"
-             xml:space="preserve"><tspan
-               id="tspan10362-7-4"
-               y="866.53125"
-               x="51.055748"
-               sodipodi:role="line">Sara</tspan></text>
-          <text
-             id="text10283-86-4-1-0"
-             y="862.04016"
-             x="51.055748"
-             style="font-style:italic;font-size:2.08346057px;fill:#ff6600;fill-opacity:1;stroke:none"
-             xml:space="preserve"><tspan
-               y="862.04016"
-               x="51.055748"
-               id="tspan10285-12-2-1-0"
-               sodipodi:role="line">Stela</tspan></text>
+             d="m 14.158351,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104623,0.1296212 -0.07777,0.061107 -0.171285,0.087031 -0.09259,0.025924 -0.236096,0.025924 H 13.1186 v -1.378614 h 0.408307 q 0.150916,0 0.225911,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.2370 [...]
+             style="stroke-width:0.75846916"
+             id="path4508"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           aria-label="CCC"
+           style="font-style:normal;font-weight:normal;font-size:1.91385388px;line-height:125%;font-family:sans-serif;letter-spacing:0.76554155px;fill:#ff0000;stroke-width:0.76554155"
+           id="text4219-4">
+          <path
+             d="m 2.8523301,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084018,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513889,0 -0.2756772,-0.042052 Q 1.9804426,9.3960627 1.8888617,9.3054163 1.7991498,9.2166389 1.7486869,9.080202 1.6982239,8.9428307 1.6982239,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261573,-0.047659 0.27941 [...]
+             style="stroke-width:0.76554155"
+             id="path4502"
+             inkscape:connector-curvature="0" />
+          <path
+             d="m 4.9560742,9.3549447 q -0.051398,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 4.0841866,9.3960627 3.9926057,9.3054163 3.9028938,9.2166389 3.8524309,9.080202 3.8019679,8.9428307 3.8019679,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261574,-0.047659 0.27941 [...]
+             style="stroke-width:0.76554155"
+             id="path4505"
+             inkscape:connector-curvature="0" />
+          <path
+             d="m 7.0598182,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242883,0.029904 -0.066349,0.013083 -0.1467164,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 6.1879307,9.3960627 6.0963498,9.3054163 6.0066379,9.2166389 5.9561749,9.080202 5.905712,8.9428307 5.905712,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401749,-0.2289522 0.088777,-0.090646 0.2140002,-0.1383059 0.1261574,-0.047659 0.2794152 [...]
+             style="stroke-width:0.76554155"
+             id="path4507"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           aria-label="123"
+           style="font-style:normal;font-weight:normal;font-size:2.13862514px;line-height:125%;font-family:sans-serif;letter-spacing:0.85545003px;fill:#ff6600;stroke-width:0.85545003"
+           id="text4219-8">
+          <path
+             d="M 9.9111806,9.5375814 H 9.0695146 V 9.3788554 H 9.3932323 V 8.3366933 H 9.0695146 V 8.1946752 q 0.065788,0 0.1409738,-0.010442 0.075186,-0.011487 0.1138233,-0.032372 0.048036,-0.026106 0.075186,-0.065788 0.028195,-0.040726 0.032372,-0.1086021 h 0.1618588 v 1.4013843 h 0.3174522 z"
+             style="stroke-width:0.85545003"
+             id="path4512"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M 12.217094,9.5375814 H 11.16449 V 9.3193331 q 0.109646,-0.093983 0.219293,-0.1879651 0.11069,-0.093983 0.205717,-0.1869209 0.200496,-0.1942306 0.274638,-0.3080539 0.07414,-0.1148676 0.07414,-0.2474874 0,-0.121133 -0.08041,-0.1890093 -0.07936,-0.068921 -0.222425,-0.068921 -0.09503,0 -0.205717,0.033416 -0.110691,0.033416 -0.21616,0.1023365 h -0.01044 V 8.0474359 q 0.07414,-0.036549 0.197364,-0.066832 0.124265,-0.030283 0.240177,-0.030283 0.239134,0 0.374886,0.1159118 0.135 [...]
+             style="stroke-width:0.85545003"
+             id="path4514"
+             inkscape:connector-curvature="0" />
+          <path
+             d="m 14.29745,8.7888538 q 0.05012,0.044903 0.0825,0.1127791 0.03237,0.067876 0.03237,0.175434 0,0.1065136 -0.03864,0.1952749 -0.03864,0.088761 -0.108603,0.1545491 -0.07832,0.073097 -0.184832,0.108602 -0.105469,0.03446 -0.231824,0.03446 -0.129487,0 -0.254797,-0.031327 -0.12531,-0.030283 -0.205717,-0.066832 V 9.2535453 h 0.01566 q 0.08876,0.058478 0.20885,0.097115 0.120089,0.038637 0.231823,0.038637 0.06579,0 0.13993,-0.021929 0.07414,-0.021929 0.120089,-0.064744 0.04803,-0.04 [...]
+             style="stroke-width:0.85545003"
+             id="path4516"
+             inkscape:connector-curvature="0" />
         </g>
-        <rect
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate"
-           id="rect6193-0-23-7-8-2-89-0-36-52-9"
-           width="16"
-           height="16"
-           x="89.522621"
-           y="832.08801" />
       </g>
       <g
-         transform="matrix(0.97020322,0,0,0.97020322,13.986932,7.0995543)"
+         transform="matrix(0.97020322,0,0,0.97020322,13.986932,3.9918743)"
          id="g18326">
         <path
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.11973214;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:4.50300026;stroke-opacity:1;marker:none;enable-background:accumulate"
diff --git a/freeplane/viewer-resources/images/showAttributes.svg b/freeplane/viewer-resources/images/showAttributes.svg
index d9e913f..7102971 100644
--- a/freeplane/viewer-resources/images/showAttributes.svg
+++ b/freeplane/viewer-resources/images/showAttributes.svg
@@ -5,9 +5,33 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg2"
    viewBox="0 0 16 16.147"
-   version="1.1">
+   version="1.1"
+   sodipodi:docname="showAttributes.svg"
+   inkscape:version="0.92.1 r15371">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1360"
+     inkscape:window-height="746"
+     id="namedview20"
+     showgrid="false"
+     inkscape:zoom="14.615719"
+     inkscape:cx="-14.78369"
+     inkscape:cy="8.0735001"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
   <defs
      id="defs44" />
   <metadata
@@ -22,72 +46,125 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <rect
-     style="color:#000000;opacity:0.93720003;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5000034"
-     height="15.646773"
-     width="14.362469"
-     y="0.25612867"
-     x="0.82313555"
-     id="rect12" />
-  <path
-     style="color:#000000;opacity:0.93720003;fill:#b1b1b1;fill-rule:evenodd;stroke:#000000;stroke-width:0.11799508;stroke-linecap:round;stroke-linejoin:round"
-     d="m 8.0043695,3.581619 -7.14663805,0 0,-3.30911514 7.14663805,0 m 0,3.30911514 7.1466385,0 0,-3.30911514 -7.1466385,0 -0.024507,3.31419874"
-     id="path14" />
-  <path
-     style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
-     d="m 8.0043695,7.013022 -7.14663805,0 0,-3.3091151 7.14663805,0 m 0,3.3091151 7.1466385,0 0,-3.3091151 -7.1466385,0 -0.024507,3.3141987"
-     id="path16" />
-  <path
-     style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
-     d="m 8.0043695,10.444425 -7.14663805,0 0,-3.3091151 7.14663805,0 m 0,3.3091151 7.1466385,0 0,-3.3091151 -7.1466385,0 -0.024507,3.3141991"
-     id="path18" />
-  <path
-     style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
-     d="m 8.0043695,13.875828 -7.14663805,0 0,-3.309115 7.14663805,0 m 0,3.309115 7.1466385,0 0,-3.309115 -7.1466385,0 -0.024507,3.314199"
-     id="path20" />
-  <path
-     style="color:#000000;opacity:0.93720003;fill:#cccccc;stroke:#000000;stroke-width:0.03117987;stroke-linecap:round;stroke-linejoin:round"
-     d="m 1.0511891,14.850177 0,-0.873031 6.9530392,0 6.9530397,0 0,0.873031 0,0.873031 -6.9530397,0 -6.9530392,0 0,-0.873031 z"
-     id="path22" />
-  <rect
-     id="rect40"
-     x="0.0040026247"
-     y="0.080026858"
-     width="16"
-     height="16"
-     style="color:#000000;fill:none" />
-  <text
-     id="text4219"
-     y="6.4314318"
-     x="1.4210041"
-     style="font-style:normal;font-weight:normal;font-size:2.5px;line-height:125%;font-family:sans-serif;letter-spacing:1px;fill:#0000ff;"
-     xml:space="preserve"><tspan
-       y="6.4314318"
-       x="1.4210041"
-       id="tspan4221">AAA</tspan></text>
-  <text
-     id="text4223"
-     y="6.4314318"
-     x="8.7576942"
-     style="font-style:normal;font-weight:normal;font-size:2.5px;line-height:125%;font-family:sans-serif;letter-spacing:1px;fill:#008000;"
-     xml:space="preserve"><tspan
-       y="6.4314318"
-       x="8.7576942"
-       id="tspan4225">BBB</tspan></text>
-  <text
-     id="text4219-4"
-     y="9.6689501"
-     x="1.4210041"
-     style="font-style:normal;font-weight:normal;font-size:2.5px;line-height:125%;font-family:sans-serif;letter-spacing:1px;fill:#ff0000;"
-     xml:space="preserve"><tspan
-       y="9.6689501"
-       x="1.4210041"
-       id="tspan4253">CCC</tspan></text>
-  <text
-     id="text4219-8"
-     y="9.6689501"
-     x="8.7576942"
-     style="font-style:normal;font-weight:normal;font-size:2.5px;line-height:125%;font-family:sans-serif;letter-spacing:1px;fill:#ff6600;"
-     xml:space="preserve"><tspan
-       id="tspan4255">123</tspan></text>
+  <g
+     id="g4533"
+     transform="matrix(1,0,0,0.99086844,-0.00400262,0.06776292)">
+    <path
+       id="rect12"
+       d="M 0.82313555,0.25612867 H 15.185604 V 15.902902 H 0.82313555 Z"
+       style="color:#000000;opacity:0.93720003;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5000034"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path14"
+       d="M 8.0043695,3.581619 H 0.85773145 V 0.27250386 H 8.0043695 m 0,3.30911514 H 15.151008 V 0.27250386 H 8.0043695 L 7.9798625,3.5867026"
+       style="color:#000000;opacity:0.93720003;fill:#b1b1b1;fill-rule:evenodd;stroke:#000000;stroke-width:0.11799508;stroke-linecap:round;stroke-linejoin:round"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path16"
+       d="M 8.0043695,7.013022 H 0.85773145 V 3.7039069 H 8.0043695 m 0,3.3091151 H 15.151008 V 3.7039069 H 8.0043695 l -0.024507,3.3141987"
+       style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path18"
+       d="M 8.0043695,10.444425 H 0.85773145 V 7.1353099 H 8.0043695 m 0,3.3091151 H 15.151008 V 7.1353099 H 8.0043695 l -0.024507,3.3141991"
+       style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path20"
+       d="M 8.0043695,13.875828 H 0.85773145 V 10.566713 H 8.0043695 m 0,3.309115 H 15.151008 V 10.566713 H 8.0043695 l -0.024507,3.314199"
+       style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path22"
+       d="m 1.0511891,14.850177 v -0.873031 h 6.9530392 6.9530397 v 0.873031 0.873031 H 8.0042283 1.0511891 Z"
+       style="color:#000000;opacity:0.93720003;fill:#cccccc;stroke:#000000;stroke-width:0.03117987;stroke-linecap:round;stroke-linejoin:round"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="0.080026858"
+       x="0.0040026247"
+       id="rect40" />
+    <g
+       id="text4219"
+       style="font-style:normal;font-weight:normal;font-size:1.93536687px;line-height:125%;font-family:sans-serif;letter-spacing:0.77414674px;fill:#0000ff;stroke-width:0.77414674"
+       aria-label="AAA">
+      <path
+         id="path4497"
+         style="stroke-width:0.77414674"
+         d="M 2.908486,6.2261734 H 2.7090903 L 2.5711198,5.833997 H 1.9625376 L 1.8245672,6.2261734 H 1.6346215 l 0.5121918,-1.40711 H 2.3962942 Z M 2.5134746,5.6733464 2.2668287,4.982549 2.0192378,5.6733464 Z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4499"
+         style="stroke-width:0.77414674"
+         d="M 5.0056375,6.2261734 H 4.8062418 L 4.6682713,5.833997 H 4.0596892 L 3.9217187,6.2261734 H 3.731773 l 0.5121918,-1.40711 H 4.4934457 Z M 4.6106261,5.6733464 4.3639802,4.982549 4.1163894,5.6733464 Z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4501"
+         style="stroke-width:0.77414674"
+         d="M 7.102789,6.2261734 H 6.9033933 L 6.7654228,5.833997 H 6.1568407 L 6.0188702,6.2261734 H 5.8289245 l 0.5121918,-1.40711 H 6.5905972 Z M 6.7077776,5.6733464 6.4611318,4.982549 6.2135409,5.6733464 Z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="text4223"
+       style="font-style:normal;font-weight:normal;font-size:1.89617288px;line-height:125%;font-family:sans-serif;letter-spacing:0.75846916px;fill:#008000;stroke-width:0.75846916"
+       aria-label="BBB">
+      <path
+         id="path4504"
+         style="stroke-width:0.75846916"
+         d="m 10.041582,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.038887,0.078699 -0.1046231,0.1296212 -0.077773,0.061107 -0.1712851,0.087031 -0.092587,0.025924 -0.2360958,0.025924 H 9.001835 v -1.378614 h 0.4083067 q 0.1509161,0 0.2259112,0.01111 0.074995,0.01111 0.1435092,0.046293 0.075921,0.039812 0.110178,0.1027711 0.034257,0.062033 0.034257,0.1490644 0,0.098142 -0.049997,0.1675816 -0.049997,0.068514 -0.1333246,0.1101781 v 0.00741 q 0.1398057,0.028702 0.220356,0.1231401 0.08055,0. [...]
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4506"
+         style="stroke-width:0.75846916"
+         d="m 12.099967,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104622,0.1296212 -0.07777,0.061107 -0.171286,0.087031 -0.09259,0.025924 -0.236095,0.025924 H 11.06022 v -1.378614 h 0.408306 q 0.150916,0 0.225912,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.2370216 [...]
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4508"
+         style="stroke-width:0.75846916"
+         d="m 14.158351,5.787879 q 0,0.1027711 -0.03889,0.1814697 -0.03889,0.078699 -0.104623,0.1296212 -0.07777,0.061107 -0.171285,0.087031 -0.09259,0.025924 -0.236096,0.025924 H 13.1186 v -1.378614 h 0.408307 q 0.150916,0 0.225911,0.01111 0.07499,0.01111 0.143509,0.046293 0.07592,0.039812 0.110178,0.1027711 0.03426,0.062033 0.03426,0.1490644 0,0.098142 -0.05,0.1675816 -0.05,0.068514 -0.133325,0.1101781 v 0.00741 q 0.139806,0.028702 0.220356,0.1231401 0.08055,0.093513 0.08055,0.2370216  [...]
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="text4219-4"
+       style="font-style:normal;font-weight:normal;font-size:1.91385388px;line-height:125%;font-family:sans-serif;letter-spacing:0.76554155px;fill:#ff0000;stroke-width:0.76554155"
+       aria-label="CCC">
+      <path
+         id="path4502"
+         style="stroke-width:0.76554155"
+         d="m 2.8523301,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084018,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513889,0 -0.2756772,-0.042052 Q 1.9804426,9.3960627 1.8888617,9.3054163 1.7991498,9.2166389 1.7486869,9.080202 1.6982239,8.9428307 1.6982239,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261573,-0.047659 0.2794152,- [...]
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4505"
+         style="stroke-width:0.76554155"
+         d="m 4.9560742,9.3549447 q -0.051398,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242884,0.029904 -0.066349,0.013083 -0.1467163,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 4.0841866,9.3960627 3.9926057,9.3054163 3.9028938,9.2166389 3.8524309,9.080202 3.8019679,8.9428307 3.8019679,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401748,-0.2289522 0.088777,-0.090646 0.2140003,-0.1383059 0.1261574,-0.047659 0.2794152,- [...]
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4507"
+         style="stroke-width:0.76554155"
+         d="m 7.0598182,9.3549447 q -0.051397,0.022428 -0.09345,0.042052 -0.041118,0.019625 -0.1084019,0.041118 -0.057004,0.017756 -0.1242883,0.029904 -0.066349,0.013083 -0.1467164,0.013083 -0.1513888,0 -0.2756772,-0.042052 Q 6.1879307,9.3960627 6.0963498,9.3054163 6.0066379,9.2166389 5.9561749,9.080202 5.905712,8.9428307 5.905712,8.7615379 q 0,-0.1719478 0.048594,-0.3074502 0.048594,-0.1355023 0.1401749,-0.2289522 0.088777,-0.090646 0.2140002,-0.1383059 0.1261574,-0.047659 0.2794152,-0. [...]
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="text4219-8"
+       style="font-style:normal;font-weight:normal;font-size:2.13862514px;line-height:125%;font-family:sans-serif;letter-spacing:0.85545003px;fill:#ff6600;stroke-width:0.85545003"
+       aria-label="123">
+      <path
+         id="path4512"
+         style="stroke-width:0.85545003"
+         d="M 9.9111806,9.5375814 H 9.0695146 V 9.3788554 H 9.3932323 V 8.3366933 H 9.0695146 V 8.1946752 q 0.065788,0 0.1409738,-0.010442 0.075186,-0.011487 0.1138233,-0.032372 0.048036,-0.026106 0.075186,-0.065788 0.028195,-0.040726 0.032372,-0.1086021 h 0.1618588 v 1.4013843 h 0.3174522 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4514"
+         style="stroke-width:0.85545003"
+         d="M 12.217094,9.5375814 H 11.16449 V 9.3193331 q 0.109646,-0.093983 0.219293,-0.1879651 0.11069,-0.093983 0.205717,-0.1869209 0.200496,-0.1942306 0.274638,-0.3080539 0.07414,-0.1148676 0.07414,-0.2474874 0,-0.121133 -0.08041,-0.1890093 -0.07936,-0.068921 -0.222425,-0.068921 -0.09503,0 -0.205717,0.033416 -0.110691,0.033416 -0.21616,0.1023365 h -0.01044 V 8.0474359 q 0.07414,-0.036549 0.197364,-0.066832 0.124265,-0.030283 0.240177,-0.030283 0.239134,0 0.374886,0.1159118 0.135753, [...]
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4516"
+         style="stroke-width:0.85545003"
+         d="m 14.29745,8.7888538 q 0.05012,0.044903 0.0825,0.1127791 0.03237,0.067876 0.03237,0.175434 0,0.1065136 -0.03864,0.1952749 -0.03864,0.088761 -0.108603,0.1545491 -0.07832,0.073097 -0.184832,0.108602 -0.105469,0.03446 -0.231824,0.03446 -0.129487,0 -0.254797,-0.031327 -0.12531,-0.030283 -0.205717,-0.066832 V 9.2535453 h 0.01566 q 0.08876,0.058478 0.20885,0.097115 0.120089,0.038637 0.231823,0.038637 0.06579,0 0.13993,-0.021929 0.07414,-0.021929 0.120089,-0.064744 0.04803,-0.045947 [...]
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
 </svg>
diff --git a/freeplane/viewer-resources/translations/Resources_en.properties b/freeplane/viewer-resources/translations/Resources_en.properties
index 95f1d60..812e018 100644
--- a/freeplane/viewer-resources/translations/Resources_en.properties
+++ b/freeplane/viewer-resources/translations/Resources_en.properties
@@ -363,6 +363,8 @@ ExecuteScripts.noScriptsAvailable=None available
 ExecuteScripts.text=Scripts
 ExecuteScriptSecurityError.text=An error occured during the script execution: {0}
 export_failed=Export failed
+export_pdf_text=Portable Document Format (PDF)
+export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Freeplane Export
 ExportAction.text=Export map...
 ExportAllPresentationsAction.text=Export all presentations to PNG images
@@ -1140,6 +1142,7 @@ OptionPanel.ja=Japanese / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Text separator
 OptionPanel.key_type_action=On key type
 OptionPanel.Keystrokes=Keystrokes
+OptionPanel.kn=Kannada / \u0C95\u0CA8\u0CCD\u0CA8\u0CA1
 OptionPanel.ko=Korean / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Font family
 OptionPanel.label_font_size=Font size
@@ -1210,6 +1213,7 @@ OptionPanel.number_format=Standard number format
 OptionPanel.number_format.tooltip=A pattern containing '#' for optional or '0' for mandatory digits. Examples: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=Number of different files for automatic save
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> number n of different files to store the maps into.  The first automatic save is done in the first file, and so on  up to the n+1-save which is again stored in the first file (cyclic)</html>
+OptionPanel.oc=Occitan
 OptionPanel.OK=Save
 OptionPanel.org.freeplane.plugin.bugreport=Policy
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Always send
@@ -1899,7 +1903,7 @@ slide.last=Last
 slide.next=Next
 slide.nofilter=No filter
 slide.on_the_left.tooltip=on the left
-slide.on_the_right.tooltip=on the left
+slide.on_the_right.tooltip=on the right
 slide.placenode=Place selected node
 slide.placenode.tooltip=when slide is presented
 slide.present=Present
diff --git a/freeplane/viewer-resources/version.properties b/freeplane/viewer-resources/version.properties
index 950bf8c..21d9e57 100644
--- a/freeplane/viewer-resources/version.properties
+++ b/freeplane/viewer-resources/version.properties
@@ -1,2 +1,2 @@
-freeplane_version=1.6.6
+freeplane_version=1.6.10
 freeplane_version_status=
diff --git a/freeplane_framework/eclipse/CodeStyle/codetemplates.xml b/freeplane_framework/eclipse/CodeStyle/codetemplates.xml
index d4dfb50..39837ec 100644
--- a/freeplane_framework/eclipse/CodeStyle/codetemplates.xml
+++ b/freeplane_framework/eclipse/CodeStyle/codetemplates.xml
@@ -49,4 +49,4 @@ ${type_declaration}</template><template autoinsert="true" context="classbody_con
 </template><template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
 ${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated method stub
 ${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
-// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${par [...]
+// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${par [...]
\ No newline at end of file
diff --git a/freeplane_framework/launch4j/freeplaneConsole.lj4.xml b/freeplane_framework/launch4j/freeplaneConsole.lj4.xml
index 623149d..6584012 100644
--- a/freeplane_framework/launch4j/freeplaneConsole.lj4.xml
+++ b/freeplane_framework/launch4j/freeplaneConsole.lj4.xml
@@ -24,4 +24,4 @@
     <runtimeBits>64/32</runtimeBits>
     <opt>-Dorg.freeplane.userfpdir="%APPDATA%\\Freeplane"</opt>
   </jre>
-</launch4jConfig>
+</launch4jConfig>
\ No newline at end of file
diff --git a/freeplane_framework/launch4j/freeplaneGui.lj4.xml b/freeplane_framework/launch4j/freeplaneGui.lj4.xml
index 0c53be0..bd4a6c4 100644
--- a/freeplane_framework/launch4j/freeplaneGui.lj4.xml
+++ b/freeplane_framework/launch4j/freeplaneGui.lj4.xml
@@ -24,4 +24,4 @@
     <runtimeBits>64/32</runtimeBits>
     <opt>-Dorg.freeplane.userfpdir="%APPDATA%\\Freeplane"</opt>
   </jre>
-</launch4jConfig>
+</launch4jConfig>
\ No newline at end of file
diff --git a/freeplane_framework/windows-installer/Freeplane_without_Java.iss b/freeplane_framework/windows-installer/Freeplane_without_Java.iss
index 565cf56..16a4e09 100644
--- a/freeplane_framework/windows-installer/Freeplane_without_Java.iss
+++ b/freeplane_framework/windows-installer/Freeplane_without_Java.iss
@@ -11,7 +11,7 @@
 ; Predrag Cuklin 18/06/2009 - Universial Version
 ;****************************************************************************
 
-#define MyVersion "1.6.6"
+#define MyVersion "1.6.10"
 #define MyStatus ""
 #define MyAppName "Freeplane"
 #define MyAppPublisher "Open source"
diff --git a/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini b/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini
index 77e5982..974fb6a 100644
--- a/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini
+++ b/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini
@@ -21,8 +21,8 @@ CommercialUse=true
 EULAVersion=1
 
 [Version]
-PackageVersion=1.6.5.1
-DisplayVersion=1.6.6
+PackageVersion=1.6.10.1
+DisplayVersion=1.6.10
 
 [SpecialPaths]
 Plugins=NONE
diff --git a/freeplane_mac/build.properties b/freeplane_mac/build.properties
deleted file mode 100644
index 8b13789..0000000
--- a/freeplane_mac/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/freeplane_mac/src/main/java/org/freeplane/plugin/macos/MacChanges.java b/freeplane_mac/src/main/java/org/freeplane/plugin/macos/MacChanges.java
index 9feee31..792fdf2 100644
--- a/freeplane_mac/src/main/java/org/freeplane/plugin/macos/MacChanges.java
+++ b/freeplane_mac/src/main/java/org/freeplane/plugin/macos/MacChanges.java
@@ -23,12 +23,12 @@ import java.awt.EventQueue;
 import java.io.File;
 import java.net.URI;
 
+import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.util.Compat;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.features.link.LinkController;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.mindmapmode.MModeController;
-import org.freeplane.features.ui.ViewController;
 
 import com.apple.eawt.*;
 import com.apple.eawt.AppEvent.AboutEvent;
@@ -79,7 +79,8 @@ public class MacChanges implements  AboutHandler, OpenFilesHandler, PreferencesH
 	
 	public void handleQuitRequestWith(QuitEvent event, QuitResponse response) {
 		try {
-			controller.quit();
+			if(! isStarting())
+				controller.quit();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -91,8 +92,7 @@ public class MacChanges implements  AboutHandler, OpenFilesHandler, PreferencesH
 		URI uri = event.getURI();
 		
 		try {
-			ViewController viewController = controller.getViewController();
-			if(viewController == null) {
+			if(isStarting()) {
 				// restore at startup:
 				loadedMapCounter++;
 				System.setProperty("org.freeplane.param" + loadedMapCounter, uri.toString());				
@@ -107,7 +107,9 @@ public class MacChanges implements  AboutHandler, OpenFilesHandler, PreferencesH
 
 	
 	public void handlePreferences(PreferencesEvent event) {
-		getModeController().getAction("ShowPreferencesAction").actionPerformed(null);
+		AFreeplaneAction action = getModeController().getAction("ShowPreferencesAction");
+		if(action != null)
+			action.actionPerformed(null);
 		
 	}
 
@@ -121,8 +123,7 @@ public class MacChanges implements  AboutHandler, OpenFilesHandler, PreferencesH
 
 	private void openFile(String filePath) {
 		try {
-			ViewController viewController = controller.getViewController();
-			if(viewController == null) {
+			if(isStarting()) {
 				// restore at startup:
 				loadedMapCounter++;
 				System.setProperty("org.freeplane.param" + loadedMapCounter, filePath);				
@@ -135,9 +136,15 @@ public class MacChanges implements  AboutHandler, OpenFilesHandler, PreferencesH
 		}
 	}
 
+	private boolean isStarting() {
+		return controller.getViewController() == null;
+	}
+
 	
 	public void handleAbout(AboutEvent event) {
-		getModeController().getController().getAction("AboutAction").actionPerformed(null);
+		AFreeplaneAction action = getModeController().getController().getAction("AboutAction");
+		if(action != null)
+			action.actionPerformed(null);
 		
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/ImmutableGenericNodeUpdated.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/ImmutableGenericNodeUpdated.java
deleted file mode 100644
index 3d412a9..0000000
--- a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/ImmutableGenericNodeUpdated.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package org.freeplane.plugin.collaboration.client.event;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import javax.annotation.Generated;
-
-/**
- * Immutable implementation of {@link GenericNodeUpdated}.
- * <p>
- * Use the builder to create immutable instances:
- * {@code ImmutableGenericNodeUpdated.builder()}.
- */
- at SuppressWarnings("all")
- at Generated({"Immutables.generator", "GenericNodeUpdated"})
-public final class ImmutableGenericNodeUpdated
-    implements GenericNodeUpdated {
-  private final String contentType;
-  private final JsonNode content;
-  private final String nodeId;
-
-  private ImmutableGenericNodeUpdated(
-      String contentType,
-      JsonNode content,
-      String nodeId) {
-    this.contentType = contentType;
-    this.content = content;
-    this.nodeId = nodeId;
-  }
-
-  /**
-   * @return The value of the {@code contentType} attribute
-   */
-  @JsonProperty("contentType")
-  @Override
-  public String contentType() {
-    return contentType;
-  }
-
-  /**
-   * @return The value of the {@code content} attribute
-   */
-  @JsonProperty("content")
-  @Override
-  public JsonNode content() {
-    return content;
-  }
-
-  /**
-   * @return The value of the {@code nodeId} attribute
-   */
-  @JsonProperty("nodeId")
-  @Override
-  public Optional<String> nodeId() {
-    return Optional.ofNullable(nodeId);
-  }
-
-  /**
-   * Copy the current immutable object by setting a value for the {@link GenericNodeUpdated#contentType() contentType} attribute.
-   * An equals check used to prevent copying of the same value by returning {@code this}.
-   * @param contentType A new value for contentType
-   * @return A modified copy of the {@code this} object
-   */
-  public final ImmutableGenericNodeUpdated withContentType(String contentType) {
-    if (this.contentType.equals(contentType)) return this;
-    String newValue = Objects.requireNonNull(contentType, "contentType");
-    return new ImmutableGenericNodeUpdated(newValue, this.content, this.nodeId);
-  }
-
-  /**
-   * Copy the current immutable object by setting a value for the {@link GenericNodeUpdated#content() content} attribute.
-   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
-   * @param content A new value for content
-   * @return A modified copy of the {@code this} object
-   */
-  public final ImmutableGenericNodeUpdated withContent(JsonNode content) {
-    if (this.content == content) return this;
-    JsonNode newValue = Objects.requireNonNull(content, "content");
-    return new ImmutableGenericNodeUpdated(this.contentType, newValue, this.nodeId);
-  }
-
-  /**
-   * Copy the current immutable object by setting a <i>present</i> value for the optional {@link GenericNodeUpdated#nodeId() nodeId} attribute.
-   * @param value The value for nodeId
-   * @return A modified copy of {@code this} object
-   */
-  public final ImmutableGenericNodeUpdated withNodeId(String value) {
-    String newValue = Objects.requireNonNull(value, "nodeId");
-    if (Objects.equals(this.nodeId, newValue)) return this;
-    return new ImmutableGenericNodeUpdated(this.contentType, this.content, newValue);
-  }
-
-  /**
-   * Copy the current immutable object by setting an optional value for the {@link GenericNodeUpdated#nodeId() nodeId} attribute.
-   * An equality check is used on inner nullable value to prevent copying of the same value by returning {@code this}.
-   * @param optional A value for nodeId
-   * @return A modified copy of {@code this} object
-   */
-  public final ImmutableGenericNodeUpdated withNodeId(Optional<String> optional) {
-    String value = optional.orElse(null);
-    if (Objects.equals(this.nodeId, value)) return this;
-    return new ImmutableGenericNodeUpdated(this.contentType, this.content, value);
-  }
-
-  /**
-   * This instance is equal to all instances of {@code ImmutableGenericNodeUpdated} that have equal attribute values.
-   * @return {@code true} if {@code this} is equal to {@code another} instance
-   */
-  @Override
-  public boolean equals(Object another) {
-    if (this == another) return true;
-    return another instanceof ImmutableGenericNodeUpdated
-        && equalTo((ImmutableGenericNodeUpdated) another);
-  }
-
-  private boolean equalTo(ImmutableGenericNodeUpdated another) {
-    return contentType.equals(another.contentType)
-        && content.equals(another.content)
-        && Objects.equals(nodeId, another.nodeId);
-  }
-
-  /**
-   * Computes a hash code from attributes: {@code contentType}, {@code content}, {@code nodeId}.
-   * @return hashCode value
-   */
-  @Override
-  public int hashCode() {
-    int h = 31;
-    h = h * 17 + contentType.hashCode();
-    h = h * 17 + content.hashCode();
-    h = h * 17 + Objects.hashCode(nodeId);
-    return h;
-  }
-
-  /**
-   * Prints the immutable value {@code GenericNodeUpdated} with attribute values.
-   * @return A string representation of the value
-   */
-  @Override
-  public String toString() {
-    StringBuilder builder = new StringBuilder("GenericNodeUpdated{");
-    builder.append("contentType=").append(contentType);
-    builder.append(", ");
-    builder.append("content=").append(content);
-    if (nodeId != null) {
-      builder.append(", ");
-      builder.append("nodeId=").append(nodeId);
-    }
-    return builder.append("}").toString();
-  }
-
-  /**
-   * Utility type used to correctly read immutable object from JSON representation.
-   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonDeserialize
-  @JsonTypeInfo(use=JsonTypeInfo.Id.NONE)
-  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
-  static final class Json implements GenericNodeUpdated {
-    String contentType;
-    JsonNode content;
-    Optional<String> nodeId = Optional.empty();
-    @JsonProperty("contentType")
-    public void setContentType(String contentType) {
-      this.contentType = contentType;
-    }
-    @JsonProperty("content")
-    public void setContent(JsonNode content) {
-      this.content = content;
-    }
-    @JsonProperty("nodeId")
-    public void setNodeId(Optional<String> nodeId) {
-      this.nodeId = nodeId;
-    }
-    @Override
-    public String contentType() { throw new UnsupportedOperationException(); }
-    @Override
-    public JsonNode content() { throw new UnsupportedOperationException(); }
-    @Override
-    public Optional<String> nodeId() { throw new UnsupportedOperationException(); }
-  }
-
-  /**
-   * @param json A JSON-bindable data structure
-   * @return An immutable value type
-   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonCreator
-  static ImmutableGenericNodeUpdated fromJson(Json json) {
-    ImmutableGenericNodeUpdated.Builder builder = ImmutableGenericNodeUpdated.builder();
-    if (json.contentType != null) {
-      builder.contentType(json.contentType);
-    }
-    if (json.content != null) {
-      builder.content(json.content);
-    }
-    if (json.nodeId != null) {
-      builder.nodeId(json.nodeId);
-    }
-    return builder.build();
-  }
-
-  /**
-   * Creates an immutable copy of a {@link GenericNodeUpdated} value.
-   * Uses accessors to get values to initialize the new immutable instance.
-   * If an instance is already immutable, it is returned as is.
-   * @param instance The instance to copy
-   * @return A copied immutable GenericNodeUpdated instance
-   */
-  public static ImmutableGenericNodeUpdated copyOf(GenericNodeUpdated instance) {
-    if (instance instanceof ImmutableGenericNodeUpdated) {
-      return (ImmutableGenericNodeUpdated) instance;
-    }
-    return ImmutableGenericNodeUpdated.builder()
-        .from(instance)
-        .build();
-  }
-
-  /**
-   * Creates a builder for {@link ImmutableGenericNodeUpdated ImmutableGenericNodeUpdated}.
-   * @return A new ImmutableGenericNodeUpdated builder
-   */
-  public static ImmutableGenericNodeUpdated.Builder builder() {
-    return new ImmutableGenericNodeUpdated.Builder();
-  }
-
-  /**
-   * Builds instances of type {@link ImmutableGenericNodeUpdated ImmutableGenericNodeUpdated}.
-   * Initialize attributes and then invoke the {@link #build()} method to create an
-   * immutable instance.
-   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
-   * but instead used immediately to create instances.</em>
-   */
-  public static final class Builder {
-    private static final long INIT_BIT_CONTENT_TYPE = 0x1L;
-    private static final long INIT_BIT_CONTENT = 0x2L;
-    private long initBits = 0x3L;
-
-    private String contentType;
-    private JsonNode content;
-    private String nodeId;
-
-    private Builder() {
-    }
-
-    /**
-     * Fill a builder with attribute values from the provided {@code GenericNodeUpdated} instance.
-     * Regular attribute values will be replaced with those from the given instance.
-     * Absent optional values will not replace present values.
-     * @param instance The instance from which to copy values
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder from(GenericNodeUpdated instance) {
-      Objects.requireNonNull(instance, "instance");
-      contentType(instance.contentType());
-      content(instance.content());
-      Optional<String> nodeIdOptional = instance.nodeId();
-      if (nodeIdOptional.isPresent()) {
-        nodeId(nodeIdOptional);
-      }
-      return this;
-    }
-
-    /**
-     * Initializes the value for the {@link GenericNodeUpdated#contentType() contentType} attribute.
-     * @param contentType The value for contentType 
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder contentType(String contentType) {
-      this.contentType = Objects.requireNonNull(contentType, "contentType");
-      initBits &= ~INIT_BIT_CONTENT_TYPE;
-      return this;
-    }
-
-    /**
-     * Initializes the value for the {@link GenericNodeUpdated#content() content} attribute.
-     * @param content The value for content 
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder content(JsonNode content) {
-      this.content = Objects.requireNonNull(content, "content");
-      initBits &= ~INIT_BIT_CONTENT;
-      return this;
-    }
-
-    /**
-     * Initializes the optional value {@link GenericNodeUpdated#nodeId() nodeId} to nodeId.
-     * @param nodeId The value for nodeId
-     * @return {@code this} builder for chained invocation
-     */
-    public final Builder nodeId(String nodeId) {
-      this.nodeId = Objects.requireNonNull(nodeId, "nodeId");
-      return this;
-    }
-
-    /**
-     * Initializes the optional value {@link GenericNodeUpdated#nodeId() nodeId} to nodeId.
-     * @param nodeId The value for nodeId
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder nodeId(Optional<String> nodeId) {
-      this.nodeId = nodeId.orElse(null);
-      return this;
-    }
-
-    /**
-     * Builds a new {@link ImmutableGenericNodeUpdated ImmutableGenericNodeUpdated}.
-     * @return An immutable instance of GenericNodeUpdated
-     * @throws java.lang.IllegalStateException if any required attributes are missing
-     */
-    public ImmutableGenericNodeUpdated build() {
-      if (initBits != 0) {
-        throw new IllegalStateException(formatRequiredAttributesMessage());
-      }
-      return new ImmutableGenericNodeUpdated(contentType, content, nodeId);
-    }
-
-    private String formatRequiredAttributesMessage() {
-      List<String> attributes = new ArrayList<String>();
-      if ((initBits & INIT_BIT_CONTENT_TYPE) != 0) attributes.add("contentType");
-      if ((initBits & INIT_BIT_CONTENT) != 0) attributes.add("content");
-      return "Cannot build GenericNodeUpdated, some of required attributes are not set " + attributes;
-    }
-  }
-}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableServerUpdatesFinished.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableServerUpdatesFinished.java
deleted file mode 100644
index d158b49..0000000
--- a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableServerUpdatesFinished.java
+++ /dev/null
@@ -1,386 +0,0 @@
-package org.freeplane.plugin.collaboration.client.event.batch;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import javax.annotation.Generated;
-import org.freeplane.plugin.collaboration.client.event.GenericNodeUpdated;
-
-/**
- * Immutable implementation of {@link ServerUpdatesFinished}.
- * <p>
- * Use the builder to create immutable instances:
- * {@code ImmutableServerUpdatesFinished.builder()}.
- */
- at SuppressWarnings("all")
- at Generated({"Immutables.generator", "ServerUpdatesFinished"})
-public final class ImmutableServerUpdatesFinished
-    implements ServerUpdatesFinished {
-  private final String mapId;
-  private final long mapRevision;
-  private final List<GenericNodeUpdated> updateEvents;
-
-  private ImmutableServerUpdatesFinished(
-      String mapId,
-      long mapRevision,
-      List<GenericNodeUpdated> updateEvents) {
-    this.mapId = mapId;
-    this.mapRevision = mapRevision;
-    this.updateEvents = updateEvents;
-  }
-
-  /**
-   * @return The value of the {@code mapId} attribute
-   */
-  @JsonProperty("mapId")
-  @Override
-  public String mapId() {
-    return mapId;
-  }
-
-  /**
-   * @return The value of the {@code mapRevision} attribute
-   */
-  @JsonProperty("mapRevision")
-  @Override
-  public long mapRevision() {
-    return mapRevision;
-  }
-
-  /**
-   * @return The value of the {@code updateEvents} attribute
-   */
-  @JsonProperty("updateEvents")
-  @Override
-  public List<GenericNodeUpdated> updateEvents() {
-    return updateEvents;
-  }
-
-  /**
-   * Copy the current immutable object by setting a value for the {@link ServerUpdatesFinished#mapId() mapId} attribute.
-   * An equals check used to prevent copying of the same value by returning {@code this}.
-   * @param mapId A new value for mapId
-   * @return A modified copy of the {@code this} object
-   */
-  public final ImmutableServerUpdatesFinished withMapId(String mapId) {
-    if (this.mapId.equals(mapId)) return this;
-    String newValue = Objects.requireNonNull(mapId, "mapId");
-    return new ImmutableServerUpdatesFinished(newValue, this.mapRevision, this.updateEvents);
-  }
-
-  /**
-   * Copy the current immutable object by setting a value for the {@link ServerUpdatesFinished#mapRevision() mapRevision} attribute.
-   * A value equality check is used to prevent copying of the same value by returning {@code this}.
-   * @param mapRevision A new value for mapRevision
-   * @return A modified copy of the {@code this} object
-   */
-  public final ImmutableServerUpdatesFinished withMapRevision(long mapRevision) {
-    if (this.mapRevision == mapRevision) return this;
-    return new ImmutableServerUpdatesFinished(this.mapId, mapRevision, this.updateEvents);
-  }
-
-  /**
-   * Copy the current immutable object with elements that replace the content of {@link ServerUpdatesFinished#updateEvents() updateEvents}.
-   * @param elements The elements to set
-   * @return A modified copy of {@code this} object
-   */
-  public final ImmutableServerUpdatesFinished withUpdateEvents(GenericNodeUpdated... elements) {
-    List<GenericNodeUpdated> newValue = createUnmodifiableList(false, createSafeList(Arrays.asList(elements), true, false));
-    return new ImmutableServerUpdatesFinished(this.mapId, this.mapRevision, newValue);
-  }
-
-  /**
-   * Copy the current immutable object with elements that replace the content of {@link ServerUpdatesFinished#updateEvents() updateEvents}.
-   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
-   * @param elements An iterable of updateEvents elements to set
-   * @return A modified copy of {@code this} object
-   */
-  public final ImmutableServerUpdatesFinished withUpdateEvents(Iterable<? extends GenericNodeUpdated> elements) {
-    if (this.updateEvents == elements) return this;
-    List<GenericNodeUpdated> newValue = createUnmodifiableList(false, createSafeList(elements, true, false));
-    return new ImmutableServerUpdatesFinished(this.mapId, this.mapRevision, newValue);
-  }
-
-  /**
-   * This instance is equal to all instances of {@code ImmutableServerUpdatesFinished} that have equal attribute values.
-   * @return {@code true} if {@code this} is equal to {@code another} instance
-   */
-  @Override
-  public boolean equals(Object another) {
-    if (this == another) return true;
-    return another instanceof ImmutableServerUpdatesFinished
-        && equalTo((ImmutableServerUpdatesFinished) another);
-  }
-
-  private boolean equalTo(ImmutableServerUpdatesFinished another) {
-    return mapId.equals(another.mapId)
-        && mapRevision == another.mapRevision
-        && updateEvents.equals(another.updateEvents);
-  }
-
-  /**
-   * Computes a hash code from attributes: {@code mapId}, {@code mapRevision}, {@code updateEvents}.
-   * @return hashCode value
-   */
-  @Override
-  public int hashCode() {
-    int h = 31;
-    h = h * 17 + mapId.hashCode();
-    h = h * 17 + (int) (mapRevision ^ (mapRevision >>> 32));
-    h = h * 17 + updateEvents.hashCode();
-    return h;
-  }
-
-  /**
-   * Prints the immutable value {@code ServerUpdatesFinished} with attribute values.
-   * @return A string representation of the value
-   */
-  @Override
-  public String toString() {
-    return "ServerUpdatesFinished{"
-        + "mapId=" + mapId
-        + ", mapRevision=" + mapRevision
-        + ", updateEvents=" + updateEvents
-        + "}";
-  }
-
-  /**
-   * Utility type used to correctly read immutable object from JSON representation.
-   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonDeserialize
-  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
-  static final class Json
-      implements ServerUpdatesFinished {
-    String mapId;
-    long mapRevision;
-    boolean mapRevisionIsSet;
-    List<GenericNodeUpdated> updateEvents = Collections.emptyList();
-    @JsonProperty("mapId")
-    public void setMapId(String mapId) {
-      this.mapId = mapId;
-    }
-    @JsonProperty("mapRevision")
-    public void setMapRevision(long mapRevision) {
-      this.mapRevision = mapRevision;
-      this.mapRevisionIsSet = true;
-    }
-    @JsonProperty("updateEvents")
-    public void setUpdateEvents(List<GenericNodeUpdated> updateEvents) {
-      this.updateEvents = updateEvents;
-    }
-    @Override
-    public String mapId() { throw new UnsupportedOperationException(); }
-    @Override
-    public long mapRevision() { throw new UnsupportedOperationException(); }
-    @Override
-    public List<GenericNodeUpdated> updateEvents() { throw new UnsupportedOperationException(); }
-  }
-
-  /**
-   * @param json A JSON-bindable data structure
-   * @return An immutable value type
-   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonCreator
-  static ImmutableServerUpdatesFinished fromJson(Json json) {
-    ImmutableServerUpdatesFinished.Builder builder = ImmutableServerUpdatesFinished.builder();
-    if (json.mapId != null) {
-      builder.mapId(json.mapId);
-    }
-    if (json.mapRevisionIsSet) {
-      builder.mapRevision(json.mapRevision);
-    }
-    if (json.updateEvents != null) {
-      builder.addAllUpdateEvents(json.updateEvents);
-    }
-    return builder.build();
-  }
-
-  /**
-   * Creates an immutable copy of a {@link ServerUpdatesFinished} value.
-   * Uses accessors to get values to initialize the new immutable instance.
-   * If an instance is already immutable, it is returned as is.
-   * @param instance The instance to copy
-   * @return A copied immutable ServerUpdatesFinished instance
-   */
-  public static ImmutableServerUpdatesFinished copyOf(ServerUpdatesFinished instance) {
-    if (instance instanceof ImmutableServerUpdatesFinished) {
-      return (ImmutableServerUpdatesFinished) instance;
-    }
-    return ImmutableServerUpdatesFinished.builder()
-        .from(instance)
-        .build();
-  }
-
-  /**
-   * Creates a builder for {@link ImmutableServerUpdatesFinished ImmutableServerUpdatesFinished}.
-   * @return A new ImmutableServerUpdatesFinished builder
-   */
-  public static ImmutableServerUpdatesFinished.Builder builder() {
-    return new ImmutableServerUpdatesFinished.Builder();
-  }
-
-  /**
-   * Builds instances of type {@link ImmutableServerUpdatesFinished ImmutableServerUpdatesFinished}.
-   * Initialize attributes and then invoke the {@link #build()} method to create an
-   * immutable instance.
-   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
-   * but instead used immediately to create instances.</em>
-   */
-  public static final class Builder {
-    private static final long INIT_BIT_MAP_ID = 0x1L;
-    private static final long INIT_BIT_MAP_REVISION = 0x2L;
-    private long initBits = 0x3L;
-
-    private String mapId;
-    private long mapRevision;
-    private List<GenericNodeUpdated> updateEvents = new ArrayList<GenericNodeUpdated>();
-
-    private Builder() {
-    }
-
-    /**
-     * Fill a builder with attribute values from the provided {@code ServerUpdatesFinished} instance.
-     * Regular attribute values will be replaced with those from the given instance.
-     * Absent optional values will not replace present values.
-     * Collection elements and entries will be added, not replaced.
-     * @param instance The instance from which to copy values
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder from(ServerUpdatesFinished instance) {
-      Objects.requireNonNull(instance, "instance");
-      mapId(instance.mapId());
-      mapRevision(instance.mapRevision());
-      addAllUpdateEvents(instance.updateEvents());
-      return this;
-    }
-
-    /**
-     * Initializes the value for the {@link ServerUpdatesFinished#mapId() mapId} attribute.
-     * @param mapId The value for mapId 
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder mapId(String mapId) {
-      this.mapId = Objects.requireNonNull(mapId, "mapId");
-      initBits &= ~INIT_BIT_MAP_ID;
-      return this;
-    }
-
-    /**
-     * Initializes the value for the {@link ServerUpdatesFinished#mapRevision() mapRevision} attribute.
-     * @param mapRevision The value for mapRevision 
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder mapRevision(long mapRevision) {
-      this.mapRevision = mapRevision;
-      initBits &= ~INIT_BIT_MAP_REVISION;
-      return this;
-    }
-
-    /**
-     * Adds one element to {@link ServerUpdatesFinished#updateEvents() updateEvents} list.
-     * @param element A updateEvents element
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder addUpdateEvents(GenericNodeUpdated element) {
-      this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
-      return this;
-    }
-
-    /**
-     * Adds elements to {@link ServerUpdatesFinished#updateEvents() updateEvents} list.
-     * @param elements An array of updateEvents elements
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder addUpdateEvents(GenericNodeUpdated... elements) {
-      for (GenericNodeUpdated element : elements) {
-        this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
-      }
-      return this;
-    }
-
-    /**
-     * Sets or replaces all elements for {@link ServerUpdatesFinished#updateEvents() updateEvents} list.
-     * @param elements An iterable of updateEvents elements
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder updateEvents(Iterable<? extends GenericNodeUpdated> elements) {
-      this.updateEvents.clear();
-      return addAllUpdateEvents(elements);
-    }
-
-    /**
-     * Adds elements to {@link ServerUpdatesFinished#updateEvents() updateEvents} list.
-     * @param elements An iterable of updateEvents elements
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder addAllUpdateEvents(Iterable<? extends GenericNodeUpdated> elements) {
-      for (GenericNodeUpdated element : elements) {
-        this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
-      }
-      return this;
-    }
-
-    /**
-     * Builds a new {@link ImmutableServerUpdatesFinished ImmutableServerUpdatesFinished}.
-     * @return An immutable instance of ServerUpdatesFinished
-     * @throws java.lang.IllegalStateException if any required attributes are missing
-     */
-    public ImmutableServerUpdatesFinished build() {
-      if (initBits != 0) {
-        throw new IllegalStateException(formatRequiredAttributesMessage());
-      }
-      return new ImmutableServerUpdatesFinished(mapId, mapRevision, createUnmodifiableList(true, updateEvents));
-    }
-
-    private String formatRequiredAttributesMessage() {
-      List<String> attributes = new ArrayList<String>();
-      if ((initBits & INIT_BIT_MAP_ID) != 0) attributes.add("mapId");
-      if ((initBits & INIT_BIT_MAP_REVISION) != 0) attributes.add("mapRevision");
-      return "Cannot build ServerUpdatesFinished, some of required attributes are not set " + attributes;
-    }
-  }
-
-  private static <T> List<T> createSafeList(Iterable<? extends T> iterable, boolean checkNulls, boolean skipNulls) {
-    ArrayList<T> list;
-    if (iterable instanceof Collection<?>) {
-      int size = ((Collection<?>) iterable).size();
-      if (size == 0) return Collections.emptyList();
-      list = new ArrayList<T>();
-    } else {
-      list = new ArrayList<T>();
-    }
-    for (T element : iterable) {
-      if (skipNulls && element == null) continue;
-      if (checkNulls) Objects.requireNonNull(element, "element");
-      list.add(element);
-    }
-    return list;
-  }
-
-  private static <T> List<T> createUnmodifiableList(boolean clone, List<T> list) {
-    switch(list.size()) {
-    case 0: return Collections.emptyList();
-    case 1: return Collections.singletonList(list.get(0));
-    default:
-      if (clone) {
-        return Collections.unmodifiableList(new ArrayList<T>(list));
-      } else {
-        if (list instanceof ArrayList<?>) {
-          ((ArrayList<?>) list).trimToSize();
-        }
-        return Collections.unmodifiableList(list);
-      }
-    }
-  }
-}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableUpdatesFinished.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableUpdatesFinished.java
deleted file mode 100644
index 4ed3644..0000000
--- a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableUpdatesFinished.java
+++ /dev/null
@@ -1,385 +0,0 @@
-package org.freeplane.plugin.collaboration.client.event.batch;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import javax.annotation.Generated;
-import org.freeplane.plugin.collaboration.client.event.MapUpdated;
-
-/**
- * Immutable implementation of {@link UpdatesFinished}.
- * <p>
- * Use the builder to create immutable instances:
- * {@code ImmutableUpdatesFinished.builder()}.
- */
- at SuppressWarnings("all")
- at Generated({"Immutables.generator", "UpdatesFinished"})
-public final class ImmutableUpdatesFinished
-    implements UpdatesFinished {
-  private final String mapId;
-  private final long mapRevision;
-  private final List<MapUpdated> updateEvents;
-
-  private ImmutableUpdatesFinished(
-      String mapId,
-      long mapRevision,
-      List<MapUpdated> updateEvents) {
-    this.mapId = mapId;
-    this.mapRevision = mapRevision;
-    this.updateEvents = updateEvents;
-  }
-
-  /**
-   * @return The value of the {@code mapId} attribute
-   */
-  @JsonProperty("mapId")
-  @Override
-  public String mapId() {
-    return mapId;
-  }
-
-  /**
-   * @return The value of the {@code mapRevision} attribute
-   */
-  @JsonProperty("mapRevision")
-  @Override
-  public long mapRevision() {
-    return mapRevision;
-  }
-
-  /**
-   * @return The value of the {@code updateEvents} attribute
-   */
-  @JsonProperty("updateEvents")
-  @Override
-  public List<MapUpdated> updateEvents() {
-    return updateEvents;
-  }
-
-  /**
-   * Copy the current immutable object by setting a value for the {@link UpdatesFinished#mapId() mapId} attribute.
-   * An equals check used to prevent copying of the same value by returning {@code this}.
-   * @param mapId A new value for mapId
-   * @return A modified copy of the {@code this} object
-   */
-  public final ImmutableUpdatesFinished withMapId(String mapId) {
-    if (this.mapId.equals(mapId)) return this;
-    String newValue = Objects.requireNonNull(mapId, "mapId");
-    return new ImmutableUpdatesFinished(newValue, this.mapRevision, this.updateEvents);
-  }
-
-  /**
-   * Copy the current immutable object by setting a value for the {@link UpdatesFinished#mapRevision() mapRevision} attribute.
-   * A value equality check is used to prevent copying of the same value by returning {@code this}.
-   * @param mapRevision A new value for mapRevision
-   * @return A modified copy of the {@code this} object
-   */
-  public final ImmutableUpdatesFinished withMapRevision(long mapRevision) {
-    if (this.mapRevision == mapRevision) return this;
-    return new ImmutableUpdatesFinished(this.mapId, mapRevision, this.updateEvents);
-  }
-
-  /**
-   * Copy the current immutable object with elements that replace the content of {@link UpdatesFinished#updateEvents() updateEvents}.
-   * @param elements The elements to set
-   * @return A modified copy of {@code this} object
-   */
-  public final ImmutableUpdatesFinished withUpdateEvents(MapUpdated... elements) {
-    List<MapUpdated> newValue = createUnmodifiableList(false, createSafeList(Arrays.asList(elements), true, false));
-    return new ImmutableUpdatesFinished(this.mapId, this.mapRevision, newValue);
-  }
-
-  /**
-   * Copy the current immutable object with elements that replace the content of {@link UpdatesFinished#updateEvents() updateEvents}.
-   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
-   * @param elements An iterable of updateEvents elements to set
-   * @return A modified copy of {@code this} object
-   */
-  public final ImmutableUpdatesFinished withUpdateEvents(Iterable<? extends MapUpdated> elements) {
-    if (this.updateEvents == elements) return this;
-    List<MapUpdated> newValue = createUnmodifiableList(false, createSafeList(elements, true, false));
-    return new ImmutableUpdatesFinished(this.mapId, this.mapRevision, newValue);
-  }
-
-  /**
-   * This instance is equal to all instances of {@code ImmutableUpdatesFinished} that have equal attribute values.
-   * @return {@code true} if {@code this} is equal to {@code another} instance
-   */
-  @Override
-  public boolean equals(Object another) {
-    if (this == another) return true;
-    return another instanceof ImmutableUpdatesFinished
-        && equalTo((ImmutableUpdatesFinished) another);
-  }
-
-  private boolean equalTo(ImmutableUpdatesFinished another) {
-    return mapId.equals(another.mapId)
-        && mapRevision == another.mapRevision
-        && updateEvents.equals(another.updateEvents);
-  }
-
-  /**
-   * Computes a hash code from attributes: {@code mapId}, {@code mapRevision}, {@code updateEvents}.
-   * @return hashCode value
-   */
-  @Override
-  public int hashCode() {
-    int h = 31;
-    h = h * 17 + mapId.hashCode();
-    h = h * 17 + (int) (mapRevision ^ (mapRevision >>> 32));
-    h = h * 17 + updateEvents.hashCode();
-    return h;
-  }
-
-  /**
-   * Prints the immutable value {@code UpdatesFinished} with attribute values.
-   * @return A string representation of the value
-   */
-  @Override
-  public String toString() {
-    return "UpdatesFinished{"
-        + "mapId=" + mapId
-        + ", mapRevision=" + mapRevision
-        + ", updateEvents=" + updateEvents
-        + "}";
-  }
-
-  /**
-   * Utility type used to correctly read immutable object from JSON representation.
-   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonDeserialize
-  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
-  static final class Json implements UpdatesFinished {
-    String mapId;
-    long mapRevision;
-    boolean mapRevisionIsSet;
-    List<MapUpdated> updateEvents = Collections.emptyList();
-    @JsonProperty("mapId")
-    public void setMapId(String mapId) {
-      this.mapId = mapId;
-    }
-    @JsonProperty("mapRevision")
-    public void setMapRevision(long mapRevision) {
-      this.mapRevision = mapRevision;
-      this.mapRevisionIsSet = true;
-    }
-    @JsonProperty("updateEvents")
-    public void setUpdateEvents(List<MapUpdated> updateEvents) {
-      this.updateEvents = updateEvents;
-    }
-    @Override
-    public String mapId() { throw new UnsupportedOperationException(); }
-    @Override
-    public long mapRevision() { throw new UnsupportedOperationException(); }
-    @Override
-    public List<MapUpdated> updateEvents() { throw new UnsupportedOperationException(); }
-  }
-
-  /**
-   * @param json A JSON-bindable data structure
-   * @return An immutable value type
-   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonCreator
-  static ImmutableUpdatesFinished fromJson(Json json) {
-    ImmutableUpdatesFinished.Builder builder = ImmutableUpdatesFinished.builder();
-    if (json.mapId != null) {
-      builder.mapId(json.mapId);
-    }
-    if (json.mapRevisionIsSet) {
-      builder.mapRevision(json.mapRevision);
-    }
-    if (json.updateEvents != null) {
-      builder.addAllUpdateEvents(json.updateEvents);
-    }
-    return builder.build();
-  }
-
-  /**
-   * Creates an immutable copy of a {@link UpdatesFinished} value.
-   * Uses accessors to get values to initialize the new immutable instance.
-   * If an instance is already immutable, it is returned as is.
-   * @param instance The instance to copy
-   * @return A copied immutable UpdatesFinished instance
-   */
-  public static ImmutableUpdatesFinished copyOf(UpdatesFinished instance) {
-    if (instance instanceof ImmutableUpdatesFinished) {
-      return (ImmutableUpdatesFinished) instance;
-    }
-    return ImmutableUpdatesFinished.builder()
-        .from(instance)
-        .build();
-  }
-
-  /**
-   * Creates a builder for {@link ImmutableUpdatesFinished ImmutableUpdatesFinished}.
-   * @return A new ImmutableUpdatesFinished builder
-   */
-  public static ImmutableUpdatesFinished.Builder builder() {
-    return new ImmutableUpdatesFinished.Builder();
-  }
-
-  /**
-   * Builds instances of type {@link ImmutableUpdatesFinished ImmutableUpdatesFinished}.
-   * Initialize attributes and then invoke the {@link #build()} method to create an
-   * immutable instance.
-   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
-   * but instead used immediately to create instances.</em>
-   */
-  public static final class Builder {
-    private static final long INIT_BIT_MAP_ID = 0x1L;
-    private static final long INIT_BIT_MAP_REVISION = 0x2L;
-    private long initBits = 0x3L;
-
-    private String mapId;
-    private long mapRevision;
-    private List<MapUpdated> updateEvents = new ArrayList<MapUpdated>();
-
-    private Builder() {
-    }
-
-    /**
-     * Fill a builder with attribute values from the provided {@code UpdatesFinished} instance.
-     * Regular attribute values will be replaced with those from the given instance.
-     * Absent optional values will not replace present values.
-     * Collection elements and entries will be added, not replaced.
-     * @param instance The instance from which to copy values
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder from(UpdatesFinished instance) {
-      Objects.requireNonNull(instance, "instance");
-      mapId(instance.mapId());
-      mapRevision(instance.mapRevision());
-      addAllUpdateEvents(instance.updateEvents());
-      return this;
-    }
-
-    /**
-     * Initializes the value for the {@link UpdatesFinished#mapId() mapId} attribute.
-     * @param mapId The value for mapId 
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder mapId(String mapId) {
-      this.mapId = Objects.requireNonNull(mapId, "mapId");
-      initBits &= ~INIT_BIT_MAP_ID;
-      return this;
-    }
-
-    /**
-     * Initializes the value for the {@link UpdatesFinished#mapRevision() mapRevision} attribute.
-     * @param mapRevision The value for mapRevision 
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder mapRevision(long mapRevision) {
-      this.mapRevision = mapRevision;
-      initBits &= ~INIT_BIT_MAP_REVISION;
-      return this;
-    }
-
-    /**
-     * Adds one element to {@link UpdatesFinished#updateEvents() updateEvents} list.
-     * @param element A updateEvents element
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder addUpdateEvents(MapUpdated element) {
-      this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
-      return this;
-    }
-
-    /**
-     * Adds elements to {@link UpdatesFinished#updateEvents() updateEvents} list.
-     * @param elements An array of updateEvents elements
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder addUpdateEvents(MapUpdated... elements) {
-      for (MapUpdated element : elements) {
-        this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
-      }
-      return this;
-    }
-
-    /**
-     * Sets or replaces all elements for {@link UpdatesFinished#updateEvents() updateEvents} list.
-     * @param elements An iterable of updateEvents elements
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder updateEvents(Iterable<? extends MapUpdated> elements) {
-      this.updateEvents.clear();
-      return addAllUpdateEvents(elements);
-    }
-
-    /**
-     * Adds elements to {@link UpdatesFinished#updateEvents() updateEvents} list.
-     * @param elements An iterable of updateEvents elements
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder addAllUpdateEvents(Iterable<? extends MapUpdated> elements) {
-      for (MapUpdated element : elements) {
-        this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
-      }
-      return this;
-    }
-
-    /**
-     * Builds a new {@link ImmutableUpdatesFinished ImmutableUpdatesFinished}.
-     * @return An immutable instance of UpdatesFinished
-     * @throws java.lang.IllegalStateException if any required attributes are missing
-     */
-    public ImmutableUpdatesFinished build() {
-      if (initBits != 0) {
-        throw new IllegalStateException(formatRequiredAttributesMessage());
-      }
-      return new ImmutableUpdatesFinished(mapId, mapRevision, createUnmodifiableList(true, updateEvents));
-    }
-
-    private String formatRequiredAttributesMessage() {
-      List<String> attributes = new ArrayList<String>();
-      if ((initBits & INIT_BIT_MAP_ID) != 0) attributes.add("mapId");
-      if ((initBits & INIT_BIT_MAP_REVISION) != 0) attributes.add("mapRevision");
-      return "Cannot build UpdatesFinished, some of required attributes are not set " + attributes;
-    }
-  }
-
-  private static <T> List<T> createSafeList(Iterable<? extends T> iterable, boolean checkNulls, boolean skipNulls) {
-    ArrayList<T> list;
-    if (iterable instanceof Collection<?>) {
-      int size = ((Collection<?>) iterable).size();
-      if (size == 0) return Collections.emptyList();
-      list = new ArrayList<T>();
-    } else {
-      list = new ArrayList<T>();
-    }
-    for (T element : iterable) {
-      if (skipNulls && element == null) continue;
-      if (checkNulls) Objects.requireNonNull(element, "element");
-      list.add(element);
-    }
-    return list;
-  }
-
-  private static <T> List<T> createUnmodifiableList(boolean clone, List<T> list) {
-    switch(list.size()) {
-    case 0: return Collections.emptyList();
-    case 1: return Collections.singletonList(list.get(0));
-    default:
-      if (clone) {
-        return Collections.unmodifiableList(new ArrayList<T>(list));
-      } else {
-        if (list instanceof ArrayList<?>) {
-          ((ArrayList<?>) list).trimToSize();
-        }
-        return Collections.unmodifiableList(list);
-      }
-    }
-  }
-}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ModifiableUpdateHeaderExtension.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ModifiableUpdateHeaderExtension.java
deleted file mode 100644
index 4f0ff1f..0000000
--- a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ModifiableUpdateHeaderExtension.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package org.freeplane.plugin.collaboration.client.event.batch;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import javax.annotation.Generated;
-
-/**
- * A modifiable implementation of the {@link UpdateHeaderExtension UpdateHeaderExtension} type.
- * <p>Use the {@link #create()} static factory methods to create new instances.
- * <p><em>ModifiableUpdateHeaderExtension is not thread-safe</em>
- */
- at SuppressWarnings("all")
- at Generated({"Modifiables.generator", "UpdateHeaderExtension"})
-public final class ModifiableUpdateHeaderExtension
-    implements UpdateHeaderExtension {
-  private static final long INIT_BIT_MAP_ID = 0x1L;
-  private static final long INIT_BIT_MAP_REVISION = 0x2L;
-  private long initBits = 0x3L;
-
-  private String mapId;
-  private long mapRevision;
-
-  private ModifiableUpdateHeaderExtension() {}
-
-  /**
-   * Construct a modifiable instance of {@code UpdateHeaderExtension}.
-   * @return A new modifiable instance
-   */
-  public static ModifiableUpdateHeaderExtension create() {
-    return new ModifiableUpdateHeaderExtension();
-  }
-
-  /**
-   * @return value of {@code mapId} attribute
-   */
-  @Override
-  public final String mapId() {
-    if (!mapIdIsSet()) {
-      checkRequiredAttributes();
-    }
-    return mapId;
-  }
-
-  /**
-   * @return value of {@code mapRevision} attribute
-   */
-  @Override
-  public final long mapRevision() {
-    if (!mapRevisionIsSet()) {
-      checkRequiredAttributes();
-    }
-    return mapRevision;
-  }
-
-  /**
-   * Clears the object by setting all attributes to their initial values.
-   * @return {@code this} for use in a chained invocation
-   */
-  public ModifiableUpdateHeaderExtension clear() {
-    initBits = 0x3L;
-    mapId = null;
-    mapRevision = 0;
-    return this;
-  }
-
-  /**
-   * Fill this modifiable instance with attribute values from the provided {@link UpdateHeaderExtension} instance.
-   * Regular attribute values will be overridden, i.e. replaced with ones of an instance.
-   * Any of the instance's absent optional values will not be copied (will not override current values).
-   * @param instance The instance from which to copy values
-   * @return {@code this} for use in a chained invocation
-   */
-  public ModifiableUpdateHeaderExtension from(UpdateHeaderExtension instance) {
-    Objects.requireNonNull(instance, "instance");
-    setMapId(instance.mapId());
-    setMapRevision(instance.mapRevision());
-    return this;
-  }
-
-  /**
-   * Assigns a value to the {@code mapId} attribute.
-   * @param mapId The value for mapId
-   * @return {@code this} for use in a chained invocation
-   */
-  public ModifiableUpdateHeaderExtension setMapId(String mapId) {
-    this.mapId = Objects.requireNonNull(mapId, "mapId");
-    initBits &= ~INIT_BIT_MAP_ID;
-    return this;
-  }
-
-  /**
-   * Assigns a value to the {@code mapRevision} attribute.
-   * @param mapRevision The value for mapRevision
-   * @return {@code this} for use in a chained invocation
-   */
-  public ModifiableUpdateHeaderExtension setMapRevision(long mapRevision) {
-    this.mapRevision = mapRevision;
-    initBits &= ~INIT_BIT_MAP_REVISION;
-    return this;
-  }
-
-  /**
-   * Returns {@code true} if the required attribute {@code mapId} is set.
-   * @return {@code true} if set
-   */
-  public final boolean mapIdIsSet() {
-    return (initBits & INIT_BIT_MAP_ID) == 0;
-  }
-
-  /**
-   * Returns {@code true} if the required attribute {@code mapRevision} is set.
-   * @return {@code true} if set
-   */
-  public final boolean mapRevisionIsSet() {
-    return (initBits & INIT_BIT_MAP_REVISION) == 0;
-  }
-
-  /**
-   * Returns {@code true} if all required attributes are set, indicating that the object is initialized.
-   * @return {@code true} if set
-   */
-  public final boolean isInitialized() {
-    return initBits == 0;
-  }
-
-  private void checkRequiredAttributes() {
-    if (!isInitialized()) {
-      throw new IllegalStateException(formatRequiredAttributesMessage());
-    }
-  }
-
-  private String formatRequiredAttributesMessage() {
-    List<String> attributes = new ArrayList<String>();
-    if (!mapIdIsSet()) attributes.add("mapId");
-    if (!mapRevisionIsSet()) attributes.add("mapRevision");
-    return "UpdateHeaderExtension in not initialized, some of the required attributes are not set " + attributes;
-  }
-
-  /**
-   * This instance is equal to all instances of {@code ModifiableUpdateHeaderExtension} that have equal attribute values.
-   * An uninitialized instance is equal only to itself.
-   * @return {@code true} if {@code this} is equal to {@code another} instance
-   */
-  @Override
-  public boolean equals(Object another) {
-    if (this == another) return true;
-    if (!(another instanceof ModifiableUpdateHeaderExtension)) return false;
-    ModifiableUpdateHeaderExtension other = (ModifiableUpdateHeaderExtension) another;
-    if (!isInitialized() || !other.isInitialized()) {
-      return false;
-    }
-    return equalTo(other);
-  }
-
-  private boolean equalTo(ModifiableUpdateHeaderExtension another) {
-    return mapId.equals(another.mapId)
-        && mapRevision == another.mapRevision;
-  }
-
-  /**
-   * Computes a hash code from attributes: {@code mapId}, {@code mapRevision}.
-   * @return hashCode value
-   */
-  @Override
-  public int hashCode() {
-    int h = 31;
-    h = h * 17 + mapId.hashCode();
-    h = h * 17 + (int) (mapRevision ^ (mapRevision >>> 32));
-    return h;
-  }
-
-  /**
-   * Generates a string representation of this {@code UpdateHeaderExtension}.
-   * If uninitialized, some attribute values may appear as question marks.
-   * @return A string representation
-   */
-  @Override
-  public String toString() {
-    return "ModifiableUpdateHeaderExtension{"
-        + "mapId="  + (mapIdIsSet() ? mapId() : "?")
-        + ", mapRevision="  + (mapRevisionIsSet() ? mapRevision() : "?")
-        + "}";
-  }
-}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableChildrenUpdated.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableChildrenUpdated.java
deleted file mode 100644
index 2ec1100..0000000
--- a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableChildrenUpdated.java
+++ /dev/null
@@ -1,350 +0,0 @@
-package org.freeplane.plugin.collaboration.client.event.children;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import javax.annotation.Generated;
-import org.freeplane.plugin.collaboration.client.event.NodeUpdated;
-
-/**
- * Immutable implementation of {@link ChildrenUpdated}.
- * <p>
- * Use the builder to create immutable instances:
- * {@code ImmutableChildrenUpdated.builder()}.
- */
- at SuppressWarnings("all")
- at Generated({"Immutables.generator", "ChildrenUpdated"})
-public final class ImmutableChildrenUpdated
-    implements ChildrenUpdated {
-  private final List<String> content;
-  private final String nodeId;
-
-  private ImmutableChildrenUpdated(List<String> content, String nodeId) {
-    this.content = content;
-    this.nodeId = nodeId;
-  }
-
-  /**
-   * @return The value of the {@code content} attribute
-   */
-  @JsonProperty("content")
-  @Override
-  public List<String> content() {
-    return content;
-  }
-
-  /**
-   * @return The value of the {@code nodeId} attribute
-   */
-  @JsonProperty("nodeId")
-  @Override
-  public String nodeId() {
-    return nodeId;
-  }
-
-  /**
-   * Copy the current immutable object with elements that replace the content of {@link ChildrenUpdated#content() content}.
-   * @param elements The elements to set
-   * @return A modified copy of {@code this} object
-   */
-  public final ImmutableChildrenUpdated withContent(String... elements) {
-    List<String> newValue = createUnmodifiableList(false, createSafeList(Arrays.asList(elements), true, false));
-    return new ImmutableChildrenUpdated(newValue, this.nodeId);
-  }
-
-  /**
-   * Copy the current immutable object with elements that replace the content of {@link ChildrenUpdated#content() content}.
-   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
-   * @param elements An iterable of content elements to set
-   * @return A modified copy of {@code this} object
-   */
-  public final ImmutableChildrenUpdated withContent(Iterable<String> elements) {
-    if (this.content == elements) return this;
-    List<String> newValue = createUnmodifiableList(false, createSafeList(elements, true, false));
-    return new ImmutableChildrenUpdated(newValue, this.nodeId);
-  }
-
-  /**
-   * Copy the current immutable object by setting a value for the {@link ChildrenUpdated#nodeId() nodeId} attribute.
-   * An equals check used to prevent copying of the same value by returning {@code this}.
-   * @param nodeId A new value for nodeId
-   * @return A modified copy of the {@code this} object
-   */
-  public final ImmutableChildrenUpdated withNodeId(String nodeId) {
-    if (this.nodeId.equals(nodeId)) return this;
-    String newValue = Objects.requireNonNull(nodeId, "nodeId");
-    return new ImmutableChildrenUpdated(this.content, newValue);
-  }
-
-  /**
-   * This instance is equal to all instances of {@code ImmutableChildrenUpdated} that have equal attribute values.
-   * @return {@code true} if {@code this} is equal to {@code another} instance
-   */
-  @Override
-  public boolean equals(Object another) {
-    if (this == another) return true;
-    return another instanceof ImmutableChildrenUpdated
-        && equalTo((ImmutableChildrenUpdated) another);
-  }
-
-  private boolean equalTo(ImmutableChildrenUpdated another) {
-    return content.equals(another.content)
-        && nodeId.equals(another.nodeId);
-  }
-
-  /**
-   * Computes a hash code from attributes: {@code content}, {@code nodeId}.
-   * @return hashCode value
-   */
-  @Override
-  public int hashCode() {
-    int h = 31;
-    h = h * 17 + content.hashCode();
-    h = h * 17 + nodeId.hashCode();
-    return h;
-  }
-
-  /**
-   * Prints the immutable value {@code ChildrenUpdated} with attribute values.
-   * @return A string representation of the value
-   */
-  @Override
-  public String toString() {
-    return "ChildrenUpdated{"
-        + "content=" + content
-        + ", nodeId=" + nodeId
-        + "}";
-  }
-
-  /**
-   * Utility type used to correctly read immutable object from JSON representation.
-   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonDeserialize
-  @JsonTypeInfo(use=JsonTypeInfo.Id.NONE)
-  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
-  static final class Json implements ChildrenUpdated {
-    List<String> content = Collections.emptyList();
-    String nodeId;
-    @JsonProperty("content")
-    public void setContent(List<String> content) {
-      this.content = content;
-    }
-    @JsonProperty("nodeId")
-    public void setNodeId(String nodeId) {
-      this.nodeId = nodeId;
-    }
-    @Override
-    public List<String> content() { throw new UnsupportedOperationException(); }
-    @Override
-    public String nodeId() { throw new UnsupportedOperationException(); }
-  }
-
-  /**
-   * @param json A JSON-bindable data structure
-   * @return An immutable value type
-   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonCreator
-  static ImmutableChildrenUpdated fromJson(Json json) {
-    ImmutableChildrenUpdated.Builder builder = ImmutableChildrenUpdated.builder();
-    if (json.content != null) {
-      builder.addAllContent(json.content);
-    }
-    if (json.nodeId != null) {
-      builder.nodeId(json.nodeId);
-    }
-    return builder.build();
-  }
-
-  /**
-   * Creates an immutable copy of a {@link ChildrenUpdated} value.
-   * Uses accessors to get values to initialize the new immutable instance.
-   * If an instance is already immutable, it is returned as is.
-   * @param instance The instance to copy
-   * @return A copied immutable ChildrenUpdated instance
-   */
-  public static ImmutableChildrenUpdated copyOf(ChildrenUpdated instance) {
-    if (instance instanceof ImmutableChildrenUpdated) {
-      return (ImmutableChildrenUpdated) instance;
-    }
-    return ImmutableChildrenUpdated.builder()
-        .from(instance)
-        .build();
-  }
-
-  /**
-   * Creates a builder for {@link ImmutableChildrenUpdated ImmutableChildrenUpdated}.
-   * @return A new ImmutableChildrenUpdated builder
-   */
-  public static ImmutableChildrenUpdated.Builder builder() {
-    return new ImmutableChildrenUpdated.Builder();
-  }
-
-  /**
-   * Builds instances of type {@link ImmutableChildrenUpdated ImmutableChildrenUpdated}.
-   * Initialize attributes and then invoke the {@link #build()} method to create an
-   * immutable instance.
-   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
-   * but instead used immediately to create instances.</em>
-   */
-  public static final class Builder {
-    private static final long INIT_BIT_NODE_ID = 0x1L;
-    private long initBits = 0x1L;
-
-    private List<String> content = new ArrayList<String>();
-    private String nodeId;
-
-    private Builder() {
-    }
-
-    /**
-     * Fill a builder with attribute values from the provided {@code org.freeplane.plugin.collaboration.client.event.children.ChildrenUpdated} instance.
-     * @param instance The instance from which to copy values
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder from(ChildrenUpdated instance) {
-      Objects.requireNonNull(instance, "instance");
-      from((Object) instance);
-      return this;
-    }
-
-    /**
-     * Fill a builder with attribute values from the provided {@code org.freeplane.plugin.collaboration.client.event.NodeUpdated} instance.
-     * @param instance The instance from which to copy values
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder from(NodeUpdated instance) {
-      Objects.requireNonNull(instance, "instance");
-      from((Object) instance);
-      return this;
-    }
-
-    private void from(Object object) {
-      if (object instanceof ChildrenUpdated) {
-        ChildrenUpdated instance = (ChildrenUpdated) object;
-        addAllContent(instance.content());
-      }
-      if (object instanceof NodeUpdated) {
-        NodeUpdated instance = (NodeUpdated) object;
-        nodeId(instance.nodeId());
-      }
-    }
-
-    /**
-     * Adds one element to {@link ChildrenUpdated#content() content} list.
-     * @param element A content element
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder addContent(String element) {
-      this.content.add(Objects.requireNonNull(element, "content element"));
-      return this;
-    }
-
-    /**
-     * Adds elements to {@link ChildrenUpdated#content() content} list.
-     * @param elements An array of content elements
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder addContent(String... elements) {
-      for (String element : elements) {
-        this.content.add(Objects.requireNonNull(element, "content element"));
-      }
-      return this;
-    }
-
-    /**
-     * Sets or replaces all elements for {@link ChildrenUpdated#content() content} list.
-     * @param elements An iterable of content elements
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder content(Iterable<String> elements) {
-      this.content.clear();
-      return addAllContent(elements);
-    }
-
-    /**
-     * Adds elements to {@link ChildrenUpdated#content() content} list.
-     * @param elements An iterable of content elements
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder addAllContent(Iterable<String> elements) {
-      for (String element : elements) {
-        this.content.add(Objects.requireNonNull(element, "content element"));
-      }
-      return this;
-    }
-
-    /**
-     * Initializes the value for the {@link ChildrenUpdated#nodeId() nodeId} attribute.
-     * @param nodeId The value for nodeId 
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder nodeId(String nodeId) {
-      this.nodeId = Objects.requireNonNull(nodeId, "nodeId");
-      initBits &= ~INIT_BIT_NODE_ID;
-      return this;
-    }
-
-    /**
-     * Builds a new {@link ImmutableChildrenUpdated ImmutableChildrenUpdated}.
-     * @return An immutable instance of ChildrenUpdated
-     * @throws java.lang.IllegalStateException if any required attributes are missing
-     */
-    public ImmutableChildrenUpdated build() {
-      if (initBits != 0) {
-        throw new IllegalStateException(formatRequiredAttributesMessage());
-      }
-      return new ImmutableChildrenUpdated(createUnmodifiableList(true, content), nodeId);
-    }
-
-    private String formatRequiredAttributesMessage() {
-      List<String> attributes = new ArrayList<String>();
-      if ((initBits & INIT_BIT_NODE_ID) != 0) attributes.add("nodeId");
-      return "Cannot build ChildrenUpdated, some of required attributes are not set " + attributes;
-    }
-  }
-
-  private static <T> List<T> createSafeList(Iterable<? extends T> iterable, boolean checkNulls, boolean skipNulls) {
-    ArrayList<T> list;
-    if (iterable instanceof Collection<?>) {
-      int size = ((Collection<?>) iterable).size();
-      if (size == 0) return Collections.emptyList();
-      list = new ArrayList<T>();
-    } else {
-      list = new ArrayList<T>();
-    }
-    for (T element : iterable) {
-      if (skipNulls && element == null) continue;
-      if (checkNulls) Objects.requireNonNull(element, "element");
-      list.add(element);
-    }
-    return list;
-  }
-
-  private static <T> List<T> createUnmodifiableList(boolean clone, List<T> list) {
-    switch(list.size()) {
-    case 0: return Collections.emptyList();
-    case 1: return Collections.singletonList(list.get(0));
-    default:
-      if (clone) {
-        return Collections.unmodifiableList(new ArrayList<T>(list));
-      } else {
-        if (list instanceof ArrayList<?>) {
-          ((ArrayList<?>) list).trimToSize();
-        }
-        return Collections.unmodifiableList(list);
-      }
-    }
-  }
-}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableSpecialNodeTypeSet.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableSpecialNodeTypeSet.java
deleted file mode 100644
index cc92d7d..0000000
--- a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableSpecialNodeTypeSet.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package org.freeplane.plugin.collaboration.client.event.children;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import javax.annotation.Generated;
-import org.freeplane.plugin.collaboration.client.event.NodeUpdated;
-
-/**
- * Immutable implementation of {@link SpecialNodeTypeSet}.
- * <p>
- * Use the builder to create immutable instances:
- * {@code ImmutableSpecialNodeTypeSet.builder()}.
- */
- at SuppressWarnings("all")
- at Generated({"Immutables.generator", "SpecialNodeTypeSet"})
-public final class ImmutableSpecialNodeTypeSet
-    implements SpecialNodeTypeSet {
-  private final SpecialNodeTypeSet.SpecialNodeType content;
-  private final String nodeId;
-
-  private ImmutableSpecialNodeTypeSet(
-      SpecialNodeTypeSet.SpecialNodeType content,
-      String nodeId) {
-    this.content = content;
-    this.nodeId = nodeId;
-  }
-
-  /**
-   * @return The value of the {@code content} attribute
-   */
-  @JsonProperty("content")
-  @Override
-  public SpecialNodeTypeSet.SpecialNodeType content() {
-    return content;
-  }
-
-  /**
-   * @return The value of the {@code nodeId} attribute
-   */
-  @JsonProperty("nodeId")
-  @Override
-  public String nodeId() {
-    return nodeId;
-  }
-
-  /**
-   * Copy the current immutable object by setting a value for the {@link SpecialNodeTypeSet#content() content} attribute.
-   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
-   * @param content A new value for content
-   * @return A modified copy of the {@code this} object
-   */
-  public final ImmutableSpecialNodeTypeSet withContent(SpecialNodeTypeSet.SpecialNodeType content) {
-    if (this.content == content) return this;
-    SpecialNodeTypeSet.SpecialNodeType newValue = Objects.requireNonNull(content, "content");
-    return new ImmutableSpecialNodeTypeSet(newValue, this.nodeId);
-  }
-
-  /**
-   * Copy the current immutable object by setting a value for the {@link SpecialNodeTypeSet#nodeId() nodeId} attribute.
-   * An equals check used to prevent copying of the same value by returning {@code this}.
-   * @param nodeId A new value for nodeId
-   * @return A modified copy of the {@code this} object
-   */
-  public final ImmutableSpecialNodeTypeSet withNodeId(String nodeId) {
-    if (this.nodeId.equals(nodeId)) return this;
-    String newValue = Objects.requireNonNull(nodeId, "nodeId");
-    return new ImmutableSpecialNodeTypeSet(this.content, newValue);
-  }
-
-  /**
-   * This instance is equal to all instances of {@code ImmutableSpecialNodeTypeSet} that have equal attribute values.
-   * @return {@code true} if {@code this} is equal to {@code another} instance
-   */
-  @Override
-  public boolean equals(Object another) {
-    if (this == another) return true;
-    return another instanceof ImmutableSpecialNodeTypeSet
-        && equalTo((ImmutableSpecialNodeTypeSet) another);
-  }
-
-  private boolean equalTo(ImmutableSpecialNodeTypeSet another) {
-    return content.equals(another.content)
-        && nodeId.equals(another.nodeId);
-  }
-
-  /**
-   * Computes a hash code from attributes: {@code content}, {@code nodeId}.
-   * @return hashCode value
-   */
-  @Override
-  public int hashCode() {
-    int h = 31;
-    h = h * 17 + content.hashCode();
-    h = h * 17 + nodeId.hashCode();
-    return h;
-  }
-
-  /**
-   * Prints the immutable value {@code SpecialNodeTypeSet} with attribute values.
-   * @return A string representation of the value
-   */
-  @Override
-  public String toString() {
-    return "SpecialNodeTypeSet{"
-        + "content=" + content
-        + ", nodeId=" + nodeId
-        + "}";
-  }
-
-  /**
-   * Utility type used to correctly read immutable object from JSON representation.
-   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonDeserialize
-  @JsonTypeInfo(use=JsonTypeInfo.Id.NONE)
-  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
-  static final class Json
-      implements SpecialNodeTypeSet {
-    SpecialNodeTypeSet.SpecialNodeType content;
-    String nodeId;
-    @JsonProperty("content")
-    public void setContent(SpecialNodeTypeSet.SpecialNodeType content) {
-      this.content = content;
-    }
-    @JsonProperty("nodeId")
-    public void setNodeId(String nodeId) {
-      this.nodeId = nodeId;
-    }
-    @Override
-    public SpecialNodeTypeSet.SpecialNodeType content() { throw new UnsupportedOperationException(); }
-    @Override
-    public String nodeId() { throw new UnsupportedOperationException(); }
-  }
-
-  /**
-   * @param json A JSON-bindable data structure
-   * @return An immutable value type
-   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
-   */
-  @Deprecated
-  @JsonCreator
-  static ImmutableSpecialNodeTypeSet fromJson(Json json) {
-    ImmutableSpecialNodeTypeSet.Builder builder = ImmutableSpecialNodeTypeSet.builder();
-    if (json.content != null) {
-      builder.content(json.content);
-    }
-    if (json.nodeId != null) {
-      builder.nodeId(json.nodeId);
-    }
-    return builder.build();
-  }
-
-  /**
-   * Creates an immutable copy of a {@link SpecialNodeTypeSet} value.
-   * Uses accessors to get values to initialize the new immutable instance.
-   * If an instance is already immutable, it is returned as is.
-   * @param instance The instance to copy
-   * @return A copied immutable SpecialNodeTypeSet instance
-   */
-  public static ImmutableSpecialNodeTypeSet copyOf(SpecialNodeTypeSet instance) {
-    if (instance instanceof ImmutableSpecialNodeTypeSet) {
-      return (ImmutableSpecialNodeTypeSet) instance;
-    }
-    return ImmutableSpecialNodeTypeSet.builder()
-        .from(instance)
-        .build();
-  }
-
-  /**
-   * Creates a builder for {@link ImmutableSpecialNodeTypeSet ImmutableSpecialNodeTypeSet}.
-   * @return A new ImmutableSpecialNodeTypeSet builder
-   */
-  public static ImmutableSpecialNodeTypeSet.Builder builder() {
-    return new ImmutableSpecialNodeTypeSet.Builder();
-  }
-
-  /**
-   * Builds instances of type {@link ImmutableSpecialNodeTypeSet ImmutableSpecialNodeTypeSet}.
-   * Initialize attributes and then invoke the {@link #build()} method to create an
-   * immutable instance.
-   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
-   * but instead used immediately to create instances.</em>
-   */
-  public static final class Builder {
-    private static final long INIT_BIT_CONTENT = 0x1L;
-    private static final long INIT_BIT_NODE_ID = 0x2L;
-    private long initBits = 0x3L;
-
-    private SpecialNodeTypeSet.SpecialNodeType content;
-    private String nodeId;
-
-    private Builder() {
-    }
-
-    /**
-     * Fill a builder with attribute values from the provided {@code org.freeplane.plugin.collaboration.client.event.NodeUpdated} instance.
-     * @param instance The instance from which to copy values
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder from(NodeUpdated instance) {
-      Objects.requireNonNull(instance, "instance");
-      from((Object) instance);
-      return this;
-    }
-
-    /**
-     * Fill a builder with attribute values from the provided {@code org.freeplane.plugin.collaboration.client.event.children.SpecialNodeTypeSet} instance.
-     * @param instance The instance from which to copy values
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder from(SpecialNodeTypeSet instance) {
-      Objects.requireNonNull(instance, "instance");
-      from((Object) instance);
-      return this;
-    }
-
-    private void from(Object object) {
-      if (object instanceof NodeUpdated) {
-        NodeUpdated instance = (NodeUpdated) object;
-        nodeId(instance.nodeId());
-      }
-      if (object instanceof SpecialNodeTypeSet) {
-        SpecialNodeTypeSet instance = (SpecialNodeTypeSet) object;
-        content(instance.content());
-      }
-    }
-
-    /**
-     * Initializes the value for the {@link SpecialNodeTypeSet#content() content} attribute.
-     * @param content The value for content 
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder content(SpecialNodeTypeSet.SpecialNodeType content) {
-      this.content = Objects.requireNonNull(content, "content");
-      initBits &= ~INIT_BIT_CONTENT;
-      return this;
-    }
-
-    /**
-     * Initializes the value for the {@link SpecialNodeTypeSet#nodeId() nodeId} attribute.
-     * @param nodeId The value for nodeId 
-     * @return {@code this} builder for use in a chained invocation
-     */
-    public final Builder nodeId(String nodeId) {
-      this.nodeId = Objects.requireNonNull(nodeId, "nodeId");
-      initBits &= ~INIT_BIT_NODE_ID;
-      return this;
-    }
-
-    /**
-     * Builds a new {@link ImmutableSpecialNodeTypeSet ImmutableSpecialNodeTypeSet}.
-     * @return An immutable instance of SpecialNodeTypeSet
-     * @throws java.lang.IllegalStateException if any required attributes are missing
-     */
-    public ImmutableSpecialNodeTypeSet build() {
-      if (initBits != 0) {
-        throw new IllegalStateException(formatRequiredAttributesMessage());
-      }
-      return new ImmutableSpecialNodeTypeSet(content, nodeId);
-    }
-
-    private String formatRequiredAttributesMessage() {
-      List<String> attributes = new ArrayList<String>();
-      if ((initBits & INIT_BIT_CONTENT) != 0) attributes.add("content");
-      if ((initBits & INIT_BIT_NODE_ID) != 0) attributes.add("nodeId");
-      return "Cannot build SpecialNodeTypeSet, some of required attributes are not set " + attributes;
-    }
-  }
-}
diff --git a/freeplane_plugin_formula/src/main/java/org/freeplane/plugin/formula/FormulaEditor.java b/freeplane_plugin_formula/src/main/java/org/freeplane/plugin/formula/FormulaEditor.java
index 47fc252..b67ba1c 100644
--- a/freeplane_plugin_formula/src/main/java/org/freeplane/plugin/formula/FormulaEditor.java
+++ b/freeplane_plugin_formula/src/main/java/org/freeplane/plugin/formula/FormulaEditor.java
@@ -58,4 +58,4 @@ class FormulaEditor extends EditNodeDialog implements INodeSelector {
 		textEditor.replaceSelection(id);
 	    textEditor.requestFocus();
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane_plugin_latex/build.gradle b/freeplane_plugin_latex/build.gradle
index 3825831..7b1b054 100644
--- a/freeplane_plugin_latex/build.gradle
+++ b/freeplane_plugin_latex/build.gradle
@@ -1,8 +1,9 @@
 dependencies {
     compile project(':freeplane')
     compile project(':freeplane_plugin_jsyntaxpane')
-    // from flatDir "localGitDepsRepository" (jlatexmath-1.0.3 is not in maven!)
-    compile ':jlatexmath-1.0.3'
+    compile 'org.scilab.forge:jlatexmath:1.0.6'
+    compile 'org.scilab.forge:jlatexmath-font-greek:1.0.6'
+    compile 'org.scilab.forge:jlatexmath-font-cyrillic:1.0.6'
 }
 
 jar {
diff --git a/freeplane_plugin_latex/src/main/java/org/freeplane/plugin/latex/LatexEditor.java b/freeplane_plugin_latex/src/main/java/org/freeplane/plugin/latex/LatexEditor.java
index 4b5ca05..ae2face 100644
--- a/freeplane_plugin_latex/src/main/java/org/freeplane/plugin/latex/LatexEditor.java
+++ b/freeplane_plugin_latex/src/main/java/org/freeplane/plugin/latex/LatexEditor.java
@@ -36,4 +36,4 @@ class LatexEditor extends EditNodeDialog {
 	    super(nodeModel, text, firstEvent, editControl, enableSplit, textEditor);
 	    super.setModal(false);
     }
-}
+}
\ No newline at end of file
diff --git a/freeplane_plugin_script/build.gradle b/freeplane_plugin_script/build.gradle
index 2d9248b..4b73062 100644
--- a/freeplane_plugin_script/build.gradle
+++ b/freeplane_plugin_script/build.gradle
@@ -9,7 +9,8 @@ dependencies {
 }
 
 tasks.withType(JavaCompile) {
-	options.compilerArgs << '-parameters'
+	if (JavaVersion.current().isJava8Compatible())
+		options.compilerArgs << '-parameters'
 }
 
 jar {
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/IFreeplaneScriptErrorHandler.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/IFreeplaneScriptErrorHandler.java
index b61161d..904d7b6 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/IFreeplaneScriptErrorHandler.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/IFreeplaneScriptErrorHandler.java
@@ -25,4 +25,4 @@ package org.freeplane.plugin.script;
  */
 public interface IFreeplaneScriptErrorHandler {
 	void gotoLine(int pLineNumber);
-}
+}
\ No newline at end of file
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptClassLoader.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptClassLoader.java
index a60cf9b..82ca037 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptClassLoader.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptClassLoader.java
@@ -103,4 +103,4 @@ public final class ScriptClassLoader extends URLClassLoader {
 	public boolean implies(Permission permission) {
 		return securityManager != null && securityManager.implies(permission);
 	}	
-}
+}
\ No newline at end of file
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptRenderer.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptRenderer.java
index 197e94d..9c1c2c0 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptRenderer.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptRenderer.java
@@ -63,4 +63,4 @@ public class  ScriptRenderer extends DefaultListCellRenderer{
 		return preferredSize;
     }
 	
-}
+}
\ No newline at end of file
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java
index bbbde5a..ecb19f8 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java
@@ -112,4 +112,4 @@ class ScriptingPolicy extends Policy {
 		ScriptClassLoader.class.getClassLoader();
 		Policy.setPolicy(new ScriptingPolicy(Policy.getPolicy()));
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/ButtonsInCellRenderer.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/ButtonsInCellRenderer.java
index 3651405..424b207 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/ButtonsInCellRenderer.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/ButtonsInCellRenderer.java
@@ -157,4 +157,4 @@ class ButtonsInCellRenderer extends AbstractCellEditor implements TableCellRende
 
 	public void mouseExited(MouseEvent e) {
 	}
-}
+}
\ No newline at end of file
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/defaults.properties b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/defaults.properties
index bf6ebad..8394b3d 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/defaults.properties
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/defaults.properties
@@ -6,4 +6,4 @@ execute_scripts_without_exec_restriction = false
 signed_script_are_trusted = true
 script_user_key_name_for_signing = FreeplaneScriptKey
 script_directories =
-script_classpath = 
+script_classpath = 
\ No newline at end of file
diff --git a/freeplane_plugin_svg/build.gradle b/freeplane_plugin_svg/build.gradle
index 70b36d3..909de8c 100644
--- a/freeplane_plugin_svg/build.gradle
+++ b/freeplane_plugin_svg/build.gradle
@@ -1,43 +1,36 @@
 dependencies {
     compile project(':freeplane')
 
-    compile 'org.apache.xmlgraphics:batik-anim:1.7',
-            'org.apache.xmlgraphics:batik-awt-util:1.7',
-            'org.apache.xmlgraphics:batik-bridge:1.7',
-            'org.apache.xmlgraphics:batik-codec:1.7',
-            'org.apache.xmlgraphics:batik-css:1.7',
-            'org.apache.xmlgraphics:batik-dom:1.7',
-            'org.apache.xmlgraphics:batik-extension:1.7',
-            'org.apache.xmlgraphics:batik-ext:1.7',
-            'org.apache.xmlgraphics:batik-gui-util:1.7',
-            'org.apache.xmlgraphics:batik-gvt:1.7',
-            'org.apache.xmlgraphics:batik-parser:1.7',
-            'org.apache.xmlgraphics:batik-script:1.7',
-            'org.apache.xmlgraphics:batik-svg-dom:1.7',
-            'org.apache.xmlgraphics:batik-svggen:1.7',
-            'org.apache.xmlgraphics:batik-swing:1.7',
-            'org.apache.xmlgraphics:batik-transcoder:1.7',
-            'org.apache.xmlgraphics:batik-util:1.7',
-            'org.apache.xmlgraphics:batik-xml:1.7',
+	// libbatik-java / batik-*.jar:
+	compile 'org.apache.xmlgraphics:batik-all:1.9.1'
+	
+	// libxml-commons-external-java 1.4.01:
+	// org.w3c.dom.svg.SVGDocument
+	//compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.2': does not help!
+	compile 'xml-apis:xml-apis:1.4.01'
+	compile 'xml-apis:xml-apis-ext:1.3.04'
+	
+	// org.apache.xmlgraphics.java2d.color.NamedColorSpace
+	// libxmlgraphics-commons-java / xmlgraphics-commons.jar:
+	compile group: 'org.apache.xmlgraphics', name: 'xmlgraphics-commons', version: '2.2'
 
-            'org.mozilla:rhino:1.7R4', // "js.jar"/librhino-java
+	// libfop-java / fop.jar:
+	compile group: 'org.apache.xmlgraphics', name: 'fop', version: '2.1'
 
-            // cannot pull this due to broken "avalon" dependency
-            // (replaced by ./lib/pdf-transcoder.jar below):
-            //'org.apache.xmlgraphics:fop:1.1', // "fop.jar"/libfop-java
+	// libavalon-framework-java / avalon-framework.jar:
+	// PDF problem: org.apache.avalon.framework.configuration.Configurable
+	compile group: 'org.apache.avalon.framework', name: 'avalon-framework-api', version: '4.3.1'
+	// PDF problem: org.apache.avalon.framework.configuration.DefaultConfiguration
+	compile group: 'org.apache.avalon.framework', name: 'avalon-framework-impl', version: '4.3.1'
 
-            // libxml-commons-external-java 1.4.01
-            //WRONG: 'org.apache.xmlgraphics:xmlgraphics-commons:1.4'
-            'xml-apis:xml-apis:1.4.01',
-            'xml-apis:xml-apis-ext:1.3.04',
+	// libcommons-logging-java / commons-logging.jar:
+	// PDF problem: org.apache.commons.logging.Log
+	compile 'commons-logging:commons-logging:1.2'
 
-            // need to fix javax.xml.parsers.FactoryConfigurationError:
-            // Provider org.apache.xerces.jaxp.SAXParserFactoryImpl not found
-            // when starting from elipse:
-            'xerces:xercesImpl:2.11.0'
-
-    // from flatDir "localGitDepsRepository":
-    compile ':pdf-transcoder-1.0' // "fop.jar"/libfop-java
+	// PDF problem: org.apache.commons.io.output.ByteArrayOutputStream
+	// PDF problem: org.apache.commons.io.IOUtils
+	// PDF problem: org.apache.commons.io.filefilter.IOFileFilter
+	// --> import from core bundle!
 }
 
 jar {
@@ -62,7 +55,10 @@ jar {
                       org.freeplane.features.*,
                       org.freeplane.main.*,
                       org.freeplane.n3.*,
-                      org.freeplane.view.*
+                      org.freeplane.view.*,
+                      org.apache.commons.io,
+                      org.apache.commons.io.output,
+                      org.apache.commons.io.filefilter
                       """
         instruction 'Import-Package', imports.replaceAll("\\s+", "")
         instruction 'Export-Package', ''
diff --git a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/Activator.java b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/Activator.java
index aaedb80..df83453 100644
--- a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/Activator.java
+++ b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/Activator.java
@@ -2,6 +2,9 @@ package org.freeplane.plugin.svg;
 
 import java.util.Hashtable;
 
+import org.freeplane.core.ui.ExampleFileFilter;
+import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.export.mindmapmode.ExportController;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.mode.mindmapmode.MModeController;
 import org.freeplane.main.osgi.IModeControllerExtensionProvider;
@@ -24,6 +27,9 @@ public class Activator implements BundleActivator {
 		context.registerService(IModeControllerExtensionProvider.class.getName(),
 		    new IModeControllerExtensionProvider() {
 			    public void installExtension(ModeController modeController) {
+			    	final ExportController exportController = ExportController.getController(modeController);
+			    	exportController.addExportEngine(new ExampleFileFilter("pdf", TextUtils.getText("export_pdf_text")), new ExportPdf());
+			    	exportController.addExportEngine(new ExampleFileFilter("svg", TextUtils.getText("export_svg_text")), new ExportSvg());
 				    final ViewerController extension = (ViewerController) modeController
 				        .getExtension(ViewerController.class);
 				    extension.addFactory(new SvgViewerFactory());
diff --git a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportPdf.java b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportPdf.java
new file mode 100644
index 0000000..443dadd
--- /dev/null
+++ b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportPdf.java
@@ -0,0 +1,90 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ *
+ *  This file author is Christian Foltin
+ *  It is modified by Dimitry Polivaev in 2008.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.plugin.svg;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+
+import org.apache.batik.svggen.SVGGraphics2D;
+import org.apache.batik.transcoder.SVGAbstractTranscoder;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.ImageTranscoder;
+import org.apache.fop.svg.PDFTranscoder;
+import org.freeplane.core.ui.components.UITools;
+import org.freeplane.features.export.mindmapmode.ExportController;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.view.swing.map.MapView;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * @author foltin
+ */
+class ExportPdf extends ExportVectorGraphic {
+
+	public ExportPdf() {
+	}
+
+	public void export(MapModel map, File chosenFile) {
+		if (!ExportController.getContoller().checkCurrentMap(map)){
+			return;
+		}
+		try {
+			final MapView view = (MapView) Controller.getCurrentController().getMapViewManager().getMapViewComponent();
+			if (view == null) {
+				return;
+			}
+			Controller.getCurrentController().getViewController().setWaitingCursor(true);
+			final SVGGraphics2D g2d = fillSVGGraphics2D(view);
+			final PDFTranscoder pdfTranscoder = new PDFTranscoder();
+			/*
+			 * according to https: &aid=1921334&group_id=7118 Submitted By:
+			 * Frank Spangenberg (f_spangenberg) Summary: Large mind maps
+			 * produce invalid PDF
+			 */
+			pdfTranscoder.addTranscodingHint(SVGAbstractTranscoder.KEY_MAX_HEIGHT, new Float(19200));
+			pdfTranscoder.addTranscodingHint(SVGAbstractTranscoder.KEY_MAX_WIDTH, new Float(19200));
+			pdfTranscoder.addTranscodingHint(ImageTranscoder.KEY_PIXEL_UNIT_TO_MILLIMETER, 25.4f/72f/UITools.FONT_SCALE_FACTOR);
+			/* end patch */
+			final Document doc = g2d.getDOMFactory();
+			final Element rootE = doc.getDocumentElement();
+			g2d.getRoot(rootE);
+			final TranscoderInput input = new TranscoderInput(doc);
+			final FileOutputStream ostream = new FileOutputStream(chosenFile);
+			final BufferedOutputStream bufStream = new BufferedOutputStream(ostream);
+			final TranscoderOutput output = new TranscoderOutput(bufStream);
+			pdfTranscoder.transcode(input, output);
+			ostream.flush();
+			ostream.close();
+		}
+		catch (final Exception ex) {
+			org.freeplane.core.util.LogUtils.warn(ex);
+			UITools.errorMessage(ex.getLocalizedMessage());
+		}
+		finally{
+			Controller.getCurrentController().getViewController().setWaitingCursor(false);
+		}
+	}
+
+}
diff --git a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportSvg.java b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportSvg.java
new file mode 100644
index 0000000..dc0d048
--- /dev/null
+++ b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportSvg.java
@@ -0,0 +1,69 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ *
+ *  This file author is Christian Foltin
+ *  It is modified by Dimitry Polivaev in 2008.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.plugin.svg;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+
+import org.apache.batik.svggen.SVGGraphics2D;
+import org.freeplane.core.ui.components.UITools;
+import org.freeplane.features.export.mindmapmode.ExportController;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.view.swing.map.MapView;
+
+class ExportSvg extends ExportVectorGraphic {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public void export(MapModel map, File chosenFile) {
+		if (!ExportController.getContoller().checkCurrentMap(map)){
+			return;
+		}
+		try {
+			final MapView view = (MapView) Controller.getCurrentController().getMapViewManager().getMapViewComponent();
+			if (view == null) {
+				return;
+			}
+			Controller.getCurrentController().getViewController().setWaitingCursor(true);
+			final SVGGraphics2D g2d = fillSVGGraphics2D(view);
+			final FileOutputStream bos = new FileOutputStream(chosenFile);
+			final BufferedOutputStream bufStream = new BufferedOutputStream(bos);
+			final OutputStreamWriter osw = new OutputStreamWriter(bufStream, "UTF-8");
+			g2d.stream(osw);
+			osw.flush();
+			bos.flush();
+			bos.close();
+		}
+		catch (final Exception ex) {
+			org.freeplane.core.util.LogUtils.warn(ex);
+			UITools.errorMessage(ex.getLocalizedMessage());
+		}
+		finally{
+			Controller.getCurrentController().getViewController().setWaitingCursor(false);
+		}
+	}
+
+}
diff --git a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportVectorGraphic.java b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportVectorGraphic.java
new file mode 100644
index 0000000..35c7f5e
--- /dev/null
+++ b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportVectorGraphic.java
@@ -0,0 +1,107 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ *
+ *  This file author is Christian Foltin
+ *  It is modified by Dimitry Polivaev in 2008.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.plugin.svg;
+
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+import org.apache.batik.dom.GenericDOMImplementation;
+import org.apache.batik.svggen.SVGGeneratorContext;
+import org.apache.batik.svggen.SVGGraphics2D;
+import org.apache.batik.svggen.SVGGeneratorContext.GraphicContextDefaults;
+import org.apache.batik.util.SVGConstants;
+import org.freeplane.features.export.mindmapmode.IExportEngine;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.view.swing.map.MapView;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+
+/**
+ * @author foltin
+ */
+abstract class ExportVectorGraphic implements IExportEngine {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 */
+	protected SVGGraphics2D fillSVGGraphics2D(final MapView view) {
+
+		// work around svg/pdf-Export problems when exporting with Gtk or Nimbus L&Fs
+		final String previousLnF = UIManager.getLookAndFeel().getClass().getName();
+		setLnF(view, UIManager.getCrossPlatformLookAndFeelClassName());
+
+		try
+		{
+			final DOMImplementation impl = GenericDOMImplementation.getDOMImplementation();
+			final String namespaceURI = SVGConstants.SVG_NAMESPACE_URI;
+			final Document domFactory = impl.createDocument(namespaceURI, "svg", null);
+			final SVGGeneratorContext ctx = SVGGeneratorContext.createDefault(domFactory);
+			ctx.setEmbeddedFontsOn(true);
+			final GraphicContextDefaults defaults = new GraphicContextDefaults();
+			defaults.setFont(new Font("Arial", Font.PLAIN, 12));
+			ctx.setGraphicContextDefaults(defaults);
+			ctx.setExtensionHandler(new GradientExtensionHandler());
+			ctx.setPrecision(12);
+			final SVGGraphics2D g2d = new SVGGraphics2D(ctx, false);
+			g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT);
+			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_DEFAULT);
+			view.preparePrinting();
+			final Rectangle innerBounds = view.getInnerBounds();
+			g2d.setSVGCanvasSize(new Dimension(innerBounds.width, innerBounds.height));
+			g2d.translate(-innerBounds.x, -innerBounds.y);
+			view.print(g2d);
+			view.endPrinting();
+			return g2d;
+		}
+		finally
+		{
+			setLnF(view, previousLnF);
+		}
+	}
+
+	private void setLnF(final MapView view, final String LnF)
+	{
+		try {
+			// Set cross-platform Java L&F (also called "Metal")
+			UIManager.setLookAndFeel(LnF);
+
+			Frame frame = JOptionPane.getFrameForComponent(view.getRoot().getRootPane());
+			SwingUtilities.updateComponentTreeUI(frame);
+			// this is recommended but causes the root node to be shifted to the bottom right corner :-(
+			// frame.pack();
+		}
+		catch(Exception ex)
+		{
+			throw new RuntimeException("Error when changing L&F for SVG Export!", ex);
+		}
+	}
+
+}
diff --git a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/GradientExtensionHandler.java b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/GradientExtensionHandler.java
new file mode 100644
index 0000000..96aad20
--- /dev/null
+++ b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/GradientExtensionHandler.java
@@ -0,0 +1,166 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2017 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ *
+ *  This file author is Martin Steiger (2012), with fixes by Felix Natter (2017),
+ *  see https://gist.github.com/msteiger/4509119.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.plugin.svg;
+
+import static org.apache.batik.util.SVGConstants.*;
+
+import java.awt.Color;
+import java.awt.LinearGradientPaint;
+import java.awt.MultipleGradientPaint;
+import java.awt.Paint;
+import java.awt.RadialGradientPaint;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+
+import org.apache.batik.svggen.DefaultExtensionHandler;
+import org.apache.batik.svggen.SVGColor;
+import org.apache.batik.svggen.SVGGeneratorContext;
+import org.apache.batik.svggen.SVGPaintDescriptor;
+import org.w3c.dom.Element;
+
+/**
+ * batik 1.9 does not natively support exporting java.awt.LinearGradientPaint/java.awt.RadialGradientPaint
+ * as SVG. Our SVG rendering library, SVGSalamander, uses these classes to render gradients.
+ * This class adds support for these paints in batik 1.9 and thus fixes export of maps to PDF/SVG with SVG icons.
+ */
+public class GradientExtensionHandler extends DefaultExtensionHandler
+{
+  @Override
+	public SVGPaintDescriptor handlePaint(Paint paint, SVGGeneratorContext genCtx)
+	{
+		// Handle LinearGradientPaint
+		if (paint instanceof LinearGradientPaint)
+			return getLgpDescriptor((LinearGradientPaint) paint, genCtx);
+			
+		// Handle RadialGradientPaint
+		if (paint instanceof RadialGradientPaint)
+			return getRgpDescriptor((RadialGradientPaint) paint, genCtx);
+		
+		return super.handlePaint(paint, genCtx);
+	}
+
+	private SVGPaintDescriptor getRgpDescriptor(RadialGradientPaint gradient, SVGGeneratorContext genCtx)
+	{
+		Element gradElem = genCtx.getDOMFactory().createElementNS(SVG_NAMESPACE_URI, SVG_RADIAL_GRADIENT_TAG);
+
+		// Create and set unique XML id
+		String id = genCtx.getIDGenerator().generateID("gradient");
+		gradElem.setAttribute(SVG_ID_ATTRIBUTE, id);
+
+		// Set x,y pairs
+		Point2D centerPt = gradient.getCenterPoint();
+		gradElem.setAttribute("cx", String.valueOf(centerPt.getX()));
+		gradElem.setAttribute("cy", String.valueOf(centerPt.getY()));
+
+		Point2D focusPt = gradient.getFocusPoint();
+		gradElem.setAttribute("fx", String.valueOf(focusPt.getX()));
+		gradElem.setAttribute("fy", String.valueOf(focusPt.getY()));
+
+		gradElem.setAttribute("r", String.valueOf(gradient.getRadius()));
+
+		addMgpAttributes(gradElem, genCtx, gradient);
+
+		return new SVGPaintDescriptor("url(#" + id + ")", SVG_OPAQUE_VALUE, gradElem);
+	}
+	
+	private SVGPaintDescriptor getLgpDescriptor(LinearGradientPaint gradient, SVGGeneratorContext genCtx)
+	{
+		Element gradElem = genCtx.getDOMFactory().createElementNS(SVG_NAMESPACE_URI, SVG_LINEAR_GRADIENT_TAG);
+
+		// Create and set unique XML id
+		String id = genCtx.getIDGenerator().generateID("gradient");
+		gradElem.setAttribute(SVG_ID_ATTRIBUTE, id);
+
+		// Set x,y pairs
+		Point2D startPt = gradient.getStartPoint();
+		gradElem.setAttribute("x1", String.valueOf(startPt.getX()));
+		gradElem.setAttribute("y1", String.valueOf(startPt.getY()));
+
+		Point2D endPt = gradient.getEndPoint();
+		gradElem.setAttribute("x2", String.valueOf(endPt.getX()));
+		gradElem.setAttribute("y2", String.valueOf(endPt.getY()));
+
+		addMgpAttributes(gradElem, genCtx, gradient);
+
+		return new SVGPaintDescriptor("url(#" + id + ")", SVG_OPAQUE_VALUE, gradElem);
+	}
+	
+	private void addMgpAttributes(Element gradElem, SVGGeneratorContext genCtx, MultipleGradientPaint gradient)
+	{
+		gradElem.setAttribute(SVG_GRADIENT_UNITS_ATTRIBUTE, SVG_USER_SPACE_ON_USE_VALUE);
+
+		// Set cycle method
+		switch (gradient.getCycleMethod())
+		{
+		case REFLECT:
+			gradElem.setAttribute(SVG_SPREAD_METHOD_ATTRIBUTE, SVG_REFLECT_VALUE);
+			break;
+		case REPEAT:
+			gradElem.setAttribute(SVG_SPREAD_METHOD_ATTRIBUTE, SVG_REPEAT_VALUE);
+			break;
+		case NO_CYCLE:
+			gradElem.setAttribute(SVG_SPREAD_METHOD_ATTRIBUTE, SVG_PAD_VALUE);	// this is the default
+			break;
+		}
+
+		// Set color space
+		switch (gradient.getColorSpace())
+		{
+		case LINEAR_RGB:
+			gradElem.setAttribute(SVG_COLOR_INTERPOLATION_ATTRIBUTE, SVG_LINEAR_RGB_VALUE);
+			break;
+			
+		case SRGB:
+			gradElem.setAttribute(SVG_COLOR_INTERPOLATION_ATTRIBUTE, SVG_SRGB_VALUE);
+			break;
+		}
+
+		// Set transform matrix if not identity
+		AffineTransform tf = gradient.getTransform();
+		if (!tf.isIdentity())
+		{
+			String matrix = "matrix(" + 
+			tf.getScaleX() + " " + tf.getShearY() + " " + tf.getShearX() + " " + 
+			tf.getScaleY() + " " + tf.getTranslateX() + " " + tf.getTranslateY() + ")";
+			gradElem.setAttribute(SVG_GRADIENT_TRANSFORM_ATTRIBUTE, matrix);
+		}
+
+		// Convert gradient stops
+		Color[] colors = gradient.getColors();
+		float[] fracs = gradient.getFractions();
+		
+		for (int i = 0; i < colors.length; i++)
+		{
+			Element stop = genCtx.getDOMFactory().createElementNS(SVG_NAMESPACE_URI, SVG_STOP_TAG);
+			SVGPaintDescriptor pd = SVGColor.toSVG(colors[i], genCtx);
+
+			stop.setAttribute(SVG_OFFSET_ATTRIBUTE, (int) (fracs[i] * 100.0f) + "%");
+			stop.setAttribute(SVG_STOP_COLOR_ATTRIBUTE, pd.getPaintValue());
+
+			if (colors[i].getAlpha() != 255)
+			{
+				stop.setAttribute(SVG_STOP_OPACITY_ATTRIBUTE, pd.getOpacityValue());
+			}
+			
+			gradElem.appendChild(stop);
+		}		
+	}	
+}
\ No newline at end of file
diff --git a/gitinfo.properties b/gitinfo.properties
index 89c3795..997311e 100644
--- a/gitinfo.properties
+++ b/gitinfo.properties
@@ -1 +1 @@
-git-revision=836c57a1e47fc69e31fe60700394ad43562bf1cc Dimitry Polivaev 2017-09-03T10:31:15Z
\ No newline at end of file
+git-revision=0c56ed9cb8c0a1c30e304db8d672767ac68eaf22 Dimitry Polivaev 2017-11-02T21:36:20Z
\ No newline at end of file
diff --git a/gitinfo.txt b/gitinfo.txt
index 89c3795..997311e 100644
--- a/gitinfo.txt
+++ b/gitinfo.txt
@@ -1 +1 @@
-git-revision=836c57a1e47fc69e31fe60700394ad43562bf1cc Dimitry Polivaev 2017-09-03T10:31:15Z
\ No newline at end of file
+git-revision=0c56ed9cb8c0a1c30e304db8d672767ac68eaf22 Dimitry Polivaev 2017-11-02T21:36:20Z
\ No newline at end of file
diff --git a/mac.dist.gradle b/mac.dist.gradle
index b5448a1..cb37dd7 100644
--- a/mac.dist.gradle
+++ b/mac.dist.gradle
@@ -25,66 +25,82 @@ def defineMacBuildTasks = {boolean includeJavaRuntime ->
     def macappfullpath = new File(bin4mac, 'Freeplane.app').absoluteFile
     
     def macosxapp = tasks.create (taskName('macosxapp')) {
-    doFirst {
-        delete bin4mac + '/Freeplane.app'
-        mkdir bin4mac
-
-        ant.appbundler(
-            outputdirectory: bin4mac,
-            name: 'Freeplane',
-            displayname: 'Freeplane',
-            mainclassname: 'org.freeplane.launcher.Launcher',
-            shortversion: distVersion,
-            copyright: "Freeplane ${distVersion}",
-            identifier: 'org.freeplane.core',
-            icon: 'freeplane_framework/mac-appbundler/freeplane.icns',
-            signature: '????'
-        ) {
-            if (includeJavaRuntime) {
-                if(macAppProperties['macapp.jdk.home'] != null) {
-                    runtime(dir: macAppProperties['macapp.jdk.home'])
-                }
-                else {
-                    def javaHomeJre = System.properties['java.home']
-                    def javaHome = javaHomeJre - ~/\/jre$/
-                    runtime(dir: javaHome)
-                }
-            }
-            classpath(dir: globalBin, includes: '*.jar')
-            option(value: "-Xmx512m")
-            option(value: "-Dapple.laf.useScreenMenuBar=true")
-            option(value: "-Xdock:name=Freeplane")
-        }
-
-        def dist_macos_info = macappfullpath.path + '/Contents/Info.plist'
-        ant.xslt(in: new File(dist_macos_info),
-            style: new File('freeplane_framework/mac-appbundler/mac_info_plist.xslt'),
-            out: new File(dist_macos_info + '2')
-        )
-        java.nio.file.Files.move(java.nio.file.Paths.get(dist_macos_info + '2'),
-                                 java.nio.file.Paths.get(dist_macos_info),
-                   java.nio.file.StandardCopyOption.REPLACE_EXISTING)
-
-        def macjavafullpath = macappfullpath.path + '/Contents/Java'
-        copy {
-            from(globalBin) {
-                 exclude('**/*.bat')
-                 exclude('**/*.exe')
-                 exclude('*.jar')
-            }
-            into(macjavafullpath)
-        }
-
-        def macresourcesfullpath = macappfullpath.path + '/Contents/Resources'
-        copy {
-             from('freeplane_framework/mac-appbundler') {
-                 include('freeplanedoc.icns')
-             }
-             into(macresourcesfullpath)
-        }
-        }
-        for (p in subprojects) {
-            dependsOn p.tasks.getByPath("build")
+		mustRunAfter binZip
+
+		doFirst {
+		
+			if(! binZip.archivePath.exists())
+				ant.fail("File ${binZip.archivePath.path} not found")
+		
+			delete bin4mac + '/Freeplane.app'
+			mkdir bin4mac
+			
+			def zipExtracted = globalBin+'-extracted'
+			delete zipExtracted
+			mkdir zipExtracted
+			
+			copy {
+				from(zipTree(binZip.archivePath))
+				into(zipExtracted)
+			}
+			
+			def globalBinExtracted = zipExtracted + '/' + file(zipExtracted).list()[0]
+
+			ant.appbundler(
+				outputdirectory: bin4mac,
+				name: 'Freeplane',
+				displayname: 'Freeplane',
+				mainclassname: 'org.freeplane.launcher.Launcher',
+				shortversion: distVersion,
+				copyright: "Freeplane ${distVersion}",
+				identifier: 'org.freeplane.core',
+				icon: 'freeplane_framework/mac-appbundler/freeplane.icns',
+				signature: '????'
+			) {
+				if (includeJavaRuntime) {
+					if(macAppProperties['macapp.jdk.home'] != null) {
+						runtime(dir: macAppProperties['macapp.jdk.home'])
+					}
+					else {
+						def javaHomeJre = System.properties['java.home']
+						def javaHome = javaHomeJre - ~/\/jre$/
+						runtime(dir: javaHome)
+					}
+				}
+				classpath(dir: globalBinExtracted, includes: '*.jar')
+				option(value: "-Xmx512m")
+				option(value: "-Dapple.laf.useScreenMenuBar=true")
+				option(value: "-Xdock:name=Freeplane")
+			}
+
+			def dist_macos_info = macappfullpath.path + '/Contents/Info.plist'
+			ant.xslt(in: new File(dist_macos_info),
+				style: new File('freeplane_framework/mac-appbundler/mac_info_plist.xslt'),
+				out: new File(dist_macos_info + '2')
+			)
+			java.nio.file.Files.move(java.nio.file.Paths.get(dist_macos_info + '2'),
+									 java.nio.file.Paths.get(dist_macos_info),
+					   java.nio.file.StandardCopyOption.REPLACE_EXISTING)
+
+			def macjavafullpath = macappfullpath.path + '/Contents/Java'
+			copy {
+				from(globalBinExtracted) {
+					 exclude('**/*.bat')
+					 exclude('**/*.exe')
+					 exclude('*.jar')
+	 				exclude('license.txt')
+				}
+				into(macjavafullpath)
+			}
+
+			def macresourcesfullpath = macappfullpath.path + '/Contents/Resources'
+			copy {
+				 from('freeplane_framework/mac-appbundler') {
+					 include('freeplanedoc.icns')
+				 }
+				 into(macresourcesfullpath)
+			}
+			delete zipExtracted
         }
     }
 
diff --git a/src.dist.gradle b/src.dist.gradle
index 66db9b9..ece119b 100644
--- a/src.dist.gradle
+++ b/src.dist.gradle
@@ -18,8 +18,8 @@ def textFilesIncludeSpec(dir) {
                 dir + '/**/*.gradle']
 }
 
-def buildFilesIncludeSpec() {
-    return ['*/build/**', '*/bin/**']
+def buildFiles() {
+    return ['*/build/**', '*/bin/**', '*/apt_generated/**']
 }
 
 def miscExcludedFilesSpec() {
@@ -44,12 +44,12 @@ task srcTarGz(type: Tar) {
         include(textFilesIncludeSpec('JOrtho_0.4_freeplane'))
 
         // exclude gradle/eclipse build files for all projects:
-        exclude(buildFilesIncludeSpec())
+        exclude(buildFiles())
         // exclude misc files:
         exclude(miscExcludedFilesSpec())
 
         filter(FixCrLfFilter.class,
-            eol:FixCrLfFilter.CrLf.newInstance("lf"))
+            eol:FixCrLfFilter.CrLf.newInstance("lf"), fixlast:false)
     }
 
     // all other (source) files
@@ -59,7 +59,7 @@ task srcTarGz(type: Tar) {
         exclude(textFilesIncludeSpec(null))
 
         // exclude gradle/eclipse build files for all projects:
-        exclude(buildFilesIncludeSpec())
+        exclude(buildFiles())
         // exclude misc files:
         exclude(miscExcludedFilesSpec())
     }
@@ -109,14 +109,14 @@ task srcpureTarGz(type: Tar) {
         include(textFilesIncludeSpec('JOrtho_0.4_freeplane'))
 
         // exclude gradle/eclipse build files for all projects:
-        exclude(buildFilesIncludeSpec())
+        exclude(buildFiles())
         // exclude misc files:
         exclude(miscExcludedFilesSpec())
         // exclude additional srcpure stuff
         exclude(srcpureAdditionalExcludeSpec())
 
         filter(FixCrLfFilter.class,
-            eol:FixCrLfFilter.CrLf.newInstance("lf"))
+            eol:FixCrLfFilter.CrLf.newInstance("lf"), fixlast:false)
     }
 
     // all other (source) files
@@ -126,7 +126,7 @@ task srcpureTarGz(type: Tar) {
         exclude(textFilesIncludeSpec(null))
 
         // exclude gradle/eclipse build files for all projects:
-        exclude(buildFilesIncludeSpec())
+        exclude(buildFiles())
         // exclude misc files:
         exclude(miscExcludedFilesSpec())
         // exclude additional srcpure stuff

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



More information about the pkg-java-commits mailing list