[freeplane] 01/06: New upstream version 1.5.18

Felix Natter fnatter-guest at moszumanska.debian.org
Sat Dec 10 17:23:46 UTC 2016


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

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

commit 83217fee1ca0daa3fe21701b53f651375208d746
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Dec 10 17:02:20 2016 +0100

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

diff --git a/build.gradle b/build.gradle
index 751a1bf..cc7e311 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,7 @@ allprojects {
         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"]
     }
 
@@ -105,7 +106,7 @@ subprojects {
 configure(subprojects.findAll {it.name =~ /plugin/ || it.name =~ /^freeplane$/ || it.name =~ /^freeplane_framework$/}){
     repositories {
         maven {
-            url 'http://www.knopflerfish.org/maven2/'
+            url 'https://dl.bintray.com/knopflerfish/knopflerfish-maven/'
         }
     }
 
diff --git a/freeplane/build.gradle b/freeplane/build.gradle
index 4957ef8..81bba63 100644
--- a/freeplane/build.gradle
+++ b/freeplane/build.gradle
@@ -12,8 +12,8 @@ dependencies {
     compile 'commons-lang:commons-lang:2.6',
             'commons-io:commons-io:2.4',
             'commons-codec:commons-codec:1.7',
-            'com.jgoodies:jgoodies-forms:1.6.0',
-            'com.jgoodies:jgoodies-common:1.4.0'
+            'com.jgoodies:jgoodies-forms:1.9.0',
+            'com.jgoodies:jgoodies-common:1.8.1'
 
 	compile  ('com.lightdev.app.shtm.simplyhtml:SimplyHTML:0.16.18') {
 		exclude module: 'javahelp'
diff --git a/freeplane/doc/freeplaneTutorial.mm b/freeplane/doc/freeplaneTutorial.mm
index a64c834..a7b7cf3 100644
--- a/freeplane/doc/freeplaneTutorial.mm
+++ b/freeplane/doc/freeplaneTutorial.mm
@@ -21,7 +21,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="MapStyle">
     <conditional_styles>
@@ -154,7 +153,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="FreeNode"/>
 <richcontent TYPE="DETAILS" HIDDEN="true">
@@ -182,7 +180,58 @@
 </html>
 </richcontent>
 </node>
-<node TEXT="Introduction" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_86446891" CREATED="1314121556502" MODIFIED="1341130602702" BACKGROUND_COLOR="#00cc33" NUMBERED="true" MIN_WIDTH="200.0 px" HGAP_QUANTITY="22.0 px" VSHIFT_QUANTITY="16.0 px">
+<node TEXT="Introduction" STYLE_REF="Beginner" POSITION="right" ID="ID_86446891" CREATED="1314121556502" MODIFIED="1341130602702" BACKGROUND_COLOR="#00cc33" NUMBERED="true" MIN_WIDTH="200.0 px" HGAP_QUANTITY="22.0 px" VSHIFT_QUANTITY="16.0 px">
+<node ID="ID_131498432" CREATED="1479208899084" MODIFIED="1479210525907"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Basically, you just start typing to write text into a node, and end with an
+    </p>
+    <p>
+      ENTER.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      To create a new node press INSERT (on MacOS press TAB) or ENTER.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      To navigate nodes use ARROW-KEYS.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      To fold/unfold press SPACE.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      And to write formatted text you press ALT-ENTER
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      These are the basics and should give you a feeling of what Freeplane is for
+    </p>
+    <p>
+      in its core. Have fun, and ask your questions in the <a href="https://sourceforge.net/p/freeplane/discussion/758437/">freeplane-forum</a>
+    </p>
+  </body>
+</html>
+
+</richcontent>
+</node>
 <node TEXT="Goal" STYLE_REF="Beginner" FOLDED="true" ID="ID_1074607965" CREATED="1314422854653" MODIFIED="1335300198070">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
@@ -205,7 +254,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -251,7 +299,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -358,7 +405,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -405,7 +451,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -459,7 +504,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -595,7 +639,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -629,7 +672,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -648,7 +690,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <edge STYLE="bezier"/>
 <node ID="ID_265318117" CREATED="1323437723250" MODIFIED="1341131023466" HGAP_QUANTITY="-95.0 px" VSHIFT_QUANTITY="150.0 px" STYLE="fork"><richcontent TYPE="NODE">
@@ -683,7 +724,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <edge STYLE="hide_edge"/>
 <hook NAME="NodeConditionalStyles">
@@ -870,7 +910,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <node ID="ID_1433249332" CREATED="1323438495734" MODIFIED="1341131039869" HGAP_QUANTITY="-100.0 px" VSHIFT_QUANTITY="114.0 px" STYLE="fork"><richcontent TYPE="NODE">
 
@@ -895,7 +934,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <edge STYLE="hide_edge"/>
 <hook NAME="NodeConditionalStyles">
@@ -929,7 +967,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <edge STYLE="hide_edge"/>
 <hook NAME="NodeConditionalStyles">
@@ -1012,7 +1049,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1032,7 +1068,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -1076,7 +1111,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1147,7 +1181,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <edge STYLE="hide_edge"/>
 </node>
@@ -1177,7 +1210,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <edge STYLE="hide_edge"/>
 </node>
@@ -1221,7 +1253,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1245,7 +1276,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1272,7 +1302,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1311,7 +1340,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1349,7 +1377,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1398,7 +1425,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1438,7 +1464,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1471,7 +1496,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1496,7 +1520,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1521,7 +1544,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1544,7 +1566,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1574,7 +1595,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1622,7 +1642,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1654,7 +1673,6 @@
     </ol>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1674,7 +1692,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -1695,7 +1712,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1720,7 +1736,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1771,7 +1786,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1815,7 +1829,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1848,7 +1861,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -1877,7 +1889,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <richcontent TYPE="DETAILS" HIDDEN="true">
 
@@ -1950,7 +1961,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -2014,7 +2024,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2052,7 +2061,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2098,7 +2106,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2117,7 +2124,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
@@ -2178,7 +2184,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2215,7 +2220,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2238,7 +2242,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2272,7 +2275,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2316,7 +2318,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2351,7 +2352,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2386,7 +2386,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2409,7 +2408,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2433,7 +2431,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -2453,7 +2450,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2537,7 +2533,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2563,7 +2558,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2606,7 +2600,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2626,7 +2619,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -2657,7 +2649,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2707,7 +2698,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2755,7 +2745,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2813,7 +2802,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2836,7 +2824,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2857,7 +2844,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <node FOLDED="true" ID="ID_357953420" CREATED="1323613544023" MODIFIED="1335095694181" HGAP_QUANTITY="-583.0 px" VSHIFT_QUANTITY="137.0 px"><richcontent TYPE="NODE">
 
@@ -2897,7 +2883,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <node TEXT="My Example" STYLE_REF="MyTemplate" ID="ID_679492060" CREATED="1323614118804" MODIFIED="1323615655812">
 <attribute NAME="birth date" VALUE=""/>
@@ -2949,7 +2934,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -2986,7 +2970,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3009,7 +2992,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3046,7 +3028,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3075,7 +3056,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3095,7 +3075,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -3151,7 +3130,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3189,7 +3167,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3219,7 +3196,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <richcontent TYPE="DETAILS">
 
@@ -3318,7 +3294,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3364,7 +3339,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 <node TEXT="Internal source" STYLE_REF="Advanced" FOLDED="true" ID="ID_1322185425" CREATED="1318936419394" MODIFIED="1336383756945" MAX_WIDTH="550.0 px" STYLE="combined">
@@ -3423,7 +3397,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3469,7 +3442,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -3496,7 +3468,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -3627,7 +3598,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3665,7 +3635,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -3732,7 +3701,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="SubWidth" LAST="false"/>
@@ -3797,7 +3765,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3835,7 +3802,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -3934,7 +3900,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -4574,7 +4539,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -4732,7 +4696,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -4755,7 +4718,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -4776,7 +4738,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 <node TEXT="All nodes a bubble, particular edge,.." STYLE_REF="Advanced" FOLDED="true" ID="ID_210892586" CREATED="1321645917041" MODIFIED="1335301155197" TEXT_SHORTENED="true" MIN_WIDTH="1.0 px" STYLE="combined"><richcontent TYPE="DETAILS">
@@ -4804,7 +4765,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -4836,7 +4796,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -4867,7 +4826,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -4914,7 +4872,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -5126,7 +5083,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -5155,7 +5111,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -5212,7 +5167,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -5245,7 +5199,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
@@ -5268,7 +5221,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -5287,7 +5239,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <hook NAME="FreeNode"/>
 <richcontent TYPE="DETAILS" HIDDEN="true">
@@ -5317,7 +5268,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 <node TEXT="The making of this mind map" STYLE_REF="Advanced" FOLDED="true" ID="ID_1394424447" CREATED="1329890506053" MODIFIED="1335301176959">
@@ -5592,7 +5542,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 <font ITALIC="false"/>
 </node>
@@ -5610,7 +5559,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
@@ -5635,7 +5583,6 @@
     </ul>
   </body>
 </html>
-
 </richcontent>
 </node>
 </node>
diff --git a/freeplane/doc/history_en.txt b/freeplane/doc/history_en.txt
index 7dfcbbe..81d294d 100644
--- a/freeplane/doc/history_en.txt
+++ b/freeplane/doc/history_en.txt
@@ -1,4 +1,15 @@
 ===============================
+1.5.18
+===============================
+Bug fixes
+
+===============================
+1.5.17
+===============================
+Freeplane Survey Runner
+Bug fixes
+
+===============================
 1.5.16
 ===============================
 Keep last selected exporter in dialog drop-down box
diff --git a/freeplane/external-resources/xml/filemodemenu.xml b/freeplane/external-resources/xml/filemodemenu.xml
index e4f33a9..9012a95 100644
--- a/freeplane/external-resources/xml/filemodemenu.xml
+++ b/freeplane/external-resources/xml/filemodemenu.xml
@@ -103,13 +103,12 @@
 	<Entry name="node_popup" builder="node_popup">
 		<Entry name="CenterAction" />
 	</Entry>
-	<Entry name="main_toolbar">
+	<Entry name="main_toolbar" builder="toolbar,ignore">
 		<Entry builder="main_toolbar_update" />
+		<Entry name="CenterAction" />
 		<Entry name="NavigationPreviousMapAction" />
 		<Entry name="NavigationNextMapAction" />
-		<Entry builder="main_toolbar_zoom" name="zoom">
-			<Entry name="CenterAction" />
-		</Entry>
+		<Entry builder="main_toolbar_zoom" name="zoom"/>
 		<Entry name="open">
 			<Entry name="PrintAction" />
 			<Entry name="CloseAction" />
diff --git a/freeplane/external-resources/xml/preferences.xml b/freeplane/external-resources/xml/preferences.xml
index 55b9e79..e5937a6 100644
--- a/freeplane/external-resources/xml/preferences.xml
+++ b/freeplane/external-resources/xml/preferences.xml
@@ -67,6 +67,9 @@
 			<separator name="updates">
 				<boolean name="check_updates_automatically" />
 			</separator>
+			<separator name="surveys">
+				<boolean name="neverShowSurvey" />
+			</separator>
 			<separator name="org.freeplane.plugin.bugreport">
 				<combo name="org.freeplane.plugin.bugreport">
 					<choice value="org.freeplane.plugin.bugreport.allowed" />
diff --git a/freeplane/external-resources/xml/stylemodemenu.xml b/freeplane/external-resources/xml/stylemodemenu.xml
index 1bc7d2f..a2731b3 100644
--- a/freeplane/external-resources/xml/stylemodemenu.xml
+++ b/freeplane/external-resources/xml/stylemodemenu.xml
@@ -129,6 +129,9 @@
 		<Entry name="extras">
 			<Entry name="SetAcceleratorOnNextClickAction" />
 		</Entry>
+		<Entry name="help">
+			<Entry name="AboutAction" builder="removeOnMac"/>
+		</Entry>
 	</Entry>
 	<Entry name="map_popup">
 		<Entry name="ToggleMenubarAction" builder="MP_ToggleMenubarAction" />
diff --git a/freeplane/resources/images/PropertyAction.png b/freeplane/resources/images/ShowPreferencesAction.png
similarity index 100%
rename from freeplane/resources/images/PropertyAction.png
rename to freeplane/resources/images/ShowPreferencesAction.png
diff --git a/freeplane/resources/translations/Resources_cs.properties b/freeplane/resources/translations/Resources_cs.properties
index ae7d457..fb34db6 100644
--- a/freeplane/resources/translations/Resources_cs.properties
+++ b/freeplane/resources/translations/Resources_cs.properties
@@ -306,7 +306,7 @@ edit_label_font_family=P\u00EDsmo
 edit_label_font_size=Velikost p\u00EDsma
 edit_link_manually=Upravit odkaz manu\u00E1ln\u011B...
 edit_long_node=Upravit j\u00E1dro uzlu v dialogu
-edit_middle_label=Edit Middle Label[translate me]
+edit_middle_label=<html>Middle<br>label
 edit_note=Editovat pozn\u00E1mku
 edit_source_label=<html>Zdrojov\u00FD<br>popisek
 edit_target_label=<html>C\u00EDlov\u00FD<br>popisek
@@ -1595,7 +1595,6 @@ selection_method_delayed=Opo\u017Ed\u011Bn\u00FD automatick\u00FD v\u00FDb\u011B
 selection_method_direct=V\u00FDb\u011Br uk\u00E1z\u00E1n\u00EDm
 SelectNoteAction.text=P\u0159epnout editor pozn\u00E1mek
 SelectNoteAction.tooltip=P\u0159epnout se z/do okna s pozn\u00E1mkou
-set_accelerator_on_next_click_action=K vytvo\u0159en\u00ED nov\u00E9 kl\u00E1vesov\u00E9 zkratky: Stiskn\u011Bte "Ctrl" p\u0159i kliknut\u00ED na zam\u00FD\u0161len\u00FD p\u0159\u00EDkaz v menu.
 SetAccelerator.dialogTitle=P\u0159i\u0159azen\u00ED kl\u00E1vesov\u00FDch zkratek
 SetAccelerator.keystrokeDetected=Kl\u00E1vesov\u00E1 zkratka "{0}" nen\u00ED p\u0159i\u0159azena k \u017E\u00E1dn\u00E9 polo\u017Ece menu.
 SetAcceleratorOnNextClickAction.text=P\u0159i\u0159adit kl\u00E1vesovou zkratku
@@ -1603,8 +1602,8 @@ SetAlwaysUnfoldedNodeFlagsAction.text=Ponechat rozlo\u017Een\u00E9 uzly
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=Zabr\u00E1nit slo\u017Een\u00ED v sou\u010Dasnosti rozlo\u017Een\u00FDch uzl\u016F
 SetImageByFileChooserAction.text=Nastavit obr\u00E1zek (V\u00FDb\u011Br souboru k nav\u00E1z\u00E1n\u00ED)...
 SetLinkAnchorAction.text=Nastav kotvu odkazu
-SetLinkAnchorAction.tooltip=<html>Nastav\u00ED vybran\u00FD uzel jako budouc\u00ED kotvu pro m\u00EDstn\u00ED i glob\u00E1ln\u00ED odkazy.</html>
-SetLinkAnchorAction.tooltip_anchored=<html>Nastav\u00ED vybran\u00FD uzel jako budouc\u00ED kotvu pro m\u00EDstn\u00ED i glob\u00E1ln\u00ED odkazy. Pr\u00E1v\u011B nastaven\u00E1 kotva:<br>{0}</html>
+SetLinkAnchorAction.tooltip=<html>Nastav\u00ED vybran\u00FD uzel jako budouc\u00ED<br/> kotvu pro m\u00EDstn\u00ED i glob\u00E1ln\u00ED odkazy.
+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
diff --git a/freeplane/resources/translations/Resources_da.properties b/freeplane/resources/translations/Resources_da.properties
index b33704d..ec60841 100644
--- a/freeplane/resources/translations/Resources_da.properties
+++ b/freeplane/resources/translations/Resources_da.properties
@@ -1601,7 +1601,6 @@ selection_method_delayed=Forsinket automatisk valg
 selection_method_direct=Peg for at marker
 SelectNoteAction.text=Note redigerings Switch
 SelectNoteAction.tooltip=Skift til resp. fra note vindue
-set_accelerator_on_next_click_action=For at oprette en ny tastaturgenvej: Tryk p\u00E5 'Ctrl' mens du klikker p\u00E5 den \u00F8nskede kommando i menuen.
 SetAccelerator.dialogTitle=Tildeling af genvejstaster
 SetAccelerator.keystrokeDetected=Taste "{0}" er ikke tildelt til noget menupunkt.
 SetAcceleratorOnNextClickAction.text=Tildel genvejstast\u2026
diff --git a/freeplane/resources/translations/Resources_de.properties b/freeplane/resources/translations/Resources_de.properties
index bf31379..7c59fee 100644
--- a/freeplane/resources/translations/Resources_de.properties
+++ b/freeplane/resources/translations/Resources_de.properties
@@ -1,5 +1,5 @@
 about=\u00DCber
-about_text=Freeplane - freie Software f\u00FCr Mindmaps und Wissensaufbau
+about_text=Freeplane - Eine freie Software f\u00FCr Mindmaps und Wissensaufbau
 AboutAction.text=\u00DCber Freeplane
 acceleratorPresets=&Tastaturk\u00FCrzel-Einstellungen
 accelerators_loading_error=Fehler beim Laden der Tastaturk\u00FCrzel in {0}
@@ -145,6 +145,10 @@ attributes_visible_tooltip=Auswahl f\u00FCr Ansicht->Attribute->Ausgew\u00E4hlte
 automatic_layout=Hierarchiebezogener Knotenstil
 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
+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
@@ -171,10 +175,12 @@ branch=Zweig
 browse=Durchsuchen...
 calendar_attributes_panel=Kalender und Attribute
 calendar_panel=Kalender
+can_not_clone_encrypted_node=Kann verschl\u00FCsselte Knoten nicht klonen
 can_not_connect_to_info_server=Verbindung zum Informations-Server nicht m\u00F6glich
 can_not_delete_predefined_style=Standard-Knotenstile k\u00F6nnen nicht gel\u00F6scht werden
 can_not_delete_root_style=Der Stil des Wurzelknotens kann nicht gel\u00F6scht werden
 can_not_delete_style_group=Knotenstil-Gruppe kann nicht gel\u00F6scht werden
+can_not_encrypt_cloned_node=Kann geklonte Knoten nicht verschl\u00FCsseln
 can_not_save_key_set=Kann Tastaturk\u00FCrzel nicht speichern
 cancel=&Abbrechen
 CancelAction.text=Abbrechen
@@ -182,6 +188,7 @@ cannot_add_parent_diff_parents=Alle Knoten m\u00FCssen zum selben Oberknoten geh
 cannot_add_parent_to_root=Der Wurzelknoten kann nicht ver\u00E4ndert werden.
 cannot_delete_root=Der Wurzelknoten kann nicht gel\u00F6scht oder ausgeschnitten werden.
 cannot_join_nodes_with_children=Knoten k\u00F6nnen nicht mit ihren Unterknoten verbunden werden
+cannot_move_into_child_node=Kann nicht in Kindknoten verschoben werden
 cannot_move_to_child=Ein Knoten kann nicht auf seine Unterknoten verschoben werden.
 CenterAction.text=Zentrieren
 CenterSelectedNodeAction.text=Auf Knoten zentrieren
@@ -206,7 +213,7 @@ choose_node_background_color=Hintergrundfarbe des Knotens ausw\u00E4hlen:
 choose_node_color=Knotenfarbe ausw\u00E4hlen:
 ClearLinkAnchorAction.text=L\u00F6sche Anker
 ClearLinkAnchorAction.tooltip=<html>l\u00F6schen des Hyperlink-Bezugspunktes</html>
-CloneAction.text=Als Klon einf\u00FCgen
+CloneAction.text=Klon einf\u00FCgen
 close_btn=S&chlie\u00DFen
 CloseAction.text=Mindmap schlie\u00DFen
 cloud=Wolke
@@ -228,6 +235,7 @@ connector_lines=Verbindung &Linien
 connector_shapes=Verbindung &Formen
 ConnectorColorAction.text=Farbe der Verbindung...
 contact=Kontakt
+ConvertCloneToIndependentNodeAction.text=Klonen aufheben
 CopyAction.text=Kopieren
 CopyAction.tooltip=Kopiert den markierten Knoten und seine Nachfolger
 CopyAttributes.text=Attribute kopieren
@@ -249,6 +257,7 @@ CutAction.text=Ausschneiden
 decrease_branch_font_size=S&chrift des Zweiges verkleinern
 DecreaseNodeFontAction.text=Kleinere Schrift
 default=Standard
+defaultAuxiliaryWordList=ein, eine, der, die, das
 DefaultColorAction.text=Standardfarbe
 defaultstyle.attributes=Attribute
 defaultstyle.details=Details
@@ -463,6 +472,7 @@ filter_style=Knotenstil
 filter_time=\u00C4nderungstag
 FilterCondition=Filterbedingungen
 filterConditions=Benutzerdefinierte Filter
+filterConditions.noActions=Keine benannten Filter
 filters_not_loaded=Filter konnte nicht geladen werden, die Datei ist besch\u00E4digt
 find=Finden
 find_what=Suchbegriff
@@ -525,6 +535,7 @@ FreeplaneHelpStarter.tooltip=Freeplane Hilfe
 general_settings=Allgemeine Einstellungen
 GettingStartedAction.text=Tutorial
 goto=Gehe zu
+goto.noActions=Keine Zielknoten
 GotoLinkNodeAction.text=Folge Link
 GotoNodeAction.text=Gehe zu Knoten mit ID...
 GrabKeyDialog.common.cancel=Abbrechen
@@ -659,7 +670,7 @@ icon_wizard=&Magisch
 icon_xmag=Noch zu &diskutieren
 icon_yes=&Wichtig
 IconGroupPopupAction.arrows.text=Pfeile
-IconGroupPopupAction.docs_folders.text=Dokumente und Ordner
+IconGroupPopupAction.docs_folders.text=Dokumente & Ordner
 IconGroupPopupAction.flags.text=Flaggen
 IconGroupPopupAction.math.text=Mathematisch
 IconGroupPopupAction.media.text=Medien
@@ -697,8 +708,9 @@ ImportBranchAction.text=aus Datei...
 ImportExplorerFavoritesAction.text=aus Explorer-Favoriten...
 ImportFolderStructureAction.text=aus Ordnerstruktur...
 ImportLinkedBranchAction.text=aus Link
-ImportLinkedBranchWithoutRootAction.text=Verlinkter Zweig ohne Wurzel...
+ImportLinkedBranchWithoutRootAction.text=Verkn\u00FCpfter Zweig ohne Wurzel...
 ImportMindmanagerFiles.text=aus MindManager X5 Mindmap...
+ImportXmlFile.text=XML-Datei importieren
 increase_branch_font_size=Schrift des Zweigs vergr\u00F6ssern
 IncreaseNodeFontAction.text=Gr\u00F6\u00DFere Schrift
 internal_error_tooltip=Interne Fehler sind aufgetreten. Details im Logfile {0}.
@@ -710,7 +722,9 @@ invalid_url_msg=Konnte keine g\u00FCltige URL erstellen f\u00FCr {0}
 ItalicAction.text=Kursiv
 italicise_branch=Zweig kursiv
 java_version=Java-Version: {0}
+JoinNodesAction.separator.format=Verschmelze Knoten mit "{0}"
 lastOpenedMaps=Zuvor ge\u00F6ffnete Karten
+lastOpenedMaps.noActions=Keine Karten im Verlauf
 latex_editor=LaTeX-Formel bearbeiten
 LatexDeleteLatexAction.text=LaTeX Formel entfernen
 LatexEditLatexAction.text=LaTeX-Formel bearbeiten...
@@ -733,6 +747,7 @@ link_not_found=Link {0} nicht gefunden.
 links=Hyper&link
 load=&Laden
 load_accelerator_presets=Sammlung laden
+load_accelerator_presets.noActions=Keine Voreinstellungen
 LoadAcceleratorPresetsAction.textPatterns.text=Text Muster
 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.
@@ -844,6 +859,7 @@ mode_File=Dateimodus
 mode_MindMap=Mindmapmodus
 mode_na=Modus nicht vorhanden
 mode_status=Modus ge\u00E4ndert zu {0}
+mode_StyleMap=Formatierung bearbeiten
 mode_title=Freeplane - {0}
 modes=Modi
 ModesMenuAction.Browse.text=Browser-Ansicht
@@ -902,11 +918,13 @@ no_found_from=<html><u>{0}</u> wurde von "{1}" aus nicht gefunden.</html>
 no_more_found_from=<html> Keine weiteren Fundstellen von<u>{0}</u> beginnend von "{1}" aus.</html>
 no_previous_find=Keine vorherigen Fundstellen.
 no_styles_found_in_map=es wurden in der Mindmap keine Stile gefunden
+no_translation_strings_found=Keine \u00FCbersetzbare Zeichenkette gefunden
 node=Knoten
 node_changed_discard_changes=Knoten wurde ver\u00E4ndert. Wollen Sie diese \u00C4nderungen verwerfen?
 node_details=Knotendetails
 node_is_write_protected=Zielknoten ist schreibgesch\u00FCtzt.
 node_location_help=Ziehen \u00E4ndert die Knotenlage, Strg+Ziehen  \u00E4ndert die Knotenabst\u00E4nde, Doppelklick und Strg+Doppelklick setzt sie zur\u00FCck.
+node_popup_scripting=Skripte
 node_selector=Knotenauswahl
 node_selector_message=Doppelklick w\u00E4hlt Knoten aus
 node_settings=Knoteneinstellungen
@@ -922,8 +940,10 @@ NodeListAction.tooltip=Zeigt alle Knoten in einer filterbaren Liste an.
 nodes=Knoten
 NodeShapeAction.bubble.text=Knotentyp Blase
 NodeShapeAction.fork.text=Knotentyp Linie
+NodeShapeAction.narrow_hexagon.text=Schmales Sechseck
 NodeShapeAction.oval.text=Oval
 NodeShapeAction.rectangle.text=Rechteck
+NodeShapeAction.wide_hexagon.text=Weites Sechseck
 NodeUpAction.text=Nach oben tauschen
 nonboldify_branch=Zweig normal
 nonitalicise_branch=Zweig nicht kursiv
@@ -932,6 +952,10 @@ 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
+NotificationOptions.CLOSE=Schlie\u00DFen
+NotificationOptions.REMIND_ME_LATER=Erinnere mich sp\u00E4ter
+NotificationOptions.REMOVE_REMINDER=Erinnerung entfernen
+NotificationOptions.SELECT_NODE=Zur Erinnerung gehen
 ok=&OK
 OKAction.text=OK
 OnlineReference.text=Online-Mindmap-Dokumentation
@@ -983,6 +1007,10 @@ OptionPanel.automaticFormat_level2=Format der 1. Ebene
 OptionPanel.backup_file_number=Anzahl der Backup-Dateien
 OptionPanel.Behaviour=Verhalten
 OptionPanel.bezier=Bezier
+OptionPanel.border_color=Farbe
+OptionPanel.border_color_matches_edge_color=Benutze Kantenfarbe
+OptionPanel.border_width=Linienst\u00E4rke
+OptionPanel.border_width_matches_edge_width=Benutze Kantenst\u00E4rke
 OptionPanel.bubble=Blase
 OptionPanel.ca=Katalan, Valencian / Catal\u00E0
 OptionPanel.Cancel=Abbrechen
@@ -999,6 +1027,7 @@ OptionPanel.combined=Kombiniert
 OptionPanel.compare_as_number=Als Zahl vergleichen
 OptionPanel.convert_to_current_version=<html>Sollen Mindmaps von \u00E4lteren Freeplane Versionen<br>automatisch zur aktuellen Version konvertiert werden?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Nur sehr gro\u00DFe Mindmaps, die nicht konvertiert werden sollen<br>(hierzu braucht man Expertenwissen), kann man ohne Umwandlung \u00F6ffnen.</html>
+OptionPanel.copyFormatToNewSibling=Kopiere Formatierung auf neue Geschwister
 OptionPanel.copyFormatToNewSiblingIncludesIcons=Kopiere Format mit Symbolen
 OptionPanel.cs=Tschechisch / \u010Desky
 OptionPanel.cut_nodes_without_question=Knoten ohne Best\u00E4tigung ausschneiden?
@@ -1053,6 +1082,7 @@ OptionPanel.en=Englisch / english
 OptionPanel.Environment=Allgemein
 OptionPanel.es=Spanisch (Kastilien)/  espa\u00F1ol, castellano
 OptionPanel.et=Estnisch / eesti, eesti keel
+OptionPanel.eu=Baskisch
 OptionPanel.execute_scripts_without_asking=Skripte ohne Nachfragen ausf\u00FChren?
 OptionPanel.execute_scripts_without_asking.tooltip=<html>Skripte sind in Freeplane nicht beschr\u00E4nkt und k\u00F6nnen daher auf alle Resourcen des Rechners zugreifen.<br>Sie sollten daher nur dann ausgef\u00FChrt werden, wenn eine zuverl?ssige Quelle sichergestellt ist.</html>
 OptionPanel.execute_scripts_without_exec_restriction=Ausf\u00FChren anderer Applikationen erlauben (NICHT empfohlen)
@@ -1109,8 +1139,10 @@ OptionPanel.id=Indonesisch / Bahasa Indonesia
 OptionPanel.IGNORE=Nichts tun
 OptionPanel.il__enter_confirms_by_default=<ENTER> beendet die Texteingabe im Knoten
 OptionPanel.image_cache=f\u00FCr Bilder
+OptionPanel.indentationUsesTabsInTextOutput=Benutze Tabulatoren in der Textausgabe
 OptionPanel.it=Italienisch / italiano
 OptionPanel.ja=Japanisch / \u65E5\u672C\u8A9E
+OptionPanel.JoinNodesAction.textSeparators=Texttrennzeichen
 OptionPanel.key_type_action=Bei Tastendruck
 OptionPanel.Keystrokes=Tasten
 OptionPanel.ko=Koreanisch / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
@@ -1138,6 +1170,8 @@ OptionPanel.load_last_map=Automatisch letzte Mindmap laden
 OptionPanel.load_last_map.tooltip=<html>Wenn selektiert, l\u00E4d Freeplane beim Start, automatisch die zuletzt ge\u00F6ffnete Mindmap.</html>
 OptionPanel.load_last_maps=Alle zuletzt ge\u00F6ffneten Mindmaps laden
 OptionPanel.lookandfeel=Look-and-feel
+OptionPanel.lookandfeel.scaleuifonts=Schriftarten skalieren
+OptionPanel.lookandfeel.scaleuifonts.tooltip=N\u00FCtzlich f\u00FCr Bildschirme mit hoher Aufl\u00F6sung
 OptionPanel.lookandfeel.tooltip=<html>Bei Problemen bitte einfach 'Standard' w\u00E4hlen.</html>
 OptionPanel.lt=Litauisch / kalba
 OptionPanel.max_displayed_node_count=Maximale Anzahl angezeigter Knoten
@@ -1150,6 +1184,7 @@ OptionPanel.max_shortened_text_length=Maximale L\u00E4nge des gek\u00FCrzten Kno
 OptionPanel.metal=Metall
 OptionPanel.min_node_width=Minimale Knotenbreite
 OptionPanel.motif=Motif
+OptionPanel.narrow_hexagon=Schmales Sechseck
 OptionPanel.nb=Norwegisch Bokm\u00E5l / Norsk bokm\u00E5l
 OptionPanel.never_save_folding=nie
 OptionPanel.nl=Niederl\u00E4ndisch, Fl\u00E4misch / Nederlands, Vlaams
@@ -1167,6 +1202,7 @@ OptionPanel.nodeformat=Format
 OptionPanel.nodeformat.tooltip=<html>Textersetzung und/oder Formatierung:<ul><li><em>Textersetzung</em> (<tt>%s</tt> ist der Originaltext), z.B.. <tt>VORSICHT: %s</tt><li><em>Formatierung von Datumswerten und Zahlen</em> - siehe Beispiele in der Auswahlbox</ul></html>
 OptionPanel.nodenumbering=Nummerierung
 OptionPanel.nodenumbering.tooltip=F\u00FCgt hierarchische Nummerierung (z.B. 1.3.1) dem Knotentext hinzu.
+OptionPanel.nodeshape=Knotenform
 OptionPanel.nodetext=Knotentext
 OptionPanel.nodetext.tooltip=Legt den Text eines Knotens fest. Der vorherige Text wird gel\u00F6scht, wenn ein solcher Stil angewendet wird.
 OptionPanel.nothing=Nichts
@@ -1182,6 +1218,7 @@ OptionPanel.org.freeplane.plugin.bugreport.denied=Nie senden
 OptionPanel.org.freeplane.plugin.bugreport.userid=Optional \u00FCbertragbare ID
 OptionPanel.outline_hgap=Horizontaler Abstand
 OptionPanel.outline_vgap=Vertikaler Abstand
+OptionPanel.oval=Oval
 OptionPanel.paint_connectors_behind=Verbindungen hinter den Knoten zeichnen
 OptionPanel.parse_data=Erkenne Datum-, Datum/Zeit- und Zahleneingaben
 OptionPanel.parse_data.tooltip=Erkenne Datum-, Datum/Zeit- und Zahleneingaben und wende Standardformate an; z.B. 100.000,00, 31.12, 31.12.99, 1999-12-31 und 1999-12-31 23:59
@@ -1206,9 +1243,13 @@ OptionPanel.printonwhitebackground.tooltip=<html>Legt fest, dass immer weiss als
 OptionPanel.pt_BR=Protugiesisch (Brasilien)/ Portugu\u00EAs (Brasil)
 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_use_rich_text_in_new_nodes=F\u00FCr eingef\u00FCgte Knoten erweiterte Formatierung verwenden
+OptionPanel.remindersBlink=Blinkende Erinnerung
+OptionPanel.remindersShowNotifications=Erinnerung erzeugt Benachrichtigungseinblendung
+OptionPanel.remindersStandardDelay=Erinnerungsaufschub
 OptionPanel.remove_notes_without_question=Notizen ohne Nachfrage l\u00F6schen?
 OptionPanel.remove_notes_without_question.tooltip=Wenn diese Option gew\u00E4hlt ist, werden die Notizen des Knotens ohne Warnung gel\u00F6scht. Dies kann bei unbeabsichtigtem L\u00F6schen zu Datenverlust f\u00FChren.
 OptionPanel.resources_use_default_font_for_notes_too=Standard Zeichensatz f\u00FCr Notizen verwenden
@@ -1220,6 +1261,7 @@ OptionPanel.ru=Russisch / \u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u043
 OptionPanel.save_folding=Faltung speichern
 OptionPanel.save_folding_if_map_is_changed=Wenn Mindmap ver\u00E4ndert wurde
 OptionPanel.save_last_position_in_map=Letzte Position in Mindmap speichern
+OptionPanel.save_last_visited_node=Speichere die letzte Position auf der Karte
 OptionPanel.save_modification_times=\u00C4nderungszeiten speichern
 OptionPanel.script_classpath=Skripte Klassenpfad: Verzeichnisse, die Klassen und/oder JARs enthalten
 OptionPanel.script_classpath.tooltip=<html>Eine Liste von JARs und/oder Verzeichnissen, die zum Klassenpfad der Skripte/Formeln hinzugef\u00FCgt wird. <br> Verwenden Sie ";" (Windows) oder ":" (Linux, Mac), um die Eintr\u00E4ge der Liste voneinander zu trennen.<br>Verzeichnisse werden nach JAR- und .class-Dateien durchsucht.<br>Relative Pfade werden als relativ zum Freeplane Benutzerverzeichnis angesehen.<br> Wenn Sie den Klassenpfad angeben, muss er lesbar sein.</html>
@@ -1231,6 +1273,7 @@ OptionPanel.script_user_key_name_for_signing=Optionaler Aliasname eines private
 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=Karte nach dem Aufklappen eines Knotens 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
@@ -1265,6 +1308,7 @@ OptionPanel.separator.icon_properties=Icons
 OptionPanel.separator.icons=Piktogramme in "Icon W\u00E4hlen..."
 OptionPanel.separator.initial_map_size=Anf\u00E4ngliche Gr\u00F6\u00DFe der Mindmap
 OptionPanel.separator.inline_editor=Texteingabe im Knoten
+OptionPanel.separator.JoinNodesAction=Knoten verschmelzen
 OptionPanel.separator.key_typing=Tastatureingabe
 OptionPanel.separator.language=Sprache
 OptionPanel.separator.latex=LaTeX
@@ -1274,6 +1318,7 @@ OptionPanel.separator.mouse_wheel=Mausrad
 OptionPanel.separator.new_node_commands=Knotenerzeugung
 OptionPanel.separator.node_editing_commands=Knotenver\u00E4nderung
 OptionPanel.separator.node_navigation_commands=Knotennavigation
+OptionPanel.separator.NodeBorder=Knotenrand
 OptionPanel.separator.NodeColors=Knotenfarben
 OptionPanel.separator.NodeFont=Knotenschrift
 OptionPanel.separator.NodeShape=Knotenform
@@ -1285,6 +1330,7 @@ OptionPanel.separator.other_defaults=Andere Standards
 OptionPanel.separator.others=Andere Tastenkombinationen
 OptionPanel.separator.outline_view=Gliederungsansicht
 OptionPanel.separator.patterns=Stile
+OptionPanel.separator.reminderOptions=Erinnerungseinstellungen
 OptionPanel.separator.RichTextEditor=Rich-Text-Editor
 OptionPanel.separator.root_node_appearance=Stil des Wurzel-Knotens
 OptionPanel.separator.save=Speichern
@@ -1296,6 +1342,7 @@ OptionPanel.separator.selection_method=Auswahlmodus
 OptionPanel.separator.single_instance_mode=Freeplane Instanzen
 OptionPanel.separator.size_limits=Gr\u00F6\u00DFenbeschr\u00E4nkung
 OptionPanel.separator.spelling=Rechtschreibpr\u00FCfung
+OptionPanel.separator.SplitToWordsAction=Knoten in Worte teilen
 OptionPanel.separator.status=Status-Zeile
 OptionPanel.separator.tooltip=Tooltip
 OptionPanel.separator.undo=R\u00FCckg\u00E4ngig
@@ -1304,8 +1351,11 @@ OptionPanel.set_property_text=Ver\u00E4ndern
 OptionPanel.set_property_text.tooltip=<html><ul><li>Leer=Nicht \u00E4ndern </li><li>Minus=Eigenschaft l\u00F6schen (also auf den Standard zur\u00FCcksetzen)</li><li>Plus=Eigenschaft setzen.</li></ul></html>
 OptionPanel.setscript=Ver\u00E4ndern?
 OptionPanel.setscript.tooltip=Schaltet die M\u00F6glichkeit zu, ein Skript zu dem Stil hinzuzuf\u00FCgen, dass ausgef\u00FChrt wird, wenn der Stil angewendet wird.
+OptionPanel.shape_horizontal_margin=Horizontaler Abstand
+OptionPanel.shape_vertical_margin=Vertikaler Abstand
 OptionPanel.sharp_bezier=Geschwungen und spitz
 OptionPanel.sharp_linear=Spitze gerade Linie
+OptionPanel.shouldCenterSmallMaps=Kleine Karten zentrieren
 OptionPanel.show_icon_for_attributes=Icon f\u00FCr Attribut anzeigen
 OptionPanel.show_less_than_N_nodes_by_default_after_load=Von Karte laden oder manche Knoten aufklappen
 OptionPanel.show_node_tooltips=Notiz anzeigen
@@ -1322,6 +1372,7 @@ OptionPanel.single_instance=Dateien in einer aktiven Freeplane Instanz \u00F6ffn
 OptionPanel.single_instance_force=Eine zweite Instanz von Freeplane in jedem Fall verhindern
 OptionPanel.single_instance_force.tooltip=Vermeidet eine zweite Instanz, selbst wenn keine ladbare Datei existiert
 OptionPanel.sk=Slovakisch / sloven\u010Dina
+OptionPanel.skip_template_selection=Vorlagenauswahl-Dialog \u00FCberspringen
 OptionPanel.sl=Slovenisch / sloven\u0161\u010Dina
 OptionPanel.slow_scroll_selected_node=Langsames Scrollen zum selektierten Knoten
 OptionPanel.spelling_opt_case_sensitive=Gro\u00DF-/Kleinschreibung
@@ -1330,6 +1381,11 @@ OptionPanel.spelling_opt_ignore_capitalization=Gro\u00DFbuchstaben am Wortbeginn
 OptionPanel.spelling_opt_ignore_words_with_numbers=W\u00F6rter mit Ziffern ignorieren
 OptionPanel.spelling_opt_suggestions_limit_dialog=Maximale Anzahl der Vorschl\u00E4ge im Dialog
 OptionPanel.spelling_opt_suggestions_limit_menu=Maximale Anzahl der Vorschl\u00E4ge im Men\u00FC
+OptionPanel.SplitToWordsAction.auxiliaryWordList=Liste mit Hilfsw\u00F6rtern
+OptionPanel.SplitToWordsAction.charactersAcceptedInWord=Zeichen in W\u00F6rtern
+OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=Ursprungsknoten leer lassen
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=Knotennummer in der Zeile
+OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=Speichere Originaltext als Zusatz
 OptionPanel.sr=Serbisch / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=Standard Vorlage
 OptionPanel.standardbackgroundcolor=Standard Hintergrundfarbe
@@ -1349,19 +1405,23 @@ OptionPanel.standardselectednodecolor.tooltip=<html>Legt die Standardfarbe f\u00
 OptionPanel.standardselectednoderectanglecolor=Farbe f\u00FCr das Rechteck zur Anzeige des ausgew\u00E4hlten Knoten
 OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Legt die Farbe des Rechtecks fest mit dem der selektierte Knoten angezeigt wird (in HTML-Notation).<br>Gilt nur, wenn die Option "Selektierten Knoten durch Rechteck anzeigen" selektiert ist.</html>
 OptionPanel.STAR=Stern
+OptionPanel.statesymbolwidth=Gr\u00F6\u00DFe des Zustandsymbols
 OptionPanel.structured_html_import=Importiere HTML als Knotenhierarchie
 OptionPanel.structured_icon_toolbar=Strukturierte Icon-Toolbar
 OptionPanel.summary=Zusammenfassung
 OptionPanel.sv=Schwedisch / svenska
 OptionPanel.text.use_ctrl_key=<html>Um den Programm-Funktionen ein Tastaturk\u00FCrzel zuzuweisen,<br> verwende die Men\u00FCfunktion "Extras -> Tastaturk\u00FCrzel zuweisen"</html>
+OptionPanel.textalignment=Textausrichtung
 OptionPanel.time_for_automatic_save=Zeitabstand f\u00FCr automatisches Speichern (in Millisekunden)
 OptionPanel.time_for_automatic_save.tooltip=<html>Legt die Zeit zwischen zwei aufeinanderfolgenden automatischen Speicherungen in Millisekunden fest <br>Wenn Sie diese Funktion deaktivieren wollen, dann setzen Sie die Zeit auf 200.00.00.000.</html>
 OptionPanel.time_for_delayed_selection=Zeit f\u00FCr die verz\u00F6gerte Auswahl (in Millisekunden)
 OptionPanel.time_for_delayed_selection.tooltip=<html>Legt fest, wie lange die Maus \u00FCber dem Knoten sein muss, bevor er ausgew\u00E4hlt wird.<br>Ein Wert von 1 bedeutet direkte Auswahl mit der Maus (ohne Klick).</html>
 OptionPanel.toolTipManager.dismissDelay=Ausblenden des ToolTips (in Millisekunden)
 OptionPanel.toolTipManager.initialDelay=Anf\u00E4ngliche Verz\u00F6gerung (in Millisekunden)
-OptionPanel.toolTipManager.max_tooltip_width=Maximale Anzeigebreite f\u00FCr ToolTips
-OptionPanel.toolTipManager.max_tooltip_width.tooltip=<html>Legt die maximale Breite der Tooltips in Pixeln fest.</html>
+OptionPanel.toolTipManager.max_tooltip_height=Maximale H\u00F6he der Kurzinformation
+OptionPanel.toolTipManager.max_tooltip_height.tooltip=Die maximale H\u00F6he der Kurzinformation in Pixeln.
+OptionPanel.toolTipManager.max_tooltip_width=Maximale Anzeigebreite f\u00FCr Kurzinformation
+OptionPanel.toolTipManager.max_tooltip_width.tooltip=Die maximale Breite der Kurzinformation in Pixeln.
 OptionPanel.toolTipManager.reshowDelay=Verz\u00F6gerung zur erneuten Anzeige (in Millisekunden)
 OptionPanel.tr=T\u00FCrkisch / T\u00FCrk\u00E7e
 OptionPanel.uk_UA=Ukrainisch / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
@@ -1370,6 +1430,7 @@ OptionPanel.undo_levels=Anzahl widerrufbarer Aktionen
 OptionPanel.undo_levels.tooltip=<html>Legt fest, wie viele Aktionen r\u00FCckg\u00E4ngig gemacht werden k\u00F6nnen.</html>
 OptionPanel.unfold_on_paste=Knoten beim Einf\u00FCgen entfalten
 OptionPanel.unfold_on_paste.tooltip=Knoten beim Einf\u00FCgen und beim Drag-And-Drop entfalten
+OptionPanel.uniform_shape=Einheitlich
 OptionPanel.use_auto_edge_color=Farbe {0} verwenden
 OptionPanel.use_common_out_point_for_root_node=Alle Linien am Wurzelknoten starten aus einem Punkt
 OptionPanel.use_common_out_point_for_root_node.tooltip=<html>Wenn selektiert starten alle Linien am Wurzelknoten aus einem Punkt.</html>
@@ -1383,9 +1444,12 @@ OptionPanel.validate_invalid_number_format=Standard-Format f\u00FCr Zahlen ist u
 OptionPanel.validate_write_without_read=Skripte: Evtl. ben\u00F6tigen Sie zus\u00E4tzlich zum schreibenden Zugriff auch den lesenden Zugriff auf Dateien.
 OptionPanel.validation_error=<html><body>Fehler bei der Auswertung:<p><em>{0}</em><p>Bitte \u00E4ndern Sie die Voreinstellungen, um die Fehler zu beheben.</body></html>
 OptionPanel.validation_warning=<html><body>Warnung(en) bei der Auswertung:<p><em>{0}</em></body></html>
+OptionPanel.vertical_child_gap=Raum zwischen Nachfahren
+OptionPanel.vertical_child_gap.tooltip=Vertikaler Abstand zwischen Kindknoten
 OptionPanel.vi=Vietnamesisch / Ti\u1EBFng Vi\u1EC7t
 OptionPanel.wheel_velocity=Geschwindigkeit
 OptionPanel.wheel_velocity.tooltip=Ein gr\u00F6\u00DFerer Wert resultiert in schnelleren Bewegungen der Mindmap bei Bet\u00E4tigung des Mausrades.
+OptionPanel.wide_hexagon=Weites Sechseck
 OptionPanel.windows=Windows
 OptionPanel.zh_CN=Einfaches Chinesisch / \u7B80\u4F53\u5B57
 OptionPanel.zh_TW=Traditionelles Chinesisch / \u7E41\u9AD4\u5B57
@@ -1503,8 +1567,11 @@ RedoFilterAction.text=Wiederherstellen
 regular_expressions=Regul\u00E4re Ausdr\u00FCcke
 ReminderHookAction.text=Wiedervorlage entfernen
 ReminderHookAction.tooltip=Entfernt eine Wiedervorlage.
+reminderNotification=Erinnerungsbenachrichtigung
 remove_file_from_list_on_error=Konnte Datei {0} nicht \u00F6ffnen. Soll sie aus der Liste der zuletzt ge\u00F6ffneten Dateien entfernt werden?
 remove_shortcut_question=Tastaturk\u00FCrzel ersetzen?
+RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Ausgeklappte Knoten zur\u00FCcksetzen
+RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Erlaubt das Auf-/Zuklappen f\u00FCr jeden Knoten
 RemoveAllIconsAction.text=L\u00F6sche alle
 RemoveConnectorAction.text=Verbindung entfernen
 RemoveEncryption.text=Knotenpasswort entfernen
@@ -1525,7 +1592,7 @@ reset_to_default=Default benutzen
 ResetNodeLocationAction.text=Position zur\u00FCcksetzen
 ResetStyleAction.text=Knotenstil zur\u00FCcksetzen
 resources=Ressourcen
-RevertAction.text=Wiederherstellen aus lokalem Verlauf
+RevertAction.text=Aus lokalem Verlauf wiederherstellen
 RevisionPluginAction.text=&\u00C4nderungen markieren
 ribbon.extras=Extras
 ribbon.filter=Filter
@@ -1543,7 +1610,7 @@ save_failed=Der Versuch, {0} zu speichern, ist fehlgeschlagen.
 save_unsaved=Soll die folgende Mindmap gespeichert werden?
 save_unsaved_styles=Knotenstile speichern?
 SaveAcceleratorPresetsAction.text=Sammlung speichern...
-SaveAction.text=Speichern
+SaveAction.text=Karte speichern
 SaveAction_readonlyMsg=Diese Karte ist schreibgesch\u00FCtzt. Bitte benutzen Sie 'Datei->Karte speichern unter...'.
 SaveAction_readonlyTitle=Versuche eine read-only Mindmap zu speichern
 SaveAll.text=Alle ge\u00F6ffneten Mindmaps speichern
@@ -1565,6 +1632,9 @@ scripting_api_generator_proxy=Proxy
 scripting_api_generator_title=Skript-API
 scripting_api_generator_utilities=Dienstprogramme
 scripting_api_generator_web=Web-Ressourcen
+ScriptsRunToggleAction.ON_SELECTED_NODE.text=Skripte auf alle ausgew\u00E4hlten Knoten anwenden
+ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=Skripte auf alle ausgew\u00E4hlten Knoten rekursiv anwenden
+ScriptsRunToggleAction.ON_SINGLE_NODE.text=Skripte auf einen ausgew\u00E4hlten Knoten anwenden
 search_and_filter=Suchen und filtern
 select_favorites_folder=Ordner w\u00E4hlen der Favoriten enth\u00E4lt
 select_file_export_to=Die Datei, zu der exportiert werden soll, selektieren
@@ -1572,7 +1642,8 @@ select_folder_for_importing=W\u00E4hlen Sie den Ordner aus, der importiert werde
 select_icon=Iconauswahl
 select_menu_item_dialog=Men\u00FCeintrag ausw\u00E4hlen
 select_menu_item_root_node=Men\u00FC
-SelectAllAction.text=Alles markieren
+select_template=Vorlage ausw\u00E4hlen
+SelectAllAction.text=Alle sichtbaren Knoten ausw\u00E4hlen
 SelectBranchAction.text=Zweig markieren
 SelectedPasteAction.text=Einf\u00FCgen als...
 selection_method_by_click=Einfacher Mausklick selektiert
@@ -1580,10 +1651,12 @@ selection_method_delayed=Verz\u00F6gerte automatische Selektion
 selection_method_direct=Mausber\u00FChrung selektiert
 SelectNoteAction.text=Wechsel Notiz<->Knoten
 SelectNoteAction.tooltip=Wechselt vom bzw. zum Notiz-Editor
-set_accelerator_on_next_click_action=Um ein neues Tastaturk\u00FCrzel zu erstellen, klicken sie auf den gew\u00FCnschten Men\u00FCeintrag.
+set_accelerator_on_next_click_helpmessage=Um ein neues Tastaturk\u00FCrzel zu erstellen, klicken Sie auf den gew\u00FCnschten Men\u00FCeintrag.
 SetAccelerator.dialogTitle=Tastaturk\u00FCrzel zuweisen
 SetAccelerator.keystrokeDetected=Tastaturk\u00FCrzel {0} ist keinem Men\u00FCeintrag zugeordnet.
 SetAcceleratorOnNextClickAction.text=Tastaturk\u00FCrzel zuweisen...
+SetAlwaysUnfoldedNodeFlagsAction.text=Behalte zugeklappte Knoten
+SetAlwaysUnfoldedNodeFlagsAction.tooltip=Verhindert das Zuklappen f\u00FCr gegenw\u00E4rtig aufgeklappte Knoten
 SetImageByFileChooserAction.text=Bildverkn\u00FCpfung erstellen...
 SetLinkAnchorAction.text=Setze Anker
 SetLinkAnchorAction.tooltip=<html>gew\u00E4hlten Knoten als k\u00FCnftigen Bezugspunkt<br/>zu lokalen oder globalen Verkn\u00FCpfungen machen.
@@ -1803,6 +1876,7 @@ split=&Teilen
 SplitConditionAction.text=Aufteilen
 SplitNode.text=Text aufteilen
 SplitNode.tooltip=<html>Knoteninhalt wird auf mehrere Knoten verteilt.</html>
+SplitToWordsAction.text=Nach {0} W\u00F6rtern pro Zeile teilen
 STANDARD_FORMAT=Standard
 stop_processing=Stop
 StringFlavorHandler=Knotenhierarchie als einfacher Text
@@ -1835,6 +1909,7 @@ styles.subtopic=Unterbegriff
 styles.topic=Oberbegriff
 styles.user-defined=Benutzerdefinierte Knotenstile
 styles.website=Website
+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 \u00DCber diesen Lernstil\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n Dieser Standard wurde nach 11 Jahren Bildungsforschung dar\u00FCber, wie man den Prozes [...]
 styles_menu=Knotenstile
 submenu_keystroke_in_use_error=Tastaturk\u00FCrzel {0} kann nicht f\u00FCr ein Untermen\u00FC ({1}) verwendet werden und wurde deshalb entfernt.
 summary_nodes=Gruppierungsknoten
@@ -1849,10 +1924,22 @@ task.resources=Ressourcen
 task.tools_and_settings=Werkzeuge und Einstellungen
 task.view=Ansicht
 template_dir=Standard Vorlagen
+TextAlignAction.CENTER.text=Zentrierter Text
+TextAlignAction.DEFAULT.text=Voreinstellung
+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.tooltip=Zeigt alle Wiedervorlagezeiten und die dazugeh\u00F6rigen Knoten.
 TimeManagementAction.text=Kalender anzeigen...
 TimeManagementAction.tooltip=<html>Zeigt das Kalender Modul von Kai Toedter.</html>
+TimePeriodUnits.days=Tage
+TimePeriodUnits.hours=Stunden
+TimePeriodUnits.minutes=Minuten
+TimePeriodUnits.ms=ms
+TimePeriodUnits.seconds=Sekunden
+TimePeriodUnits.weeks=Wochen
 ToggleChildrenFoldedAction.text=Unterknoten falten/entfalten
 ToggleDetailsAction.text=Knotendetails ein-/ausblenden
 ToggleFBarAction.text=F-Tasten
@@ -1868,6 +1955,11 @@ toolbars=Symbol&leisten
 tools_and_settings=Werkzeuge und Einstellungen
 tools_misc=Verschiedenes
 tooltips=Schnellinfos
+TranslatedElement.BORDER=Textrand
+TranslatedElement.TEXT=Text
+TranslatedElement.TOOLTIP=Kurzinfo
+uiTextChanger.originalTextIsNotDefined=Ursprungstext ist nicht definiert
+uiTextChanger.replaceText=Ersetze Text
 undefined_error=Ein unerwarteter Fehler ist aufgetreten. Eine Fehlernachricht im Forum w\u00E4re sch\u00F6n.
 underline=Unterstrich
 UnderlineAction.text=Unterstreichen
@@ -1905,6 +1997,7 @@ user_defined_zoom_status_bar=Der Zoom wurde ge\u00E4ndert und steht nun auf dem
 user_icon={0}
 user_template_dir=Benutzerdefinierte Vorlagen
 user_zoom=Druckvergr\u00F6\u00DFerung (0.0 - 2.0):
+userScripts=Skripte
 value_format=Zahlenformat
 version_up_to_date=Sie benutzen bereits die aktuellste Version
 view=&Ansicht
@@ -1914,6 +2007,7 @@ ViewLayoutTypeAction.OUTLINE.text=Gliederungsansicht
 viewsettings=Ansichtseinstellungen
 web_resources=Web-Ressourcen
 WebDocuAction.text=Web Dokumentation
+WhatsNewAction.text=Was ist neu in Freeplane 1.5.x
 width=Breite
 wrong_regexp=Der Regul\u00E4re Ausdruck "{0}" ist fehlerhaft (Fehler {1})
 xslt_export.html=Html Dokument
diff --git a/freeplane/resources/translations/Resources_el.properties b/freeplane/resources/translations/Resources_el.properties
index 1ff3cfc..4157b1c 100644
--- a/freeplane/resources/translations/Resources_el.properties
+++ b/freeplane/resources/translations/Resources_el.properties
@@ -1433,7 +1433,6 @@ selection_method_delayed=\u039A\u03B1\u03B8\u03C5\u03C3\u03C4\u03AD\u03C1\u03B9\
 selection_method_direct=\u0394\u03B5\u03AF\u03BE\u03C4\u03B5 \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03C4\u03B5
 SelectNoteAction.text=\u0394\u03B9\u03B1\u03BA\u03CC\u03C0\u03C4\u03B7\u03C2 \u03C3\u03CD\u03BD\u03C4\u03B1\u03BE\u03B7\u03C2 \u03C3\u03B7\u03BC\u03B5\u03B9\u03CE\u03BC\u03B1\u03C4\u03BF\u03C2
 SelectNoteAction.tooltip=\u0394\u03B9\u03B1\u03BA\u03CC\u03C0\u03C4\u03B7\u03C2 \u03B3\u03B9\u03B1 \u03B1\u03C0\u03CC\u03BA\u03C1\u03B9\u03C3\u03B7 \u03B1\u03C0\u03CC \u03C4\u03BF \u03C0\u03B1\u03C1\u03AC\u03B8\u03C5\u03C1\u03BF \u03C3\u03B7\u03BC\u03B5\u03B9\u03CE\u03C3\u03B5\u03C9\u03BD
-set_accelerator_on_next_click_action=\u039A\u03AC\u03BD\u03C4\u03B5 \u03BA\u03BB\u03B9\u03BA \u03C3\u03B5 \u03BF\u03C0\u03BF\u03B9\u03BF\u03B4\u03AE\u03C0\u03BF\u03C4\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF \u03C4\u03BF\u03C5 \u03BC\u03B5\u03BD\u03BF\u03CD \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03BF\u03C1\u03AF\u03C3\u03B5\u03C4\u03B5 \u03C3\u03C5\u03BD\u03C4\u03CC\u03BC\u03B5\u03C5\u03C3\u03B7
 SetAcceleratorOnNextClickAction.text=\u039F\u03C1\u03B9\u03C3\u03BC\u03CC\u03C2 \u03C0\u03BB\u03AE\u03BA\u03C4\u03C1\u03BF\u03C5 \u03C3\u03C5\u03BD\u03C4\u03CC\u03BC\u03B5\u03C5\u03C3\u03B7\u03C2
 SetImageByFileChooserAction.text=\u0395\u03B9\u03BA\u03CC\u03BD\u03B1 ...
 SetLinkAnchorAction.text=\u039F\u03C1\u03B9\u03C3\u03BC\u03CC\u03C2 \u03B1\u03BD\u03B1\u03C6\u03BF\u03C1\u03AC\u03C2 \u03C3\u03C5\u03BD\u03B4\u03AD\u03C3\u03BC\u03BF\u03C5
diff --git a/freeplane/resources/translations/Resources_es.properties b/freeplane/resources/translations/Resources_es.properties
index f4c6c5a..de6f13b 100644
--- a/freeplane/resources/translations/Resources_es.properties
+++ b/freeplane/resources/translations/Resources_es.properties
@@ -1472,7 +1472,6 @@ selection_method_delayed=Selecci\u00F3n Autom\u00E1tica Retardada
 selection_method_direct=Apunta para seleccionar
 SelectNoteAction.text=Muestra/Oculta el Editor de Notas
 SelectNoteAction.tooltip=Muestra u Oculta el Editor de Notas
-set_accelerator_on_next_click_action=Para crear un nuevo atajo presione 'Ctrl' mientras clickea sobre el comando deseado en el men\u00FA.
 SetAccelerator.dialogTitle=Asignar atajo de teclado
 SetAccelerator.keystrokeDetected=Combinaci\u00F3n ''{0}'' no est\u00E1 asignada a ning\u00FAn \u00EDtem de alg\u00FAn men\u00FA.
 SetAcceleratorOnNextClickAction.text=Asignar atajo\u2026
diff --git a/freeplane/resources/translations/Resources_fr.properties b/freeplane/resources/translations/Resources_fr.properties
index fbade77..13c2980 100644
--- a/freeplane/resources/translations/Resources_fr.properties
+++ b/freeplane/resources/translations/Resources_fr.properties
@@ -1,6 +1,6 @@
 about_text=Freeplane - Logiciel libre de conception de cartes mentales
 AboutAction.text=\u00C0 propos...
-acceleratorPresets=Charger ou enregistrer les touches de fonction
+acceleratorPresets=Raccourcis pr\u00E9d\u00E9finis
 accelerators_loading_error=Impossible de charger les touches de fonction depuis {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=Editeur de mise en forme
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Editeur de mise en forme
@@ -976,7 +976,9 @@ OptionPanel.backup_file_number=Nombre de fichiers de sauvegarde conserv\u00E9s
 OptionPanel.Behaviour=Comportement
 OptionPanel.bezier=Courbe
 OptionPanel.border_color=Couleur
+OptionPanel.border_color_matches_edge_color=Utiliser la couleur de ligne
 OptionPanel.border_width=Largeur de ligne
+OptionPanel.border_width_matches_edge_width=Utiliser une largeur de bords
 OptionPanel.bubble=Bulle
 OptionPanel.ca=Catalan
 OptionPanel.Cancel=Annuler
@@ -1153,6 +1155,7 @@ OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Hexagone ajust\u00E9
 OptionPanel.nb=Norv\u00E9gien
 OptionPanel.never_save_folding=Jamais
+OptionPanel.neverShowSurvey=Ne jamais afficher de sondages ou d'astuces
 OptionPanel.nl=N\u00E9erlandais
 OptionPanel.nn=Nn
 OptionPanel.nodebackgroundcolor=Couleur du fond
@@ -1308,6 +1311,7 @@ OptionPanel.separator.size_limits=Tailles maximales
 OptionPanel.separator.spelling=Correcteur orthographique
 OptionPanel.separator.SplitToWordsAction=Diviser le n\u0153ud par mot
 OptionPanel.separator.status=Barre d'\u00E9tat
+OptionPanel.separator.surveys=Sondages
 OptionPanel.separator.tooltip=Info-bulles
 OptionPanel.separator.undo=Annulation
 OptionPanel.separator.updates=Mise \u00E0 jour du programme
@@ -1557,7 +1561,7 @@ ResetNodeLocationAction.text=Restaurer la position du n\u0153ud
 ResetStyleAction.text=Effacer le style du n\u0153ud
 RevertAction.text=Restaurer le dernier enregistrement
 RevisionPluginAction.text=Modifier la couleur d'arri\u00E8re-plan des n\u0153uds r\u00E9vis\u00E9s
-save=Enregistrer sous...
+save=&Enregistrer sous...
 save_failed=L''enregistrement de la carte {0} a \u00E9chou\u00E9.
 save_unsaved=Souhaitez-vous enregistrer la carte suivante ?
 save_unsaved_styles=Enregistrer les styles ?
@@ -1602,7 +1606,7 @@ selection_method_delayed=S\u00E9lection retard\u00E9e
 selection_method_direct=S\u00E9lection par pointage
 SelectNoteAction.text=Aller \u00E0 l'\u00E9diteur de notes
 SelectNoteAction.tooltip=Placer le curseur dans l'\u00E9diteur de notes pour la modifier
-set_accelerator_on_next_click_action=Pour cr\u00E9er un nouveau raccourci :\ns\u00E9lectionnez une commande dans un menu en maintenant la touche 'Ctrl' enfonc\u00E9e.
+set_accelerator_on_next_click_helpmessage=Pour cr\u00E9er un nouveau raccourci clavier, cliquez sur la commande souhait\u00E9e dans le menu.
 SetAccelerator.dialogTitle=Raccourcis clavier
 SetAccelerator.keystrokeDetected=La s\u00E9quence de raccourci "{0}" n''est associ\u00E9e \u00E0 aucune commande.
 SetAcceleratorOnNextClickAction.text=Cr\u00E9er un nouveau raccourci...
@@ -1866,11 +1870,12 @@ summary_nodes=N\u0153ud de synth\u00E8se
 summary_not_possible=Impossible de cr\u00E9er une synth\u00E8se pour le(s) n\u0153ud(s) s\u00E9lectionn\u00E9s
 svg=*.svg
 template_dir=Mod\u00E8les
-TextAlignAction.CENTER.text=Centrer le texte
+TextAlignAction.CENTER.text=Texte centr\u00E9
 TextAlignAction.DEFAULT.text=Par d\u00E9faut
 TextAlignAction.LEFT.text=Texte align\u00E9 \u00E0 gauche
 TextAlignAction.RIGHT.text=Texte align\u00E9 \u00E0 droite
 textalignment=Alignement du texte
+TextChangeHotKeyAction.text=D\u00E9finir le raccourci pour modifier le texte
 TimeListAction.text=Afficher la liste des alertes...
 TimeListAction.tooltip=Montre toutes les alertes horaire ainsi que les n\u0153uds associ\u00E9s.
 TimeManagementAction.text=Afficher le calendrier...
@@ -1896,6 +1901,7 @@ TranslatedElement.BORDER=Bordure de texte
 TranslatedElement.TEXT=Texte
 TranslatedElement.TOOLTIP=Info-bulle
 uiTextChanger.originalTextIsNotDefined=Le texte original n'est pas d\u00E9finit
+uiTextChanger.replaceText=Remplacer le texte de l'interface utilisateur
 undefined_error=Une erreur impr\u00E9vue vient de se produire. Merci de bien vouloir signaler le bogue.
 underline=Soulign\u00E9
 UnderlineAction.text=Soulign\u00E9
diff --git a/freeplane/resources/translations/Resources_hr.properties b/freeplane/resources/translations/Resources_hr.properties
index 82a2e64..ce2a1e8 100644
--- a/freeplane/resources/translations/Resources_hr.properties
+++ b/freeplane/resources/translations/Resources_hr.properties
@@ -1154,6 +1154,7 @@ OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Uski \u0161esterokut
 OptionPanel.nb=Norve\u0161ki (Bokm\u00E5l)
 OptionPanel.never_save_folding=Nikad ne spremaj
+OptionPanel.neverShowSurvey=Nikad ne pokazuj pitanja, istra\u017Eivanja i savjete
 OptionPanel.nl=nizozemski
 OptionPanel.nn=norve\u0161ki (Nynorsk)
 OptionPanel.nodebackgroundcolor=Boja pozadine \u010Dvora
@@ -1309,6 +1310,7 @@ OptionPanel.separator.size_limits=Ograni\u010Denja veli\u010Dina
 OptionPanel.separator.spelling=Opcije provjere pravopisa
 OptionPanel.separator.SplitToWordsAction=Razdvajanje \u010Dvora prema rije\u010Dima
 OptionPanel.separator.status=Statusna traka
+OptionPanel.separator.surveys=Istra\u017Eivanja
 OptionPanel.separator.tooltip=Vrijeme prikaza opisa alata
 OptionPanel.separator.undo=Poni\u0161ti
 OptionPanel.separator.updates=Nadogradnja programa
@@ -1604,7 +1606,7 @@ selection_method_delayed=Zaka\u0161njela automatska metoda odabira
 selection_method_direct=Prika\u017Ei odabrano
 SelectNoteAction.text=Prelazak iz bilje\u0161ke u \u010Dvor
 SelectNoteAction.tooltip=Prebaci iz bilje\u0161ke u \u010Dvor
-set_accelerator_on_next_click_action=Za kreiranje nove tipkovni\u010Dke kratice: dr\u017Eite pritisnutu 'Ctrl' tipku za vrijeme odabira naredbe izbornika.
+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
diff --git a/freeplane/resources/translations/Resources_hu.properties b/freeplane/resources/translations/Resources_hu.properties
index e4b3166..553908a 100644
--- a/freeplane/resources/translations/Resources_hu.properties
+++ b/freeplane/resources/translations/Resources_hu.properties
@@ -249,7 +249,7 @@ CutAction.text=Kiv\u00E1g\u00E1s
 decrease_branch_font_size=Kisebb bet\u0171
 DecreaseNodeFontAction.text=Kisebb bet\u0171
 default=Alap\u00E9rtelmezett
-defaultAuxiliaryWordList=a, the, of
+defaultAuxiliaryWordList=a, az, \u00E9s, vagy, de, hogy
 DefaultColorAction.text=Alap\u00E9rtelmezett sz\u00EDn
 defaultstyle.attributes=Attrib\u00FAtumok
 defaultstyle.details=R\u00E9szletek
@@ -374,7 +374,7 @@ ExternalImageAddAction.text=K\u00E9p hozz\u00E1ad\u00E1sa...
 ExternalImageChangeAction.text=K\u00E9p cser\u00E9je...
 ExternalImageRemoveAction.text=K\u00E9p elt\u00E1vol\u00EDt\u00E1sa
 ExtractLinkFromTextAction.text=Sz\u00F6veg konvert\u00E1l\u00E1sa linkk\u00E9
-ExtractLinkFromTextAction.tooltip=Hivatkoz\u00E1s be\u00E1ll\u00EDt\u00E1sa a pont sz\u00F6vegben tal\u00E1lhat\u00F3 linkb\u0151l
+ExtractLinkFromTextAction.tooltip=Hivatkoz\u00E1s k\u00E9sz\u00EDt\u00E9se a pont sz\u00F6veg\u00E9ben tal\u00E1lhat\u00F3 c\u00EDmb\u0151l
 extras=&Eszk\u00F6z\u00F6k
 f_button_unassigned=<nincs m\u0171velet>
 FaqOpenURLAction.text=GYIK
@@ -713,7 +713,7 @@ LatexInsertLatexAction.msg2=<html>R\u00F6viden: <ul><li>haszn\u00E1ljon "\\latex
 LatexInsertLatexAction.text=LaTeX formula hozz\u00E1ad\u00E1sa...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
-LengthUnits.in="
+LengthUnits.in=in
 LengthUnits.mm=mm
 LengthUnits.pt=pt
 LengthUnits.px=px
@@ -726,6 +726,7 @@ link_not_found={0} hivatkoz\u00E1s nem tal\u00E1lhat\u00F3.
 links=Hivatkoz\u00E1s
 load=Bet\u00F6&lt\u00E9s
 load_accelerator_presets=Bet\u00F6lt\u00E9s
+load_accelerator_presets.noActions=Nincsenek be\u00E1ll\u00EDt\u00E1sok
 LoadAcceleratorPresetsAction.textPatterns.text=Sz\u00F6vegmint\u00E1k
 locking_failed_by_open=A(z) {0} t\u00E9rk\u00E9p z\u00E1rol\u00E1sa sikertelen volt. Megnyitom csak-olvashat\u00F3k\u00E9nt.
 locking_failed_by_save_as=A(z) {0} t\u00E9rk\u00E9p lez\u00E1r\u00E1sa sikertelen volt. A Ment\u00E9s ez\u00E9rt le lett \u00E1ll\u00EDtva.
@@ -791,7 +792,7 @@ menu_applyStyle=St\u00EDlus alkalmaz\u00E1sa
 menu_attributes=&Attrib\u00FAtum
 menu_clouds=Felh\u0151k
 menu_copy=M\u00E1sol\u00E1s
-menu_coreFormat=Pont t\u00F6rzs
+menu_coreFormat=Pont
 menu_details=R\u00E9szletek
 menu_displayAttributes=Pont attrib\u00FAtumok
 menu_encryption=Jelsz\u00F3v\u00E9delem
@@ -817,7 +818,7 @@ menu_remove_icons=Ikonok elt\u00E1vol\u00EDt\u00E1sa
 menu_removeAttribute=Attrib\u00FAtum elt\u00E1vol\u00EDt\u00E1sa
 menu_select=Kijel\u00F6l\u00E9s
 menu_time=Id\u0151gazd\u00E1lkod\u00E1s
-menu_title=Pont t\u00F6rzs
+menu_title=Pont
 menu_viewmode=Megjelen\u00EDt\u00E9si m\u00F3dok
 MenuUtils.invalid_menuitem=A(z) "{0}" nem \u00E9rv\u00E9nyes men\u00FC elem kulcs.
 mindmap=T\u00E9rk\u00E9p
@@ -887,6 +888,7 @@ no_found_from=<html>Nem tal\u00E1lhat\u00F3 "{0}" itt: "{1}".</html>
 no_more_found_from=<html>A(z) "{1}" elem alatt nem tal\u00E1lhat\u00F3 t\u00F6bb olyan elem, ahol <u>{0}</u>.</html>
 no_previous_find=Nem tal\u00E1lhat\u00F3 el\u00F5z\u00F5.
 no_styles_found_in_map=A t\u00E9rk\u00E9pben nem tal\u00E1lhat\u00F3 st\u00EDlus
+no_translation_strings_found=Nincs leford\u00EDthat\u00F3 sz\u00F6veg
 node=Pont
 node_changed_discard_changes=Megv\u00E1ltoztatta a pontot. Szeretn\u00E9 elvetni a v\u00E1ltoztat\u00E1sokat?
 node_is_write_protected=A c\u00E9l-pont \u00EDr\u00E1sv\u00E9dett.
@@ -972,6 +974,10 @@ OptionPanel.automaticFormat_level2=1. szint\u0171 pont form\u00E1tuma
 OptionPanel.backup_file_number=Biztons\u00E1gi m\u00E1solat ment\u00E9sek sz\u00E1ma
 OptionPanel.Behaviour=Viselked\u00E9s
 OptionPanel.bezier=Finoman \u00EDvelt (bezier)
+OptionPanel.border_color=Sz\u00EDn
+OptionPanel.border_color_matches_edge_color=\u00C9l sz\u00EDn\u00E9nek haszn\u00E1lata
+OptionPanel.border_width=Vonalvastags\u00E1g
+OptionPanel.border_width_matches_edge_width=\u00C9lvastags\u00E1g haszn\u00E1lata
 OptionPanel.bubble=Bubor\u00E9k
 OptionPanel.ca=Katal\u00E1n, valenciai / Catal\u00E0
 OptionPanel.Cancel=M\u00E9gsem
@@ -1100,6 +1106,7 @@ OptionPanel.id=Indon\u00E9z / Bahasa Indonesia
 OptionPanel.IGNORE=Ne t\u00F6rt\u00E9njen semmi
 OptionPanel.il__enter_confirms_by_default=Az Enter alap\u00E9rtelmezetten meger\u0151s\u00EDt
 OptionPanel.image_cache=k\u00E9pek sz\u00E1m\u00E1ra
+OptionPanel.indentationUsesTabsInTextOutput=Tabul\u00E1torok haszn\u00E1lata a sz\u00F6veges kimenetben
 OptionPanel.it=Olasz / Italiano
 OptionPanel.ja=Jap\u00E1n / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Sz\u00F6veg elv\u00E1laszt\u00F3
@@ -1118,7 +1125,8 @@ OptionPanel.latex_editor_font=Font a LaTeX szintaktika kiemel\u00E9s szerkeszt\u
 OptionPanel.latex_editor_font.tooltip=Haszn\u00E1ljon 'Dialog' vagy 'Monospaced' \u00E9rt\u00E9ket ha unik\u00F3d karaktereket haszn\u00E1l!
 OptionPanel.latex_editor_font_size=Font m\u00E9ret a LaTeX szintaktika kiemel\u00E9s szerkeszt\u0151j\u00E9hez
 OptionPanel.latex_macros=Szok\u00E1sos LaTeX Makr\u00F3k
-OptionPanel.layout_map_on_text_change.tooltip=Ha jobb teljes\u00EDtm\u00E9nyt szeretne, tiltsa le
+OptionPanel.layout_map_on_text_change=T\u00E9rk\u00E9p kin\u00E9zet\u00E9nek friss\u00EDt\u00E9se szerkeszt\u00E9s k\u00F6zben
+OptionPanel.layout_map_on_text_change.tooltip=Letilt\u00E1sa gyorsabb m\u0171k\u00F6d\u00E9st eredm\u00E9nyezhet
 OptionPanel.linear=Egyenes
 OptionPanel.links=Hivatkoz\u00E1sok
 OptionPanel.links.tooltip=<html>Hivatkoz\u00E1sok be\u00E1ll\u00EDt\u00E1sa relat\u00EDvra vagy abszol\u00FAtra </html>
@@ -1129,7 +1137,9 @@ OptionPanel.load_last_map=Utols\u00F3 t\u00E9rk\u00E9p automatikus megnyit\u00E1
 OptionPanel.load_last_map.tooltip=<html>E be\u00E1ll\u00EDt\u00E1s hat\u00E1s\u00E1ra a Freeplane indul\u00E1skor automatikusan bet\u00F6lti az utolj\u00E1ra megnyitott t\u00E9rk\u00E9pet.</html>
 OptionPanel.load_last_maps=Minden legut\u00F3bb megnyitott f\u00E1jl bet\u00F6lt\u00E9se
 OptionPanel.lookandfeel=Kin\u00E9zet
-OptionPanel.lookandfeel.tooltip=<html>A haszn\u00E1lni k\u00EDv\u00E1nt megjelen\u00EDt\u00E9si st\u00EDlus megad\u00E1sa. A 'metal','windows','motif' \u00E9s 'gtk' t\u00E1mogatott, a 'mac' csak MacOS eset\u00E9n \u00E9rhet\u0151 el. Alap\u00E9rtelmezett eset\u00E9n az alap\u00E9rtelezett st\u00EDlus lesz \u00E9rv\u00E9nyben. Ha szeretne saj\u00E1t kin\u00E9zetet megadni, akkor itt adja meg az oszt\u00E1ly (class) nev\u00E9t, \u00E9s gy\u0151z\u0151dj\u00F6n meg r\u00F3la, hogy a megfele [...]
+OptionPanel.lookandfeel.scaleuifonts=A felhaszn\u00E1l\u00F3i fel\u00FClet sz\u00F6veg\u00E9nek nagy\u00EDt\u00E1sa
+OptionPanel.lookandfeel.scaleuifonts.tooltip=Nagy felbont\u00E1s\u00FA monitorok eset\u00E9n hasznos
+OptionPanel.lookandfeel.tooltip=<html>A haszn\u00E1lni k\u00EDv\u00E1nt megjelen\u00EDt\u00E9si st\u00EDlus megad\u00E1sa. A 'metal','windows','motif' \u00E9s 'gtk' t\u00E1mogatott, a 'mac' csak MacOS eset\u00E9n \u00E9rhet\u0151 el. "Alap\u00E9rtelmezett" eset\u00E9n az alap\u00E9rtelezett st\u00EDlus lesz \u00E9rv\u00E9nyben. Saj\u00E1t kin\u00E9zet megad\u00E1s\u00E1hoz adja meg itt az oszt\u00E1ly (class) nev\u00E9t, \u00E9s gondoskodjon a megfelel\u0151 jar f\u00E1jl(ok) bet\u00F6lt [...]
 OptionPanel.lt=Litv\u00E1n / kalba
 OptionPanel.max_displayed_node_count=Megjelen\u00EDtett pontok maxim\u00E1lis sz\u00E1ma
 OptionPanel.max_image_width=K\u00E9pek kezdeti sz\u00E9less\u00E9ge
@@ -1144,6 +1154,7 @@ OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Keskeny hexagon
 OptionPanel.nb=Norv\u00E9g Bokm\u00E5l / Norsk bokm\u00E5l
 OptionPanel.never_save_folding=Soha
+OptionPanel.neverShowSurvey=Ne mutassa a k\u00E9rd\u00E9seket, felm\u00E9r\u00E9seket \u00E9s tippeket
 OptionPanel.nl=Holland, flamand / Nederlands, Vlaams
 OptionPanel.nn=Norv\u00E9g Nynorsk / Norsk nynorsk
 OptionPanel.nodebackgroundcolor=H\u00E1tt\u00E9r
@@ -1166,7 +1177,7 @@ OptionPanel.nothing=Semmi
 OptionPanel.number_format=Alap\u00E9rtelmezett sz\u00E1mform\u00E1tum
 OptionPanel.number_format.tooltip=Minta melyben a '#' opcion\u00E1lis a '0' k\u00F6telez\u0151 sz\u00E1mjegyeket jel\u00F6l. Pl: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=Automatikus ment\u00E9s f\u00E1jl verzi\u00F3inak sz\u00E1ma
-OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>n k\u00FCl\u00F6nb\u00F6z\u0151 f\u00E1jlba menti a t\u00E9rk\u00E9pet. Az els\u0151 automatikus ment\u00E9s az els\u0151 f\u00E1jlba ker\u00FCl, azt\u00E1n a m\u00E1sodikba eg\u00E9szen az n+1-edik ment\u00E9sig ami \u00FAjra az els\u0151 f\u00E1jlba \u00EDr (ism\u00E9tl\u0151d\u0151en)</html>
+OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>Ennyi k\u00FCl\u00F6nb\u00F6z\u0151 ment\u00E9s meg\u0151rz\u00E9se a t\u00E9rk\u00E9pr\u0151l. Az els\u0151 automatikus ment\u00E9s az els\u0151 f\u00E1jlba ker\u00FCl, azt\u00E1n a m\u00E1sodikba, eg\u00E9szen az n+1-edik ment\u00E9sig, ami \u00FAjra az els\u0151 f\u00E1jlba \u00EDr (ism\u00E9tl\u0151d\u0151en)</html>
 OptionPanel.OK=Ment\u00E9s
 OptionPanel.org.freeplane.plugin.bugreport=H\u00E1zirend
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Mindig jelentse
@@ -1273,6 +1284,7 @@ OptionPanel.separator.mouse_wheel=Eg\u00E9r g\u00F6rg\u0151
 OptionPanel.separator.new_node_commands=\u00DAj pont-parancsok
 OptionPanel.separator.node_editing_commands=Pont szerkeszt\u0151 parancsok
 OptionPanel.separator.node_navigation_commands=Pont navig\u00E1l\u00E1si parancsok
+OptionPanel.separator.NodeBorder=Pont szeg\u00E9ly
 OptionPanel.separator.NodeColors=Az eg\u00E9sz t\u00F6rzs sz\u00EDne
 OptionPanel.separator.NodeFont=Az eg\u00E9sz t\u00F6rzs bet\u0171t\u00EDpusa
 OptionPanel.separator.NodeShape=Pont alakja
@@ -1296,8 +1308,9 @@ OptionPanel.separator.selection_method=Kijel\u00F6l\u00E9si m\u00F3d
 OptionPanel.separator.single_instance_mode=Program fut\u00E1s m\u00F3d
 OptionPanel.separator.size_limits=M\u00E9rethat\u00E1rok
 OptionPanel.separator.spelling=Helyes\u00EDr\u00E1s-ellen\u0151rz\u0151 be\u00E1ll\u00EDt\u00E1sok
-OptionPanel.separator.SplitToWordsAction=Pont feloszt\u00E1sa szavakra
+OptionPanel.separator.SplitToWordsAction=Pont sz\u00E9tbont\u00E1sa szavank\u00E9nt
 OptionPanel.separator.status=St\u00E1tuszsor
+OptionPanel.separator.surveys=Felm\u00E9r\u00E9sek
 OptionPanel.separator.tooltip=Inform\u00E1ci\u00F3s bubor\u00E9k id\u0151k
 OptionPanel.separator.undo=Visszavon\u00E1s
 OptionPanel.separator.updates=Programfriss\u00EDt\u00E9sek
@@ -1318,13 +1331,15 @@ OptionPanel.show_styles_in_tooltip=Pont st\u00EDlus mutat\u00E1sa az inform\u00E
 OptionPanel.signed_script_are_trusted=Megb\u00EDz\u00E1s az al\u00E1\u00EDrt szkriptekben (javasolt)
 OptionPanel.signed_script_are_trusted.tooltip=Ha a szkripteket megb\u00EDzhat\u00F3 f\u00E9l \u00EDrta al\u00E1 (ti. a Freeplane alkot\u00F3i vagy \u00E9ppen \u00D6n), akkor korl\u00E1toz\u00E1sok n\u00E9lk\u00FCl futhat.
 OptionPanel.simplyhtml.default_paste_mode=Alap\u00E9rtelmezett beilleszt\u00E9si m\u00F3d
-OptionPanel.single_backup_directory=Egy mappa haszn\u00E1lata a biztons\u00E1gi ment\u00E9sekhez
-OptionPanel.single_backup_directory_path=Biztons\u00E1gi ment\u00E9s mapp\u00E1ja (ha a f\u00F6ls\u0151 opci\u00F3 ki van v\u00E1lasztva)
+OptionPanel.single_backup_directory=Egyetlen mappa haszn\u00E1lata a biztons\u00E1gi ment\u00E9sekhez
+OptionPanel.single_backup_directory.tooltip=<html> A biztons\u00E1gi ment\u00E9s \u00E9s az automatikus ment\u00E9sek egyetlen k\u00F6nyvt\u00E1rba ker\u00FCljenek, ne pedig a t\u00E9rk\u00E9p k\u00F6nyvt\u00E1r\u00E1nak egy alk\u00F6nyvt\u00E1r\u00E1ba</html>
+OptionPanel.single_backup_directory_path=Biztons\u00E1gi ment\u00E9s mapp\u00E1ja (ha az el\u0151z\u0151 opci\u00F3 be van kapcsolva)
 OptionPanel.single_backup_directory_path.tooltip=<html>Fel\u00FClb\u00EDr\u00E1lja az alap\u00E9rtelmez\u00E9st, ami a <freeplaneuserdir>/.backup</html>
 OptionPanel.single_instance=F\u00E1jlok megnyit\u00E1sa egy fut\u00F3 p\u00E9ld\u00E1nyban
 OptionPanel.single_instance_force=Mindenk\u00E9pp ker\u00FClje el a k\u00E9t p\u00E9ld\u00E1nyban fut\u00E1st
 OptionPanel.single_instance_force.tooltip=Mindenk\u00E9pp ker\u00FClje el a t\u00F6bb p\u00E9ld\u00E1nyban fut\u00E1st, m\u00E9g akkor is, ha nincs bet\u00F6ltend\u0151 f\u00E1jl
 OptionPanel.sk=Szlov\u00E1k / sloven\u010Dina
+OptionPanel.skip_template_selection=Sablonv\u00E1laszt\u00F3 ablak \u00E1tugr\u00E1sa
 OptionPanel.sl=Szlov\u00E9n / sloven\u0161\u010Dina
 OptionPanel.slow_scroll_selected_node=Lass\u00FA g\u00F6rget\u00E9s a kijel\u00F6lt pontra
 OptionPanel.small_bubble=Kis bubor\u00E9k
@@ -1338,10 +1353,10 @@ OptionPanel.spelling_opt_suggestions_limit_menu=Javaslatok maxim\u00E1lis sz\u00
 OptionPanel.SplitToWordsAction.auxiliaryWordList=k\u00F6t\u0151szavak list\u00E1ja
 OptionPanel.SplitToWordsAction.charactersAcceptedInWord=karakterek sz\u00E1ma a szavakban
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=az eredeti pont \u00FCresen hagy\u00E1sa
-OptionPanel.SplitToWordsAction.nodeNumbersInLine=pont sz\u00E1ma a sorban
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=Sz\u00E9tbont\u00E1s ennyi szavank\u00E9nt
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=eredeti sz\u00F6veg ment\u00E9se r\u00E9szletk\u00E9nt
 OptionPanel.sr=Szerb / \u0441\u0440\u043F\u0441\u043A\u0438
-OptionPanel.standard_template=\u00C1ltal\u00E1nos sablon f\u00E1jl
+OptionPanel.standard_template=\u00C1ltal\u00E1nos sablon
 OptionPanel.standardbackgroundcolor=\u00C1ltal\u00E1nos h\u00E1tt\u00E9rsz\u00EDn
 OptionPanel.standardbackgroundcolor.tooltip=<html>Alap\u00E9rtelmezett h\u00E1tt\u00E9rsz\u00EDn HTML sz\u00EDnk\u00F3ddal megadva (#RRGGBB hex\u00E1ban) </html>
 OptionPanel.standardcloudcolor=Alap\u00E9rtelmezett felh\u0151 sz\u00EDn
@@ -1359,6 +1374,7 @@ OptionPanel.standardselectednodecolor.tooltip=<html>Kijel\u00F6lt pontok alap\u0
 OptionPanel.standardselectednoderectanglecolor=Kijel\u00F6lt pont bubor\u00E9k sz\u00EDne
 OptionPanel.standardselectednoderectanglecolor.tooltip=<html>A kijel\u00F6lt pontok keret\u00E9nek alap\u00E9rtelmezett sz\u00EDne, HTML sz\u00EDnk\u00F3ddal megadva (#RRGGBB hex\u00E1ban)</html>
 OptionPanel.STAR=Csillag
+OptionPanel.statesymbolwidth=\u00C1llapotszimb\u00F3lum sz\u00E9less\u00E9ge
 OptionPanel.structured_html_import=HTML import\u00E1l\u00E1sa pont strukt\u00FArak\u00E9nt
 OptionPanel.structured_icon_toolbar=Strukt\u00FAr\u00E1lt eszk\u00F6zt\u00E1r ikonok
 OptionPanel.summary=\u00D6sszegz\u00E9s
@@ -1548,7 +1564,7 @@ save=&Ment\u00E9s
 save_failed=A(z) {0} t\u00E9rk\u00E9p ment\u00E9se sikertelen volt.
 save_unsaved=Menti az al\u00E1bbi elmet\u00E9rk\u00E9pet?
 save_unsaved_styles=Menti a st\u00EDlusokat?
-SaveAcceleratorPresetsAction.text=Gyorsbillenty\u0171 profil ment\u00E9se...
+SaveAcceleratorPresetsAction.text=Gyorsbillenty\u0171-be\u00E1ll\u00EDt\u00E1s ment\u00E9se...
 SaveAction.text=Ment\u00E9s
 SaveAction_readonlyMsg=A t\u00E9rk\u00E9p csak \u00EDr\u00E1sv\u00E9dett. K\u00E9rem haszn\u00E1lja a "F\u00E1jl->T\u00E9rk\u00E9p ment\u00E9se mint..." men\u00FCpontot a t\u00E9rk\u00E9p lement\u00E9s\u00E9hez.
 SaveAction_readonlyTitle=K\u00EDs\u00E9rlet \u00EDr\u00E1sv\u00E9dett t\u00E9rk\u00E9p ment\u00E9s\u00E9re
@@ -1580,6 +1596,7 @@ select_folder_for_importing=V\u00E1laszd ki az import\u00E1land\u00F3 mapp\u00E1
 select_icon=V\u00E1lasszon ikont
 select_menu_item_dialog=V\u00E1lasszon egy men\u00FCelemet
 select_menu_item_root_node=Men\u00FC
+select_template=Sablon kiv\u00E1laszt\u00E1sa
 SelectAllAction.text=Minden megjelen\u00EDtett pont kijel\u00F6l\u00E9se
 SelectBranchAction.text=L\u00E1that\u00F3 \u00E1g kijel\u00F6l\u00E9se
 SelectedPasteAction.text=Beilleszt\u00E9s mint...
@@ -1588,7 +1605,6 @@ selection_method_delayed=K\u00E9sleltetett automatikus kiv\u00E1laszt\u00E1s
 selection_method_direct=R\u00E1mutat\u00E1s a kijel\u00F6l\u00E9shez
 SelectNoteAction.text=Megjegyz\u00E9s szerkeszt\u0151 panel megjelen\u00EDt\u00E9se
 SelectNoteAction.tooltip=Megjegyz\u00E9s szerkeszt\u0151 panel megjelen\u00EDt\u00E9se
-set_accelerator_on_next_click_action=\u00DAj billenty\u0171kombin\u00E1ci\u00F3hoz nyomja meg a 'Ctrl' gombot, mik\u00F6zben a k\u00EDv\u00E1nt parancsra kattint a men\u00FCben.
 SetAccelerator.dialogTitle=Gyorsbillenty\u0171 hozz\u00E1rendel\u00E9se
 SetAccelerator.keystrokeDetected=A ''{0}'' billenty\u0171 nincs hozz\u00E1rendelve egy men\u00FCelemhez sem.
 SetAcceleratorOnNextClickAction.text=Gyorsbillenty\u0171 be\u00E1ll\u00EDt\u00E1sa...
@@ -1632,6 +1648,8 @@ simplyhtml.appendTableColLabel=Oszlop hozz\u00E1f\u0171z\u00E9se
 simplyhtml.appendTableRowLabel=Sor hozz\u00E1f\u0171z\u00E9se
 simplyhtml.applyCellAttrLabel=Be\u00E1ll\u00EDt\u00E1s hat\u00F3k\u00F6re:
 simplyhtml.backgroundLabel=H\u00E1tt\u00E9r:
+simplyhtml.blackFontColorLabel=Fekete
+simplyhtml.blueFontColorLabel=K\u00E9k
 simplyhtml.boldItalicName=f\u00E9lk\u00F6v\u00E9r d\u0151lt
 simplyhtml.boldName=f\u00E9lk\u00F6v\u00E9r
 simplyhtml.borderColorLabel=Sz\u00EDn:
@@ -1661,6 +1679,7 @@ simplyhtml.cTagNamePara=Bekezd\u00E9s
 simplyhtml.cTagNameUL=Felsorol\u00E1s
 simplyhtml.cutLabel=Kiv\u00E1g\u00E1s
 simplyhtml.cutTip=kiv\u00E1g\u00E1s
+simplyhtml.decreaseFontSizeLabel=Kisebb
 simplyhtml.defaultDocName=N\u00E9vtelen
 simplyhtml.deleteTableColLabel=Oszlop t\u00F6rl\u00E9se
 simplyhtml.deleteTableRowLabel=Sor t\u00F6rl\u00E9se
@@ -1693,9 +1712,11 @@ simplyhtml.formatParaLabel=Bekezd\u00E9s...
 simplyhtml.formatParaTip=Bekezd\u00E9s form\u00E1tum\u00E1nak m\u00F3dos\u00EDt\u00E1sa
 simplyhtml.formatTableLabel=T\u00E1bl\u00E1zat...
 simplyhtml.formatTableTip=T\u00E1bl\u00E1zat form\u00E1z\u00E1sa
+simplyhtml.greenFontColorLabel=Z\u00F6ld
 simplyhtml.helpLabel=S\u00FAg\u00F3
 simplyhtml.htmlTabTitle=HTML k\u00F3d n\u00E9zet
 simplyhtml.imageFileDesc=K\u00E9pf\u00E1jlok
+simplyhtml.increaseFontSizeLabel=Nagyobb
 simplyhtml.insertTableColLabel=Oszlop besz\u00FAr\u00E1sa
 simplyhtml.insertTableLabel=T\u00E1bl\u00E1zat...
 simplyhtml.insertTableMsg=H\u00E1ny oszlop?
@@ -1727,7 +1748,7 @@ simplyhtml.matchCase.tooltip=\u00C9rz\u00E9keny legyen-e a kis- \u00E9s nagybet\
 simplyhtml.newStyleDefaultName=\u00FAj st\u00EDlus
 simplyhtml.nextTableCellLabel=K\u00F6vetkez\u0151 cella
 simplyhtml.noLineLabel=nincs
-simplyhtml.noMoreOccurrencesFound=nincs (t\u00F6bb) el\u0151fordul\u00E1s
+simplyhtml.noMoreOccurrencesFound=Nincs (t\u00F6bb) tal\u00E1lat
 simplyhtml.okBtnName=OK
 simplyhtml.paddingLabel=Bels\u0151
 simplyhtml.paraAlignCenterLabel=K\u00F6z\u00E9pre igaz\u00EDtott
@@ -1747,12 +1768,15 @@ simplyhtml.previewLabel=El\u0151n\u00E9zet
 simplyhtml.previewText=Sz\u00F6veg el\u0151n\u00E9zet
 simplyhtml.prevTableCellLabel=El\u0151z\u0151 cella
 simplyhtml.printLabel=Nyomtat\u00E1s...
+simplyhtml.redFontColorLabel=Piros
 simplyhtml.redoLabel=\u00DAjra
 simplyhtml.redoTip=\u00FAjra
+simplyhtml.removeFontColorLabel=Sz\u00EDn elt\u00E1vol\u00EDt\u00E1sa
 simplyhtml.replace=Csere...
 simplyhtml.replaceAll=Mindet
 simplyhtml.replaceDone=K\u00E9sz
 simplyhtml.replaceNo=Nem
+simplyhtml.replaceThisQuery=Kicser\u00E9li ezt az el\u0151fordul\u00E1st:
 simplyhtml.replaceWith=Csere erre:
 simplyhtml.replaceYes=Igen
 simplyhtml.rightLabel=jobb:
@@ -1763,6 +1787,7 @@ simplyhtml.searchFromStart.tooltip=A keres\u00E9s ne a kurzort\u00F3l induljon,
 simplyhtml.searchUp=Keres\u00E9s visszafel\u00E9
 simplyhtml.searchUp.tooltip=Keres\u00E9s a v\u00E9g\u00E9t\u0151l az elej\u00E9ig.
 simplyhtml.selectAllLabel=Minden kijel\u00F6l\u00E9se
+simplyhtml.selectedFontColorLabel=Kijel\u00F6lt sz\u00F6veg sz\u00EDne
 simplyhtml.sizeLabel=M\u00E9ret
 simplyhtml.standardStyleName=standard
 simplyhtml.strikeLabel=\u00C1th\u00FAzott
@@ -1799,10 +1824,10 @@ simplyhtml.wholeWordsOnly=Csak teljes szavak
 simplyhtml.wholeWordsOnly.tooltip=A tal\u00E1latok korl\u00E1toz\u00E1sa eg\u00E9sz szavakra.
 SortNodes.text=Gyermekek rendez\u00E9se
 SortNodes.tooltip=\u00C1b\u00E9c\u00E9 sorrendbe rendezi a pont minden gyermek\u00E9t.
-split=&Sz\u00E9tv\u00E1g\u00E1s
-SplitConditionAction.text=Megbont\u00E1s
+split=&Sz\u00E9tbont\u00E1s
+SplitConditionAction.text=Sz\u00E9tbont\u00E1s
 SplitNode.text=Pont sz\u00E9tbont\u00E1sa
-SplitNode.tooltip=<html>Pont sz\u00E9tv\u00E1lasztva</html>
+SplitNode.tooltip=<html>A pont soronk\u00E9nt sz\u00E9tbont\u00E1sra ker\u00FCl</html>
 SplitToWordsAction.text=A sor {0} sz\u00F3ra oszt\u00E1sa
 STANDARD_FORMAT=Standard
 stop_processing=\u00C1llj
@@ -1848,6 +1873,7 @@ TextAlignAction.DEFAULT.text=Alap\u00E9rtelmezett
 TextAlignAction.LEFT.text=Balra igaz\u00EDtott sz\u00F6veg
 TextAlignAction.RIGHT.text=Jobbra igaz\u00EDtott sz\u00F6veg
 textalignment=Sz\u00F6veg igaz\u00EDt\u00E1sa
+TextChangeHotKeyAction.text=Sz\u00F6veg cser\u00E9j\u00E9hez gyorsbillenty\u0171 be\u00E1ll\u00EDt\u00E1sa
 TimeListAction.text=Feladatok kezel\u00E9se...
 TimeListAction.tooltip=Minden \u00FCtemezett id\u0151 \u00E9s a hozz\u00E1juk tartoz\u00F3 pontok megjelen\u00EDt\u00E9se.
 TimeManagementAction.text=Id\u0151 kezel\u00E9se...
@@ -1869,6 +1895,11 @@ ToggleScrollbarsAction.text=G\u00F6rd\u00EDt\u0151s\u00E1vok
 ToggleStatusAction.text=St\u00E1tuszsor megjelen\u00EDt\u00E9se
 ToggleToolbarAction.text=Eszk\u00F6zt\u00E1r
 toolbars=Eszk\u00F6zt\u00E1rak
+TranslatedElement.BORDER=Szeg\u00E9ly sz\u00F6vege
+TranslatedElement.TEXT=Sz\u00F6veg
+TranslatedElement.TOOLTIP=Gyorstipp
+uiTextChanger.originalTextIsNotDefined=Eredeti sz\u00F6veg nincs defini\u00E1lva
+uiTextChanger.replaceText=Felhaszn\u00E1l\u00F3i fel\u00FClet sz\u00F6veg\u00E9nek cser\u00E9je
 undefined_error=V\u00E1ratlan hiba l\u00E9pett fel. K\u00E9rem, pr\u00F3b\u00E1lja meg bejelenteni a hib\u00E1t.
 underline=Al\u00E1h\u00FAz\u00E1s
 UnderlineAction.text=Al\u00E1h\u00FAz\u00E1s
diff --git a/freeplane/resources/translations/Resources_id.properties b/freeplane/resources/translations/Resources_id.properties
index 348e8fe..aa061af 100644
--- a/freeplane/resources/translations/Resources_id.properties
+++ b/freeplane/resources/translations/Resources_id.properties
@@ -1,8 +1,10 @@
+about_text=Pesawatbebas - pemetaan pendapat dan pengetahuan pembangunan perangkat lunak secara bebas
 AboutAction.text=Tentang
-accelerators_loading_error=TIdak bisa memuat akselerator
+acceleratorPresets=awal kunci utama
+accelerators_loading_error=TIdak bisa memuat akselerator dari null
 accessories/plugins/ApplyFormatPlugin.dialog.title=Ubah format node
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Ubah pola
-accessories/plugins/EncryptNode.properties_0=Pilih kata sandi untuk node terenkripsi.
+accessories/plugins/EncryptNode.properties_0=tentukan kata sandi untuk node terlindung(terenkripsi)
 accessories/plugins/EncryptNode.properties_1=Kata sandi tidak sama atau terlalu pendek.
 accessories/plugins/EncryptNode.properties_2=Ketikkan Kata Sandi:
 accessories/plugins/EncryptNode.properties_3=Ketikkan lagi Kata Sandi:
@@ -17,7 +19,7 @@ accessories/plugins/ExportWithTWiki.text=Sebagai TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Ekspor peta sebagai dokumen TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=Metode ekspor universal menggunakan skrip XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Sebagai Applet Java...
-accessories/plugins/ExportWithXSLT_Applet.tooltip=Ekspor peta sebagai applet Java
+accessories/plugins/ExportWithXSLT_Applet.tooltip=ekspor peta sebagai applet peramban java
 accessories/plugins/ExportWithXSLT_Flash.text=Sebagai Flash...
 accessories/plugins/ExportWithXSLT_Flash.tooltip=Ekspor peta sebagai aplikasi Flash
 accessories/plugins/ExportWithXSLT_HTML.text=Sebagai XHTML (versi JavaScript)...
@@ -627,7 +629,7 @@ OptionPanel.standardselectednoderectanglecolor=Warna Balon Node Terpilih
 OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Warna balon yang menandai pilihan node, dalam notasi HTML (#RRGGBB heksadesimal) </html>
 OptionPanel.sv=Se
 OptionPanel.time_for_automatic_save=Waktu saat Penyimpanan Otomatis
-OptionPanel.time_for_automatic_save.tooltip=<html> Masa antar waktu penyimpanan otomatis (dalam ms): Untuk menonaktifkan penyimpanan otomatis, setel ke 2000000000.</html>
+OptionPanel.time_for_automatic_save.tooltip=<html> Masa antarwaktu penyimpanan otomatis (dalam ms): Untuk menonaktifkan penyimpanan otomatis, setel ke 2000000000.</html>
 OptionPanel.time_for_delayed_selection=Waktu untuk Pemilihan Tertunda
 OptionPanel.time_for_delayed_selection.tooltip=<html> Waktu yang dibutuhkan untuk menunjuk node dengan tetikus sampai node tersebut terpilih. Angka 1 berarti node langsung terpilih.</html>
 OptionPanel.toolTipManager.initialDelay=Initial delay, ms[translate me]
@@ -953,7 +955,7 @@ unfold=Buka Lipatan
 UnfoldAllAction.text=Buka Semua
 UnfoldAllAction.tooltip=<html>Buka lipatan node terpilih dan semua anaknya.</html>
 UnfoldOneLevelAction.text=Buka Satu Level
-UnfoldOneLevelAction.tooltip=<html>Buka lipatan node terpilih satu level.</html>
+UnfoldOneLevelAction.tooltip=Buka lipatan node terpilih satu level.
 UpdateCheckAction.text=Check for Updates[translate me]
 url_error=URL ini salah formatnya!
 url_load_error=Peta yang diacu URL tidak dapat dimuat.
diff --git a/freeplane/resources/translations/Resources_it.properties b/freeplane/resources/translations/Resources_it.properties
index 1b8c334..2cc82ab 100644
--- a/freeplane/resources/translations/Resources_it.properties
+++ b/freeplane/resources/translations/Resources_it.properties
@@ -1448,7 +1448,6 @@ 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_action=Cliccare su qualsiasi elemento del menu, per assegnare una nuova scorciatoia
 SetAcceleratorOnNextClickAction.text=Assegna scorciatoia
 SetImageByFileChooserAction.text=Immagini
 SetLinkAnchorAction.text=Imposta collegamento \u00E0ncora
diff --git a/freeplane/resources/translations/Resources_ja.properties b/freeplane/resources/translations/Resources_ja.properties
index 786743a..20f31d6 100644
--- a/freeplane/resources/translations/Resources_ja.properties
+++ b/freeplane/resources/translations/Resources_ja.properties
@@ -949,6 +949,7 @@ OptionPanel.always_load_last_maps.tooltip=<html>\u30DE\u30C3\u30D7\u3092\u6307\u
 OptionPanel.always_save_folding=\u5E38\u306B\u4FDD\u5B58\u3059\u308B
 OptionPanel.always_save_folding_state=\u6298\u308A\u7573\u307F\u72B6\u614B\u306E\u5909\u66F4\u3092\u5E38\u306B\u4FDD\u5B58\u3059\u308B
 OptionPanel.always_save_folding_state.tooltip=\u30C1\u30A7\u30C3\u30AF\u3059\u308B\u3068\u3001\u6298\u308A\u7573\u307F\u72B6\u614B\u3092\u4FDD\u5B58\u3059\u308B\u304B\u3069\u3046\u304B\u3001\u78BA\u8A8D\u3057\u307E\u3059\u3002
+OptionPanel.always_show_less_than_N_nodes_after_load=\u30CE\u30FC\u30C9\u306E\u6700\u5927\u8868\u793A\u6570\u3092\u5143\u306B\u30CE\u30FC\u30C9\u3092\u5C55\u958B\u3059\u308B
 OptionPanel.always_unfold_all_after_load=\u3059\u3079\u3066\u5C55\u958B\u3059\u308B
 OptionPanel.antialias=\u753B\u9762\u8868\u793A\u306E\u54C1\u8CEA
 OptionPanel.antialias.tooltip=<html>\u30A2\u30F3\u30C1\u30A8\u30A4\u30EA\u30A2\u30B9\u3092\u7528\u3044\u308B\u3068\u30DE\u30C3\u30D7\u306E\u8868\u793A\u54C1\u8CEA\u304C\u5411\u4E0A\u3057\u307E\u3059\u304C\u3001\u30A2\u30F3\u30C1\u30A8\u30A4\u30EA\u30A2\u30B9\u304C\u591A\u304F<br>\u306A\u308B\u3068\u8868\u793A\u306B\u6642\u9593\u304C\u304B\u304B\u308A\u307E\u3059\u3002</html>
@@ -1145,6 +1146,7 @@ OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=\u7D30\u3044\u516D\u89D2\u5F62
 OptionPanel.nb=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E\uFF08\u30D6\u30FC\u30AF\u30E2\u30FC\u30EB\uFF09\uFF0FNorsk bokm\u00E5l
 OptionPanel.never_save_folding=\u4FDD\u5B58\u3057\u306A\u3044
+OptionPanel.neverShowSurvey=\u8ABF\u67FB\u3084\u30D2\u30F3\u30C8\u306E\u8CEA\u554F\u3092\u8868\u793A\u3057\u306A\u3044
 OptionPanel.nl=\u30AA\u30E9\u30F3\u30C0\u8A9E\uFF0FNederlands, Vlaams
 OptionPanel.nn=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E (\u30CB\u30E5\u30FC\u30CE\u30EB\u30B9\u30AF)\uFF0FNorsk nynorsk
 OptionPanel.nodebackgroundcolor=\u80CC\u666F\u8272
@@ -1299,6 +1301,7 @@ OptionPanel.separator.size_limits=\u8868\u793A\u5E45
 OptionPanel.separator.spelling=\u30B9\u30DA\u30EB\u30C1\u30A7\u30C3\u30AF\u30AA\u30D7\u30B7\u30E7\u30F3
 OptionPanel.separator.SplitToWordsAction=\u30CE\u30FC\u30C9\u3092\u5358\u8A9E\u306B\u5206\u5272
 OptionPanel.separator.status=\u30B9\u30C6\u30FC\u30BF\u30B9\u30D0\u30FC
+OptionPanel.separator.surveys=\u8ABF\u67FB
 OptionPanel.separator.tooltip=\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7\u8868\u793A\u306E\u6642\u9593
 OptionPanel.separator.undo=\u5143\u306B\u623B\u3059
 OptionPanel.separator.updates=\u30D7\u30ED\u30B0\u30E9\u30E0\u306E\u66F4\u65B0
@@ -1312,6 +1315,7 @@ OptionPanel.sharp_bezier=\u5148\u7D30\u30D9\u30B8\u30A7\u66F2\u7DDA
 OptionPanel.sharp_linear=\u5148\u7D30\u76F4\u7DDA
 OptionPanel.shouldCenterSmallMaps=\u5C0F\u3055\u306A\u30DE\u30C3\u30D7\u3092\u4E2D\u592E\u3078\u8868\u793A
 OptionPanel.show_icon_for_attributes=\u5C5E\u6027\u4ED8\u304D\u30A2\u30A4\u30B3\u30F3\u3092\u8868\u793A
+OptionPanel.show_less_than_N_nodes_by_default_after_load=\u4FDD\u5B58\u6642\u306E\u72B6\u614B\u304B\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30CE\u30FC\u30C9\u6570\u3092\u5C55\u958B\u3059\u308B
 OptionPanel.show_node_tooltips=\u30CE\u30FC\u30C9\u60C5\u5831\u3092\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7\u8868\u793A
 OptionPanel.show_note_icons=\u30CE\u30FC\u30C8\u4ED8\u304D\u30A2\u30A4\u30B3\u30F3\u3092\u8868\u793A
 OptionPanel.show_styles_in_tooltip=\u30CE\u30FC\u30C9\u30B9\u30BF\u30A4\u30EB\u3092\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7\u8868\u793A
@@ -1591,7 +1595,6 @@ selection_method_delayed=\u9593\u3092\u7F6E\u3044\u3066\u81EA\u52D5\u9078\u629E
 selection_method_direct=\u76F4\u3061\u306B\u9078\u629E
 SelectNoteAction.text=\u30CE\u30FC\u30C8\u7DE8\u96C6\u306B\u5207\u308A\u66FF\u3048
 SelectNoteAction.tooltip=\u64CD\u4F5C\u5BFE\u8C61\u3092\u30CE\u30FC\u30C8\u30D1\u30CD\u30EB\u306B\u5207\u308A\u66FF\u3048\u307E\u3059\u3002
-set_accelerator_on_next_click_action=<html>\u65B0\u898F\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u306E\u4F5C\u6210\uFF1A<br>\u30E1\u30CB\u30E5\u30FC\u306E\u4E2D\u304B\u3089\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u3092\u5272\u308A\u5F53\u3066\u305F\u3044\u6A5F\u80FD\u3092 Ctrl \u3092\u62BC\u3057\u306A\u304C\u3089\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001<br>\u30AD\u30FC\u5272\u308A\u5F53\u3066\u30C0\u30A4\u30A2\u30ED\u30B0\u304C\u958B\u304D\u307E\u3059\u3002</html>
 SetAccelerator.dialogTitle=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u306E\u5272\u308A\u5F53\u3066
 SetAccelerator.keystrokeDetected=\u5165\u529B\u30AD\u30FC ''{0}'' \u306F\u3001\u3069\u306E\u30E1\u30CB\u30E5\u30FC\u30A2\u30A4\u30C6\u30E0\u306B\u3082\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 SetAcceleratorOnNextClickAction.text=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u3092\u5272\u308A\u5F53\u3066...
diff --git a/freeplane/resources/translations/Resources_ko.properties b/freeplane/resources/translations/Resources_ko.properties
index 678f8ce..dbce57a 100644
--- a/freeplane/resources/translations/Resources_ko.properties
+++ b/freeplane/resources/translations/Resources_ko.properties
@@ -44,7 +44,7 @@ AddOnDetailsPanel.header.menu=\uBA54\uB274\uC704\uCE58
 AddOnDetailsPanel.header.shortcut=\uB2E8\uCD95\uD0A4
 AddOnDetailsPanel.homepage=\uD648\uD398\uC774\uC9C0:
 addons.installer.canceled=\uC124\uCE58 \uCDE8\uC18C
-addons.installer.confirm.licence=<html><body><h1>\uB77C\uC774\uC13C\uC2A4</h1>{0}<p><p><em>\uB77C\uC774\uC13C\uC2A4\uB97C \uBC1B\uC544\uB4E4\uC774\uACA0\uC2B5\uB2C8\uAE4C?</em></p></body></html>
+addons.installer.confirm.licence=<html><body><h1>\uD5C8\uAC00\uC11C</h1>{0}<p><p><em>\uD5C8\uAC00\uC11C\uB97C \uC218\uB77D \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?</em></p></body></html>
 addons.installer.failed=\uC124\uCE58 \uC2E4\uD328: {0}
 addons.installer.freeplaneversion.format.error={0}\uC5D0 \uD615\uC2DD \uC624\uB958 (\uAC12: {1})
 addons.installer.html.script=\uC2A4\uD06C\uB9BD\uD2B8 \uBCF8\uBB38\uC740 HTML \uD615\uC2DD\uC73C\uB85C \uB418\uC9C0 \uC54A\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4
@@ -644,8 +644,8 @@ icon_subtraction=\uBE84\uC148
 icon_unchecked=\uCCB4\uD06C \uD574\uC81C
 icon_up=\uC704\uB85C
 icon_user_icon=\uC0AC\uC6A9\uC790 \uC544\uC774\uCF58
-icon_very_negative=\uAC15\uD558\uAC8C \uBD80\uC815
-icon_very_positive=\uAC15\uD558\uAC8C \uAE0D\uC815
+icon_very_negative=\uAC15\uD55C \uBD80\uC815
+icon_very_positive=\uAC15\uD55C \uAE0D\uC815
 icon_video=\uB3D9\uC601\uC0C1
 icon_wizard=\uB9C8\uC220
 icon_xmag=\uC758\uB17C\uB418\uC5B4\uC57C \uD568
@@ -717,7 +717,7 @@ LengthUnits.mm=\uBC00\uB9AC\uBBF8\uD130
 LengthUnits.pt=\uD3EC\uC778\uD2B8
 LengthUnits.px=\uD53D\uC140
 less_than_two_selected_nodes=\uC5F0\uACB0\uD558\uB824\uBA74 \uB178\uB4DC\uAC00 2\uAC1C \uC774\uC0C1 \uC120\uD0DD\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
-license=\uB77C\uC774\uC13C\uC2A4: GPL 2 \uB610\uB294 \uC774\uD6C4
+license=\uD5C8\uAC00\uC11C: GPL 2 \uB610\uB294 \uC774\uD6C4
 license_text=<html> \uC774 \uD504\uB85C\uADF8\uB7A8\uC740 \uC790\uC720 \uC18C\uD504\uD2B8\uC6E8\uC5B4\uC785\uB2C8\uB2E4.<br> \uB2F9\uC2E0\uC740 \uC790\uC720 \uC18C\uD504\uD2B8\uC6E8\uC5B4 \uC7AC\uB2E8\uC774 \uBC1C\uD45C\uD55C GNU \uC77C\uBC18 \uACF5\uC911 \uC0AC\uC6A9 \uD5C8\uAC00\uC11C \uBC84\uC804 2\uB098<br> \uADF8 \uC774\uD6C4 \uBC84\uC804\uC5D0 \uB530\uB77C \uC774 \uD30C\uC77C\uC744 \uC7AC\uBC30\uD3EC\uD558\uAC70\uB098 \uC218\uC815\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.<br><br>\uC77 [...]
 link_error=\uC798\uBABB\uB41C \uB9C1\uD06C "{0}"\uC740(\uB294) \uBD88\uB7EC\uC624\uC9C0 \uC54A\uC74C
 link_not_available_any_more=\uC5F0\uACB0\uB418\uC5C8\uB358 \uB178\uB4DC\uAC00 \uC0AD\uC81C\uB418\uC5C8\uC73C\uBBC0\uB85C \uC774 \uB9C1\uD06C\uB294 \uB354\uC774\uC0C1 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
@@ -864,7 +864,7 @@ NewerFileRevisionsFoundDialog.restore.tooltip={0}\uC744 {1}(\uC73C)\uB85C \uB300
 NewerFileRevisionsFoundDialog.title=\uB354 \uC0C8\uB85C\uC6B4 \uAC1C\uC815\uD310\uC774 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4!
 NewFreeNodeAction.text=\uC0C8\uB85C\uC6B4 \uB5A0\uC788\uB294 \uB178\uB4DC
 NewLevelStyleAction.text=\uB2E8\uACC4\uBCC4 \uAF34 \uCD94\uAC00
-newmap.install.addon.question={0} \uC740 \uBD80\uAC00 \uAE30\uB2A5 \uAFB8\uB7EC\uBBF8 \uAC19\uC2B5\uB2C8\uB2E4.\n \uC124\uCE58\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?\n("\uC544\uB2C8\uC624" \uC120\uD0DD\uC2DC \uC77C\uBC18 \uC5F4\uAE30.)
+newmap.install.addon.question={0} \uC740 \uBD80\uAC00 \uAE30\uB2A5 \uAFB8\uB7EC\uBBF8\uB85C \uBCF4\uC785\uB2C8\uB2E4.\n \uC124\uCE58\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?\n("\uC544\uB2C8\uC624"\uB97C \uC120\uD0DD\uD560 \uACBD\uC6B0 \uADF8\uB0E5 \uC5FD\uB2C8\uB2E4.)
 newmap.install.addon.title=\uBD80\uAC00 \uAE30\uB2A5\uC744 \uC124\uCE58\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 NewMapAction.text=\uC0C8\uB85C\uC6B4 \uC9C0\uB3C4
 NewMapViewAction.text=\uC0C8\uB85C\uC6B4 \uC9C0\uB3C4 \uBCF4\uAE30
@@ -1152,6 +1152,7 @@ OptionPanel.motif=\uBAA8\uD2F0\uD504(\uD478\uB978\uACC4\uC5F4)
 OptionPanel.narrow_hexagon=\uC881\uC740 \uC721\uAC01\uD615
 OptionPanel.nb=\uB178\uB974\uC6E8\uC774\uC5B4 Bokm\u00E5l / Norsk bokm\u00E5l
 OptionPanel.never_save_folding=\uC808\uB300 \uC800\uC7A5 \uC548\uD568
+OptionPanel.neverShowSurvey=\uB2E4\uC2DC\uB294 \uC9C8\uBB38, \uC124\uBB38\uC870\uC0AC, \uB3C4\uC6C0 \uD301 \uAC19\uC740\uAC83\uC744 \uD45C\uC2DC\uD558\uC9C0 \uC54A\uC74C
 OptionPanel.nl=Nl
 OptionPanel.nn=Nn
 OptionPanel.nodebackgroundcolor=\uB178\uB4DC \uBC30\uACBD\uC0C9
@@ -1307,6 +1308,7 @@ OptionPanel.separator.size_limits=\uD06C\uAE30 \uC81C\uD55C
 OptionPanel.separator.spelling=\uC2A4\uD3A0 \uCCB4\uD06C \uC635\uC158
 OptionPanel.separator.SplitToWordsAction=\uB178\uB4DC\uB97C \uB2E8\uC5B4 \uB2E8\uC704\uB85C \uB098\uB204\uAE30
 OptionPanel.separator.status=\uC0C1\uD0DC \uC904
+OptionPanel.separator.surveys=\uC124\uBB38\uC870\uC0AC
 OptionPanel.separator.tooltip=\uB3C4\uAD6C \uD301 \uC2DC\uAC04
 OptionPanel.separator.undo=\uC2E4\uD589 \uCDE8\uC18C
 OptionPanel.separator.updates=\uD504\uB85C\uADF8\uB7A8 \uAC31\uC2E0
@@ -1600,7 +1602,6 @@ selection_method_delayed=\uB9C8\uC6B0\uC2A4\uB97C \uAC00\uC838\uAC00\uBA74 \uC57
 selection_method_direct=\uB9C8\uC6B0\uC2A4\uB97C \uAC00\uC838\uAC00\uBA74 \uBC14\uB85C \uC120\uD0DD
 SelectNoteAction.text=\uBA54\uBAA8 \uD3B8\uC9D1 \uBCC0\uD658
 SelectNoteAction.tooltip=\uB178\uD2B8 \uD328\uB110\uC5D0\uC11C resp. \uB85C \uC804\uD658
-set_accelerator_on_next_click_action=\uC0C8\uB85C\uC6B4 \uD0A4\uBCF4\uB4DC \uBC14\uB85C \uAC00\uAE30\uB97C \uB9CC\uB4E4\uB824\uBA74:'Ctrl'\uD0A4\uB97C \uB204\uB978 \uC0C1\uD0DC\uC5D0\uC11C \uBA54\uB274\uC5D0\uC11C \uC6D0\uD558\uB294 \uBA85\uB839\uC744 \uD074\uB9AD\uD569\uB2C8\uB2E4.
 SetAccelerator.dialogTitle=\uB2E8\uCD95\uD0A4 \uC9C0\uC815
 SetAccelerator.keystrokeDetected=\uD0A4\uC785\uB825 "{0}"\uC740 \uC5B4\uB5A0\uD55C \uBA54\uB274\uD56D\uBAA9\uC5D0\uB3C4 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
 SetAcceleratorOnNextClickAction.text=\uB2E8\uCD95\uD0A4 \uC9C0\uC815...
diff --git a/freeplane/resources/translations/Resources_nl.properties b/freeplane/resources/translations/Resources_nl.properties
index 540c314..6f25dd1 100644
--- a/freeplane/resources/translations/Resources_nl.properties
+++ b/freeplane/resources/translations/Resources_nl.properties
@@ -536,7 +536,7 @@ HideableAction.tooltip=<html>Markeren van de achtergrond van elke gewijzigde kno
 HideAllAttributesAction.text=Verbergen van alle atributen
 HierarchicalIcons2Action.text=Toon kruispunt kind-pictogrammen
 HierarchicalIconsAction.text=Toon pictogrammenhi\u00EBrarchie
-HierarchicalIconsAction.tooltip=Als \u00E9\u00E9n van mijn onderliggende mappen een icoontje heeft, dan zal ik dat ook in het klein tonen.
+HierarchicalIconsAction.tooltip=Als \u00E9\u00E9n van mijn onderliggende mappen een pictogram heeft, dan zal ik deze in het klein tonen.
 hot_keys=Sneltoetsen
 hot_keys_table=Overzicht sneltoetsen
 HotKeyInfoAction.text=Overzicht van sneltoetsen
@@ -670,14 +670,14 @@ IconProgressExtended10Action.tooltip=<html>Voegt schijf toe met punt die 10% gro
 IconProgressExtended25Action.text=Grote schijf met 25% punt
 IconProgressExtended25Action.tooltip=<html>Voegt %schijf toe punt die 25% groter wordt bij dubbel rechtsklikken..<br> Control +dubbel linksklikken verkleint of verwijdert de schijfpunt.</html>
 IconProgressIconDownAction.text=Verminderen %
-IconProgressIconDownAction.tooltip=Vermindert/verwijdert schijfpunten (100%->75%->50%->25%->0%->verwijder).
+IconProgressIconDownAction.tooltip=Voortgangspictogrammen verlagen, toevoegen of verwijderen (100%->75%->50%->25%->0%->verwijder).
 IconProgressIconUpAction.text=Vermeerderen %
-IconProgressIconUpAction.tooltip=Verhoog/voeg vorderingspictogrammen toe (0%->25%->50%->100% + OK).
+IconProgressIconUpAction.tooltip=Voortgangspictogrammen ophogen of toevoegen (0%->25%->50%->100% + OK).
 IconProgressRemoveAction.text=Verwijder schijfpunt
-IconProgressRemoveAction.tooltip=Verwijder %schijf (pictogram en grote schijf).
-icons=Iconen
-IconSelectionPlugin.text=Kiezen pictogram uit tabel...
-IconSelectionPlugin.tooltip=<html> Hier kun je een pictogram kiezen..</html>
+IconProgressRemoveAction.tooltip=Normale en uitgebreide voortgangspictogrammen verwijderen.
+icons=Pictogrammen
+IconSelectionPlugin.text=Pictogram uit tabel kiezen\u2026
+IconSelectionPlugin.tooltip=<html> Hier kun je via een scherm een pictogram kiezen.</html>
 image_covertLink=Converteer koppeling naar afbeelding
 ImageFlavorHandler=Afbeelding (gebruik apart bestand)
 import=Importeren
@@ -813,7 +813,7 @@ menu_nodes=Knoop
 menu_nodeView=Knoopkern
 menu_noteView=Knoopnotitie
 menu_openmaps=Mindmap
-menu_remove_icons=Verwijderen pictogrammen
+menu_remove_icons=Pictogrammen verwijderen
 menu_removeAttribute=Verwijderen attribuut
 menu_select=Selecteren
 menu_time=Agenda
@@ -992,7 +992,7 @@ OptionPanel.compare_as_number=Vergelijken als getallen
 OptionPanel.convert_to_current_version=<html>  Automatisch oudere Freeplane versies <br> naar de huidige versie converteren ?</html>
 OptionPanel.convert_to_current_version.tooltip=<html> Alleen voor gevorderde gebruikers die weten wat ze doen:<br>alleen heel grote mindmaps die niet geconverteerd hoeven worden<br>kun je openen zonder conversie.</html>
 OptionPanel.copyFormatToNewSibling=Kopi\u00EBren opmaak naar nieuwe broers en zussen
-OptionPanel.copyFormatToNewSiblingIncludesIcons=Kopieer opmaak met pictogrammen
+OptionPanel.copyFormatToNewSiblingIncludesIcons=Opmaak met pictogrammen kopi\u00EBren
 OptionPanel.cs=Tsjechisch  \u010Desky
 OptionPanel.cut_nodes_without_question=Knopen knippen zonder bevestiging?
 OptionPanel.cut_nodes_without_question.tooltip=Indien het vinkje is gezet worden alle knopen zonder bevestigingsvraag gekipt. Per ongeluk knippen geeft informatieverlies.
@@ -1059,8 +1059,8 @@ OptionPanel.execute_scripts_without_write_restriction=Bestandsoperaties toestaan
 OptionPanel.execute_scripts_without_write_restriction.tooltip=<html> <body>Als je Groovy scrips schrijftoegang tot bestanden nodig hebben (schrijven, wissen (!)),<br>moet je deze optie toestaan.<br>Normaal met leestoegang.<br>Maar gebruik met zorg omdat kwaadaardige scripts je computer kunnen beschadigen!</body></html>
 OptionPanel.experimental_file_locking_on=Experimenteel: bestanden beveiligen
 OptionPanel.experimental_file_locking_on.tooltip=<html>  Experimentele functie</html>
-OptionPanel.export_icons_in_html=Exporteren pictogrammen in HTML
-OptionPanel.export_icons_in_html.tooltip=<html>  Aangeven of de HTML uit Freeplane ge\u00EBxporteerd ook pictogrammen moet bevatten. Het probleem met pictogrammen is dat de links naar pictogrammen in de ge\u00EBxporteerde HTML dikwijls niet werken.</html>
+OptionPanel.export_icons_in_html=Pictogrammen in HTML exporteren
+OptionPanel.export_icons_in_html.tooltip=<html>  Aangeven of de uit Freeplane ge\u00EBxporteerde HTML ook pictogrammen moet bevatten. Het probleem met pictogrammen is dat de snelkoppelingen naar de pictogrammen in de ge\u00EBxporteerde HTML vaak niet werken.</html>
 OptionPanel.exported_image_resolution_dpi=Geexporteerde beeldresolutie (in DPI)
 OptionPanel.Files=Bestanden
 OptionPanel.first=Eerste
@@ -1097,7 +1097,7 @@ OptionPanel.ic_file=Gebruik schijf
 OptionPanel.ic_ram=gebruikt RAM geheugen
 OptionPanel.icon=Pictogram
 OptionPanel.icon.tooltip=De knoop krijgt dit pictogram.
-OptionPanel.icons.list=Lijst met stadaardpictogrammen
+OptionPanel.icons.list=Lijst met standaardpictogrammen
 OptionPanel.icons.list.tooltip=Hier kun je de standaardpictogrammen instellen. De pictogrammen moeten worden gescheiden door ';'.
 OptionPanel.id=Indonesisch / Bahasa Indonesia
 OptionPanel.IGNORE=Doe niets
@@ -1151,6 +1151,7 @@ OptionPanel.motif=Motief
 OptionPanel.narrow_hexagon=Nauwe zeshoek
 OptionPanel.nb=Noors / Norsk bokm\u00E5l
 OptionPanel.never_save_folding=Nooit
+OptionPanel.neverShowSurvey=Nooit vragen, enqu\u00EAtes of tips laten zien
 OptionPanel.nl=Nederlands, Vlaams  / Nederlands, Vlaams
 OptionPanel.nn=Noors  / Norsk nynorsk
 OptionPanel.nodebackgroundcolor=Achtergrondkleur
@@ -1269,7 +1270,7 @@ OptionPanel.separator.html_export=HTML-exporteren
 OptionPanel.separator.html_import=HTML Importeren
 OptionPanel.separator.hyperlink_types=Types snelkoppelingen
 OptionPanel.separator.icon_properties=Pictogrammen
-OptionPanel.separator.icons=Pictogrammen in "Selecteren pictogram..."
+OptionPanel.separator.icons=Pictogrammen in "Pictogram selecteren\u2026"
 OptionPanel.separator.initial_map_size=Initi\u00EBle grootte mindmap
 OptionPanel.separator.inline_editor=Geintegreerd knoopbewerkingsvenster
 OptionPanel.separator.JoinNodesAction=Knopen samenvoegen
@@ -1308,6 +1309,7 @@ OptionPanel.separator.size_limits=Grootte beperking
 OptionPanel.separator.spelling=Opties voor spellingscontrole
 OptionPanel.separator.SplitToWordsAction=Knopen in woorden splitsen
 OptionPanel.separator.status=Statuslijn
+OptionPanel.separator.surveys=Enqu\u00EAtes
 OptionPanel.separator.tooltip=Tijdsintervallen voor tooltips
 OptionPanel.separator.undo=Ongedaan maken bewerken
 OptionPanel.separator.updates=Nieuwe programmaonderdelen
@@ -1320,10 +1322,10 @@ OptionPanel.shape_vertical_margin=Verticale marge
 OptionPanel.sharp_bezier=Taps toelopend bocht
 OptionPanel.sharp_linear=Tapstoelopend recht
 OptionPanel.shouldCenterSmallMaps=Kleine mappen centreren
-OptionPanel.show_icon_for_attributes=Tonen pictogram voor attributen
+OptionPanel.show_icon_for_attributes=Het pictogram voor attributen tonen
 OptionPanel.show_less_than_N_nodes_by_default_after_load=Uit mindmap overnemen of enkele knopen openvouwen
 OptionPanel.show_node_tooltips=Tonen tooltip van knoop
-OptionPanel.show_note_icons=Tonen notitieicons
+OptionPanel.show_note_icons=Het pictogram voor notities tonen
 OptionPanel.show_styles_in_tooltip=Tonen knoopstijl in tooltip
 OptionPanel.signed_script_are_trusted=Vertrouw ondertekende scripts (aanbevolen).
 OptionPanel.signed_script_are_trusted.tooltip=Uitvoeren script zonder beperkingen indien getekend door een vertouwde partij zoals Freeplane's auteurs of jijzelf.
@@ -1371,7 +1373,7 @@ OptionPanel.standardselectednoderectanglecolor.tooltip=<html> De kleur van de om
 OptionPanel.STAR=Ster
 OptionPanel.statesymbolwidth=Breedte van het symbool voor de staat van de knoop
 OptionPanel.structured_html_import=Importeren HTML als knoop structuur
-OptionPanel.structured_icon_toolbar=Gestructureerde werkbalk pictogrammenmenu
+OptionPanel.structured_icon_toolbar=Gestructureerde pictogrammenbalk
 OptionPanel.summary=Samenvatting/Groep
 OptionPanel.sv=Zweeds/ svenska
 OptionPanel.text.use_ctrl_key=Gebruik 'Toewijzen sneltoets' van het menu Extra
@@ -1505,7 +1507,7 @@ PrintAction.text=Afdrukken mindmap...
 PrintDirectAction.text=Afdrukken
 printing_settings=Pagina-afdrukinstellingen
 PrintPreviewAction.text=Afdrukvoorbeeld...
-progress=%Schijf
+progress=Voortgangspictogram (%)
 PropertyAction.dialog=Instellingen
 PropertyAction.text=Instellingen...
 QuickFilterAction.text=Filteren mindmap
@@ -1534,12 +1536,12 @@ remove_file_from_list_on_error=Bestand (0) kon niet geopend worden. Verwijderen
 remove_shortcut_question=Sneltoets verwijderen ?
 RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Opengevouwen knopen resetten
 RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Alle knopen toestaan om dicht te vouwen
-RemoveAllIconsAction.text=Verwijderen alle pictogrammen
+RemoveAllIconsAction.text=Alle pictogrammen verwijderen
 RemoveConnectorAction.text=Verwijderen verbindindingslijn
 RemoveEncryption.text=Verwijderen wachtwoord
 RemoveFormatAction.text=Verwijderen opmaak
-RemoveIcon_0_Action.text=Verwijderen eerste pictogram
-RemoveIconAction.text=Verwijderen laatste pictogram
+RemoveIcon_0_Action.text=Eerste pictogram verwijderen
+RemoveIconAction.text=Laatste pictogram verwijderen
 RemoveNoteAction.text=Verwijderen knoopnotitie
 RemoveNoteAction.tooltip=<html> Verwijderen inhoud van notitievenster.</html>
 rename=&Hernoemen
@@ -1588,7 +1590,7 @@ ScriptsRunToggleAction.ON_SINGLE_NODE.text=Scripts voor \u00E9\u00E9n geselectee
 select_favorites_folder=Selecteren map waarin je favorieten staan
 select_file_export_to=Selecteren bestand voor exporteren
 select_folder_for_importing=Selecteren map voor importeren
-select_icon=Selecteren pictogram
+select_icon=Een pictogram selecteren
 select_menu_item_dialog=Kiezen menuoptie
 select_menu_item_root_node=Menu
 select_template=Selecteer sjabloon
@@ -1600,7 +1602,7 @@ selection_method_delayed=Uitgestelde automatische selectie
 selection_method_direct=Aanwijzen om te selecteren
 SelectNoteAction.text=Bewerken notitiehulpvenster
 SelectNoteAction.tooltip=Wissel naar/van notitievenster
-set_accelerator_on_next_click_action=Om een nieuwe sneltoets toe te wijzen: druk op 'Ctrl' tijdens het aankikken van het commando.
+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...
@@ -1885,7 +1887,7 @@ ToggleDetailsAction.text=Tonen knoopdetails
 ToggleFBarAction.text=Tonen F-balk (functietoetsen)
 ToggleFoldedAction.text=Open/dichtvouwen
 ToggleFullScreenAction.text=Tonen volledig scherm
-ToggleLeftToolbarAction.text=Tonen pictogrammenbalk
+ToggleLeftToolbarAction.text=Pictogrammenbalk tonen
 ToggleMenubarAction.text=Tonen hoofdmenu
 ToggleScrollbarsAction.text=Schuifbalken
 ToggleStatusAction.text=Tonen statuslijn
diff --git a/freeplane/resources/translations/Resources_pl.properties b/freeplane/resources/translations/Resources_pl.properties
index e5c336c..bc8c0cb 100644
--- a/freeplane/resources/translations/Resources_pl.properties
+++ b/freeplane/resources/translations/Resources_pl.properties
@@ -1382,7 +1382,6 @@ selection_method_delayed=Z op\u00F3\u017Anieniem
 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_action=Kliknij na dowolnej pozycji menu aby przypisa\u0107 nowy skr\u00F3t
 SetAcceleratorOnNextClickAction.text=Przypisz skr\u00F3t klawiszowy
 SetImageByFileChooserAction.text=Obraz (wybierz plik)...
 SetLinkByFileChooserAction.text=Odno\u015Bnik (wybierz plik)...
diff --git a/freeplane/resources/translations/Resources_pt_BR.properties b/freeplane/resources/translations/Resources_pt_BR.properties
index e8c7563..742ff2e 100644
--- a/freeplane/resources/translations/Resources_pt_BR.properties
+++ b/freeplane/resources/translations/Resources_pt_BR.properties
@@ -6,14 +6,14 @@ accessories/plugins/ApplyFormatPlugin.dialog.title=Alterar o formato de n\u00F3s
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Alterar padr\u00E3o
 accessories/plugins/EncryptNode.properties_0=Escolha uma senha para encriptar n\u00F3
 accessories/plugins/EncryptNode.properties_1=As senhas n\u00E3o s\u00E3o iguais ou curta.
-accessories/plugins/EncryptNode.properties_2=Digite a senha\:
-accessories/plugins/EncryptNode.properties_3=Redigite a senha\:
+accessories/plugins/EncryptNode.properties_2=Digite a senha:
+accessories/plugins/EncryptNode.properties_3=Redigite a senha:
 accessories/plugins/EncryptNode.properties_4=Digite sua senha.
 accessories/plugins/EncryptNode.properties_5=<html>Lembre-se que a for\u00E7a de criptografia<br> depende quase completamente da qualidade da sua senha.
 accessories/plugins/EncryptNode.properties_6=OK
 accessories/plugins/EncryptNode.properties_7=Cancelar
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Voc\u00EA s\u00F3 pode ativar ou desativar a criptografia de n\u00F3s criptografados. Por favor insira um n\u00F3 desse tipo usando o menu Ferramentas.
-accessories/plugins/EncryptNode.properties_select_me=Me selecione para continuar\!
+accessories/plugins/EncryptNode.properties_select_me=Me selecione para continuar!
 accessories/plugins/EncryptNode.properties_wrong_password=A senha est\u00E1 incorreta.
 accessories/plugins/ExportWithTWiki.text=TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Exporta o mapa como um documento TWiki.
@@ -44,23 +44,23 @@ AddOnDetailsPanel.authored.by=Por {0}
 AddOnDetailsPanel.header.function=Fun\u00E7\u00E3o
 AddOnDetailsPanel.header.menu=Localiza\u00E7\u00E3o do Menu
 AddOnDetailsPanel.header.shortcut=Atalho
-AddOnDetailsPanel.homepage=P\u00E1gina Inicial\:
+AddOnDetailsPanel.homepage=P\u00E1gina Inicial:
 addons.installer.canceled=Instala\u00E7\u00E3o cancelada
 addons.installer.confirm.licence=<html><body><h1>Licen\u00E7a</h1>{0}<p><p><em>Voc\u00EA aceita essa licen\u00E7a?</em></p></body></html>
-addons.installer.failed=A instala\u00E7\u00E3o falhou\: {0}
-addons.installer.freeplaneversion.format.error=Erro de Formato em {0} (valor\: {1})
+addons.installer.failed=A instala\u00E7\u00E3o falhou: {0}
+addons.installer.freeplaneversion.format.error=Erro de Formato em {0} (valor: {1})
 addons.installer.html.script=Corpo do "Script" pode n\u00E3o pode ser formatado como HTML
 addons.installer.install=Instalar
 addons.installer.invalid.keyboard.shortcut=Atalho inv\u00E1lido {0}.
 addons.installer.licence.unchanged=A licen\u00E7a n\u00E3o foi alterada
-addons.installer.map.structure=Erro na estrutura do mapa\: {0}
-addons.installer.missing.child.nodes=Faltando os n\u00F3s filhos\:{0}
-addons.installer.missing.permission.attribute=Script {0}\: Atributos de permiss\u00E3o faltando {1}
-addons.installer.missing.properties=Propriedades faltando\: {0}
+addons.installer.map.structure=Erro na estrutura do mapa: {0}
+addons.installer.missing.child.nodes=Faltando os n\u00F3s filhos:{0}
+addons.installer.missing.permission.attribute=Script {0}: Atributos de permiss\u00E3o faltando {1}
+addons.installer.missing.properties=Propriedades faltando: {0}
 addons.installer.missing.translation=Faltando tradu\u00E7\u00F5es de {0} para o local {1}
 addons.installer.no.scripts=Nenhum "script" encontrado
 addons.installer.no.zipdata=Nenhum dado compactado encontrado
-addons.installer.nonstandard.permissions=O "script" solicita as seguintes permiss\u00F5es, que no momento n\u00E3o est\u00E3o habilitadas\: {0}\ndeseja adiciona-las \u00E0s permiss\u00F5es padr\u00E3o?
+addons.installer.nonstandard.permissions=O "script" solicita as seguintes permiss\u00F5es, que no momento n\u00E3o est\u00E3o habilitadas: {0}\ndeseja adiciona-las \u00E0s permiss\u00F5es padr\u00E3o?
 addons.installer.one.child.expected=Era esperado exatamente um filho de {0} mas foram encontrados {1}.
 addons.installer.script.name.suffix=O script {0} n\u00E3o possui sufixo ".groovy"
 addons.installer.script.no.execution_mode=Nenhum atributo "execution_mode" definido para {0}
@@ -75,7 +75,7 @@ addons.installer.too.old=A vers\u00E3o atual do Freeplane {0} \u00E9 muito antig
 addons.installer.unknown.deinstallation.rules=Regra(s) de desinstala\u00E7\u00E3o desconhecida(s) {0}
 addons.installer.update=Atualiza\u00E7\u00E3o da vers\u00E3o {0}
 addons.installer.warning=<html><body><em>Voc\u00EA s\u00F3 deve instalar add-ons a partir de fontes confi\u00E1veis. Softwares maliciosos podem danificar seus dados ou violar sua privacidade.</em></body></html>
-addons.site=http\://freeplane.sourceforge.net/addons
+addons.site=http://freeplane.sourceforge.net/addons
 AddStyleAttributes.text=Atributos a partir do estilo
 AddStyleAttributes.tooltip=Adicionar atributos a partir do estilo do n\u00F3
 AllMapsNodeListAction.text=Procura e modifica em todos os mapas
@@ -103,7 +103,7 @@ attribute_name_or_value=Atribuir nome ou valor
 attribute_replace=Substituir por
 attribute_top=Todos os atributos conhecidos para os n\u00F3s carregados
 attribute_value=Valor do atributo
-attributes_AddAttributeAction.text=Editar Atributo na Caixa de Di\u00E1logo
+attributes_AddAttributeAction.text=Editar atributo na caixa de di\u00E1logo...
 attributes_adding_empty_attribute_error=N\u00E3o pode ser utilizado um "string" vazio como nome de atributo
 attributes_all=Todos os atributos
 attributes_assign_dialog=Editor extendido de atributos
@@ -144,6 +144,7 @@ automatically_save_message=O mapa foi salvo automaticamente (com o nome de {0})
 AutomaticEdgeColor.FOR_BRANCHES=para ramos
 AutomaticEdgeColor.FOR_COLUMNS=para colunas
 AutomaticEdgeColor.FOR_LEVELS=para n\u00EDveis
+AutomaticEdgeColor.ON_BRANCH_CREATION=ao criar ramos
 AutomaticEdgeColorHookAction.text=Cor de borda autom\u00E1tica
 AutomaticLayout.ALL=para todos os n\u00F3s
 AutomaticLayout.HEADINGS=Para n\u00F3s que n\u00E3o sejam do tipo folha
@@ -182,6 +183,7 @@ cannot_add_parent_diff_parents=Para usar esta fun\u00E7\u00E3o, \u00E9 necess\u0
 cannot_add_parent_to_root=O n\u00F3 raiz n\u00E3o pode ser adicionado a um novo pai.
 cannot_delete_root=O n\u00F3 raiz n\u00E3o pode ser apagado ou cortado.
 cannot_join_nodes_with_children=N\u00E3o \u00E9 poss\u00EDvel unificar n\u00F3s com filhos
+cannot_move_into_child_node=N\u00E3o pode ser movido para um n\u00F3 filho
 cannot_move_to_child=N\u00E3o \u00E9 poss\u00EDvel mover o n\u00F3 para um de seus filhos.
 CenterAction.text=Centralizar
 CenterSelectedNodeAction.text=Centralizar o n\u00F3 selecionado
@@ -198,12 +200,12 @@ ChangeNodeLevelLeftsAction.text=Mover n\u00F3 para Esquerda
 ChangeNodeLevelLeftsAction.tooltip=No lado esquerdo da raiz o(s) n\u00F3(s) \u00E9/s\u00E3o deslocado(s) para baixo. Eles se tornam filhos dos seus n\u00F3s g\u00EAmeos. No lado direito da raiz o(s) n\u00F3(s) \u00E9/s\u00E3o deslocado(s)para cima. Diretamente na raiz, o(s) n\u00F3(s) muda(m) de lado.
 ChangeNodeLevelRightsAction.text=Mover n\u00F3 para a Direita
 ChangeNodeLevelRightsAction.tooltip=No lado direito da raiz os n\u00F3s s\u00E3o deslocados para baixo. Eles se tornam filhos da crian\u00E7a acima. No lado esquerdo da raiz os n\u00F3s s\u00E3o deslocados para cima. Diretamente na raiz, os n\u00F3s mudam de lado.
-choose_background_color=Escolha a cor de fundo\:
-choose_cloud_color=Escolha a cor da nuvem\:
+choose_background_color=Escolha a cor de fundo:
+choose_cloud_color=Escolha a cor da nuvem:
 choose_edge_color=Escolha a cor da borda
 choose_map_background_color=Escolha a cor de fundo do mapa
-choose_node_background_color=Escolha a cor de fundo do n\u00F3\:
-choose_node_color=Escolha a cor do n\u00F3\:
+choose_node_background_color=Escolha a cor de fundo do n\u00F3:
+choose_node_color=Escolha a cor do n\u00F3:
 ClearLinkAnchorAction.text=Limpar a \u00E2ncora do link
 ClearLinkAnchorAction.tooltip=<html>Limpar a \u00E2ncora do conjunto de n\u00F3s anterior</html>
 CloneAction.text=colar como clone
@@ -231,7 +233,7 @@ CopyAction.text=Copiar
 CopyAction.tooltip=Copiar galho selecionado
 CopyAttributes.text=Copiar atributos
 CopyIDAction.text=Copiar ID do n\u00F3
-CopyMapStylesAction.text=Copiar estilo do um outro mapa mental j\u00E1 existente
+CopyMapStylesAction.text=Copiar o estilo do mapa de...
 CopyMapStylesAction.tooltip=Com esta fun\u00E7\u00E3o voc\u00EA ir\u00E1 pegar os padr\u00F5es de configura\u00E7\u00F5es de outro mapa j\u00E1 existente e ir\u00E1 aplicar no mapa selecionado
 CopyNodeURIAction.text=Copiar URI do n\u00F3
 copyright=Direitos autorais 2000-2016 Time Freeplane e outros
@@ -342,6 +344,7 @@ error_applying_template=Erro aplicando template XSL.
 error_creating_directory=N\u00E3o foi poss\u00EDvel criar o diret\u00F3rio para exportar.
 error_in_template=Erros no modelo padr\u00E3o do mapa {0}. Tente remover o arquivo.
 errornumber={0} erros
+ExecuteScript.available_modes_tooltip={0} est\u00E1 dispon\u00EDvel para
 ExecuteScript.script=Script
 ExecuteScriptError.text=Erro executando o "script"\n{0}
 ExecuteScriptForAllNodes.text=Executar todos os "scripts"
@@ -351,7 +354,7 @@ ExecuteScriptOnSelectedNodeRecursively.text=Executar {0} nos n\u00F3s selecionad
 ExecuteScriptOnSingleNode.text=Executar {0} em um n\u00F3 selecionado
 ExecuteScripts.noScriptsAvailable=Nenhum dispon\u00EDvel
 ExecuteScripts.text=Scripts
-ExecuteScriptSecurityError.text=Um erro ocorreu durante a execu\u00E7\u00E3o do "script"\: {0}
+ExecuteScriptSecurityError.text=Um erro ocorreu durante a execu\u00E7\u00E3o do "script": {0}
 export_failed=A exporta\u00E7\u00E3o falhou
 export_pdf_text=Portable Document Format (PDF)
 export_svg_text=Scalable Vector Graphic (SVG)
@@ -384,19 +387,19 @@ file=&Arquivo
 file_already_exists=O arquivo {0} j\u00E1 existe. Voc\u00EA quer escrever por cima dele?
 file_not_found=Arquivo {0} n\u00E3o encontrado
 FileListFlavorHandler=Lins para arquivos
-FileProperties_BranchLeafCount=N\u00FAmero de n\u00F3s-folhas num galho selecionado\:
-FileProperties_BranchNodeCount=N\u00FAmero de n\u00F3s num galho selecionado\:
-FileProperties_ChangesSinceLastSave=Altera\u00E7\u00F5es desde a \u00FAltima vez que foi salvo\:
-FileProperties_FileName=Nome do arquivo\:
-FileProperties_FileSaved=Arquivo salvo\:
-FileProperties_FileSize=Tamanho do arquivo\:
-FileProperties_MainBranchCount=N\u00FAmero de galhos principais\:
+FileProperties_BranchLeafCount=N\u00FAmero de n\u00F3s-folhas num galho selecionado:
+FileProperties_BranchNodeCount=N\u00FAmero de n\u00F3s num galho selecionado:
+FileProperties_ChangesSinceLastSave=Altera\u00E7\u00F5es desde a \u00FAltima vez que foi salvo:
+FileProperties_FileName=Nome do arquivo:
+FileProperties_FileSaved=Arquivo salvo:
+FileProperties_FileSize=Tamanho do arquivo:
+FileProperties_MainBranchCount=N\u00FAmero de galhos principais:
 FileProperties_NeverSaved=Nunca foi salvo
-FileProperties_NodeChildCount=N\u00FAmero de filhos do(s) n\u00F3(s) selecionado(s)\:
-FileProperties_NodeSelectionCount=N\u00FAmero de n\u00F3s selecionados\:
-FileProperties_TotalFilteredCount=N\u00FAmero de n\u00F3s que satisfazem o filtro\:
-FileProperties_TotalLeafCount=N\u00FAmero total de n\u00F3s-folhas\:
-FileProperties_TotalNodeCount=N\u00FAmero total de n\u00F3s\:
+FileProperties_NodeChildCount=N\u00FAmero de filhos do(s) n\u00F3(s) selecionado(s):
+FileProperties_NodeSelectionCount=N\u00FAmero de n\u00F3s selecionados:
+FileProperties_TotalFilteredCount=N\u00FAmero de n\u00F3s que satisfazem o filtro:
+FileProperties_TotalLeafCount=N\u00FAmero total de n\u00F3s-folhas:
+FileProperties_TotalNodeCount=N\u00FAmero total de n\u00F3s:
 FilePropertiesAction.text=Estat\u00EDsticas do mapa...
 FileRevisionsDialog.cancel=&Cancelar
 FileRevisionsDialog.file_last_modified=Protocolo
@@ -412,6 +415,8 @@ filter=&Fitrar
 filter_add=Adicionar
 filter_and=E
 filter_any_text=Conte\u00FAdo, detalhes ou nota
+filter_clone_snapshot=Clones salvos para sele\u00E7\u00E3o
+filter_clones=Clones da sele\u00E7\u00E3o
 filter_conditions=Filtros
 filter_contains=Cont\u00E9m
 filter_created_after=Criado ap\u00F3s
@@ -458,7 +463,7 @@ filter_selected_node_view=N\u00F3s selecionados no momento
 filter_selected_node_view_snapshot=Sele\u00E7\u00E3o salva
 filter_style=Estilo
 filter_time=Filtro de data
-filterConditions=Filtros Definidos pelo Usu\u00E1rio
+filterConditions=Filtros definidos pelo usu\u00E1rio
 filters_not_loaded=Filtro n\u00E3o pode ser carregado; arquivo corrompido
 find=Localizar / Procurar
 find_what=Procurar o qu\u00EA
@@ -492,7 +497,7 @@ FormatPaste.text=Cola formata\u00E7\u00E3o
 FormatPaste.tooltip=<html>Cola a formata\u00E7\u00E3o de um n\u00F3.</html>
 formats_not_loaded=Formatos n\u00E3o puderam ser carregados; arquivos corrompidos
 formula.error.attributeValueIsNull=Valor do atributo "{0}" \u00E9 nulo depois da avalia\u00E7\u00E3o.
-formula.error.circularReference=Refer\u00EAncia circular\: A f\u00F3rmula no n\u00F3 "{0}" referencia a si mesmo.
+formula.error.circularReference=Refer\u00EAncia circular: A f\u00F3rmula no n\u00F3 "{0}" referencia a si mesmo.
 formula.EvaluateAllAction.text=Avalia todos
 formula.EvaluateAllAction.tooltip=Avaliar todas as f\u00F3rmulas do mapa atual
 formula.menuname=F\u00F3rmulas
@@ -694,17 +699,18 @@ invalid_url=N\u00E3o foi poss\u00EDve3l criar uma URL v\u00E1lida
 invalid_url_msg=N\u00E3o foi poss\u00EDvel criar uma URL v\u00E1lida para {0}
 ItalicAction.text=It\u00E1lica
 italicise_branch=It\u00E1lico
-java_version=Vers\u00E3o do java\: {0}
+java_version=Vers\u00E3o do java: {0}
+JoinNodesAction.separator.format=Mesclar n\u00F3s com "{0}"
 lastOpenedMaps=Mapas Abertos Recentemente
 latex_editor=Editor LaTeX
 LatexDeleteLatexAction.text=Remover f\u00F3rmula LaTeX
 LatexEditLatexAction.text=Editar f\u00F3rmula LaTeX...
-LatexInsertLatexAction.msg1=<html>Voc\u00EA est\u00E1 tentando inserir uma f\u00F3rmula <i>legacy</i> do LaTeX.<br/> A nova maneira de se criar um texto ou f\u00F3rmula LaTeX est\u00E1 descrito na p\u00E1gina\: </html>
-LatexInsertLatexAction.msg2=<html>Em resumo\: <ul><li>use um prefixo "\\latex" no n\u00F3 de texto ou</li><li><i>Vizualizar->Painel de Propriedades</i>, em seguida <i>Texto Principal->Formatar->LaTeX</i></li></ul></html>
+LatexInsertLatexAction.msg1=<html>Voc\u00EA est\u00E1 tentando inserir uma f\u00F3rmula <i>legacy</i> do LaTeX.<br/> A nova maneira de se criar um texto ou f\u00F3rmula LaTeX est\u00E1 descrito na p\u00E1gina: </html>
+LatexInsertLatexAction.msg2=<html>Em resumo: <ul><li>use um prefixo "\\latex" no n\u00F3 de texto ou</li><li><i>Vizualizar->Painel de Propriedades</i>, em seguida <i>Texto Principal->Formatar->LaTeX</i></li></ul></html>
 LatexInsertLatexAction.text=Adicionar f\u00F3rmula LaTeX...
 latexPatternFormat=LaTeX
 less_than_two_selected_nodes=\u00C9 preciso selecionar ao menos dois n\u00F3s para estabelecer um link.
-license=Licen\u00E7a\: GPL 2 ou posterior
+license=Licen\u00E7a: GPL 2 ou posterior
 license_text=<html>Esse programa \u00E9 um software livre; voc\u00EA pode redistribu\u00ED-lo e/ou<br>modific\u00E1-lo sob os termos da GNU - Licen\u00E7a P\u00FAblica Geral<br>como publicado pela Funda\u00E7\u00E3o do Software Livre; mesmo a vers\u00E3o 2<br>da licen\u00E7a, ou(em sua opini\u00E3o) qualquer vers\u00E3o posterior.<br><br>Esse programa \u00E9 distribu\u00EDdo com a esperan\u00E7a de ser \u00FAtil,<br> mas SEM NENHUMA GARANTIA; sem mesmo a garantia impl\u00EDcita de<br>COM [...]
 link_error=Link incorreto "{0}" n\u00E3o carregada
 link_not_available_any_more=O link n\u00E3o \u00E9 mais v\u00E1lido. Um dos n\u00F3s foi apagado.
@@ -719,8 +725,8 @@ locking_old_lock_removed=O Mapa {0} foi travado pelo usu\u00E1rio {1}. O travame
 long_node_changed_cancel=Voc\u00EA mudou o n\u00F3. Voc\u00EA quer descartar as mudan\u00E7as?
 long_node_changed_submit=Voc\u00EA mudou o n\u00F3. Voc\u00EA quer salvar as mudan\u00E7as?
 lots_of_links_warning=Voc\u00EA est\u00E1 para criar v\u00E1rios links para o mesmo n\u00F3. Voc\u00EA realmente quer criar esses links?
-main_resource_directory=Instala\u00E7\u00E3o de recursos\: {0}
-MainView.errorUpdateText=Erro ao definir oo texto para a seguinte entrada\: {0}.
+main_resource_directory=Instala\u00E7\u00E3o de recursos: {0}
+MainView.errorUpdateText=Erro ao definir oo texto para a seguinte entrada: {0}.
 MakeLinkFromAnchorAction.text=Fa\u00E7a um link a partir da \u00E2ncora
 MakeLinkFromAnchorAction.tooltip=<html>Criar um link local ou global a partir<br/> da \u00E2ncora do n\u00F3 para o n\u00F3 selecionado</html>
 MakeLinkToAnchorAction.text=Faz um link para a \u00E2ncora
@@ -729,16 +735,16 @@ ManageAddOnsAction.text=Adicionais
 ManageAddOnsDialog.activate=Ativar
 ManageAddOnsDialog.activation.success={0} ser\u00E1 ativado depois de reiniciar.
 ManageAddOnsDialog.authored.by=por {0}
-ManageAddOnsDialog.cannot.activate=N\u00E3o foi poss\u00EDvel ativar\: {0} ainda est\u00E1 ativo.
+ManageAddOnsDialog.cannot.activate=N\u00E3o foi poss\u00EDvel ativar: {0} ainda est\u00E1 ativo.
 ManageAddOnsDialog.cannot.configure=N\u00E3o foi poss\u00EDvel configurar {0}.
-ManageAddOnsDialog.cannot.deactivate=N\u00E3o foi poss\u00EDvel desativar\: {0} n\u00E3o est\u00E1 ativo.
+ManageAddOnsDialog.cannot.deactivate=N\u00E3o foi poss\u00EDvel desativar: {0} n\u00E3o est\u00E1 ativo.
 ManageAddOnsDialog.cannot.deinstall=N\u00E3o foi poss\u00EDvel desinstalar {0}.
 ManageAddOnsDialog.configure=Configurar
 ManageAddOnsDialog.deactivate=Desativar
 ManageAddOnsDialog.deactivation.success={0} ser\u00E1 desativado depois de um rein\u00EDcio.
 ManageAddOnsDialog.deinstall=Desinstalar
 ManageAddOnsDialog.deinstallation.success={0} ser\u00E1 desinstalado ap\u00F3s o rein\u00EDcio.
-ManageAddOnsDialog.error=Erro na instala\u00E7\u00E3o\: {0}.
+ManageAddOnsDialog.error=Erro na instala\u00E7\u00E3o: {0}.
 ManageAddOnsDialog.install=$Instalar
 ManageAddOnsDialog.install.from.known.location=Instale o adicional a partir de um local conhecido
 ManageAddOnsDialog.install.tooltip=Insira a URL de um arquivo de instala\u00E7\u00E3o de adicionais aqui
@@ -768,7 +774,7 @@ map_locked_by_save_as=O Mapa {0} j\u00E1 est\u00E1 sendo editado por {1}. A\u00E
 map_not_saved=O mapa n\u00E3o foi salvo anteriormente.
 MapBackgroundClearAction.text=Redefinir Configura\u00E7\u00F5es Padr\u00E3o do Fundo do Mapa
 MapBackgroundColorAction.text=Cor de fundo do mapa
-MapBackgroundImageAction.text=Imagem de Fundo
+MapBackgroundImageAction.text=Imagem de fundo...
 maps=Mapas Abertos
 MaxNodeWidth.text=Define a largura m\u00E1xima do n\u00F3
 menu_applyStyle=Aplicar estilo
@@ -841,10 +847,10 @@ NewerFileRevisionsFoundDialog.file_name=Arquivo
 NewerFileRevisionsFoundDialog.file_size=Bytes
 NewerFileRevisionsFoundDialog.open=&Abrir
 NewerFileRevisionsFoundDialog.open.tooltip=Abrir o arquivo mesmo que esteja desatualizado
-NewerFileRevisionsFoundDialog.question=Encontradas novas revis\u00F5es de {0}\!
+NewerFileRevisionsFoundDialog.question=Encontradas novas revis\u00F5es de {0}!
 NewerFileRevisionsFoundDialog.restore=Rest&aurar
 NewerFileRevisionsFoundDialog.restore.tooltip=Substituir {0} por {1}
-NewerFileRevisionsFoundDialog.title=Encontradas novas revis\u00F5es de arquivo\!
+NewerFileRevisionsFoundDialog.title=Encontradas novas revis\u00F5es de arquivo!
 NewFreeNodeAction.text=Novo n\u00F3 Flutuante
 NewLevelStyleAction.text=Adicionar estilo de n\u00EDvel
 newmap.install.addon.question={0} parece ser um pacote add-on?\nDeseja instala-lo??\n(Selecione "N\u00E3o" para abri-lo normalmente.)
@@ -932,7 +938,7 @@ OptionPanel.antialias_edges=Suaviza bordas
 OptionPanel.antialias_none=Sem suaviza\u00E7\u00E3o
 OptionPanel.Appearance=Apar\u00EAncia
 OptionPanel.approximate_search_threshold=princ\u00EDpio de correspond\u00EAncia aproximada
-OptionPanel.approximate_search_threshold.tooltip=<html>Limite para correspond\u00EAncia aproximada<br/><font size\="2">consulte http\://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(quanto maior a varia\u00E7\u00E3o menor<br/>ser\u00E1 o termo encontrado)</html>
+OptionPanel.approximate_search_threshold.tooltip=<html>Limite para correspond\u00EAncia aproximada<br/><font size="2">consulte http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(quanto maior a varia\u00E7\u00E3o menor<br/>ser\u00E1 o termo encontrado)</html>
 OptionPanel.ar=\u00C1rabe
 OptionPanel.ARC=Arco
 OptionPanel.as_parent=Como pai
@@ -960,6 +966,7 @@ OptionPanel.combined=Combinado
 OptionPanel.compare_as_number=Comparar uns n\u00FAmeros
 OptionPanel.convert_to_current_version=<html>Automaticamente converter mapas de vers\u00F5es antigas do Freeplane<br> para a vers\u00E3o atual?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Apenas para mapas grandes que n\u00E3o precisam ser convertidas <br>(este \u00E9 um conhecimento de expert) voc\u00EA pode abrir os mapas sem convert\u00EA-los.</html>
+OptionPanel.copyFormatToNewSibling=Copiar o formato para novos irm\u00E3os
 OptionPanel.cs=Tcheco
 OptionPanel.cut_nodes_without_question=Cortar os n\u00F3s sem pedir confirma\u00E7\u00E3o ?
 OptionPanel.cut_nodes_without_question.tooltip=Se esta op\u00E7\u00E3o for selecionada, os n\u00F3s ser\u00E3o cortados sem confirma\u00E7\u00E3o.
@@ -967,19 +974,19 @@ OptionPanel.da=Dinamarca
 OptionPanel.date_format=Formato de data padr\u00E3o
 OptionPanel.date_format.tooltip=CURTO, M\u00C9DIO, LONGO, INTEIRO ou PADR\u00C3O como "MM/dd/yyyy"
 OptionPanel.datetime_format=Formato de data e hora padr\u00E3o
-OptionPanel.datetime_format.tooltip=<datestyle>,<timestyle> (estilo CURTO, M\u00C9DIO, LONGO ou INTEIRO) ou um padr\u00E3o inteiro como  "M/d/yyyy hh\:mm"
+OptionPanel.datetime_format.tooltip=<datestyle>,<timestyle> (estilo CURTO, M\u00C9DIO, LONGO ou INTEIRO) ou um padr\u00E3o inteiro como  "M/d/yyyy hh:mm"
 OptionPanel.de=Alemanha
 OptionPanel.default=Padr\u00E3o
 OptionPanel.default_attribute_key_column_width=Atributo padr\u00E3o de largura de chave
 OptionPanel.default_attribute_value_column_width=Atributo padr\u00E3o valor de largura
 OptionPanel.default_browser_command_mac=Comando padr\u00E3o do Mac para browser
-OptionPanel.default_browser_command_mac.tooltip=<html> e para o MAC\: (gra\u00E7as ao Nick\!)</html>
+OptionPanel.default_browser_command_mac.tooltip=<html> e para o MAC: (gra\u00E7as ao Nick!)</html>
 OptionPanel.default_browser_command_other_os=Comando padr\u00E3o para o browser em outros sistemas operacionais
-OptionPanel.default_browser_command_other_os.tooltip=<html> Este \u00E9 tipicamente Linux\:</html>
+OptionPanel.default_browser_command_other_os.tooltip=<html> Este \u00E9 tipicamente Linux:</html>
 OptionPanel.default_browser_command_windows_9x=Comando padr\u00E3o para o browser no Windows 9x
-OptionPanel.default_browser_command_windows_9x.tooltip=<html>Para o Windows (as aspas ("") s\u00E3o necess\u00E1rias para links que tem "\=" em suas URLs).</html>
+OptionPanel.default_browser_command_windows_9x.tooltip=<html>Para o Windows (as aspas ("") s\u00E3o necess\u00E1rias para links que tem "=" em suas URLs).</html>
 OptionPanel.default_browser_command_windows_nt=Comando padr\u00E3o para o browser no Windows NT
-OptionPanel.default_browser_command_windows_nt.tooltip=<html>Para o Windows (as aspas ("") s\u00E3o necess\u00E1rias para links que tem "\=" em suas URLs).</html>
+OptionPanel.default_browser_command_windows_nt.tooltip=<html>Para o Windows (as aspas ("") s\u00E3o necess\u00E1rias para links que tem "=" em suas URLs).</html>
 OptionPanel.default_charset=Conjunto de caracteres
 OptionPanel.default_save_dir=Pasta Padr\u00E3o para Salvar
 OptionPanel.Defaults=Padr\u00F5es
@@ -1016,13 +1023,13 @@ OptionPanel.et=Estoniano
 OptionPanel.execute_scripts_without_asking=Execu\u00E7\u00E3o de script habilitada
 OptionPanel.execute_scripts_without_asking.tooltip=<html>Scripts Freeplane sao capazes de executar qualquer acao em seu computador. <br>Desta forma, voc\u00EA nao deve executar scripts que voc\u00EA nao tenha certeza que sejam seguros.</html>
 OptionPanel.execute_scripts_without_exec_restriction=Autoriza\u00E7\u00E3o para executar outras aplica\u00E7\u00F5es (N\u00C3O RECOMENDADA)
-OptionPanel.execute_scripts_without_exec_restriction.tooltip=<html><body>Se seus Groovy Scripts precisar executar outras aplica\u00E7\u00F5es especiais (como um browser) sem te perguntar, habilitar esta op\u00E7\u00E3o. Cuidado ao usar pois um script malicioso pode prejudicar seu computador\!</body></html>
+OptionPanel.execute_scripts_without_exec_restriction.tooltip=<html><body>Se seus Groovy Scripts precisar executar outras aplica\u00E7\u00F5es especiais (como um browser) sem te perguntar, habilitar esta op\u00E7\u00E3o. Cuidado ao usar pois um script malicioso pode prejudicar seu computador!</body></html>
 OptionPanel.execute_scripts_without_file_restriction=Permitir opera\u00E7\u00F5es de leitura do arquivo (N\u00C3O RECOMENDADA)
-OptionPanel.execute_scripts_without_file_restriction.tooltip=<html><body>Se Groovy Scripts precisa ter acesso de leitura (abrir, fechar, ler),<br>voc\u00EA precisa habilitar essa op\u00E7\u00E3o.<br>Cuidado, um script malicioso pode prejudicar seu computador\!</body></html>
+OptionPanel.execute_scripts_without_file_restriction.tooltip=<html><body>Se Groovy Scripts precisa ter acesso de leitura (abrir, fechar, ler),<br>voc\u00EA precisa habilitar essa op\u00E7\u00E3o.<br>Cuidado, um script malicioso pode prejudicar seu computador!</body></html>
 OptionPanel.execute_scripts_without_network_restriction=Permitir opera\u00E7\u00F5es de rede (N\u00C3O RECOMENDADA)
-OptionPanel.execute_scripts_without_network_restriction.tooltip=<html><body>Se os scripts Groovy precisa executar a\u00E7\u00F5es especiais de rede,<br>voc\u00EA tem que habilitar essa op\u00E7\u00E3o. <br>Use com cuidado, o script malicioso pode prejudicar seguran\u00E7a das informa\u00E7\u00F5es\!</body></html>
+OptionPanel.execute_scripts_without_network_restriction.tooltip=<html><body>Se os scripts Groovy precisa executar a\u00E7\u00F5es especiais de rede,<br>voc\u00EA tem que habilitar essa op\u00E7\u00E3o. <br>Use com cuidado, o script malicioso pode prejudicar seguran\u00E7a das informa\u00E7\u00F5es!</body></html>
 OptionPanel.execute_scripts_without_write_restriction=Permitir opera\u00E7\u00F5es de arquivo/escrita (N\u00C3O RECOMENDADA)
-OptionPanel.execute_scripts_without_write_restriction.tooltip=<html><body>Se precisar de seus scripts Groovy para acesso de grava\u00E7\u00E3o aos arquivos (escrever, apagar (\!)),<br>voc\u00EA tem que habilitar essa op\u00E7\u00E3o. <br>Normalmente usado com acesso de leitura.<br>Use com cuidado, pois script malicioso pode prejudicar seu computador\!</body></html>
+OptionPanel.execute_scripts_without_write_restriction.tooltip=<html><body>Se precisar de seus scripts Groovy para acesso de grava\u00E7\u00E3o aos arquivos (escrever, apagar (!)),<br>voc\u00EA tem que habilitar essa op\u00E7\u00E3o. <br>Normalmente usado com acesso de leitura.<br>Use com cuidado, pois script malicioso pode prejudicar seu computador!</body></html>
 OptionPanel.experimental_file_locking_on=Bloqueio de arquivo experimental
 OptionPanel.experimental_file_locking_on.tooltip=<html> Caracter\u00EDstica experimental</html>
 OptionPanel.export_icons_in_html=Exporta \u00EDcones para HTML
@@ -1043,7 +1050,7 @@ OptionPanel.gl=Galego
 OptionPanel.goto_note_end_on_edit=Mova o cursor de nota para o final
 OptionPanel.grid_size=Tamanho da lacuna de grade
 OptionPanel.groovy_editor_font=Fonte para editor Groovy Syntax Highlighting
-OptionPanel.groovy_editor_font.tooltip=Usar 'Dialog' ou 'Monospaced' se voc\u00EA necessita caracteres unicode\!
+OptionPanel.groovy_editor_font.tooltip=Usar 'Dialog' ou 'Monospaced' se voc\u00EA necessita caracteres unicode!
 OptionPanel.groovy_editor_font_size=Tamanho da fonte para editor Groovy Syntax Highlighting
 OptionPanel.gtk=GTK
 OptionPanel.hide_edge=Ocultar a borda
@@ -1082,7 +1089,7 @@ OptionPanel.last_opened_list_length=Comprimento da \u00FAltima lista de arquivos
 OptionPanel.latex_disable_editor=Desativar editor LaTeX Syntax Highlighting
 OptionPanel.latex_disable_editor.tooltip=Marque esta op\u00E7\u00E3o se voc\u00EA est\u00E1 tendo problemas com o editor LaTeX
 OptionPanel.latex_editor_font=Fonte para LaTeX Syntax Highlighting
-OptionPanel.latex_editor_font.tooltip=Usar 'Dialog' ou 'Monospaced' se voc\u00EA necessita de caracteres unicode\!
+OptionPanel.latex_editor_font.tooltip=Usar 'Dialog' ou 'Monospaced' se voc\u00EA necessita de caracteres unicode!
 OptionPanel.latex_editor_font_size=Tamanho da fonte para editor LaTeX Syntax Highlighting
 OptionPanel.latex_macros=Macros comuns LaTeX
 OptionPanel.layout_map_on_text_change=Mapa de layout durante a edi\u00E7\u00E3o
@@ -1124,14 +1131,14 @@ OptionPanel.nodefontitalic=It\u00E1lico
 OptionPanel.nodefontname=Fam\u00EDlia de fontes
 OptionPanel.nodefontsize=Tamanho da fonte
 OptionPanel.nodeformat=Formato
-OptionPanel.nodeformat.tooltip=<html>Substitui\u00E7\u00E3o de texto e/ou formata\u00E7\u00E3o\:<ul><li><em>Expan\u00E3o do modelo</em> (<tt>%s</tt> \u00E9 texto original), por exemplo <tt>BEWARE\: %s</tt><li><em>Formata\u00E7\u00E3o de datas e n\u00FAmeros</em> - veja os exemplos na caixa de sele\u00E7\u00E3o</ul></html>
+OptionPanel.nodeformat.tooltip=<html>Substitui\u00E7\u00E3o de texto e/ou formata\u00E7\u00E3o:<ul><li><em>Expan\u00E3o do modelo</em> (<tt>%s</tt> \u00E9 texto original), por exemplo <tt>BEWARE: %s</tt><li><em>Formata\u00E7\u00E3o de datas e n\u00FAmeros</em> - veja os exemplos na caixa de sele\u00E7\u00E3o</ul></html>
 OptionPanel.nodenumbering=Numera\u00E7\u00E3o de n\u00F3
 OptionPanel.nodenumbering.tooltip=Adiciona n\u00FAmero de s\u00E9rie (p.e. 1.3.1) para o texto do n\u00F3.
 OptionPanel.nodetext=Texto principal
 OptionPanel.nodetext.tooltip=Aqui voc\u00EA pode definir o texto dos n\u00F3s. O texto anterior \u00E9 descartado quando o padr\u00E3o \u00E9 aplicado.
 OptionPanel.nothing=Nenhum
 OptionPanel.number_format=Padr\u00E3o formato de n\u00FAmero
-OptionPanel.number_format.tooltip=Um padr\u00E3o contendo '\#' para opcional ou '0' para d\u00EDgitos obrigat\u00F3rios. Exemplos\: "0.00", "0.0%", "$\#.00", "\#0"
+OptionPanel.number_format.tooltip=Um padr\u00E3o contendo '#' para opcional ou '0' para d\u00EDgitos obrigat\u00F3rios. Exemplos: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=N\u00FAmero de arquivos diferentes para salvamento autom\u00E1tico
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> N\u00FAmero de arquivos diferentes para armazenar os mapas. Quando for realizado este n\u00FAmero de grava\u00E7\u00F5es autom\u00E1ticas o primeiro arquivo gravada ser\u00E1 regravado com o mapa mais recente e o ciclo se reinicia.</html>
 OptionPanel.OK=Salvar
@@ -1144,10 +1151,10 @@ OptionPanel.outline_hgap=Dist\u00E2ncia horizontal
 OptionPanel.outline_vgap=Dist\u00E2ncia vertical
 OptionPanel.paint_connectors_behind=Pintar conectores atr\u00E1s de n\u00F3s
 OptionPanel.parse_data=Reconhecer a entrada de n\u00FAmeros e data/hora
-OptionPanel.parse_data.tooltip=Tente analisar a data, data e hora e o n\u00FAmero de entrada e aplicar formatos padr\u00F5es. Exemplos\: 100,000.00, 12/31, 12/31/99, 1999-12-31 e 1999-12-31 23\:59
+OptionPanel.parse_data.tooltip=Tente analisar a data, data e hora e o n\u00FAmero de entrada e aplicar formatos padr\u00F5es. Exemplos: 100,000.00, 12/31, 12/31/99, 1999-12-31 e 1999-12-31 23:59
 OptionPanel.PASTE_HTML=Colar como HTML
 OptionPanel.PASTE_PLAIN_TEXT=Colar como texto sem formata\u00E7\u00E3o
-OptionPanel.path_property_may_not_be_empty=Propriedade do caminho n\u00E3o pode ser vazia\! Mudan\u00E7a pode ser revertida.
+OptionPanel.path_property_may_not_be_empty=Propriedade do caminho n\u00E3o pode ser vazia! Mudan\u00E7a pode ser revertida.
 OptionPanel.patternname=Nome
 OptionPanel.patternname.tooltip=Nome do padr\u00E3o exclusivo
 OptionPanel.pl=Polon\u00EAs
@@ -1177,12 +1184,12 @@ OptionPanel.save_folding=Salvar recolhido
 OptionPanel.save_folding_if_map_is_changed=Se o mapa \u00E9 modificado
 OptionPanel.save_last_visited_node=Salvar \u00FAltima posi\u00E7\u00E3o do Mapa
 OptionPanel.save_modification_times=Economize horas de modifica\u00E7\u00F5es
-OptionPanel.script_classpath=Script do caminho classe\: Diret\u00F3rios adicionais contendo classes e/ou JARs (veja a dica de ferramenta)
-OptionPanel.script_classpath.tooltip=<html>A lista de JARs e/ou diret\u00F3rios para adicionar a f\u00F3rmula e o caminho de classe do script.<br>Uso ; (Windows) ou \: (Linux, Mac) para separar as entradas.<br>Diret\u00F3rios ser\u00E3o verificados para JARs e para arquivos.class.<br>Caminhos de que n\u00E3o s\u00E3o absolutos ser\u00E3o considerados relativos ao diret\u00F3rio de usu\u00E1rio FreePlane.<br>Se voc\u00EA  definir o caminho de classe tem que permitir o acesso de leitura ta [...]
+OptionPanel.script_classpath=Script do caminho classe: Diret\u00F3rios adicionais contendo classes e/ou JARs (veja a dica de ferramenta)
+OptionPanel.script_classpath.tooltip=<html>A lista de JARs e/ou diret\u00F3rios para adicionar a f\u00F3rmula e o caminho de classe do script.<br>Uso ; (Windows) ou : (Linux, Mac) para separar as entradas.<br>Diret\u00F3rios ser\u00E3o verificados para JARs e para arquivos.class.<br>Caminhos de que n\u00E3o s\u00E3o absolutos ser\u00E3o considerados relativos ao diret\u00F3rio de usu\u00E1rio FreePlane.<br>Se voc\u00EA  definir o caminho de classe tem que permitir o acesso de leitura tam [...]
 OptionPanel.script_compilation_disabled_extensions=Extens\u00F5es de arquivos n\u00E3o podem ser compilados (veja a dica de ferramenta)
 OptionPanel.script_compilation_disabled_extensions.tooltip=<html>Se todos os scripts de uma linguagem instalada (exceto<br>Groovy e JavaScript) t\u00EAm um problema geral de compila\u00E7\u00E3o<br>tente adicionar a extens\u00E3o do arquivo aqui (lista separada por ponto-e-v\u00EDrgula).</html>
 OptionPanel.script_directories=Caminho de busca de script (veja a dica de ferramenta)
-OptionPanel.script_directories.tooltip=<html>Uma lista de diret\u00F3rios (al\u00E9m do "scripts").<br>Uso do ; (Windows) ou \: (Linux, Mac) para separar as entradas.<br>Caminhos n\u00E3o absolutos ser\u00E3o considerados relativos ao diret\u00F3rio de usu\u00E1rio FreePlane.</html>
+OptionPanel.script_directories.tooltip=<html>Uma lista de diret\u00F3rios (al\u00E9m do "scripts").<br>Uso do ; (Windows) ou : (Linux, Mac) para separar as entradas.<br>Caminhos n\u00E3o absolutos ser\u00E3o considerados relativos ao diret\u00F3rio de usu\u00E1rio FreePlane.</html>
 OptionPanel.script_user_key_name_for_signing=Alias de chave de usu\u00E1rio para assinatura opcional
 OptionPanel.script_user_key_name_for_signing.tooltip=<html>Se voc\u00EA quer assinar os seus scripts, digite o alias da chave aqui. <br>A chave dever\u00E1 residir no armazenamento padr\u00E3o de chaves. <br>A senha da chave secreta deve coincidir com a senha do armazenamento de chaves (este \u00E9 o padr\u00E3o).</html>
 OptionPanel.scrollbar_increment=Velocidade
@@ -1220,6 +1227,7 @@ OptionPanel.separator.icon_properties=\u00CDcones
 OptionPanel.separator.icons=\u00CDcones em "Selecionar \u00EDcone..."
 OptionPanel.separator.initial_map_size=Tamanho inicial do mapa
 OptionPanel.separator.inline_editor=Editor de n\u00F3 em linha
+OptionPanel.separator.JoinNodesAction=Mesclando n\u00F3s
 OptionPanel.separator.key_typing=Digita\u00E7\u00E3o
 OptionPanel.separator.language=Idioma
 OptionPanel.separator.latex=LaTeX
@@ -1251,12 +1259,13 @@ OptionPanel.separator.selection_method=M\u00E9todo de sele\u00E7\u00E3o
 OptionPanel.separator.single_instance_mode=Programa de inst\u00E2ncia simples
 OptionPanel.separator.size_limits=Limites de tamanho
 OptionPanel.separator.spelling=Op\u00E7\u00F5es do verificador ortogr\u00E1fico
+OptionPanel.separator.SplitToWordsAction=Dividindo o n\u00F3 por palavras
 OptionPanel.separator.status=Linha de status
 OptionPanel.separator.tooltip=Tempos de dica de ferramenta
 OptionPanel.separator.undo=Desfazer
 OptionPanel.separator.updates=Atualiza\u00E7\u00F5es do programa
 OptionPanel.set_property_text=Mudar
-OptionPanel.set_property_text.tooltip=Vazio\:N\u00E3o toque; Menos\: Remove a propriedade (define valores padr\u00E3o); Mais\:Altera propriedade
+OptionPanel.set_property_text.tooltip=Vazio:N\u00E3o toque; Menos: Remove a propriedade (define valores padr\u00E3o); Mais:Altera propriedade
 OptionPanel.setscript=Modificar?
 OptionPanel.setscript.tooltip=Um script pode ser associado ao estilo.
 OptionPanel.sharp_bezier=bezier "afiado"
@@ -1264,7 +1273,7 @@ OptionPanel.sharp_linear=linear "afiado"
 OptionPanel.show_icon_for_attributes=Mostra \u00EDcones para atributos
 OptionPanel.show_node_tooltips=Exibir dicas de ferramenta
 OptionPanel.show_note_icons=Mostrar \u00EDcones de nota
-OptionPanel.show_styles_in_tooltip=\ Exibir estilo do n\u00F3 na Caixa da Dica de Ferramenta
+OptionPanel.show_styles_in_tooltip=Exibir estilo do n\u00F3 nas dicas de ferramenta
 OptionPanel.signed_script_are_trusted=Confia em scripts assinados (recomendado).
 OptionPanel.signed_script_are_trusted.tooltip=Se scripts s\u00E3o assinados por uma parte de confian\u00E7a (p.e. de autores do Freeplane ou por si mesmo), ele \u00E9 executado sem restri\u00E7\u00F5es.
 OptionPanel.simplyhtml.default_paste_mode=Modo de pasta padr\u00E3o
@@ -1280,8 +1289,7 @@ OptionPanel.sl=Sl
 OptionPanel.slow_scroll_selected_node=Rolagem lenta para n\u00F3 selecionado
 OptionPanel.spelling_opt_case_sensitive=Modo sensitivo
 OptionPanel.spelling_opt_ignore_all_caps_words=Ignore todas as palavras de letras mai\u00FAsculas.
-OptionPanel.spelling_opt_ignore_capitalization=\
-OptionPanel.spelling_opt_ignore_words_with_numbers=Ignorar palavras com n\u00FAmeros
+OptionPanel.spelling_opt_ignore_capitalization=OptionPanel.spelling_opt_ignore_words_with_numbers=Ignorar palavras com n\u00FAmeros
 OptionPanel.spelling_opt_suggestions_limit_dialog=Contagem m\u00E1xima de sugest\u00F5es na caixa de di\u00E1logo
 OptionPanel.spelling_opt_suggestions_limit_menu=Contagem m\u00E1xima de sugest\u00F5es no menu
 OptionPanel.sr=S\u00E9rvio
@@ -1299,9 +1307,9 @@ OptionPanel.standardlinkcolor.tooltip=<html>A cor padr\u00E3o do link em nota\u0
 OptionPanel.standardlinkestyle=Estilo padr\u00E3o do link
 OptionPanel.standardlinkestyle.tooltip=<html>O estilo padr\u00E3o do link. No momento apenas 'bezier' \u00E9 suportado</html>
 OptionPanel.standardselectednodecolor=Cor padr\u00E3o do n\u00F3 selecionado
-OptionPanel.standardselectednodecolor.tooltip=<html>A cor padr\u00E3o dos n\u00F3s selecionados. Em nota\u00E7\u00E3o HTML (\#RRGGBB em valores hexadecimais) </html>
+OptionPanel.standardselectednodecolor.tooltip=<html>A cor padr\u00E3o dos n\u00F3s selecionados. Em nota\u00E7\u00E3o HTML (#RRGGBB em valores hexadecimais) </html>
 OptionPanel.standardselectednoderectanglecolor=Selecionar n\u00F3 na bolha cor
-OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Cor da bolha marcada pelos n\u00F3s. Na nota\u00E7\u00E3o de html (\#RRGGBB em valores HEX) </html>
+OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Cor da bolha marcada pelos n\u00F3s. Na nota\u00E7\u00E3o de html (#RRGGBB em valores HEX) </html>
 OptionPanel.STAR=Estrela
 OptionPanel.structured_html_import=Importar HTML como estrutura de n\u00F3
 OptionPanel.structured_icon_toolbar=\u00CDcone estruturada na barra de ferramentas
@@ -1327,15 +1335,15 @@ OptionPanel.unfold_on_paste.tooltip=Expandir n\u00F3 ao colar ou arrastar e solt
 OptionPanel.use_common_out_point_for_root_node=Bordas come\u00E7am de um ponto no n\u00F3 raiz
 OptionPanel.use_common_out_point_for_root_node.tooltip=Bordas come\u00E7am de um ponto no n\u00F3 raiz
 OptionPanel.use_tabbed_pane=Usar abas
-OptionPanel.use_tabbed_pane.tooltip=Se selecionado os mapas sao mostrados em abas (como no FireFox \:-) ).
+OptionPanel.use_tabbed_pane.tooltip=Se selecionado os mapas sao mostrados em abas (como no FireFox :-) ).
 OptionPanel.user_defined_screen_resolution=Resolu\u00E7\u00E3o de tela definida pelo usu\u00E1rio (dpi)
-OptionPanel.validate_classpath_needs_readaccess=Scripts\: Ao definir o caminho de classe voc\u00EA tem que permitir acesso de leitura em arquivos\!
+OptionPanel.validate_classpath_needs_readaccess=Scripts: Ao definir o caminho de classe voc\u00EA tem que permitir acesso de leitura em arquivos!
 OptionPanel.validate_invalid_date_format=Padr\u00E3o inv\u00E1lido no formato da data
 OptionPanel.validate_invalid_datetime_format=Padr\u00E3o inv\u00E1lido no formato da data e hora
 OptionPanel.validate_invalid_number_format=Padr\u00E3o inv\u00E1lido no formato n\u00FAmero
-OptionPanel.validate_write_without_read=Scripts\: Considere adicionar leitura/arquivo para escrita/arquivo.
-OptionPanel.validation_error=<html><body>Erro(s) de valida\u00E7\u00E3o\:<p><em>{0}</em><p>Por favor, altere as prefer\u00EAncias para corrigir o(s) erro(s).</body></html>
-OptionPanel.validation_warning=<html><body>Aviso(s) de valida\u00E7\u00E3o\:<p><em>{0}</em></body></html>
+OptionPanel.validate_write_without_read=Scripts: Considere adicionar leitura/arquivo para escrita/arquivo.
+OptionPanel.validation_error=<html><body>Erro(s) de valida\u00E7\u00E3o:<p><em>{0}</em><p>Por favor, altere as prefer\u00EAncias para corrigir o(s) erro(s).</body></html>
+OptionPanel.validation_warning=<html><body>Aviso(s) de valida\u00E7\u00E3o:<p><em>{0}</em></body></html>
 OptionPanel.vi=Vietnamita
 OptionPanel.wheel_velocity=Velocidade
 OptionPanel.wheel_velocity.tooltip=Um valor mais alto resulta em um efeito mais r\u00E1pido ao se mover a roda do mouse sobre o mapa.
@@ -1382,15 +1390,15 @@ PeriodUnit.YEAR=anos
 plugins/latex/LatexNodeHook.editorTitle=Editar f\u00F3rmulas LaTex
 plugins/script_filter=Script filtro {0}
 plugins/script_filter_error={0} teve que retornar um resultado booleano em {1} mas retornou {2}
-plugins/script_filter_execute_error=Erro de execu\u00E7\u00E3o {0}\npara n\u00F3 {1}\:\n{2}
+plugins/script_filter_execute_error=Erro de execu\u00E7\u00E3o {0}\npara n\u00F3 {1}:\n{2}
 plugins/ScriptEditor.cancel=&Descartar altera\u00E7\u00F5es e sair
 plugins/ScriptEditor.exit=&Salvar e sair
-plugins/ScriptEditor.FORBIDDEN_ACTION=Os scripts Groovy est\u00E3o restritos. O seguinte {0,choice,0\#File|1\#Network|2\#Exec} opera\u00E7\u00E3o \u00E9 negada\: {1,choice,0\#Accept|1\#Connect|2\#Listen|3\#Multicast|4\#SetFactory|5\#Exec|6\#Link|7\#Delete|8\#Read|9\#Write} {2}. Voc\u00EA pode alterar isso nas configura\u00E7\u00F5es do programa.
+plugins/ScriptEditor.FORBIDDEN_ACTION=Os scripts Groovy est\u00E3o restritos. O seguinte {0,choice,0#File|1#Network|2#Exec} opera\u00E7\u00E3o \u00E9 negada: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write} {2}. Voc\u00EA pode alterar isso nas configura\u00E7\u00F5es do programa.
 plugins/ScriptEditor.menu_actions=&A\u00E7\u00F5es
 plugins/ScriptEditor.new_script=Novo script
 plugins/ScriptEditor.run=Executar
 plugins/ScriptEditor.sign=Sinal do script...
-plugins/ScriptEditor/window.Result=Resultado\:
+plugins/ScriptEditor/window.Result=Resultado:
 plugins/ScriptEditor/window.title=Editor de scripts
 plugins/ScriptingEngine.illegalAccessToInternalAPI=Acesso ilegal a API interna (pacote {0}). - Por favor entre em contato com a equipe Freeplane se a API de script n\u00E3o for suficiente.
 plugins/TimeList.xml_Created=Criado
@@ -1407,9 +1415,9 @@ plugins/TimeManagement.xml_closeButton=Fechar
 plugins/TimeManagement.xml_Export=Exportar n\u00F3s selecionados
 plugins/TimeManagement.xml_Find=Buscar
 plugins/TimeManagement.xml_Goto=Ir para
-plugins/TimeManagement.xml_hour=Hora\:
+plugins/TimeManagement.xml_hour=Hora:
 plugins/TimeManagement.xml_menu_actions=A\u00E7\u00F5es
-plugins/TimeManagement.xml_minute=Minuto\:
+plugins/TimeManagement.xml_minute=Minuto:
 plugins/TimeManagement.xml_reminderButton=Lembre-me nesta data
 plugins/TimeManagement.xml_reminderButton_tooltip=<html>Quando clicado, um temporizador \u00E9 programado para a data estabelecida. Ent\u00E3o um cursor piscante \u00E9 ativado para chamar a sua aten\u00E7\u00E3o.<br> Se voce fechar o mapa, os temporizadores ser\u00E3o reativados a pr\u00F3xima v\u00EAz que o mapa for aberto.</html>
 plugins/TimeManagement.xml_reminderNode_onlyOneDate=<html>Currently, there may only be one reminder per node. <br>The current remnider is scheduled at {0,date} {0,time}, your choice was {1,date} {1,time}. <br><br>Do you want to change the node's reminder time (YES) <br>or do you want to keep the old one (NO)?</html>
@@ -1492,7 +1500,7 @@ SaveAsAction.text=Salvar como...
 saved=Salvo
 saving_canceled=Salvamento cancelado
 scanners_not_loaded=Os scanners n\u00E3o p\u00F4de ser carregado, arquivo corrompido
-scheme_evaluate=Avaliar\!
+scheme_evaluate=Avaliar!
 script_execution_disabled=Execu\u00E7\u00E3o do script desativado, veja em Ferramentas/Prefer\u00EAncias/Plugins
 ScriptEditor.text=Editor de scripts...
 ScriptEditor.tooltip=Permite escrever scripts maiores dentro do Freeplane.
@@ -1517,20 +1525,19 @@ selection_method_delayed=Sele\u00E7\u00E3o autom\u00E1tica com atraso
 selection_method_direct=Apontar seleciona
 SelectNoteAction.text=Chave de Edi\u00E7\u00E3o de Anota\u00E7\u00F5es
 SelectNoteAction.tooltip=Switch to resp. from note window
-set_accelerator_on_next_click_action=Para criar um novo atalho de teclado\: pressione 'CTRL' e clique no comando desejado no menu.
 SetAccelerator.dialogTitle=Atribui\u00E7\u00E3o de teclas de atalho
 SetAccelerator.keystrokeDetected=Pressionamento de tecla '{0}' n\u00E3o \u00E9 atribu\u00EDdo a qualquer item de menu.
 SetAcceleratorOnNextClickAction.text=Atribuir teclas de atalho...
 SetAlwaysUnfoldedNodeFlagsAction.text=Engessar / Travar a Posi\u00E7\u00E3o dos N\u00F3s
 SetBooleanPropertyAction.show_styles_in_tooltip.tooltip=N\u00E3o \u00E9 recomend\u00E1vel que esta op\u00E7\u00E3o seja marcada.
-SetImageByFileChooserAction.text=Criar um Link com um Arquivo em Meu Computador
+SetImageByFileChooserAction.text=Imagem por escolha ou link...
 SetImageByFileChooserAction.tooltip=Este recurso permite que voc\u00EA crie um link com qualquer arquivo em seu computador e ao clicar no link dentro do n\u00F3 o arquivo ir\u00E1 abrir automaticamente
 SetLinkAnchorAction.text=Definir link \u00E2ncora
 SetLinkAnchorAction.tooltip=<html>Definir o n\u00F3 selecionado como \u00E2ncora para futura<br/>cria\u00E7\u00E3o de links locais ou globais.
-SetLinkAnchorAction.tooltip_anchored=<html>definir o n\u00F3 selecionado como \u00E2ncora para futura<br/>cria\u00E7\u00E3o de links locais ou globais. \u00C2ncora atual\:<br/>{0}
-SetLinkByFileChooserAction.text=Criar um Link para abrir um arquivo dentro do meu computador - (Escolher arquivo)
+SetLinkAnchorAction.tooltip_anchored=<html>definir o n\u00F3 selecionado como \u00E2ncora para futura<br/>cria\u00E7\u00E3o de links locais ou globais. \u00C2ncora atual:<br/>{0}
+SetLinkByFileChooserAction.text=Criar um link para um arquivo (escolher arquivo)...
 SetLinkByFileChooserAction.tooltip=Aqui voc\u00EA poder\u00E1 selecionar qualquer arquivo de dentro do seu computador e quando voc\u00EA clicar no n\u00F3 com este link para este aquivo ele ser\u00E1 aberto automaticamente
-SetLinkByTextFieldAction.text=Adicionar Link Manualmente
+SetLinkByTextFieldAction.text=Adicionar ou modificar link (digitar)...
 SetLinkByTextFieldAction.tooltip=Link da Internet ou Link de um arquivo dentro do meu computador
 SetNodeLink.text=Conjunto de n\u00F3 link...
 SetNoteWindowPosition.bottom.text=Bot\u00E3o
@@ -1556,7 +1563,7 @@ ShowSelectionAsRectangleAction.text=Sele\u00E7\u00E3o retangular
 simplyhtml.aboutFrameTitle=Sobre esta aplica\u00E7\u00E3o
 simplyhtml.aboutLabel=Sobre SimplyHTML...
 simplyhtml.alignCenter=centro
-simplyhtml.alignLabel=Alinhamentoo\:
+simplyhtml.alignLabel=Alinhamentoo:
 simplyhtml.alignLeft=esquerda
 simplyhtml.alignRight=direita
 simplyhtml.allCellsRangeLabel=todas as c\u00E9lulas
@@ -1564,12 +1571,12 @@ simplyhtml.allOccurrencesReplaced=Todas as ocorr\u00EAncias foram substitu\u00ED
 simplyhtml.appendTableColLabel=Adicionar coluna
 simplyhtml.appendTableRowLabel=Adicionar linha
 simplyhtml.applyCellAttrLabel=Aplicar em
-simplyhtml.backgroundLabel=Plano de fundo\:
+simplyhtml.backgroundLabel=Plano de fundo:
 simplyhtml.boldItalicName=Negrito it\u00E1lico
 simplyhtml.boldName=Negrito
-simplyhtml.borderColorLabel=Cor\:
+simplyhtml.borderColorLabel=Cor:
 simplyhtml.borderWidthLabel=Largura
-simplyhtml.bottomLabel=abaixo\:
+simplyhtml.bottomLabel=abaixo:
 simplyhtml.cancelBtnName=Cancelar
 simplyhtml.cellBorderTabLabel=Bordas
 simplyhtml.cellGenTabLabel=Geral
@@ -1597,7 +1604,7 @@ simplyhtml.cutTip=Cortar
 simplyhtml.defaultDocName=Sem nome
 simplyhtml.deleteTableColLabel=Apagar coluna
 simplyhtml.deleteTableRowLabel=Apagar linha
-simplyhtml.docTitleQuery=Altera t\u00EDtulo para\:
+simplyhtml.docTitleQuery=Altera t\u00EDtulo para:
 simplyhtml.docTitleTitle=Editar t\u00EDtulo do documento
 simplyhtml.editLabel=Editar
 simplyhtml.effectLabel=Efeito
@@ -1618,7 +1625,7 @@ simplyhtml.fontTabLabel=Fonte
 simplyhtml.fontTip=Formatar fonte...
 simplyhtml.fontUnderlineLabel=Sublinhado
 simplyhtml.fontUnderlineTip=Liga/desliga sublinhado
-simplyhtml.foregroundLabel=Plano de frente\:
+simplyhtml.foregroundLabel=Plano de frente:
 simplyhtml.formatLabel=Formatar
 simplyhtml.formatListLabel=Lista...
 simplyhtml.formatListTip=Muda formata\u00E7\u00E3o da lista
@@ -1636,16 +1643,16 @@ simplyhtml.insertTableRowLabel=Inserir linha
 simplyhtml.insertTableTitle=Inserir tabela
 simplyhtml.italicName=It\u00E1lico
 simplyhtml.layoutTabTitle=Ver layout
-simplyhtml.leftLabel=esquerda\:
+simplyhtml.leftLabel=esquerda:
 simplyhtml.listDialogTitle=Formatar lista
-simplyhtml.listIndentTitle=Indenta\u00E7\u00E3o\:
+simplyhtml.listIndentTitle=Indenta\u00E7\u00E3o:
 simplyhtml.listPosInside=dentro
-simplyhtml.listPositionLabel=Posi\u00E7\u00E3o\:
+simplyhtml.listPositionLabel=Posi\u00E7\u00E3o:
 simplyhtml.listPosOutside=fora
 simplyhtml.listTypeCircle=marcador redondo
 simplyhtml.listTypeDecimal=1.,2.,3.,4.
 simplyhtml.listTypeDisc=S\u00EDmbolo de arquivo como marcador
-simplyhtml.listTypeLabel=Tipo\:
+simplyhtml.listTypeLabel=Tipo:
 simplyhtml.listTypeLowerAlpha=a.,b.,c.,d.
 simplyhtml.listTypeLowerRoman=i.,ii.,iii.,iv.
 simplyhtml.listTypeNone=nenhum
@@ -1687,9 +1694,9 @@ simplyhtml.replaceAll=Tudo
 simplyhtml.replaceDone=Feito
 simplyhtml.replaceNo=N\u00E3o
 simplyhtml.replaceThisQuery=substitui esta ocorr\u00EAncia de
-simplyhtml.replaceWith=Substituir com\:
+simplyhtml.replaceWith=Substituir com:
 simplyhtml.replaceYes=Sim
-simplyhtml.rightLabel=direita\:
+simplyhtml.rightLabel=direita:
 simplyhtml.searchDown=Procurar abaixo
 simplyhtml.searchDown.tooltip=Localizar de cima para baixo.
 simplyhtml.searchFromStart=A partir do in\u00EDcio
@@ -1703,13 +1710,13 @@ simplyhtml.strikeLabel=Riscado
 simplyhtml.styleLabel=Estilo
 simplyhtml.styleNameInputText=Nome do novo estilo?
 simplyhtml.styleNameInputTitle=Salvar estilo
-simplyhtml.tableBgColLabel=Cor de fundo\:
+simplyhtml.tableBgColLabel=Cor de fundo:
 simplyhtml.tableDialogTitle=Formatar tabela
 simplyhtml.tableLabel=Tabela
 simplyhtml.tablePanelTitle=Formato da tabela
-simplyhtml.tableWidthLabel=Largura\:
-simplyhtml.textIndentLabel=Indenta\u00E7\u00E3o\:
-simplyhtml.textToFind=Buscar texto\:
+simplyhtml.tableWidthLabel=Largura:
+simplyhtml.textIndentLabel=Indenta\u00E7\u00E3o:
+simplyhtml.textToFind=Buscar texto:
 simplyhtml.thisCellRangeLabel=Esta c\u00E9lula
 simplyhtml.thisColRangeLabel=esta coluna
 simplyhtml.thisRowRangeLabel=esta linha
@@ -1717,16 +1724,16 @@ simplyhtml.toggleBulletsLabel=Liga/desliga lista com marcadores
 simplyhtml.toggleBulletsTip=Liga/desliga lista com marcadores
 simplyhtml.toggleNumbersLabel=Liga/desliga lista numerada
 simplyhtml.toggleNumbersTip=Liga/desliga lista numerada
-simplyhtml.topLabel=acima\:
+simplyhtml.topLabel=acima:
 simplyhtml.uLineLabel=Sublinhado
 simplyhtml.unableToOpenFileError=Arquivo n\u00E3o p\u00F4de ser aberto
-simplyhtml.unableToRedoError=N\u00E3o \u00E9 poss\u00EDvel refazer\:
-simplyhtml.unableToUndoError=N\u00E3o \u00E9 poss\u00EDvel desfazer\:
+simplyhtml.unableToRedoError=N\u00E3o \u00E9 poss\u00EDvel refazer:
+simplyhtml.unableToUndoError=N\u00E3o \u00E9 poss\u00EDvel desfazer:
 simplyhtml.undoLabel=Desfazer
 simplyhtml.undoTip=Desfaz a \u00FAltima a\u00E7\u00E3o
 simplyhtml.valignBaseline=base de refer\u00EAncia
 simplyhtml.valignBottom=Base
-simplyhtml.valignLabel=Alinhamento vertical\:
+simplyhtml.valignLabel=Alinhamento vertical:
 simplyhtml.valignMiddle=Meio
 simplyhtml.valignTop=Topo
 simplyhtml.wholeWordsOnly=Apenas palavras inteiras
@@ -1737,6 +1744,7 @@ split=&Dividir
 SplitConditionAction.text=Dividir
 SplitNode.text=Dividir n\u00F3
 SplitNode.tooltip=<html>N\u00F3 est\u00E1 dividido</html>
+SplitToWordsAction.text=Dividir com {0} palavras em linha
 STANDARD_FORMAT=Padr\u00E3o
 stop_processing=Parar
 StringFlavorHandler=Texto sem formata\u00E7\u00E3o como hierarquia de n\u00F3
@@ -1778,6 +1786,7 @@ template_dir=Modelos padr\u00F5es
 TextAlignAction.CENTER.text=Texto Centralizado
 TextAlignAction.LEFT.text=Alinhar Texto \u00E0 Esquerda
 TextAlignAction.RIGHT.text=Alinhar Texto \u00E0 Direita
+TextChangeHotKeyAction.text=Defina o atalho para mudan\u00E7a de texto
 TimeListAction.text=Gerenciar tarefas...
 TimeListAction.tooltip=Mostra todos os hor\u00E1rios programados e os n\u00F3s correspondentes.
 TimeManagementAction.text=Gerenciar o tempo...
@@ -1819,21 +1828,21 @@ updater.version.installed=Vers\u00E3o instalada
 updater.version.latest=\u00DAltima vers\u00E3o
 updater.version.noUpdateUrl=Nenhuma URL de atualiza\u00E7\u00E3o ou site para este complemento.
 updater.version.unknown=desconhecido
-updater.version.unreachable=Fonte inacess\u00EDvel\:
+updater.version.unreachable=Fonte inacess\u00EDvel:
 updater.viewChangelog=Visualizar altera\u00E7\u00F5es
-url_error=Essa URL \u00E9 malformada\!
-url_load_error=N\u00E3o posso ler o mapa da URL\:
+url_error=Essa URL \u00E9 malformada!
+url_load_error=N\u00E3o posso ler o mapa da URL:
 url_open_error=N\u00E3o foi poss\u00EDvel abrir o URL {0}.
 used_in_menu=Este atalho n\u00E3o pode ser definido, \u00E9 usado como um menu de atalho.
 UsePlainTextAction.text=Usar texto sem formata\u00E7\u00E3o
-user_config_folder=Pasta de configura\u00E7\u00E3o do usu\u00E1rio\: {0}
+user_config_folder=Pasta de configura\u00E7\u00E3o do usu\u00E1rio: {0}
 user_defined_filters=Filtros definidos pelo usu\u00E1rio
 user_defined_scale=Escala definida pelo &usu\u00E1rio
 user_defined_zoom=Definido pelo usu\u00E1rio
 user_defined_zoom_status_bar=Mudando a amplia\u00E7\u00E3o para {0}%.
 user_icon=\u00CDcone de usu\u00E1rio "{0}"
 user_template_dir=Modelos de usu\u00E1rio
-user_zoom=Fator de amplia\u00E7\u00E3o da impress\u00E3o (0.0 - 2.0)\:
+user_zoom=Fator de amplia\u00E7\u00E3o da impress\u00E3o (0.0 - 2.0):
 value_format=Formato de valor
 version_up_to_date=Voc\u00EA j\u00E1 est\u00E1 usando a \u00FAltima vers\u00E3o
 view=Visualizar
diff --git a/freeplane/resources/translations/Resources_pt_PT.properties b/freeplane/resources/translations/Resources_pt_PT.properties
index 9077e9a..bce7236 100644
--- a/freeplane/resources/translations/Resources_pt_PT.properties
+++ b/freeplane/resources/translations/Resources_pt_PT.properties
@@ -1,23 +1,23 @@
 about_text=Freeplane - programa gratuito para cria\u00E7\u00E3o de mapas mentais e constru\u00E7\u00E3o de conhecimento
-AboutAction.text=Acerca de...
+AboutAction.text=Sobre...
 acceleratorPresets=Atalhos predefinidos
 accelerators_loading_error=Imposs\u00EDvel carregar os atalhos de {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=Alterar formato dos n\u00F3s
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Alterar padr\u00E3o
-accessories/plugins/EncryptNode.properties_0=Escolha uma palavra-passe para o n\u00F3 encriptado
-accessories/plugins/EncryptNode.properties_1=As palavras-passe s\u00E3o muito curtas ou n\u00E3o coincidem.
-accessories/plugins/EncryptNode.properties_2=Palavra-passe:
-accessories/plugins/EncryptNode.properties_3=Repita a palavra-passe:
-accessories/plugins/EncryptNode.properties_4=Introduza a sua palavra-passe.
-accessories/plugins/EncryptNode.properties_5=<html>Lembre-se que a for\u00E7a da encripta\u00E7\u00E3o<br> est\u00E1 diretamente relacionada com a qualidade da sua palavra-passe.
+accessories/plugins/EncryptNode.properties_0=Escolha uma senha para o n\u00F3 encriptado
+accessories/plugins/EncryptNode.properties_1=As senhas s\u00E3o muito curtas ou n\u00E3o coincidem.
+accessories/plugins/EncryptNode.properties_2=Insira a senha:
+accessories/plugins/EncryptNode.properties_3=Repita a senha:
+accessories/plugins/EncryptNode.properties_4=Insira a sua senha.
+accessories/plugins/EncryptNode.properties_5=<html>Lembre-se que a for\u00E7a da encripta\u00E7\u00E3o<br>est\u00E1 directamente relacionada com a qualidade da sua senha.
 accessories/plugins/EncryptNode.properties_6=Aceitar
 accessories/plugins/EncryptNode.properties_7=Cancelar
-accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=S\u00F3 pode alternar o estado de encripta\u00E7\u00E3o de um n\u00F3 j\u00E1 encriptado. Insira um n\u00F3 encriptado a partir do menu Ferramentas.
-accessories/plugins/EncryptNode.properties_select_me=Selecione-me para continuar!
-accessories/plugins/EncryptNode.properties_wrong_password=A palavra-passe n\u00E3o est\u00E1 correta.
+accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=S\u00F3 se pode alternar o estado de encripta\u00E7\u00E3o num n\u00F3 j\u00E1 encriptado. Insira um n\u00F3 encriptado a partir do menu Ferramentas.
+accessories/plugins/EncryptNode.properties_select_me=Marque-me para continuar!
+accessories/plugins/EncryptNode.properties_wrong_password=A senha n\u00E3o est\u00E1 correcta.
 accessories/plugins/ExportWithTWiki.text=Como TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Exporta o mapa como um documento TWiki.
-accessories/plugins/ExportWithXSLT.tooltip=Este \u00E9 um m\u00E9todo de exporta\u00E7\u00E3o uniforme que usa scripts XSLT.
+accessories/plugins/ExportWithXSLT.tooltip=Este \u00E9 um m\u00E9todo de exporta\u00E7\u00E3o uniforme utilizando scripts XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Como Java Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exporta o mapa como applet Java para o navegador.
 accessories/plugins/ExportWithXSLT_Flash.text=Como Flash...
@@ -28,8 +28,8 @@ accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Recursos do n\u00F3 RECURSO
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Exporta recursos do n\u00F3 RECURSOS para o m\u00F3dulo Taskjuggler. </html>
 accessories/plugins/ExportWithXSLT_TASKSTJI.text=Tarefas do n\u00F3 TAREFAS para o ficheiro TaskJuggler...
 accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Exporta as tarefas do n\u00F3 TAREFAS para o m\u00F3dulo Taskjuggler. </html>
-action_keystroke_in_use_error=A tecla {0} pedida para a a\u00E7\u00E3o {1} j\u00E1 est\u00E1 em uso para {2}
-active=Ativo
+action_keystroke_in_use_error=A tecla {0} pedida para a ac\u00E7\u00E3o {1} j\u00E1 est\u00E1 em uso para a ac\u00E7\u00E3o {2}
+active=Activo
 actual_map_styles=Estilos condicionais do mapa aplicados ao n\u00F3
 actual_node_styles=Estilos condicionais do n\u00F3 aplicados ao n\u00F3
 add=&Adicionar
@@ -56,44 +56,44 @@ addons.installer.missing.child.nodes=Faltam n\u00F3s-filho: {0}
 addons.installer.missing.permission.attribute=Script {0}: atributos de permiss\u00E3o {1} em falta
 addons.installer.missing.properties=Propriedades em falta: {0}
 addons.installer.missing.translation=Tradu\u00E7\u00E3o de {0} em falta para o idioma {1}
-addons.installer.no.scripts=N\u00E3o foram encontrados scripts
-addons.installer.no.zipdata=N\u00E3o foram encontrados dados comprimidos
-addons.installer.nonstandard.permissions=O script pede as seguintes permiss\u00F5es que n\u00E3o est\u00E3o atualmente ativadas: {0}.\nQuer adicion\u00E1-las \u00E0s permiss\u00F5es padr\u00E3o?
+addons.installer.no.scripts=N\u00E3o se encontraram scripts
+addons.installer.no.zipdata=N\u00E3o se encontraram dados comprimidos
+addons.installer.nonstandard.permissions=O script requer as seguintes permiss\u00F5es que n\u00E3o est\u00E3o actualmente activadas: {0}.\nQuer adicion\u00E1-las \u00E0s permiss\u00F5es padr\u00E3o?
 addons.installer.one.child.expected=S\u00F3 se esperava um n\u00F3-filho de {0} mas h\u00E1 {1}.
 addons.installer.script.name.suffix=O nome do script {0} n\u00E3o tem um sufixo como ".groovy"
 addons.installer.script.no.execution_mode=Atributo "execution_mode" n\u00E3o definido para {0}
 addons.installer.script.no.menulocation=Atributo "menuLocation" n\u00E3o definido para {0}
 addons.installer.script.no.menutitle=Atributo "menuTitleKey" n\u00E3o definido para {0}
 addons.installer.script.no.permissions=Permiss\u00F5es n\u00E3o definidas para {0}
-addons.installer.success=Instala\u00E7\u00E3o com sucesso.\nO novo suplemento estar\u00E1 dispon\u00EDvel depois de reiniciar.
-addons.installer.success.update=Atualiza\u00E7\u00E3o de {0} para {1} com sucesso.\nAlgumas fun\u00E7\u00F5es poder\u00E3o s\u00F3 estar dispon\u00EDveis ap\u00F3s reiniciar.
-addons.installer.title=Instalador de suplementos
-addons.installer.too.new=A sua vers\u00E3o do Freeplane {0} \u00E9 demasiado recente. Este suplemento suporta no m\u00E1ximo a {1}
-addons.installer.too.old=A sua vers\u00E3o do Freeplane {0} \u00E9 demasiado antiga. Este suplemento requer pelo menos a {1}
+addons.installer.success=Instala\u00E7\u00E3o com sucesso.\nA nova extens\u00E3o estar\u00E1 dispon\u00EDvel depois de reiniciar.
+addons.installer.success.update=Actualiza\u00E7\u00E3o de {0} para {1} com sucesso.\nAlgumas fun\u00E7\u00F5es poder\u00E3o s\u00F3 estar dispon\u00EDveis ap\u00F3s reiniciar.
+addons.installer.title=Instalador de extens\u00F5es
+addons.installer.too.new=A vers\u00E3o do Freeplane {0} \u00E9 demasiado recente. Esta extens\u00E3o suporta no m\u00E1ximo a {1}
+addons.installer.too.old=A vers\u00E3o do Freeplane {0} \u00E9 demasiado antiga. Este suplemento requer pelo menos a {1}
 addons.installer.unknown.deinstallation.rules=Regras de desinstala\u00E7\u00E3o {0} desconhecidas
-addons.installer.update=Atualizar da vers\u00E3o {0}
-addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">S\u00F3 deve instalar suplementos de fontes seguras. Programas maliciosos podem danificar os seus dados ou violar a sua privacidade.</strong></body></html>
+addons.installer.update=Actualizar da vers\u00E3o {0}
+addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">S\u00F3 deve instalar extens\u00F5es de fontes seguras. Programas maliciosos podem danificar os seus dados ou violar a sua privacidade.</strong></body></html>
 addons.site=http://freeplane.sourceforge.net/addons/
 AddStyleAttributes.text=Adicionar atributos de estilo
 AddStyleAttributes.tooltip=Adicionar atributos de estilo do n\u00F3
 AllMapsNodeListAction.text=Localizar e substituir em todos os mapas
 always=Sempre
-AlwaysUnfoldedNodeAction.text=N\u00F3 sempre desdobrado (Definir/repor)
-antialias_all=Uniformizar tudo
-antialias_edges=Uniformizar linhas
-antialias_none=N\u00E3o uniformizar
+AlwaysUnfoldedNodeAction.text=N\u00F3 sempre desdobrado (definir/repor)
+antialias_all=Suavizar tudo
+antialias_edges=Suavizar linhas
+antialias_none=N\u00E3o suavizar
 apply=&Aplicar
 ApplyAction.text=Aplicar
 ApplyFormatPlugin.text=Alterar formato ...
-ApplyFormatPlugin.tooltip=Mostra uma janela na qual os atributos do n\u00F3 e linhas podem ser modificados de uma vez s\u00F3.
+ApplyFormatPlugin.tooltip=Mostra um di\u00E1logo no qual os atributos do n\u00F3 e linhas podem ser modificados de uma vez s\u00F3.
 ApplyNoFilteringAction.text=Sem filtragem
-ApplySelectedViewConditionAction.text=Filtrar os n\u00F3s selecionados
+ApplySelectedViewConditionAction.text=Filtrar n\u00F3s seleccionados
 ApplyToVisibleAction.text=Aplica-se aos n\u00F3s filtrados
 as_parent=Como n\u00F3-m\u00E3e
 AskForHelp.text=Pedir ajuda no f\u00F3rum
 AssignAttributesAction.text=Localizar e substituir atributos...
-attribute_delete=Apagar todos os valores
-attribute_delete_value=Apagar este valor
+attribute_delete=Eliminar todos os valores
+attribute_delete_value=Eliminar este valor
 attribute_font_size_tooltip=Tamanho da letra do atributo
 attribute_list_box_label_text=Valores existentes
 attribute_name=Nome do atributo
@@ -101,8 +101,8 @@ attribute_name_or_value=Nome ou valor de atributo
 attribute_replace=Substituir por
 attribute_top=Todos os atributos conhecidos para os mapas carregados
 attribute_value=Valor do atributo
-attributes_AddAttributeAction.text=Adicionar atributo na janela...
-attributes_adding_empty_attribute_error=N\u00E3o pode utilizar uma cadeia vazia como nome de atributo
+attributes_AddAttributeAction.text=Adicionar atributo no di\u00E1logo...
+attributes_adding_empty_attribute_error=Imposs\u00EDvel utilizar uma cadeia vazia como nome de atributo
 attributes_all=Todos os atributos
 attributes_assign_dialog=Editor expandido de atributos
 attributes_attribute=Atributos
@@ -111,11 +111,11 @@ attributes_deselect_all=Nada
 attributes_dialog_title=Gestor de atributos
 attributes_edit=Editar
 attributes_edit_tooltip=Editar conjunto
-attributes_for_selected=N\u00F3s selecionados
+attributes_for_selected=N\u00F3s seleccionados
 attributes_for_visible=Todos os n\u00F3s vis\u00EDveis
-attributes_import=Importar
+attributes_import=&Importar
 attributes_import_tooltip=Importar atributos de outros mapas carregados
-attributes_no_import_candidates_found=N\u00E3o foram encontrados novos atributos
+attributes_no_import_candidates_found=N\u00E3o se encontraram novos atributos
 attributes_popup_delete=Eliminar
 attributes_popup_down=Abaixo
 attributes_popup_edit=Editar
@@ -123,21 +123,21 @@ attributes_popup_hide=Ocultar
 attributes_popup_new=Novo atributo
 attributes_popup_optimal_width=Largura ideal
 attributes_popup_up=Acima
-attributes_refresh=Atualizar
+attributes_refresh=Actualizar
 attributes_RemoveAllAttributesAction.text=Remover todos os atributos
 attributes_RemoveFirstAttributeAction.text=Remover o primeiro atributo
 attributes_RemoveLastAttributeAction.text=Remover o \u00FAltimo atributo
 attributes_restricted_attributes_tooltip=Restringir conjunto de atributos
-attributes_restricted_values_tooltip=Restringir conjunto de valores para o atributo atual
+attributes_restricted_values_tooltip=Restringir conjunto de valores para o atributo actual
 attributes_restriction=Conjunto restrito
 attributes_select_all=Todos
-attributes_select_all_tooltip=Selecionar tudo / nada
+attributes_select_all_tooltip=Seleccionar tudo/nada
 attributes_show=Mostrar
-attributes_skip_root=Ignorar o n\u00F3-ra\u00EDz
-attributes_visible=Selecionados vis\u00EDveis
-attributes_visible_tooltip=Selecionados vis\u00EDveis
+attributes_skip_root=Ignorar o n\u00F3-raiz
+attributes_visible=Seleccionados vis\u00EDveis
+attributes_visible_tooltip=Seleccionados vis\u00EDveis
 automatic_layout=Desenho autom\u00E1tico
-automatic_layout_disabled=desativado
+automatic_layout_disabled=desactivado
 automatically_save_message=O mapa foi gravado automaticamente (com o nome {0})...
 AutomaticEdgeColor.FOR_BRANCHES=para ramos
 AutomaticEdgeColor.FOR_COLUMN=para coluna
@@ -147,22 +147,22 @@ AutomaticEdgeColor.ON_BRANCH_CREATION=ao criar ramo
 AutomaticEdgeColorHookAction.text=Cor da linha autom\u00E1tica
 AutomaticLayout.ALL=para todos os n\u00F3s
 AutomaticLayout.COLUMNS=para colunas
-AutomaticLayout.HEADINGS=para n\u00F3s finais
+AutomaticLayout.HEADINGS=para n\u00F3s n\u00E3o-finais
 AutomaticLayout.level=N\u00EDvel {0}
-AutomaticLayout.level.root=Ra\u00EDz
+AutomaticLayout.level.root=Raiz
 AutomaticLayoutAction.text=Aplicar estilos por n\u00EDvel
 AutomaticLayoutAction.tooltip=<html>Fixa o desenho do mapa. <br>O primeiro n\u00EDvel \u00E9 preto, o segundo azul, etc.</html>
 AutomaticLayoutControllerAction.ALL.text=para todos os n\u00F3s
 AutomaticLayoutControllerAction.COLUMNS.text=para colunas
-AutomaticLayoutControllerAction.HEADINGS.text=para n\u00F3s finais
-AutomaticLayoutControllerAction.null.text=desativado
+AutomaticLayoutControllerAction.HEADINGS.text=para n\u00F3s n\u00E3o-finais
+AutomaticLayoutControllerAction.null.text=desactivado
 BackAction.text=Recuar
-BackAction.tooltip=Recua na cadeia selecionada
+BackAction.tooltip=Recua na cadeia seleccionada
 background=Fundo
 bitmaps=Mapas de bits
 black=Preto
 BlinkingNodeHookAction.text=N\u00F3 cintilante
-BlinkingNodeHookAction.tooltip=<html>Faz o n\u00F3 piscar.Tenha cuidado. N\u00E3o associe a muitos n\u00F3s, e <strong> nunca com outras formata\u00E7\u00F5es autom\u00E1ticas no mesmo n\u00F3</strong></html>
+BlinkingNodeHookAction.tooltip=<html>Faz o n\u00F3 piscar. Tenha cuidado. N\u00E3o associe a muitos n\u00F3s, e <strong>nunca com outras formata\u00E7\u00F5es autom\u00E1ticas no mesmo n\u00F3</strong>.</html>
 blue=Azul
 BoldAction.text=Negrito
 boldify_branch=Negrito
@@ -171,25 +171,25 @@ browse=Navegar...
 calendar_attributes_panel=Calend\u00E1rio e atributos
 calendar_panel=Calend\u00E1rio
 can_not_clone_encrypted_node=Imposs\u00EDvel clonar n\u00F3s encriptados
-can_not_connect_to_info_server=Imposs\u00EDvel estabelecer liga\u00E7\u00E3o ao servidor
+can_not_connect_to_info_server=Imposs\u00EDvel ligar ao servidor de informa\u00E7\u00E3o
 can_not_delete_predefined_style=Imposs\u00EDvel eliminar estilo predefinido
-can_not_delete_root_style=Imposs\u00EDvel eliminar estilo ra\u00EDz
+can_not_delete_root_style=Imposs\u00EDvel eliminar estilo raiz
 can_not_delete_style_group=Imposs\u00EDvel eliminar grupo de estilos
 can_not_encrypt_cloned_node=Imposs\u00EDvel encriptar n\u00F3s clonados
 can_not_save_key_set=Imposs\u00EDvel gravar conjunto de atalhos
 cancel=&Cancelar
 CancelAction.text=Cancelar
 cannot_add_parent_diff_parents=Todos os n\u00F3s devem ter o mesmo n\u00F3-m\u00E3e para usar esta fun\u00E7\u00E3o.
-cannot_add_parent_to_root=O n\u00F3-ra\u00EDz n\u00E3o pode ser adicionado a um novo n\u00F3-m\u00E3e.
-cannot_delete_root=O n\u00F3 ra\u00EDz n\u00E3o pode ser eliminado ou cortado.
+cannot_add_parent_to_root=O n\u00F3-raiz n\u00E3o pode ser adicionado a um novo n\u00F3-m\u00E3e.
+cannot_delete_root=O n\u00F3-raiz n\u00E3o pode ser eliminado ou cortado.
 cannot_join_nodes_with_children=Imposs\u00EDvel juntar n\u00F3s com filhos
-cannot_move_into_child_node=Imposs\u00EDvel mover para n\u00F3 filho
-cannot_move_to_child=Imposs\u00EDvel mover um n\u00F3 para um dos seus filhos.
+cannot_move_into_child_node=Imposs\u00EDvel mover para n\u00F3-filho
+cannot_move_to_child=Imposs\u00EDvel mover um n\u00F3 para um dos seus n\u00F3s-filho.
 CenterAction.text=Centrar
-CenterSelectedNodeAction.text=Centrar n\u00F3 selecionado
-ChangeConnectorArrowsAction.backward.text=Desenhar seta para tr\u00E1s
+CenterSelectedNodeAction.text=Centrar n\u00F3 seleccionado
+ChangeConnectorArrowsAction.backward.text=Desenhar seta atr\u00E1s
 ChangeConnectorArrowsAction.both.text=Desenhar seta dupla
-ChangeConnectorArrowsAction.forward.text=Desenhar seta para a frente
+ChangeConnectorArrowsAction.forward.text=Desenhar seta adiante
 ChangeConnectorArrowsAction.none.text=Nenhuma
 ChangeConnectorArrowsAction.text=Alterar setas da liga\u00E7\u00E3o
 ChangeConnectorShapeAction.CUBIC_CURVE.text=Curva
@@ -197,47 +197,47 @@ ChangeConnectorShapeAction.EDGE_LIKE.text=Simular linha
 ChangeConnectorShapeAction.LINE.text=Linha
 ChangeConnectorShapeAction.LINEAR_PATH.text=Caminho linear
 ChangeNodeLevelLeftsAction.text=Mover n\u00F3 para a esquerda
-ChangeNodeLevelLeftsAction.tooltip=\u00C0 esquerda da ra\u00EDz o(s) n\u00F3(s) \u00E9/s\u00E3o empurrado(s) para baixo. Torna(m)-se filho(s) dos parentes acima. \u00C0 direita da ra\u00EDz o(s) n\u00F3(s) \u00E9/s\u00E3o empurrado(s) para cima. Diretamente na ra\u00EDz, os n\u00F3s mudam de lado.
-ChangeNodeLevelRightsAction.text=Mover n\u00F3 para a direita
-ChangeNodeLevelRightsAction.tooltip=\u00C0 esquerda da ra\u00EDz o(s) n\u00F3(s) \u00E9/s\u00E3o empurrado(s) para baixo. Torna(m)-se descendente(s) dos parentes acima. \u00C0 direita da ra\u00EDz o(s) n\u00F3(s) \u00E9/s\u00E3o empurrado(s) para cima. Diretamente na ra\u00EDz, os n\u00F3s mudam de lado.
+ChangeNodeLevelLeftsAction.tooltip=\u00C0 esquerda da raiz os n\u00F3s s\u00E3o empurrados para baixo. Tornam-se filhos dos n\u00F3s-m\u00E3e acima. \u00C0 direita da raiz os n\u00F3s s\u00E3o empurrados para cima. Directamente na raiz, os n\u00F3s mudam de lado.
+ChangeNodeLevelRightsAction.text=Mover n\u00F3 \u00E0 direita
+ChangeNodeLevelRightsAction.tooltip=\u00C0 esquerda da raiz os n\u00F3s s\u00E3o empurrados para baixo. Tornam-se filhos dos n\u00F3s-m\u00E3e acima. \u00C0 direita da raiz os n\u00F3s s\u00E3o empurrados para cima. Directamente na raiz, os n\u00F3s mudam de lado.
 choose_background_color=Escolha a cor do fundo:
 choose_cloud_color=Escolha a cor da nuvem:
 choose_edge_color=Escolha a cor da linha:
 choose_map_background_color=Escolha a cor do fundo do mapa:
-choose_node_background_color=Selecione a cor de fundo do n\u00F3:
+choose_node_background_color=Escolha a cor de fundo do n\u00F3:
 choose_node_color=Escolha a cor do n\u00F3:
-ClearLinkAnchorAction.text=Eliminar \u00E2ncora da liga\u00E7\u00E3o
+ClearLinkAnchorAction.text=Limpar \u00E2ncora da liga\u00E7\u00E3o
 ClearLinkAnchorAction.tooltip=<html>eliminar \u00E2ncora do n\u00F3 previamente definida</html>
 CloneAction.text=Colar clone
 close_btn=Fe&char
-CloseAction.text=Fechar mapa atual
+CloseAction.text=Fechar o mapa actual
 cloud_shapes=Formas da nuvem
 CloudAction.text=Adicionar/remover nuvem
 CloudColorAction.text=Cor da nuvem...
 CloudShapeAction.ARC.text=Arco
-CloudShapeAction.RECT.text=Ret\u00E2ngulo
-CloudShapeAction.ROUND_RECT.text=Ret\u00E2ngulo arredondado
+CloudShapeAction.RECT.text=Rect\u00E2ngulo
+CloudShapeAction.ROUND_RECT.text=Rect\u00E2ngulo arredondado
 CloudShapeAction.STAR.text=Estrela
 ColorProperty.ResetColor=Repor cor
 combined=Combinado
 condition=Condi\u00E7\u00E3o
 confirmation=Confirma\u00E7\u00E3o
-connector=Conector
-connector_arrows=Setas do conector
-connector_label=R\u00F3tulo do conector
-connector_lines=Linhas do conector
-connector_shapes=Formas do conector
-ConnectorColorAction.text=Cor do conector...
+connector=Liga\u00E7\u00E3o
+connector_arrows=Setas da liga\u00E7\u00E3o
+connector_label=R\u00F3tulo da liga\u00E7\u00E3o
+connector_lines=Linhas da liga\u00E7\u00E3o
+connector_shapes=Formas da liga\u00E7\u00E3o
+ConnectorColorAction.text=Cor da liga\u00E7\u00E3o...
 ConvertCloneToIndependentNodeAction.text=Desfazer clonagem
 CopyAction.text=Copiar
-CopyAction.tooltip=Copiar ramo selecionado
+CopyAction.tooltip=Copiar ramo seleccionado
 CopyAttributes.text=Copiar atributos
 CopyIDAction.text=Copiar ID do n\u00F3
 CopyMapStylesAction.text=Copiar estilo do mapa de...
 CopyNodeURIAction.text=Copiar URL do n\u00F3
 copyright=Copyright \u00A9 2000-2016 Equipa do Freeplane e outros
 CopySingleAction.text=Copiar n\u00F3 (simples)
-CopySingleAction.tooltip=Copiar s\u00F3 o n\u00F3 selecionado
+CopySingleAction.tooltip=Copiar s\u00F3 o n\u00F3 seleccionado
 CopyStyleExtensionsAction.text=Copiar extens\u00F5es do n\u00F3 de estilo
 corrupt_map=O conte\u00FAdo do mapa est\u00E1 corrompido
 CreateConjunctConditionAction.text=E
@@ -260,16 +260,16 @@ delete=&Eliminar
 delete_child=Eliminar n\u00F3
 DeleteAction.text=Remover n\u00F3
 DeleteConditionAction.text=Eliminar
-DeleteDetailsAction.text=Eliminar detalhes do n\u00F3
-DeleteLevelStyleAction.text=Eliminar estilo do n\u00EDvel
-DeleteStyleAction.text=Eliminar estilo
-DeleteUserStyleAction.text=Eliminar estilo definido pelo utilizador
+DeleteDetailsAction.text=Remover detalhes do n\u00F3
+DeleteLevelStyleAction.text=Remover estilo do n\u00EDvel
+DeleteStyleAction.text=Remover estilo
+DeleteUserStyleAction.text=Remover estilo do utilizador
 dialect_info.app=O mapa mental{0} foi criado com {1}.
 dialect_info.later_version=O mapa mental {0} foi criado com uma vers\u00E3o posterior deste programa.
 dialect_info.unknownApp=O mapa mental {0} foi criado por um programa desconhecido.
-dialect_info.unknownURL=A sua p\u00E1gina Web n\u00E3o \u00E9 conhecida.
-dialect_info.url=Visite a p\u00E1gina Web do programa {0} para mais informa\u00E7\u00E3o.
-dialect_info.warning=Pode acontecer que o Freeplane o abra, mostre ou grave incorretamente.
+dialect_info.unknownURL=A sua p\u00E1gina web n\u00E3o \u00E9 conhecida.
+dialect_info.url=Visite a p\u00E1gina web do programa {0} para mais informa\u00E7\u00E3o.
+dialect_info.warning=O Freeplane poder\u00E1 abri-lo, mostr\u00E1-lo ou grav\u00E1-lo incorrectamente.
 DirectHtmlFlavorHandler=HTML como n\u00F3 \u00FAnico
 DocumentationAction.text=Documenta\u00E7\u00E3o
 down=Abaix&o
@@ -279,22 +279,22 @@ dropped_file_error=Imposs\u00EDvel abrir ficheiro(s) largado(s). Motivo: {0}
 edge=Linha
 edge_is_formatted_by_style=O formato da linha \u00E9 controlado pelo estilo. Edite os estilos se necess\u00E1rio.
 edge_style=Estilo da linha
-edge_width=Largura da linha
-edge_widths=Larguras da margem
+edge_width=Espessura da linha
+edge_widths=Espessuras da linha
 EdgeColorAction.text=Cor da linha...
-EdgeProperties=Propriedades da margem
+EdgeProperties=Propriedades da linha
 EdgeStyleAction.bezier.text=Curva suave (B\u00E9zier)
 EdgeStyleAction.bezier.tooltip=<html>Mostrar a linha como curva suave</html>
 EdgeStyleAction.hide_edge.text=Ocultar linha
-EdgeStyleAction.hide_edge.tooltip=<html>Para os n\u00F3s selecionados, mostrar linha como<br>linha pontilhada. Sen\u00E3o ocultar a linha.</html>
+EdgeStyleAction.hide_edge.tooltip=<html>Para os n\u00F3s seleccionados, mostrar linha como<br>linha pontilhada. Sen\u00E3o, ocultar a linha.</html>
 EdgeStyleAction.horizontal.text=Horizontal
-EdgeStyleAction.horizontal.tooltip=<html>Usar linhas retas perpendiculares para as linhas.</html>
+EdgeStyleAction.horizontal.tooltip=<html>Usar linhas rectas perpendiculares para as linhas.</html>
 EdgeStyleAction.linear.text=Linear
-EdgeStyleAction.linear.tooltip=<html>Mostrar a linha como linha reta</html>
-EdgeStyleAction.sharp_bezier.text=Curva afiada (B\u00E9zier)
-EdgeStyleAction.sharp_bezier.tooltip=<html>Mostrar a linha como curva suave com pontas afiadas.</html>
-EdgeStyleAction.sharp_linear.text=Linear afiada
-EdgeStyleAction.sharp_linear.tooltip=<html>Mostrar a linha como linha reta com pontas afiadas.</html>
+EdgeStyleAction.linear.tooltip=<html>Mostrar a linha como linha recta</html>
+EdgeStyleAction.sharp_bezier.text=Curva precisa (B\u00E9zier)
+EdgeStyleAction.sharp_bezier.tooltip=<html>Mostrar a linha como curva suave com pontas precisas.</html>
+EdgeStyleAction.sharp_linear.text=Linear precisa
+EdgeStyleAction.sharp_linear.tooltip=<html>Mostrar a linha como linha recta com pontas precisas.</html>
 EdgeStyleAsParentAction.text=Igual ao do n\u00F3-m\u00E3e
 EdgeStyleAsParentAction.tooltip=<html>Usar estilo de linha do n\u00F3-m\u00E3e.</html>[obsoleto]
 EdgeWidthAction_width_parent.text=N\u00F3-m\u00E3e
@@ -303,8 +303,8 @@ edit=&Editar
 edit.decision=Editor HTML
 edit.edit_rich_text=Quer utilizar formata\u00E7\u00F5es como negrito e it\u00E1lico?
 edit_details=Editar detalhes do n\u00F3
-edit_end_label=<html>R\u00F3tulo do<br>conector
-edit_label_font_family=Tipo de letra
+edit_end_label=<html>R\u00F3tulo da<br>liga\u00E7\u00E3o
+edit_label_font_family=Letra
 edit_label_font_size=Tamanho da letra
 edit_link_manually=Editar hiperliga\u00E7\u00E3o manualmente...
 edit_long_node=Editar n\u00FAcleo do n\u00F3 em janela
@@ -320,22 +320,22 @@ EditDetailsAction.text=Editar detalhes do n\u00F3 em linha
 EditDetailsInDialogAction.text=Editar detalhes do n\u00F3 em janela
 EditFilterAction.text=Compor filtro
 EditLongAction.text=Editar n\u00FAcleo do n\u00F3 em janela
-EditNoteInDialogAction.text=Editar n\u00F3 em janela
+EditNoteInDialogAction.text=Editar nota em janela
 EditScript=Editar script...
 EditStylesAction.text=Editar estilos
 EncryptedMap.text=Novo mapa protegido (encriptado)...
-EncryptedMap.tooltip=Novo mapa encriptado
+EncryptedMap.tooltip=Novo mapa protegido
 encryption=Encripta\u00E7\u00E3o
-enter_base_url=Vou colar liga\u00E7\u00F5es relativas. Por favor indique a URL base.
+enter_base_url=V\u00E3o-se colar liga\u00E7\u00F5es relativas. Por favor, indique o URL base.
 enter_command=Insira o comando
-enter_condition_name=Introduza o nome da nova condi\u00E7\u00E3o
+enter_condition_name=Insira o nome da nova condi\u00E7\u00E3o
 enter_confirms=&Enter confirma
-enter_keyset_name=Introduza o nome do conjunto de atalhos
-enter_map_url=Introduza a URL do mapa
-enter_new_style_name=Introduza o nome do novo estilo
-enter_node_id=Introduza a ID do n\u00F3
-enter_zoom=Introduza a amplia\u00E7\u00E3o
-EnterPassword.text=Introduza a palavra-passe
+enter_keyset_name=Insira o nome do conjunto de atalhos
+enter_map_url=Insira o URL do mapa
+enter_new_style_name=Insira o nome do novo estilo
+enter_node_id=Insira a ID do n\u00F3
+enter_zoom=Insira a amplia\u00E7\u00E3o
+EnterPassword.text=Insira a senha
 error=Erro
 error_applying_template=Erro ao aplicar o modelo XSL.
 error_creating_directory=Imposs\u00EDvel criar a pasta para exporta\u00E7\u00E3o.
@@ -345,13 +345,13 @@ ExecuteScript.available_modes_tooltip={0} est\u00E1 dispon\u00EDvel para
 ExecuteScript.script=Script
 ExecuteScriptError.text=Erro ao executar o script:\n{0}
 ExecuteScriptForAllNodes.text=Executar todos os scripts
-ExecuteScriptForSelectionAction.text=Executar os scripts dos n\u00F3s selecionados
-ExecuteScriptOnSelectedNode.text=Executar {0} em todos os n\u00F3s selecionados
-ExecuteScriptOnSelectedNodeRecursively.text=Executar {0} recursivamente nos n\u00F3s selecionados
-ExecuteScriptOnSingleNode.text=Executar {0} num n\u00F3 selecionado
+ExecuteScriptForSelectionAction.text=Executar scripts dos n\u00F3s seleccionados
+ExecuteScriptOnSelectedNode.text=Executar {0} em todos os n\u00F3s seleccionados
+ExecuteScriptOnSelectedNodeRecursively.text=Executar {0} recursivamente nos n\u00F3s seleccionados
+ExecuteScriptOnSingleNode.text=Executar {0} num n\u00F3 seleccionado
 ExecuteScripts.noScriptsAvailable=Nenhum dispon\u00EDvel
 ExecuteScripts.text=Scripts
-ExecuteScriptSecurityError.text=Ocorreu um erro durante a execu\u00E7\u00E3o do script {0}
+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)
@@ -359,10 +359,10 @@ export_using_xslt=Exportar para Freeplane
 ExportAction.text=Exportar mapa...
 ExportBranchAction.text=Mover ramo para novo mapa...
 ExportBranchToHTMLAction.text=Ramo como HTML
-exported_file={0} ficheiros
+exported_file=ficheiro {0}
 ExportPdf.text=Como PDF...
 ExportSvg.text=Como SVG...
-ExportToHTMLAction.text=Como HTML
+ExportToHTMLAction.text=Como HTML...
 ExportToImage.jpg.text=Como JPEG...
 ExportToImage.png.text=Como PNG...
 ExportToOoWriter.text=Como documento do Apache OpenOffice Writer...
@@ -370,72 +370,72 @@ ExportToOoWriter.tooltip=N\u00F3s desdobrados da estrutura, dobram os n\u00F3s d
 extension_menu=Estilo f\u00EDsico
 ExternalImage_popupMenu_Change=Alterar...
 ExternalImage_popupMenu_Open=Abrir no visualizador
-ExternalImage_popupMenu_Remove=Eliminar
+ExternalImage_popupMenu_Remove=Remover
 ExternalImage_popupMenu_ResetZoom=Repor amplia\u00E7\u00E3o
 ExternalImageAddAction.text=Adicionar imagem...
 ExternalImageChangeAction.text=Alterar imagem...
-ExternalImageRemoveAction.text=Eliminar imagem
+ExternalImageRemoveAction.text=Remover imagem
 ExtractLinkFromTextAction.text=Converter texto em hiperliga\u00E7\u00E3o
 ExtractLinkFromTextAction.tooltip=Criar hiperliga\u00E7\u00E3o de endere\u00E7o no texto do n\u00F3
-extras=&Ferramentas
-f_button_unassigned=<nenhuma a\u00E7\u00E3o>
+extras=Ferramen&tas
+f_button_unassigned=<nenhuma ac\u00E7\u00E3o>
 FaqOpenURLAction.text=FAQ
 file=&Ficheiro
 file_already_exists=O ficheiro {0} j\u00E1 existe. Quer substitu\u00ED-lo?
 file_not_found=Ficheiro {0} n\u00E3o encontrado
 FileListFlavorHandler=Liga\u00E7\u00F5es a ficheiros
-FileProperties_BranchLeafCount=N\u00FAmero de n\u00F3s finais no(s) ramo(s) selecionado(s):
-FileProperties_BranchNodeCount=N\u00FAmero de n\u00F3s no(s) ramo(s) selecionado(s):
+FileProperties_BranchLeafCount=N\u00FAmero de n\u00F3s finais nos ramos seleccionados:
+FileProperties_BranchNodeCount=N\u00FAmero de n\u00F3s nos ramos seleccionados:
 FileProperties_ChangesSinceLastSave=Altera\u00E7\u00F5es desde a \u00FAltima grava\u00E7\u00E3o:
 FileProperties_FileName=Nome do ficheiro:
 FileProperties_FileSaved=Ficheiro gravado:
 FileProperties_FileSize=Tamanho do ficheiro:
 FileProperties_MainBranchCount=N\u00FAmero de ramos principais:
 FileProperties_NeverSaved=Nunca gravado
-FileProperties_NodeChildCount=N\u00FAmero de n\u00F3s-filho dos n\u00F3s selecionados:
-FileProperties_NodeSelectionCount=N\u00FAmero de n\u00F3s selecionados:
+FileProperties_NodeChildCount=N\u00FAmero de n\u00F3s-filho dos n\u00F3s seleccionados:
+FileProperties_NodeSelectionCount=N\u00FAmero de n\u00F3s seleccionados:
 FileProperties_TotalFilteredCount=N\u00FAmero de n\u00F3s que satisfazem o filtro:
 FileProperties_TotalLeafCount=N\u00FAmero total de n\u00F3s finais:
 FileProperties_TotalNodeCount=N\u00FAmero total de n\u00F3s:
 FilePropertiesAction.text=Estat\u00EDsticas do mapa...
 FileRevisionsDialog.cancel=&Cancelar
-FileRevisionsDialog.file_last_modified=Selo de data
+FileRevisionsDialog.file_last_modified=Data e hora
 FileRevisionsDialog.file_name=Ficheiro
 FileRevisionsDialog.file_size=Bytes
 FileRevisionsDialog.open=&Abrir
-FileRevisionsDialog.open.tooltip=Abrir o ficheiro mesmo que esteja desatualizado
+FileRevisionsDialog.open.tooltip=Abrir o ficheiro mesmo que esteja desactualizado
 FileRevisionsDialog.question=Encontradas revis\u00F5es de {0}
 FileRevisionsDialog.restore=Resta&urar
 FileRevisionsDialog.restore.tooltip=Substituir {0} por {1}
 FileRevisionsDialog.title=Revis\u00F5es do ficheiro
 filter=F&iltrar
 filter_add=&Adicionar
-filter_and=E
+filter_and=&E
 filter_any_text=N\u00FAcleo, detalhes ou nota
-filter_clone_snapshot=Clones gravados da sele\u00E7\u00E3o
-filter_clones=Clones da sele\u00E7\u00E3o
+filter_clone_snapshot=Clones gravados da selec\u00E7\u00E3o
+filter_clones=Clones da selec\u00E7\u00E3o
 filter_conditions=Filtros
 filter_contains=Cont\u00E9m
-filter_created_after=Criado depois de
+filter_created_after=Criado ap\u00F3s
 filter_created_before=Criado antes de
 filter_delete=&Eliminar
 filter_details=Detalhes
-filter_dialog=Composi\u00E7\u00E3o de filtros
+filter_dialog=Compositor de filtros
 filter_does_not_exist=N\u00E3o existe
 filter_edit_description=Editar lista de filtros
-filter_enter_value=Introduza o valor
+filter_enter_value=Insira o valor
 filter_even_level=N\u00F3 de n\u00EDvel \u00EDmpar
 filter_exist=Existe
 filter_icon=\u00CDcone
 filter_is_equal_to=\u00C9 igual a
-filter_is_not_equal_to=N\u00E3o \u00E9 igual a
+filter_is_not_equal_to=\u00C9 diferente de
 filter_leaf=N\u00F3 final
 filter_link=Hiperliga\u00E7\u00E3o
 filter_match_approximately=&Aproximado
-filter_match_approximately_tooltip=<html>Se se permitem coincid\u00EAncias aproximadas,<br/>i.e. procurar por 'meia' encontra 'miea'.</html>
-filter_match_case=Mai\u00FAs&culas e min\u00FAsculas
-filter_match_case_tooltip=Se se respeitam as mai\u00FAsculas e as min\u00FAsculas durante a procura.
-filter_modified_after=Modificado depois de
+filter_match_approximately_tooltip=<html>Se se permitem resultados aproximados,<br/>i.e. procurar por 'meia' encontra 'miea'.</html>
+filter_match_case=&Comparar mai\u00FAsculas
+filter_match_case_tooltip=Se se respeitam as mai\u00FAsculas e as min\u00FAsculas durante a compara\u00E7\u00E3o.
+filter_modified_after=Modificado ap\u00F3s
 filter_modified_before=Modificado antes de
 filter_no_filtering=Sem filtragem
 filter_node=Texto do n\u00FAcleo
@@ -443,21 +443,21 @@ filter_node_level=N\u00EDvel do n\u00F3
 filter_not=&N\u00E3o
 filter_note=Nota
 filter_odd_level=N\u00F3 de n\u00EDvel par
-filter_or=Ou
+filter_or=O&u
 filter_parent=Texto do n\u00F3-m\u00E3e
 filter_periodic_level=Peri\u00F3dico
 filter_priority=Prioridade
-filter_regexp_matches=Express\u00F5es regulares
+filter_regexp_matches=Express\u00E3o regular
 filter_reminder=Lembrete
-filter_reminder_after=marcado depois de
+filter_reminder_after=marcado ap\u00F3s
 filter_reminder_before=marcado antes de
 filter_reminder_executed=j\u00E1 terminado
 filter_reminder_later=marcado mais tarde
-filter_root=N\u00F3-ra\u00EDz
+filter_root=N\u00F3-raiz
 filter_script=Filtro de script
-filter_select=&Selecionar
-filter_selected_node_view=N\u00F3s atualmente selecionados
-filter_selected_node_view_snapshot=Sele\u00E7\u00E3o gravada
+filter_select=&Seleccionar
+filter_selected_node_view=N\u00F3s actualmente seleccionados
+filter_selected_node_view_snapshot=Selec\u00E7\u00E3o gravada
 filter_style=Estilo
 filter_time=Filtro de data
 FilterCondition=Condi\u00E7\u00F5es do filtro
@@ -470,25 +470,25 @@ FindAction.text=&Localizar...
 FindNextAction.text=Localizar seguinte
 FindPreviousAction.text=Localizar anterior
 fit_background_to_page=Ajustar imagem de fundo a uma p\u00E1gina
-fit_map_to_page=A&justar numa pagina
-fit_map_to_page_height=Ajustar altura a uma p\u00E1gina
-fit_map_to_page_width=Ajustar largura a uma p\u00E1gina
+fit_map_to_page=A&justar a uma pagina
+fit_map_to_page_height=Ajustar &altura a uma p\u00E1gina
+fit_map_to_page_width=Ajustar &largura a uma p\u00E1gina
 FitToPage.text=Ampliar \u00E0 p\u00E1gina
 FitToPage.tooltip=Ajusta a amplia\u00E7\u00E3o para que o mapa caiba todo na janela.
 fold=Dobrar
 FoldAllAction.text=Dobrar todos
-FoldAllAction.tooltip=<html>Dobra os n\u00F3s selecionados e todos os seus n\u00F3s-filho.</html>
+FoldAllAction.tooltip=<html>Dobra os n\u00F3s seleccionados e todos os seus n\u00F3s-filho.</html>
 FoldOneLevelAction.text=Dobrar um n\u00EDvel
-FoldOneLevelAction.tooltip=<html>Dobra os n\u00F3s selecionados um n\u00EDvel.</html>
+FoldOneLevelAction.tooltip=<html>Dobra os n\u00F3s seleccionados um n\u00EDvel.</html>
 follow_clone=Dentro de "{0}"
 follow_graphical_link=Ir para "{0}"
 FollowLinkAction.text=Seguir liga\u00E7\u00E3o
-font=Tipo de letra
+font=Letra
 FontFamilyAction.text=Fam\u00EDlia da letra
 FontSizeAction.text=Tamanho da letra
 format=F&ormatar
 format_invalid_pattern=Padr\u00E3o inv\u00E1lido
-format_menu_cloud_shapes=Adicionar cor ou alterar estilo
+format_menu_cloud_shapes=Adicionar nuvem ou alterar estilo
 format_menu_edge_styles=&Estilo das linhas
 format_menu_edge_widths=Es&pessura das linhas
 format_panel=Formatar
@@ -500,23 +500,23 @@ formats_not_loaded=Imposs\u00EDvel carregar formatos, ficheiro corrompido
 formula.error.attributeValueIsNull=O valor do atributo {0} \u00E9 nulo ap\u00F3s a avalia\u00E7\u00E3o.
 formula.error.circularReference=Refer\u00EAncia circular: a f\u00F3rmula no n\u00F3 {0} referencia-se a si mesma.
 formula.EvaluateAllAction.text=Avaliar tudo
-formula.EvaluateAllAction.tooltip=Avaliar todas as f\u00F3rmulas no mapa atual
+formula.EvaluateAllAction.tooltip=Avaliar todas as f\u00F3rmulas no mapa actual
 formula.menuname=F\u00F3rmulas
 formula_editor=Editar f\u00F3rmula
 ForwardAction.text=Avan\u00E7ar
-ForwardAction.tooltip=Avan\u00E7a na cadeia selecionada
+ForwardAction.tooltip=Avan\u00E7a na cadeia seleccionada
 FreeNodeAction.text=N\u00F3 livre (definir/repor)
 Freeplane.progress.buildScreen=Construir ecr\u00E3...
 Freeplane.progress.createController=Criar controlador...
-Freeplane.progress.createInitialMode=Criar Modo Inicial...
+Freeplane.progress.createInitialMode=Criar modo inicial...
 Freeplane.progress.endStartup=Terminar in\u00EDcio.
 Freeplane.progress.gettingPreferenceDirectories=A obter pastas preferidas...
 Freeplane.progress.gettingPreferences=A obter prefer\u00EAncias...
 Freeplane.progress.loadMaps=Carregar mapas...
-Freeplane.progress.propagateLookAndFeel=Propagar aspeto e estilos...
+Freeplane.progress.propagateLookAndFeel=Propagar aspecto e estilos...
 Freeplane.progress.settingPreferences=A definir prefer\u00EAncias...
 Freeplane.progress.startCreateController=Iniciar a cria\u00E7\u00E3o do controlador...
-Freeplane.progress.updateLookAndFeel=Atualizar aspeto e estilos...
+Freeplane.progress.updateLookAndFeel=Actualizar aspecto e estilos...
 freeplane_reverted=Freeplane_Revertido_
 FreeplaneHelpStarter.text=Ajuda...
 FreeplaneHelpStarter.tooltip=Extens\u00E3o da ajuda do Freeplane
@@ -528,18 +528,18 @@ GotoNodeAction.text=Ir para o n\u00F3 com a ID...
 GrabKeyDialog.common.cancel=Cancelar
 GrabKeyDialog.common.ok=Aceitar
 GrabKeyDialog.grab-key.assigned-to=Atribu\u00EDdo a
-GrabKeyDialog.grab-key.assigned-to.none=Atualmente n\u00E3o atribu\u00EDdo
+GrabKeyDialog.grab-key.assigned-to.none=Actualmente n\u00E3o atribu\u00EDdo
 GrabKeyDialog.grab-key.clear=Limpar
-GrabKeyDialog.grab-key.remove=Eliminar
-GrabKeyDialog.grab-key.remove-ask=Tem a certeza que quer eliminar esta combina\u00E7\u00E3o de teclas?
-GrabKeyDialog.grab-key.title=Introduza nova chave
+GrabKeyDialog.grab-key.remove=Remover
+GrabKeyDialog.grab-key.remove-ask=Tem a certeza de que quer eliminar esta combina\u00E7\u00E3o de teclas?
+GrabKeyDialog.grab-key.title=Insira nova tecla
 green=Verde
 help=Aj&uda
 HideableAction.tooltip=<html>Marca o fundo de cada n\u00F3 alterado.</html>
 HideAllAttributesAction.text=Ocultar todos os atributos
 HierarchicalIcons2Action.text=Mostrar intersec\u00E7\u00E3o dos \u00EDcones-filho
 HierarchicalIconsAction.text=Mostrar \u00EDcones hierarquicamente
-HierarchicalIconsAction.tooltip=Se um dos meus netos tiver um \u00EDcone, tamb\u00E9m mostro este \u00EDcone num formato pequeno.
+HierarchicalIconsAction.tooltip=Se um dos netos deste n\u00F3 tiver um \u00EDcone, mostr\u00E1-lo tamb\u00E9m num formato pequeno.
 hot_keys=Atalhos
 hot_keys_table=Tabela de atalhos
 HotKeyInfoAction.text=Refer\u00EAncia de teclas
@@ -558,7 +558,7 @@ icon_attach=Ver aqui
 icon_audio=Som
 icon_back=Anterior
 icon_bee=Freeplane
-icon_bell=A lembrar
+icon_bell=Recordar
 icon_bookmark=Excelente
 icon_broken-line=Quebrado
 icon_button_cancel=Mal
@@ -611,9 +611,9 @@ icon_idea=Ideia
 icon_image=Imagem
 icon_info=Informa\u00E7\u00E3o
 icon_internet=Internet
-icon_internet_warning=Aviso da internet
+icon_internet_warning=Aviso da Internet
 icon_kaddressbook=Telefone
-icon_kmail=Correio eletr\u00F3nico
+icon_kmail=Correio electr\u00F3nico
 icon_knotify=M\u00FAsica
 icon_korn=Caixa de correio
 icon_ksmiletris=Estou feliz
@@ -632,7 +632,7 @@ icon_narrative=Narrativa
 icon_negative=Negativo
 icon_neutral=Neutro
 icon_password=Chave
-icon_pencil=A refinar
+icon_pencil=Para refinar
 icon_penguin=Linux
 icon_positive=Positivo
 icon_prepare=Sem\u00E1foro amarelo
@@ -642,8 +642,8 @@ icon_smiley-neutral=Neutro
 icon_smiley-oh=Surpreso
 icon_smily_bad=Triste
 icon_stop=Sem\u00E1foro vermelho
-icon_stop-sign=Stop
-icon_subtraction=Subtra\u00E7\u00E3o
+icon_stop-sign=Parar
+icon_subtraction=Subtrac\u00E7\u00E3o
 icon_unchecked=N\u00E3o verificado
 icon_up=Acima
 icon_user_icon=\u00CDcones do utilizador
@@ -665,8 +665,8 @@ IconGroupPopupAction.office.text=Escrit\u00F3rio
 IconGroupPopupAction.people.text=Pessoas
 IconGroupPopupAction.rating.text=Classifica\u00E7\u00E3o
 IconGroupPopupAction.signs.text=Sinais
-IconGroupPopupAction.smiley.text=Smileys
-IconGroupPopupAction.time.text=Tempo
+IconGroupPopupAction.smiley.text=Smiley
+IconGroupPopupAction.time.text=Hora
 IconGroupPopupAction.user.text=\u00CDcones do utilizador
 IconProgressExtended10Action.text=Aumentar progresso em 10%
 IconProgressExtended10Action.tooltip=<html>Adiciona um indicador de progresso que \u00E9 incrementado em 10% ao duplo clique.<br>Ctrl + duplo clique decrementa-o/remove-o.</html>
@@ -676,25 +676,25 @@ IconProgressIconDownAction.text=Reduzir progresso
 IconProgressIconDownAction.tooltip=Decrementa/insere/remove \u00EDcones de progresso (100%->75%->50%->25%->0%->remover).
 IconProgressIconUpAction.text=Aumentar progresso
 IconProgressIconUpAction.tooltip=Incrementa/insere \u00EDcones de progresso (0%->25%->50%->75%->100%->Completo).
-IconProgressRemoveAction.text=Remove indicador de progresso
+IconProgressRemoveAction.text=Remover progresso
 IconProgressRemoveAction.tooltip=Remove \u00EDcones de progresso e o \u00EDcone clic\u00E1vel.
 icons=\u00CDcones
-IconSelectionPlugin.text=Selecionar \u00EDcone da tabela...
-IconSelectionPlugin.tooltip=<html>Aqui pode selecionar um \u00EDcone usando uma subjanela.</html>
+IconSelectionPlugin.text=Seleccionar \u00EDcone da tabela...
+IconSelectionPlugin.tooltip=<html>Aqui pode seleccionar um \u00EDcone usando uma sub-janela.</html>
 image_covertLink=Converter liga\u00E7\u00E3o em imagem
 ImageFlavorHandler=Imagem (usar ficheiro separado)
 import=I&mportar
-import_linked_branch_no_link=O n\u00F3 selecionado n\u00E3o tem liga\u00E7\u00F5es para importar.
+import_linked_branch_no_link=O n\u00F3 seleccionado n\u00E3o tem liga\u00E7\u00F5es para importar.
 ImportAction.text=Importar mapa
 ImportBranchAction.text=Ramo...
-ImportExplorerFavoritesAction.text=Favoritos do IExplorer...
+ImportExplorerFavoritesAction.text=Favoritos do Explorer...
 ImportFolderStructureAction.text=Estrutura de pastas...
-ImportLinkedBranchAction.text=Importar ramo ligado
+ImportLinkedBranchAction.text=Ramo ligado
 ImportLinkedBranchWithoutRootAction.text=Ramo ligado sem raiz...
 ImportMindmanagerFiles.text=Mapa MindManager X5...
-ImportXmlFile.text=Importar fiheiro XML
+ImportXmlFile.text=Importar ficheiro XML
 increase_branch_font_size=Aumentar letra
-IncreaseNodeFontAction.text=Aumentar letra
+IncreaseNodeFontAction.text=Letra maior
 internal_error_tooltip=Erro interno. Clique para abrir o di\u00E1rio log.0 para mais informa\u00E7\u00E3o.
 invalid_export_file=Nome para exporta\u00E7\u00E3o inv\u00E1lido
 invalid_file_msg=Imposs\u00EDvel encontrar ficheiro para {0}
@@ -711,19 +711,19 @@ latex_editor=Editar f\u00F3rmula LaTex
 LatexDeleteLatexAction.text=Remover f\u00F3rmula LaTeX
 LatexEditLatexAction.text=Editar f\u00F3rmula LaTeX...
 LatexInsertLatexAction.msg1=<html>Est\u00E1 a tentar inserir uma f\u00F3rmula LaTex <i>antiga</i>.<br/>A nova forma de criar texto/f\u00F3rmulas LaTeX \u00E9 descrita nesta p\u00E1gina:</html>
-LatexInsertLatexAction.msg2=<html>Em resumo: <ul><li>use um prefixo "\\latex " no n\u00F3 de texto ou</li><li><i>Ver->Propriedades</i>, e depois <i>Texto do n\u00FAcleo->Formatar->Latex</i></li></ul></html>
-LatexInsertLatexAction.text=Adicionar f\u00F3rmula LaTex...
-latexPatternFormat=LaTex
+LatexInsertLatexAction.msg2=<html>Em resumo: <ul><li>use um prefixo "\\latex " no n\u00F3 de texto ou</li><li><i>Ver->Barras de ferramentas->Janela de propriedades</i> e depois <i>Texto do n\u00FAcleo->Formato->LaTeX</i></li></ul></html>
+LatexInsertLatexAction.text=Adicionar f\u00F3rmula LaTeX...
+latexPatternFormat=LaTeX
 LengthUnits.cm=cm
 LengthUnits.in=pol
 LengthUnits.mm=mm
 LengthUnits.pt=pt
 LengthUnits.px=px
-less_than_two_selected_nodes=Tem de selecionar pelo menos dois n\u00F3s para criar liga\u00E7\u00F5es.
+less_than_two_selected_nodes=Tem de seleccionar pelo menos dois n\u00F3s para criar liga\u00E7\u00F5es.
 license=Licen\u00E7a: GPL 2 ou posterior
 license_text=<html>Este programa \u00E9 gratuito; pode redistribui-lo e/ou<br>modific\u00E1-lo sob os termos da licen\u00E7a p\u00FAblica geral - GNU General Public License<br>como publicado pela Free Software Foundation; seja a vers\u00E3o 2<br>da Licen\u00E7a, ou (por escolha sua) outra vers\u00E3o posterior.<br><br>Este programa \u00E9 distribu\u00EDdo na esperan\u00E7a de que seja \u00FAtil,<br>mas SEM QUALQUER GARANTIA; sem sequer a garantia impl\u00EDcita de<br>VALOR COMERCIAL ou S [...]
-link_error=Liga\u00E7\u00E3o incorreta, {0} n\u00E3o carregado
-link_not_available_any_more=A liga\u00E7\u00E3o j\u00E1 n\u00E3o \u00E9 v\u00E1lida. O n\u00F3 foi eliminado no meio tempo.
+link_error=Liga\u00E7\u00E3o incorrecta, "{0}" n\u00E3o carregado
+link_not_available_any_more=A liga\u00E7\u00E3o j\u00E1 n\u00E3o \u00E9 v\u00E1lida. O n\u00F3 foi eliminado entretanto.
 link_not_found=Liga\u00E7\u00E3o {0} n\u00E3o encontrada.
 links=Liga\u00E7\u00E3o
 load=&Carregar
@@ -733,51 +733,51 @@ LoadAcceleratorPresetsAction.textPatterns.text=Padr\u00F5es de texto
 locking_failed_by_open=Bloqueio do mapa {0} falhou. A abrir em modo s\u00F3 de leitura.
 locking_failed_by_save_as=Bloqueio do mapa {0} falhou. Opera\u00E7\u00E3o "Gravar como" cancelada.
 locking_old_lock_removed=O mapa {0} foi bloqueado pelo utilizador {1}. O bloqueio foi removido por ser muito antigo.
-long_node_changed_cancel=O n\u00F3 foi modificado. Quer ignorar as altera\u00E7\u00F5es?
+long_node_changed_cancel=O n\u00F3 foi modificado. Quer descartar as altera\u00E7\u00F5es?
 long_node_changed_submit=O n\u00F3 foi modificado. Quer gravar as altera\u00E7\u00F5es?
-lots_of_links_warning=Vai criar muitas liga\u00E7\u00F5es ao mesmo n\u00F3. Tem a certeza que quer continuar?
+lots_of_links_warning=Vai criar muitas liga\u00E7\u00F5es ao mesmo n\u00F3. Tem a certeza de que quer continuar?
 main_menu=Menu
 main_resource_directory=Recursos da instala\u00E7\u00E3o: {0}
 MainView.errorUpdateText=Erro ao definir o texto para a entrada: {0}.
 MakeLinkFromAnchorAction.text=Criar liga\u00E7\u00E3o a partir da \u00E2ncora
-MakeLinkFromAnchorAction.tooltip=<html>criar uma liga\u00E7\u00E3o local ou global da<br/>\u00E2ncora do n\u00F3 ao n\u00F3 selecionado</html>
+MakeLinkFromAnchorAction.tooltip=<html>criar uma liga\u00E7\u00E3o local ou global da<br/>\u00E2ncora do n\u00F3 ao n\u00F3 seleccionado</html>
 MakeLinkToAnchorAction.text=Criar liga\u00E7\u00E3o \u00E0 \u00E2ncora
-MakeLinkToAnchorAction.tooltip=<html>criar uma liga\u00E7\u00E3o local ou global do<br/>n\u00F3 selecionado \u00E0 \u00E2ncora do n\u00F3</html>
-ManageAddOnsAction.text=Suplementos
-ManageAddOnsDialog.activate=Ativar
-ManageAddOnsDialog.activation.success={0} ser\u00E1 ativado ap\u00F3s reiniciar.
+MakeLinkToAnchorAction.tooltip=<html>criar uma liga\u00E7\u00E3o local ou global do<br/>n\u00F3 seleccionado \u00E0 \u00E2ncora do n\u00F3</html>
+ManageAddOnsAction.text=Extens\u00F5es
+ManageAddOnsDialog.activate=Activar
+ManageAddOnsDialog.activation.success={0} ser\u00E1 activado ap\u00F3s reiniciar.
 ManageAddOnsDialog.authored.by=por {0}
-ManageAddOnsDialog.cannot.activate=Imposs\u00EDvel ativar: {0} j\u00E1 est\u00E1 ativo.
+ManageAddOnsDialog.cannot.activate=Imposs\u00EDvel activar: {0} j\u00E1 est\u00E1 activo.
 ManageAddOnsDialog.cannot.configure=Imposs\u00EDvel configurar {0}.
-ManageAddOnsDialog.cannot.deactivate=Imposs\u00EDvel desativar: {0} n\u00E3o est\u00E1 ativo.
+ManageAddOnsDialog.cannot.deactivate=Imposs\u00EDvel desactivar: {0} n\u00E3o est\u00E1 activo.
 ManageAddOnsDialog.cannot.deinstall=Imposs\u00EDvel desinstalar {0}.
 ManageAddOnsDialog.configure=Configurar
-ManageAddOnsDialog.deactivate=Desativar
-ManageAddOnsDialog.deactivation.success={0} ser\u00E1 desativado ap\u00F3s reiniciar.
+ManageAddOnsDialog.deactivate=Desactivar
+ManageAddOnsDialog.deactivation.success={0} ser\u00E1 desactivado ap\u00F3s reiniciar.
 ManageAddOnsDialog.deinstall=Desinstalar
 ManageAddOnsDialog.deinstallation.success={0} ser\u00E1 desinstalado ap\u00F3s reiniciar.
 ManageAddOnsDialog.error=Erro de instala\u00E7\u00E3o: {0}.
 ManageAddOnsDialog.install=&Instalar
-ManageAddOnsDialog.install.from.known.location=Instalar suplemento de uma localiza\u00E7\u00E3o conhecida
-ManageAddOnsDialog.install.tooltip=Insira aqui o URL do ficheiro de instala\u00E7\u00E3o do suplemento
+ManageAddOnsDialog.install.from.known.location=Instalar extens\u00E3o de uma localiza\u00E7\u00E3o conhecida
+ManageAddOnsDialog.install.tooltip=Insira aqui o URL do ficheiro de instala\u00E7\u00E3o da extens\u00E3o
 ManageAddOnsDialog.map.not.opened=O mapa {0} n\u00E3o parece estar aberto.
 ManageAddOnsDialog.really.deinstall=Quer mesmo desinstalar {0}?
-ManageAddOnsDialog.search=Procurar suplementos
+ManageAddOnsDialog.search=Procurar extens\u00F5es
 ManageAddOnsDialog.search.file=Procurar
-ManageAddOnsDialog.select.tooltip=Selecionar ficheiro
+ManageAddOnsDialog.select.tooltip=Seleccionar ficheiro
 ManageAddOnsDialog.status.downloading=A transferir ficheiro...
-ManageAddOnsDialog.status.installing=A instalar suplemento...
-ManageAddOnsDialog.status.success={0} instalado com sucesso.
+ManageAddOnsDialog.status.installing=A instalar extens\u00E3o...
+ManageAddOnsDialog.status.success=Instala\u00E7\u00E3o de {0} com sucesso.
 ManageAddOnsDialog.tab.install=Procurar e instalar
-ManageAddOnsDialog.tab.install.tooltip=Procurar e instalar novos suplementos
-ManageAddOnsDialog.tab.manage=Suplementos
+ManageAddOnsDialog.tab.install.tooltip=Procurar e instalar novas extens\u00F5es
+ManageAddOnsDialog.tab.manage=Extens\u00F5es
 ManageAddOnsDialog.tab.manage.themes=Temas
 ManageAddOnsDialog.tab.manage.themes.tooltip=Gerir temas instalados
-ManageAddOnsDialog.tab.manage.tooltip=Gerir suplementos instalados
-ManageAddOnsDialog.visit.addon.page=Visite a p\u00E1gina de suplementos...
+ManageAddOnsDialog.tab.manage.tooltip=Gerir extens\u00F5es instaladas
+ManageAddOnsDialog.visit.addon.page=Visite a p\u00E1gina de extens\u00F5es...
 ManageConditionalStylesAction.text=Gerir estilos condicionais para o mapa
-ManageNodeConditionalStylesAction.text=Gerir estilos condicionais para n\u00F3s
-map_already_exists=O mapa j\u00E1 existe. Quer substitui-lo?
+ManageNodeConditionalStylesAction.text=Gerir estilos condicionais para o n\u00F3
+map_already_exists=O mapa j\u00E1 existe. Quer sobrescrev\u00EA-lo?
 map_background=Fundo do mapa
 map_background_image=Imagem de fundo
 map_corrupted=Mapa corrompido. Ver detalhes?
@@ -791,14 +791,14 @@ MapBackgroundImageAction.text=Imagem de fundo...
 maps=Mapas
 MaxNodeWidth.text=Definir largura m\u00E1xima do n\u00F3
 menu_applyStyle=Aplicar estilo
-menu_attributes=&Atributos
+menu_attributes=&Atributo
 menu_clouds=Nuvens
 menu_copy=Copiar
 menu_coreFormat=N\u00FAcleo do n\u00F3
 menu_details=Detalhes
 menu_displayAttributes=Atributos do n\u00F3
-menu_encryption=Prote\u00E7\u00E3o por palavra-passe
-menu_error=Erro na estrutura do menu definido pelo utilizador {0}:\n{1}\nA cancelar
+menu_encryption=Protec\u00E7\u00E3o por senha
+menu_error=Erro na estrutura do menu definido pelo utilizador {0}:\n{1}\nA abortar
 menu_extensions=Extens\u00F5es do n\u00F3
 menu_group=Grupo de n\u00F3s
 menu_hoverView=Sugest\u00F5es
@@ -806,19 +806,19 @@ menu_iconByCategory=\u00CDcone por categoria...
 menu_iconView=\u00CDcones
 menu_image=Imagem
 menu_insert=In&serir
-menu_latex_formula=F\u00F3rmula LaTex
+menu_latex_formula=F\u00F3rmula LaTeX
 menu_manageStyles=&Gerir estilos
 menu_moveNode=Mover e ordenar
 menu_newNode=Novo n\u00F3
 menu_node=N\u00F3
-menu_node_features=Funcionalidades do n\u00F3
+menu_node_features=F&uncionalidades do n\u00F3
 menu_nodes=&N\u00F3s
 menu_nodeView=N\u00FAcleo do n\u00F3
 menu_noteView=Notas
 menu_openmaps=Mapas
 menu_remove_icons=Remover \u00EDcones
 menu_removeAttribute=Remover atributo
-menu_select=Selecionar
+menu_select=Seleccionar
 menu_time=Gest\u00E3o de tempo
 menu_title=N\u00FAcleo do n\u00F3
 menu_viewmode=Ver defini\u00E7\u00F5es
@@ -840,9 +840,9 @@ modes=Modos
 ModesMenuAction.Browse.text=Navegador de mapas
 ModesMenuAction.File.text=Explorador de ficheiros
 ModesMenuAction.MindMap.text=Editor de mapa mental
-most_recent_files=Ficheiros recentes
+most_recent_files=Mapas mais recentes
 MoveAction.text=Mover
-MoveToRootAction.text=Ir para a ra\u00EDz
+MoveToRootAction.text=Ir para a raiz
 NameConditionAction.text=Definir nome
 navigate=&Navegar
 NavigationNextMapAction.text=Mapa seguinte
@@ -851,32 +851,32 @@ new=&Novo
 new_map_from_user_templates.text=Novo mapa a partir de modelo...
 new_mindmap=Novo mapa mental
 new_node=Novo n\u00F3
-new_node_as_sibling_not_possible_for_the_root=Novo n\u00F3-irm\u00E3o n\u00E3o \u00E9 poss\u00EDvel para a ra\u00EDz
+new_node_as_sibling_not_possible_for_the_root=Imposs\u00EDvel ter n\u00F3s-irm\u00E3o na raiz
 new_version_available=Nova vers\u00E3o "{0}" dispon\u00EDvel
 NewChildAction.text=Novo n\u00F3-filho
 NewerFileRevisionsFoundDialog.cancel=&Saltar
 NewerFileRevisionsFoundDialog.cancel.tooltip=N\u00E3o abrir este ficheiro
-NewerFileRevisionsFoundDialog.file_last_modified=Selo de tempo
+NewerFileRevisionsFoundDialog.file_last_modified=Data e hora
 NewerFileRevisionsFoundDialog.file_name=Ficheiro
 NewerFileRevisionsFoundDialog.file_size=Bytes
-NewerFileRevisionsFoundDialog.open=%Abrir
-NewerFileRevisionsFoundDialog.open.tooltip=Abrir ficheiro mesmo que possa estar desatualizado
+NewerFileRevisionsFoundDialog.open=&Abrir
+NewerFileRevisionsFoundDialog.open.tooltip=Abrir ficheiro mesmo que possa estar desactualizado
 NewerFileRevisionsFoundDialog.question=Encontradas novas revis\u00F5es de {0}!
 NewerFileRevisionsFoundDialog.restore=Resta&urar
 NewerFileRevisionsFoundDialog.restore.tooltip=Substituir {0} por {1}
 NewerFileRevisionsFoundDialog.title=Novas revis\u00F5es de ficheiro encontradas!
 NewFreeNodeAction.text=Novo n\u00F3 flutuante
 NewLevelStyleAction.text=Adicionar estilo de n\u00EDvel
-newmap.install.addon.question={0} parece ser um pacote de suplementos\nQuer instal\u00E1-lo?\n(selecione "N\u00E3o" para abrir normalmente).
-newmap.install.addon.title=Instalar suplemento?
+newmap.install.addon.question={0} parece ser um pacote de extens\u00E3o\nQuer instal\u00E1-lo?\n(seleccione "N\u00E3o" para abrir normalmente).
+newmap.install.addon.title=Instalar extens\u00E3o?
 NewMapAction.text=Novo mapa
 NewMapViewAction.text=Nova vista de mapa
 NewParentNode.text=Novo n\u00F3-m\u00E3e
-NewParentNode.tooltip=<html>Toda a sele\u00E7\u00E3o ser\u00E1 enviada para um novo n\u00F3-m\u00E3e.</html>
+NewParentNode.tooltip=<html>Toda a selec\u00E7\u00E3o ser\u00E1 enviada para um novo n\u00F3-m\u00E3e.</html>
 NewPreviousSiblingAction.text=Novo n\u00F3-irm\u00E3o anterior
 NewSiblingAction.text=Novo n\u00F3-irm\u00E3o
-NewSummaryAction.text=Novo n\u00F3 resumo (n\u00F3s selecionados)
-NewUserStyleAction.text=Novo estilo a partir da sele\u00E7\u00E3o
+NewSummaryAction.text=Novo n\u00F3 resumo (n\u00F3s seleccionados)
+NewUserStyleAction.text=Novo estilo a partir da selec\u00E7\u00E3o
 NextNodeAction.BACK.text=Ir para o n\u00F3 anterior
 NextNodeAction.BACK_N_FOLD.text=Ir para o n\u00F3 anterior (dobrar)
 NextNodeAction.FORWARD.text=Ir para o n\u00F3 seguinte
@@ -886,18 +886,18 @@ no=N\u00E3o
 no_copy_attributes_before_paste_attributes=N\u00E3o pode colar atributos sem primeiro os ter copiado.
 NO_FORMAT=Texto
 no_format_copy_before_format_paste=N\u00E3o pode colar um formato sem primeiro o ter copiado.
-no_found_from=<html>N\u00E3o foi encontrado <u>"{0}"</u> a partir de "{1}".</html>
-no_more_found_from=<html>N\u00E3o foram encontrados mais <u>{0}</u> a partir de "{1}".</html>
+no_found_from=<html>N\u00E3o se encontrou <u>"{0}"</u> a partir de "{1}".</html>
+no_more_found_from=<html>N\u00E3o se encontraram mais <u>{0}</u> a partir de "{1}".</html>
 no_previous_find=Sem ocorr\u00EAncia anterior.
-no_styles_found_in_map=N\u00E3o foram encontrados estilos no mapa
+no_styles_found_in_map=N\u00E3o se encontraram estilos no mapa
 no_translation_strings_found=Sem cadeias para traduzir
 node=N\u00F3
-node_changed_discard_changes=O n\u00F3 foi modificado. Quer ignorar as altera\u00E7\u00F5es?
+node_changed_discard_changes=O n\u00F3 foi modificado. Quer descartar as altera\u00E7\u00F5es?
 node_is_write_protected=O n\u00F3 destino est\u00E1 protegido contra escrita.
 node_location_help=Arrastar altera a localiza\u00E7\u00E3o do n\u00F3, Ctrl + Arrastar altera as dist\u00E2ncias, duplo clique e Ctrl + duplo clique rep\u00F5em-nas.
 node_popup_scripting=Scripts
-node_selector=Sele\u00E7\u00E3o de n\u00F3
-node_selector_message=Duplo clique para selecionar n\u00F3
+node_selector=Selec\u00E7\u00E3o de n\u00F3
+node_selector_message=Duplo clique para seleccionar n\u00F3
 node_styles=Estilos do n\u00F3
 NodeBackgroundColorAction.text=Cor de fundo do n\u00F3...
 NodeColorAction.text=Cor do n\u00F3...
@@ -911,23 +911,23 @@ NodeShapeAction.bubble.text=Bolha
 NodeShapeAction.fork.text=Bifurca\u00E7\u00E3o
 NodeShapeAction.narrow_hexagon.text=Hex\u00E1gono estreito
 NodeShapeAction.oval.text=Oval
-NodeShapeAction.rectangle.text=Ret\u00E2ngulo
+NodeShapeAction.rectangle.text=Rect\u00E2ngulo
 NodeShapeAction.small_bubble.text=Bolha pequena
 NodeShapeAction.small_wide_hexagon.text=Hex\u00E1gono pequeno
 NodeShapeAction.wide_hexagon.text=Hex\u00E1gono largo
 NodeUpAction.text=Mover n\u00F3 para cima
-nonboldify_branch=Anular Negrito
-nonitalicise_branch=Anular It\u00E1lico
+nonboldify_branch=Anular negrito
+nonitalicise_branch=Anular it\u00E1lico
 normal=Normal
-not_saved_for_image_error=O mapa tem de ser gravado antes de definir uma imagem com o seletor de ficheiros
-not_saved_for_link_error=O mapa tem que ser gravado antes de definir uma liga\u00E7\u00E3o com o seletor de ficheiros
-note_window_location=Posi\u00E7\u00E3o da janela de notas
+not_saved_for_image_error=O mapa tem de ser gravado antes de definir uma imagem com o selector de ficheiros
+not_saved_for_link_error=O mapa tem que ser gravado antes de definir uma liga\u00E7\u00E3o com o selector de ficheiros
+note_window_location=Posi\u00E7\u00E3o do painel de notas
 notes=Nota
 NotificationOptions.CLOSE=Fechar
-NotificationOptions.REMIND_ME_LATER=Lembrar-me mais tarde
+NotificationOptions.REMIND_ME_LATER=Relembrar mais tarde
 NotificationOptions.REMOVE_REMINDER=Remover lembrete
 NotificationOptions.SELECT_NODE=Ir para o lembrete
-ok=Aceitar
+ok=&Aceitar
 OKAction.text=Aceitar
 OnlineReference.text=Mapas de documenta\u00E7\u00E3o online
 open_asMindMap=Mapa mental
@@ -937,9 +937,9 @@ OpenMapsAddLocation.text=Adicionar local do OpenMaps...
 OpenMapsRemoveLocation.text=Remover local do OpenMaps...
 OpenMapsViewLocation.text=Ver local do OpenMaps...
 OpenPathAction.text=Abrir ficheiro
-OpenURLMapAction.text=Abrir mapa de um URL...
+OpenURLMapAction.text=Abrir mapa a partir de URL...
 OpenUserDirAction.text=Abrir pasta do utilizador
-option_changes_may_require_restart=Para ver o efeito das altera\u00E7\u00F5es efetuadas ter\u00E1, provavelmente, que reiniciar o Freeplane.
+option_changes_may_require_restart=Para ver o efeito das altera\u00E7\u00F5es efectuadas ter\u00E1 provavelmente que reiniciar o Freeplane.
 OptionalDontShowMeAgainDialog.cancel=&N\u00E3o
 OptionalDontShowMeAgainDialog.dontShowAgain=&N\u00E3o voltar a perguntar.
 OptionalDontShowMeAgainDialog.ok=&Sim
@@ -948,59 +948,59 @@ OptionPanel.absolute=Absoluto
 OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Padr\u00F5es de estilo de n\u00EDvel
 OptionPanel.ADD_CHILD=Adicionar n\u00F3-filho
 OptionPanel.ADD_SIBLING=Adicionar n\u00F3-irm\u00E3o
-OptionPanel.addons=Suplementos
+OptionPanel.addons=Extens\u00F5es
 OptionPanel.always_fold_all_after_load=Dobrar todos
 OptionPanel.always_load_last_maps=Carregar \u00FAltimo e novo mapas
 OptionPanel.always_load_last_maps.tooltip=Abrir os \u00FAltimos ficheiros definidos pelas op\u00E7\u00F5es acima, mesmo abrindo o Freeplane com um mapa concreto.
 OptionPanel.always_save_folding=Sempre
 OptionPanel.always_save_folding_state=Gravar sempre as altera\u00E7\u00F5es ao estado das dobras
-OptionPanel.always_save_folding_state.tooltip=Se marcada, cada a\u00E7\u00E3o de dobra mancha o mapa e lembra-o de o gravar.
+OptionPanel.always_save_folding_state.tooltip=Se marcada, cada ac\u00E7\u00E3o de dobra mancha o mapa e lembra-o de o gravar.
 OptionPanel.always_show_less_than_N_nodes_after_load=Desdobrar alguns n\u00F3s
 OptionPanel.always_unfold_all_after_load=Desdobrar todos
 OptionPanel.antialias=Suaviza\u00E7\u00E3o
 OptionPanel.antialias.tooltip=<html>Determina a qualidade do mapa. Mais suaviza\u00E7\u00E3o demora mais tempo.</html>
-OptionPanel.antialias_all=Suaviza\u00E7\u00E3o total
-OptionPanel.antialias_edges=Linhas suavizadas
-OptionPanel.antialias_none=Sem suaviza\u00E7\u00E3o
+OptionPanel.antialias_all=Suavizar tudo
+OptionPanel.antialias_edges=Suavizar linhas
+OptionPanel.antialias_none=N\u00E3o suavizar
 OptionPanel.Appearance=Apar\u00EAncia
-OptionPanel.approximate_search_threshold=Limite para coincid\u00EAncias aproximadas
-OptionPanel.approximate_search_threshold.tooltip=<html>Limite para coincid\u00EAncias aproximadas<br/>Veja <font size="2">http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(quanto mais alto menos varia\u00E7\u00F5es<br/>do termo procurado ser\u00E3o encontradas)</html>
+OptionPanel.approximate_search_threshold=Limite para resultados aproximados
+OptionPanel.approximate_search_threshold.tooltip=<html>Limite para resultados aproximados<br/>Veja <font size="2">http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(quanto mais alto menos varia\u00E7\u00F5es<br/>do termo procurado ser\u00E3o encontradas).</html>
 OptionPanel.ar=\u00C1rabe / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
 OptionPanel.ARC=Arco
 OptionPanel.as_parent=Como n\u00F3-m\u00E3e
 OptionPanel.ask=Pergunta
 OptionPanel.automatic=Autom\u00E1tico
 OptionPanel.automaticFormat_level=Aplicar estilos de n\u00EDvel
-OptionPanel.automaticFormat_level1=Formato do n\u00F3-ra\u00EDz
-OptionPanel.automaticFormat_level2=1. Formato do n\u00EDvel do n\u00F3
+OptionPanel.automaticFormat_level1=Formato do n\u00F3-raiz
+OptionPanel.automaticFormat_level2=Formato do n\u00F3 de n\u00EDvel 1
 OptionPanel.backup_file_number=N\u00FAmero de c\u00F3pias de seguran\u00E7a a manter
 OptionPanel.Behaviour=Comportamento
 OptionPanel.bezier=Curva suave (B\u00E9zier)
 OptionPanel.border_color=Cor
 OptionPanel.border_color_matches_edge_color=Usar cor da linha
-OptionPanel.border_width=Largura da linha
-OptionPanel.border_width_matches_edge_width=Usar largura da linha
+OptionPanel.border_width=Espessura da linha
+OptionPanel.border_width_matches_edge_width=Usar espessura da linha
 OptionPanel.bubble=Bolha
 OptionPanel.ca=Catal\u00E3o, Valencia/Catal\u00E0
 OptionPanel.Cancel=Cancelar
-OptionPanel.center_selected_node=Centrar n\u00F3 selecionado automaticamente
-OptionPanel.check_updates_automatically=Procurar atualiza\u00E7\u00F5es no in\u00EDcio do programa
+OptionPanel.center_selected_node=Centrar n\u00F3 seleccionado automaticamente
+OptionPanel.check_updates_automatically=Procurar actualiza\u00E7\u00F5es no in\u00EDcio do programa
 OptionPanel.childpattern=Padr\u00E3o do n\u00F3-filho
-OptionPanel.childpattern.tooltip=O padr\u00E3o selecionado \u00E9 aplicado a todos os n\u00F3s-filhos.
+OptionPanel.childpattern.tooltip=O padr\u00E3o seleccionado \u00E9 aplicado a todos os n\u00F3s-filho.
 OptionPanel.clear_all_setters=Trocar tudo
-OptionPanel.clear_all_setters.tooltip=Ativa ou desativa todas as indica\u00E7\u00F5es de altera\u00E7\u00E3o.
+OptionPanel.clear_all_setters.tooltip=Activa ou desactiva todas as indica\u00E7\u00F5es de altera\u00E7\u00E3o.
 OptionPanel.cloud=Nuvem
 OptionPanel.cloudcolor=Cor da nuvem
 OptionPanel.cloudshape=Forma da nuvem
 OptionPanel.combined=Combinado
 OptionPanel.compare_as_number=Comparar como n\u00FAmeros
 OptionPanel.convert_to_current_version=<html>Converter automaticamente mapas de vers\u00F5es anteriores<br/>do Freeplane para a vers\u00E3o atual?</html>
-OptionPanel.convert_to_current_version.tooltip=<html>S\u00F3 pode abrir mapas sem convers\u00E3o para mapas muito grandes <br/>que n\u00E3o precisem de ser convertidos(conhecimento especializado)
-OptionPanel.copyFormatToNewSibling=Copiar formato para novos parentes
+OptionPanel.convert_to_current_version.tooltip=<html>S\u00F3 pode abrir mapas sem convers\u00E3o para mapas muito grandes <br/>que n\u00E3o precisem de ser convertidos (isto \u00E9 conhecimento especializado).</html>
+OptionPanel.copyFormatToNewSibling=Copiar formato para novos n\u00F3s-irm\u00E3o
 OptionPanel.copyFormatToNewSiblingIncludesIcons=Copiar formato com \u00EDcones
 OptionPanel.cs=Checo / \u010Desky
 OptionPanel.cut_nodes_without_question=Cortar n\u00F3s sem confirma\u00E7\u00E3o?
-OptionPanel.cut_nodes_without_question.tooltip=Se esta caixa estiver marcada os n\u00F3s s\u00E3o cortados sem confirma\u00E7\u00E3o.. Isto pode causar perda n\u00E3o intencional de informa\u00E7\u00E3o.
+OptionPanel.cut_nodes_without_question.tooltip=Se esta caixa estiver marcada os n\u00F3s s\u00E3o cortados sem confirma\u00E7\u00E3o. Isto pode causar perda n\u00E3o intencional de informa\u00E7\u00E3o.
 OptionPanel.da=Dinamarqu\u00EAs/Dansk
 OptionPanel.date_format=Formato de data padr\u00E3o
 OptionPanel.date_format.tooltip=CURTO, M\u00C9DIO, LONGO, COMPLETO ou um padr\u00E3o como "MM/dd/aaaa"
@@ -1009,25 +1009,25 @@ OptionPanel.datetime_format.tooltip=Ou <datestyle>, <timestyle> (com CURTO, M\u0
 OptionPanel.de=Alem\u00E3o/Deutsch
 OptionPanel.default=Predefinido
 OptionPanel.default_attribute_key_column_width=Largura predefinida do atributo chave
-OptionPanel.default_attribute_value_column_width=Largura predefinida do atributo valor
+OptionPanel.default_attribute_value_column_width=Largura predefinida do valor do atributo
 OptionPanel.default_browser_command_mac=Comando predefinido do navegador Mac
-OptionPanel.default_browser_command_mac.tooltip=<html> e MAC:</html>
+OptionPanel.default_browser_command_mac.tooltip=<html> e MAC (gra\u00E7as ao Nick!):</html>
 OptionPanel.default_browser_command_other_os=Comando predefinido do navegador de outro SO
 OptionPanel.default_browser_command_other_os.tooltip=<html>Isto \u00E9 tipicamente Linux:</html>
 OptionPanel.default_browser_command_windows_9x=Comando predefinido do navegador Windows 9x
 OptionPanel.default_browser_command_windows_9x.tooltip=<html>Para o Windows (as "" aspas s\u00E3o necess\u00E1rias porque as liga\u00E7\u00F5es t\u00EAm "=" no URL).</html>
 OptionPanel.default_browser_command_windows_nt=Comando predefinido do navegador Windows NT
 OptionPanel.default_browser_command_windows_nt.tooltip=<html>Para o Windows (as "" aspas s\u00E3o necess\u00E1rias porque as liga\u00E7\u00F5es t\u00EAm "=" no URL).</html>
-OptionPanel.default_charset=Conjunto de carateres
+OptionPanel.default_charset=Conjunto de caracteres
 OptionPanel.default_save_dir=Pasta de grava\u00E7\u00E3o predefinida
 OptionPanel.Defaults=Predefini\u00E7\u00F5es
 OptionPanel.delete_automatic_saves_at_exit=Eliminar grava\u00E7\u00F5es autom\u00E1ticas ao sair
 OptionPanel.delete_automatic_saves_at_exit.tooltip=<html> Se os ficheiros devem ser eliminados automaticamente no encerramento normal do Freeplane, defina esta vari\u00E1vel como verdadeira</html>
 OptionPanel.delete_nodes_without_question=Eliminar os n\u00F3s sem confirma\u00E7\u00E3o?
 OptionPanel.delete_nodes_without_question.tooltip=Se marcar esta caixa os n\u00F3s ser\u00E3o eliminados sem confirma\u00E7\u00E3o. Pode causar perdas n\u00E3o intencionais de informa\u00E7\u00E3o.
-OptionPanel.disable_cursor_move_paper=Desativar cursor ao mover papel
+OptionPanel.disable_cursor_move_paper=Desactivar cursor ao mover papel
 OptionPanel.disable_cursor_move_paper.tooltip=<html>N\u00E3o mostrar o cursor 'mover' quando arrastar o papel</html>
-OptionPanel.display_inline_editor_for_all_new_nodes=Mostrar editor em linha para todos os n\u00F3s
+OptionPanel.display_inline_editor_for_all_new_nodes=Mostrar editor em linha para todos os novos n\u00F3s
 OptionPanel.display_node_id=Mostrar ID do n\u00F3
 OptionPanel.edgecolor=Cor da linha
 OptionPanel.edgecolor.tooltip=Propriedade da linha do n\u00F3-m\u00E3e (tamb\u00E9m \u00E9 aplicado aos n\u00F3s-filho)
@@ -1035,11 +1035,11 @@ OptionPanel.edgestyle=Estilo da linha
 OptionPanel.edgestyle.tooltip=Propriedade da linha do n\u00F3-m\u00E3e (tamb\u00E9m \u00E9 aplicado aos n\u00F3s-filho)
 OptionPanel.edgewidth=Espessura da linha
 OptionPanel.edgewidth.tooltip=Propriedade da linha do n\u00F3-m\u00E3e (tamb\u00E9m \u00E9 aplicado aos n\u00F3s-filho)
-OptionPanel.EDIT_CURRENT=Substituir conte\u00FAdo
+OptionPanel.EDIT_CURRENT=Sobrescrever conte\u00FAdo
 OptionPanel.edit_on_double_click=Editar com duplo clique
 OptionPanel.editor_extra_width=Passo muito largo
-OptionPanel.editor_extra_width.tooltip=<html>Determina o n\u00FAmero de pixels a acrescentar \u00E0 largura do n\u00F3 se o texto exceder a largura atual.</html>
-OptionPanel.el=Grego / \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
+OptionPanel.editor_extra_width.tooltip=<html>Determina o n\u00FAmero de pixels a acrescentar \u00E0 largura do n\u00F3 se o texto exceder a largura actual.</html>
+OptionPanel.el=Grego/\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
 OptionPanel.el__buttons_above=Bot\u00F5es no topo
 OptionPanel.el__enter_confirms_by_default=Por predefini\u00E7\u00E3o, Enter confirma
 OptionPanel.el__max_default_window_height=Altura m\u00E1xima predefinida da janela
@@ -1047,21 +1047,21 @@ OptionPanel.el__max_default_window_width=Largura m\u00E1xima predefinida da jane
 OptionPanel.el__min_default_window_height=Altura m\u00EDnima predefinida da janela
 OptionPanel.el__min_default_window_width=Largura m\u00EDnima predefinida da janela
 OptionPanel.el__position_window_below_node=Colocar a janela abaixo do n\u00F3
-OptionPanel.en=Ingl\u00EAs / English
+OptionPanel.en=Ingl\u00EAs/English
 OptionPanel.Environment=Ambiente
-OptionPanel.es=Espanhol, Castelhano / espa\u00F1ol, castellano
-OptionPanel.et=Estoniano / eesti, eesti keel
+OptionPanel.es=Espanhol, Castelhano/Espa\u00F1ol, Castellano
+OptionPanel.et=Estoniano/eesti, eesti keel
 OptionPanel.eu=Basco
-OptionPanel.execute_scripts_without_asking=Execu\u00E7\u00E3o de scripts ativada
-OptionPanel.execute_scripts_without_asking.tooltip=<html>Os scripts no Freeplane s\u00E3o capazes de efetuar qualquer a\u00E7\u00E3o no seu computador.<br>Assim, n\u00E3o deve executar scripts que n\u00E3o conhe\u00E7a como seguros.</html>
+OptionPanel.execute_scripts_without_asking=Execu\u00E7\u00E3o de scripts activada
+OptionPanel.execute_scripts_without_asking.tooltip=<html>Os scripts no Freeplane s\u00E3o capazes de efectuar qualquer ac\u00E7\u00E3o no seu computador.<br>Assim, n\u00E3o deve executar scripts que n\u00E3o conhe\u00E7a como seguros.</html>
 OptionPanel.execute_scripts_without_exec_restriction=Permitir a execu\u00E7\u00E3o de outros programas (N\u00C3O recomendado)
-OptionPanel.execute_scripts_without_exec_restriction.tooltip=<html><body>Se os seus scripts groovy precisam de executar outras aplica\u00E7\u00F5es sem perguntar (por ex. um navegador),<br>tem de ativar esta op\u00E7\u00E3o.<br>Mas use com cuidado, scripts maliciosos podem danificar o computador!</body></html>
+OptionPanel.execute_scripts_without_exec_restriction.tooltip=<html><body>Se os seus scripts groovy precisam de executar outras aplica\u00E7\u00F5es sem perguntar (por ex. um navegador),<br>tem de activar esta op\u00E7\u00E3o.<br>Mas use com cuidado, scripts maliciosos podem danificar o computador!</body></html>
 OptionPanel.execute_scripts_without_file_restriction=Permitir opera\u00E7\u00F5es de leitura/escrita (N\u00C3O recomendado)
-OptionPanel.execute_scripts_without_file_restriction.tooltip=<html><body>Se os seus scripts groovy precisam de acesso de leitura (abrir, fechar, ler),<br>tem de ativar esta op\u00E7\u00E3o. <br>Mas use com cuidado, scripts maliciosos podem danificar o computador!</body></html>
+OptionPanel.execute_scripts_without_file_restriction.tooltip=<html><body>Se os seus scripts groovy precisam de acesso de leitura (abrir, fechar, ler),<br>tem de activar esta op\u00E7\u00E3o. <br>Mas use com cuidado, scripts maliciosos podem danificar o computador!</body></html>
 OptionPanel.execute_scripts_without_network_restriction=Permitir opera\u00E7\u00F5es de rede (N\u00C3O recomendado)
-OptionPanel.execute_scripts_without_network_restriction.tooltip=<html><body>Se os seus scripts groovy precisam de executar a\u00E7\u00F5es especiais em rede,<br>tem de ativar esta op\u00E7\u00E3o. <br>Mas use com cuidado, scripts maliciosos podem revelar os seus segredos!</body></html>
+OptionPanel.execute_scripts_without_network_restriction.tooltip=<html><body>Se os seus scripts groovy precisam de executar ac\u00E7\u00F5es especiais em rede,<br>tem de activar esta op\u00E7\u00E3o. <br>Mas use com cuidado, scripts maliciosos podem revelar os seus segredos!</body></html>
 OptionPanel.execute_scripts_without_write_restriction=Permitir opera\u00E7\u00F5es de escrita (N\u00C3O recomendado)
-OptionPanel.execute_scripts_without_write_restriction.tooltip=<html><body>Se os seus scripts groovy precisam de acesso de escrita (escrever, apagar),<br>tem de ativar esta op\u00E7\u00E3o. <br>Normalmente usada com acesso de leitura.<br>Mas use com cuidado, scripts maliciosos podem danificar o computador!</body></html>
+OptionPanel.execute_scripts_without_write_restriction.tooltip=<html><body>Se os seus scripts groovy precisam de acesso de escrita (escrever, apagar),<br>tem de activar esta op\u00E7\u00E3o. <br>Normalmente usada em conjunto com acesso de leitura.<br>Mas use com cuidado, scripts maliciosos podem danificar o computador!</body></html>
 OptionPanel.experimental_file_locking_on=Bloqueio experimental de ficheiro
 OptionPanel.experimental_file_locking_on.tooltip=<html>Funcionalidade experimental</html>
 OptionPanel.export_icons_in_html=Exportar \u00EDcones em HTML
@@ -1076,59 +1076,59 @@ OptionPanel.foldingsymbolwidth.tooltip=<html>Largura do c\u00EDrculo de dobragem
 OptionPanel.fork=Bifurca\u00E7\u00E3o
 OptionPanel.format_locale=Par\u00E2metros regionais
 OptionPanel.format_locale.tooltip=Defini\u00E7\u00F5es regionais para formata\u00E7\u00E3o e an\u00E1lise de dados
-OptionPanel.formula_disable_caching=Desativar mem\u00F3ria de avalia\u00E7\u00E3o de f\u00F3rmulas
-OptionPanel.formula_disable_plugin=Desativar avalia\u00E7\u00E3o de f\u00F3rmulas
-OptionPanel.fr=Franc\u00EAs / Fran\u00E7ais
-OptionPanel.gl=Galego / Galego
+OptionPanel.formula_disable_caching=Desactivar mem\u00F3ria de avalia\u00E7\u00E3o de f\u00F3rmulas
+OptionPanel.formula_disable_plugin=Desactivar avalia\u00E7\u00E3o de f\u00F3rmulas
+OptionPanel.fr=Franc\u00EAs/Fran\u00E7ais
+OptionPanel.gl=Galego/Galego
 OptionPanel.goto_note_end_on_edit=Mover cursor para o final nas notas
 OptionPanel.grid_size=Tamanho do intervalo da grelha
-OptionPanel.groovy_editor_font=Tipo de letra do editor Groovy Syntax Highlighting
-OptionPanel.groovy_editor_font.tooltip=Utilize 'Di\u00E1logo' ou 'Mono-espa\u00E7o' se precisar de carateres Unicode!
-OptionPanel.groovy_editor_font_size=Tamanho da letra para o editor Groovy Syntax Highlighting
+OptionPanel.groovy_editor_font=Letra do editor Groovy Syntax Highlighting
+OptionPanel.groovy_editor_font.tooltip=Utilize 'Di\u00E1logo' ou 'Mono-espa\u00E7o' se precisar de caracteres Unicode!
+OptionPanel.groovy_editor_font_size=Tamanho da letra do editor Groovy Syntax Highlighting
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Ocultar linha
 OptionPanel.highlight_formulas=Real\u00E7ar f\u00F3rmulas
 OptionPanel.horizontal=Horizontal
-OptionPanel.hr=Croata / hrvatski
+OptionPanel.hr=Croata/hrvatski
 OptionPanel.HTML=HTML
 OptionPanel.html_export_based_on_headings=Baseado nos t\u00EDtulos
 OptionPanel.html_export_fold_all=Dobrar todos
-OptionPanel.html_export_fold_currently_folded=Dobrar as dobras atuais
+OptionPanel.html_export_fold_currently_folded=Dobrar as dobras actuais
 OptionPanel.html_export_folding=Dobragem para exporta\u00E7\u00E3o HTML
 OptionPanel.html_export_no_folding=Sem dobragem
-OptionPanel.hu=H\u00FAngaro / Magyar
-OptionPanel.ic_disable=Desativar
+OptionPanel.hu=H\u00FAngaro/Magyar
+OptionPanel.ic_disable=Desactivar
 OptionPanel.ic_file=Usar o disco
 OptionPanel.ic_ram=Na RAM
 OptionPanel.icon=\u00CDcone
 OptionPanel.icon.tooltip=Se aplicado, o n\u00F3 ter\u00E1 precisamente este \u00EDcone.
 OptionPanel.icons.list=Lista de \u00EDcones padr\u00E3o mostrados
-OptionPanel.icons.list.tooltip=Aqui pode ordenar ou desativar os \u00EDcones padr\u00E3o. Os \u00EDcones t\u00EAm de estar separados por ";".
-OptionPanel.id=Indon\u00E9sio / Bahasa Indonesia
+OptionPanel.icons.list.tooltip=Aqui pode ordenar ou desactivar os \u00EDcones padr\u00E3o. Os \u00EDcones t\u00EAm de estar separados por ";".
+OptionPanel.id=Indon\u00E9sio/Bahasa Indonesia
 OptionPanel.IGNORE=N\u00E3o fazer nada
 OptionPanel.il__enter_confirms_by_default=Por predefini\u00E7\u00E3o, Enter confirma
 OptionPanel.image_cache=para imagens
 OptionPanel.indentationUsesTabsInTextOutput=Usar tabula\u00E7\u00F5es em sa\u00EDda de texto
-OptionPanel.it=Italiano / Italiano
-OptionPanel.ja=Japon\u00EAs / \u65E5\u672C\u8A9E
+OptionPanel.it=Italiano/Italiano
+OptionPanel.ja=Japon\u00EAs/\u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Separador de texto
 OptionPanel.key_type_action=Ao escrever
 OptionPanel.Keystrokes=Atalhos
-OptionPanel.ko=Coreano / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
-OptionPanel.label_font_family=Fam\u00EDlia de tipo de letra
+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
 OptionPanel.language=Idioma
-OptionPanel.language.tooltip=<html>Este \u00E9 o idioma usado pelo programa. 'autom\u00E1tico' tentar\u00E1 carregar o idioma atual do utilizador. </html>
+OptionPanel.language.tooltip=<html>Este \u00E9 o idioma usado pelo programa. 'autom\u00E1tico' tentar\u00E1 carregar o idioma actual do utilizador. </html>
 OptionPanel.last=\u00DAltimo
 OptionPanel.last_opened_list_length=Tamanho da \u00FAltima lista aberta
-OptionPanel.latex_disable_editor=Desativar o editor LaTeX Syntax Highlighting
-OptionPanel.latex_disable_editor.tooltip=Verificar se tem problemas com o editor LaTex
-OptionPanel.latex_editor_font=Tipo de letra do editor LaTex Syntax Highlighting
-OptionPanel.latex_editor_font.tooltip=Usar 'Di\u00E1logo' ou 'Mono-espa\u00E7o' se precisa de carateres Unicode!
-OptionPanel.latex_editor_font_size=Tamanho da letra do editor LaTex Syntax Highlighting
-OptionPanel.latex_macros=Macros LaTex comuns
+OptionPanel.latex_disable_editor=Desactivar o editor LaTeX Syntax Highlighting
+OptionPanel.latex_disable_editor.tooltip=Verificar se tem problemas com o editor LaTeX
+OptionPanel.latex_editor_font=Letra do editor LaTeX Syntax Highlighting
+OptionPanel.latex_editor_font.tooltip=Usar 'Di\u00E1logo' ou 'Mono-espa\u00E7o' se precisa de caracteres Unicode!
+OptionPanel.latex_editor_font_size=Tamanho da letra do editor LaTeX Syntax Highlighting
+OptionPanel.latex_macros=Macros LaTeX comuns
 OptionPanel.layout_map_on_text_change=Disposi\u00E7\u00E3o do mapa durante a edi\u00E7\u00E3o
-OptionPanel.layout_map_on_text_change.tooltip=Desativar para melhor performance
+OptionPanel.layout_map_on_text_change.tooltip=Desactivar para melhor desempenho
 OptionPanel.linear=Linear
 OptionPanel.links=Liga\u00E7\u00F5es
 OptionPanel.links.tooltip=<html>Define se as liga\u00E7\u00F5es s\u00E3o relativas ou absolutas</html>
@@ -1138,16 +1138,16 @@ OptionPanel.load_folding_from_map_default_unfold_all=Carregar do mapa ou desdobr
 OptionPanel.load_last_map=Abrir automaticamente o \u00FAltimo mapa
 OptionPanel.load_last_map.tooltip=<html>Quando o Freeplane inicia, tenta abrir automaticamente o \u00FAltimo mapa utilizado.</html>
 OptionPanel.load_last_maps=Carregar todos os \u00FAltimos mapas
-OptionPanel.lookandfeel=Aspeto visual
+OptionPanel.lookandfeel=Aspecto visual
 OptionPanel.lookandfeel.scaleuifonts=Escalar letra do UI
 OptionPanel.lookandfeel.scaleuifonts.tooltip=\u00DAtil para monitores de alta densidade
-OptionPanel.lookandfeel.tooltip=<html>O aspeto visual a utilizar. S\u00E3o aceites 'metal','windows','motif', 'gtk' s\u00E3o suportados, 'mac' s\u00F3 est\u00E1 dispon\u00EDvel em MacOS. Predefinido significa que ser\u00E1 usado o aspeto visual predefinido. Se quiser usar o seu pr\u00F3prio aspeto visual, indique o nome de classe e assegure-se que os correspondentes ficheiros .jar est\u00E3o carregados. Se tiver problemas, escolha 'Nada'. Funciona para applets</html>
-OptionPanel.lt=Lituano / kalba
+OptionPanel.lookandfeel.tooltip=<html>O aspecto visual a utilizar. S\u00E3o aceites 'metal','windows','motif', 'gtk' s\u00E3o suportados, 'mac' s\u00F3 est\u00E1 dispon\u00EDvel em MacOS. Predefinido significa que ser\u00E1 usado o aspecto visual predefinido. Se quiser usar o seu pr\u00F3prio aspecto visual, indique o nome de classe e assegure-se que os correspondentes ficheiros .jar est\u00E3o carregados. Se tiver problemas, escolha 'Nada'. Funciona para applets</html>
+OptionPanel.lt=Lituano/kalba
 OptionPanel.max_displayed_node_count=N\u00FAmero m\u00E1ximo de n\u00F3s mostrados
 OptionPanel.max_image_width=Largura m\u00E1xima da imagem inicial
 OptionPanel.max_image_width.tooltip=As novas imagens s\u00E3o ajustadas a esta largura
 OptionPanel.max_menu_item_count=N\u00FAmero m\u00E1ximo de itens de menu
-OptionPanel.max_menu_item_count.tooltip=Limita o n\u00FAmero de itens num submenu, no m\u00EDnimo 10
+OptionPanel.max_menu_item_count.tooltip=Limita o n\u00FAmero de itens num sub-menu, no m\u00EDnimo 10
 OptionPanel.max_node_width=Largura m\u00E1xima do n\u00F3
 OptionPanel.max_node_width.tooltip=<html>O valor m\u00E1ximo da largura do n\u00F3 em pixels</html>
 OptionPanel.max_shortened_text_length=Largura m\u00E1xima de texto abreviado
@@ -1155,21 +1155,22 @@ OptionPanel.metal=Metal
 OptionPanel.min_node_width=Largura m\u00EDnima do n\u00F3
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Hex\u00E1gono estreito
-OptionPanel.nb=Noruegu\u00EAs Bokm\u00E5l / Norsk bokm\u00E5l
+OptionPanel.nb=Noruegu\u00EAs Bokm\u00E5l/Norsk bokm\u00E5l
 OptionPanel.never_save_folding=Nunca
-OptionPanel.nl=Holand\u00EAs, Flandres / Nederlands, Vlaams
-OptionPanel.nn=Noruegu\u00EAs Nynorsk / Norsk nynorsk
+OptionPanel.neverShowSurvey=Nunca mostrar perguntas, question\u00E1rios e dicas
+OptionPanel.nl=Holand\u00EAs, Flandres/Nederlands, Vlaams
+OptionPanel.nn=Noruegu\u00EAs Nynorsk/Norsk nynorsk
 OptionPanel.nodebackgroundcolor=Fundo
-OptionPanel.nodebackgroundcolor.tooltip=O fundo do n\u00F3 quando n\u00E3o est\u00E1 selecionado.
+OptionPanel.nodebackgroundcolor.tooltip=O fundo do n\u00F3 quando n\u00E3o est\u00E1 seleccionado.
 OptionPanel.nodecolor=Texto
-OptionPanel.nodecolor.tooltip=A cor do texto do n\u00F3 quando n\u00E3o est\u00E1 selecionado.
+OptionPanel.nodecolor.tooltip=A cor do texto do n\u00F3 quando n\u00E3o est\u00E1 seleccionado.
 OptionPanel.nodefontbold=Negrito
 OptionPanel.nodefonthyperlink=Hiperliga\u00E7\u00E3o
 OptionPanel.nodefontitalic=It\u00E1lico
-OptionPanel.nodefontname=Fam\u00EDlia do tipo de letra
+OptionPanel.nodefontname=Fam\u00EDlia da letra
 OptionPanel.nodefontsize=Tamanho da letra
 OptionPanel.nodeformat=Formato
-OptionPanel.nodeformat.tooltip=<html>Substitui\u00E7\u00E3o e/ou formata\u00E7\u00E3o de texto:<ul><li><em> expans\u00E3o de modelo</em> (<tt>%s</tt> \u00E9 o texto original), i.e. <tt>ATEN\u00C7\u00C3O: %s</tt><li><em>formata\u00E7\u00E3o de datas e n\u00FAmeros</em> - veja os exemplos na caixa de sele\u00E7\u00E3o</ul></html>
+OptionPanel.nodeformat.tooltip=<html>Substitui\u00E7\u00E3o e/ou formata\u00E7\u00E3o de texto:<ul><li><em> expans\u00E3o de modelo</em> (<tt>%s</tt> \u00E9 o texto original), i.e. <tt>ATEN\u00C7\u00C3O: %s</tt><li><em>formata\u00E7\u00E3o de datas e n\u00FAmeros</em> - veja os exemplos na caixa de selec\u00E7\u00E3o</ul></html>
 OptionPanel.nodenumbering=Numera\u00E7\u00E3o de n\u00F3s
 OptionPanel.nodenumbering.tooltip=Adiciona n\u00FAmero de s\u00E9rie ao texto do n\u00F3 (i.e. 1.3.1).
 OptionPanel.nodeshape=Forma do n\u00F3
@@ -1179,7 +1180,7 @@ OptionPanel.nothing=Nada
 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.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.OK=Gravar
 OptionPanel.org.freeplane.plugin.bugreport=Pol\u00EDtica
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Enviar sempre
@@ -1190,64 +1191,64 @@ OptionPanel.outline_hgap=Dist\u00E2ncia horizontal
 OptionPanel.outline_vgap=Dist\u00E2ncia vertical
 OptionPanel.oval=Oval
 OptionPanel.paint_connectors_behind=Pintar liga\u00E7\u00F5es atr\u00E1s dos n\u00F3s
-OptionPanel.parse_data=Reconhecer introdu\u00E7\u00E3o de n\u00FAmeros e data/hora
-OptionPanel.parse_data.tooltip=Tentar detetar data, data/hora e n\u00FAmeros e aplicar formatos padr\u00E3o. Exemplos: 100.000,00, 12/31, 12/31/99, 1999-12-31 e 1999-12-31 12:55
+OptionPanel.parse_data=Reconhecer inser\u00E7\u00E3o de n\u00FAmeros e data/hora
+OptionPanel.parse_data.tooltip=Tentar detectar data, data/hora e n\u00FAmeros e aplicar formatos padr\u00E3o. Exemplos: 100.000,00, 12/31, 12/31/99, 1999-12-31 e 1999-12-31 12:55
 OptionPanel.parse_formulas=Reconhecer f\u00F3rmulas
 OptionPanel.parse_formulas.tooltip=Processar f\u00F3rmulas em n\u00F3s come\u00E7ados por "=": veja http://www.freeplane.org/wiki/index.php/Formulas.
 OptionPanel.parse_latex=Reconhecer LaTeX
 OptionPanel.parse_latex.tooltip=Reconhecer f\u00F3rmulas LaTeX por formato ou prefixo: veja http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
-OptionPanel.PASTE_HTML=Copiar como HTML
-OptionPanel.PASTE_PLAIN_TEXT=Copiar como texto simples
+OptionPanel.PASTE_HTML=Colar como HTML
+OptionPanel.PASTE_PLAIN_TEXT=Colar como texto simples
 OptionPanel.path_property_may_not_be_empty=O caminho da propriedade n\u00E3o pode estar vazio! A altera\u00E7\u00E3o foi revertida.
 OptionPanel.patternname=Nome
 OptionPanel.patternname.tooltip=Nome \u00FAnico do padr\u00E3o
-OptionPanel.pl=Polaco / Polski
+OptionPanel.pl=Polaco/Polski
 OptionPanel.placenewbranches=Colocar novos ramos
 OptionPanel.placenewbranches.tooltip=<html>Onde colocar novos ramos. Valores v\u00E1lidos s\u00E3o 'primeiro' e '\u00FAltimo' </html>
-OptionPanel.plugin.tooltip=Plugins n\u00E3o nucleares.
-OptionPanel.plugins=Plugins
+OptionPanel.plugin.tooltip=Extens\u00F5es n\u00E3o nucleares.
+OptionPanel.plugins=Extens\u00F5es
 OptionPanel.presentation_dimmer_transparency=Regulador de transpar\u00EAncia da apresenta\u00E7\u00E3o
 OptionPanel.presentation_mode=Modo Apresenta\u00E7\u00E3o
 OptionPanel.printonwhitebackground=<html>Fundo branco para impress\u00E3o</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Usar sempre um fundo branco para impress\u00E3o</html>
 OptionPanel.pt_BR=Portuguese(Brazil)/Portugu\u00EAs(Brasil)
 OptionPanel.pt_PT=Portuguese(Portugal)/Portugu\u00EAs(Portugal)
-OptionPanel.RECT=Ret\u00E2ngulo
-OptionPanel.rectangle=Ret\u00E2ngulo
+OptionPanel.RECT=Rect\u00E2ngulo
+OptionPanel.rectangle=Rect\u00E2ngulo
 OptionPanel.relative=Relativo
 OptionPanel.remind_type_of_new_nodes.tooltip=<html>"Perguntar" pergunta-lhe (use se tem d\u00FAvidas).<br>"Sim" mostra o editor de Rich Text.<br>"N\u00E3o" mostra o editor de texto simples.</html>
-OptionPanel.remind_use_rich_text_in_new_nodes=Use Rich Text para n\u00F3s colados
+OptionPanel.remind_use_rich_text_in_new_nodes=Usar Rich Text para n\u00F3s colados
 OptionPanel.remindersBlink=Piscar dos lembretes
 OptionPanel.remindersShowNotifications=Lembretes mostram bal\u00F5es de notifica\u00E7\u00E3o
 OptionPanel.remindersStandardDelay=Atraso do lembrete
 OptionPanel.remove_notes_without_question=Remover notas sem confirmar?
-OptionPanel.remove_notes_without_question.tooltip=Se esta caixa estiver marcada, as notas dos n\u00F3s selecionados s\u00E3o removidas sem confirma\u00E7\u00E3o. Isto pode causar perda de informa\u00E7\u00E3o n\u00E3o intencional.
+OptionPanel.remove_notes_without_question.tooltip=Se esta caixa estiver marcada, as notas dos n\u00F3s seleccionados s\u00E3o removidas sem confirma\u00E7\u00E3o. Isto pode causar perda de informa\u00E7\u00E3o n\u00E3o intencional.
 OptionPanel.resources_use_default_font_for_notes_too=Usar letra predefinida tamb\u00E9m para as notas
 OptionPanel.resources_use_margin_top_zero_for_notes=Remover margem superior para as notas
 OptionPanel.revision_color=Cor da revis\u00E3o
 OptionPanel.revision_color.tooltip=Cor de fundo para os n\u00F3s alterados.
-OptionPanel.ROUND_RECT=Ret\u00E2ngulo arredondado
-OptionPanel.ru=Russo / \u0420\u0443\u0441\u0441\u043A\u0438\u0439
+OptionPanel.ROUND_RECT=Rect\u00E2ngulo arredondado
+OptionPanel.ru=Russo/\u0420\u0443\u0441\u0441\u043A\u0438\u0439
 OptionPanel.save_folding=Gravar dobragem
 OptionPanel.save_folding_if_map_is_changed=Se o mapa est\u00E1 alterado
 OptionPanel.save_last_visited_node=Gravar \u00FAltima posi\u00E7\u00E3o no mapa
 OptionPanel.save_modification_times=Gravar hora das altera\u00E7\u00F5es
-OptionPanel.script_classpath=Caminho de classe de scripts: pastas adicionais contendo classes e/ou JARs (ver sugest\u00E3o)
+OptionPanel.script_classpath=Caminho de classe de scripts: pastas adicionais contendo classes e/ou JARs (ver dica)
 OptionPanel.script_classpath.tooltip=<html>Uma lista de JARs e/ou pastas para adicionar ao caminho de classes de scripts e f\u00F3rmulas.<br>Use ; (Windows) ou : (Linux, Mac) para separar entradas.<br>V\u00E3o ser procurados ficheiros JARs e .class nas pastas.<br>Caminhos que n\u00E3o sejam absolutos ser\u00E3o considerados relativos \u00E0 pasta de instala\u00E7\u00E3o do Freeplane.<br>Se definir este caminho, tamb\u00E9m tem de permitir acesso de leitura!</html>
-OptionPanel.script_compilation_disabled_extensions=Extens\u00F5es de ficheiro a n\u00E3o compilar (ver sugest\u00E3o)
+OptionPanel.script_compilation_disabled_extensions=Extens\u00F5es de ficheiro a n\u00E3o compilar (ver dica)
 OptionPanel.script_compilation_disabled_extensions.tooltip=<html>Se todos os scripts de um idioma adicional instalado (excepto<br>Groovy e JavaScript) tiverem um problema geral de compila\u00E7\u00E3o<br>tente adicionar a extens\u00E3o de ficheiro aqui (lista separada por v\u00EDrgulas).</html>
-OptionPanel.script_directories=Caminho de procura de scripts (ver sugest\u00E3o)
+OptionPanel.script_directories=Caminho de procura de scripts (ver dica)
 OptionPanel.script_directories.tooltip=<html>Uma lista de pastas (em adi\u00E7\u00E3o a "scripts").<br>Use ; (Windows) ou : (Linux, Mac) para separar as entradas.<br>Caminhos que n\u00E3o sejam absolutos ser\u00E3o considerados relativos \u00E0 pasta de instala\u00E7\u00E3o do Freeplane.</html>
 OptionPanel.script_user_key_name_for_signing=Chave de utilizador opcional para assinatura
-OptionPanel.script_user_key_name_for_signing.tooltip=<html>Se quer assinar os seus scripts, introduza a chave alternativa aqui.<br>Espera-se que a chave resida no armaz\u00E9m predefinido.<br>A palavra-passe da chave secreta tem de coincidir com a palavra-passe de armaz\u00E9m (esta \u00E9 a predefini\u00E7\u00E3o).</html>
+OptionPanel.script_user_key_name_for_signing.tooltip=<html>Se quer assinar os seus scripts, introduza a chave alternativa aqui.<br>Espera-se que a chave resida no armaz\u00E9m predefinido.<br>A senha da chave secreta tem de coincidir com a senha do armaz\u00E9m (esta \u00E9 a predefini\u00E7\u00E3o).</html>
 OptionPanel.scrollbar_increment=Velocidade
-OptionPanel.scrolling_speed=Velocidade de desloca\u00E7\u00E3o autom\u00E1tica
+OptionPanel.scrolling_speed=Velocidade de rolamento autom\u00E1tica
 OptionPanel.scrollOnUnfold=Rolar mapa ap\u00F3s desdobrar um n\u00F3
-OptionPanel.selection_method=M\u00E9todo de sele\u00E7\u00E3o
-OptionPanel.selection_method.tooltip=<html> com o seguinte interruptor pode ativar/desativar o esquema de atraso da sele\u00E7\u00E3o. Op\u00E7\u00F5es autom\u00E1ticas. N\u00E3o modifique estes, pois ser\u00E3o guardados em auto.properties de qualquer maneira.</html>
+OptionPanel.selection_method=M\u00E9todo de selec\u00E7\u00E3o
+OptionPanel.selection_method.tooltip=<html> com o seguinte interruptor pode activar/desactivar o esquema de atraso da selec\u00E7\u00E3o. Op\u00E7\u00F5es autom\u00E1ticas. N\u00E3o modifique estas, pois ser\u00E3o gravadas em auto.properties de qualquer maneira.</html>
 OptionPanel.selection_method_by_click=Por clique
 OptionPanel.selection_method_delayed=Atrasado
-OptionPanel.selection_method_direct=Direto
+OptionPanel.selection_method_direct=Directo
 OptionPanel.separator.accessories/plugins/AutomaticLayout.properties_PatternSeparatorName=Padr\u00F5es
 OptionPanel.separator.anti_alias=Suaviza\u00E7\u00E3o
 OptionPanel.separator.attributes=Atributos
@@ -1257,7 +1258,7 @@ OptionPanel.separator.browser=Navegador
 OptionPanel.separator.cache=Mem\u00F3ria
 OptionPanel.separator.CloudControls=Nuvens
 OptionPanel.separator.commands_for_the_program=Comandos para o programa
-OptionPanel.separator.connectors=Conectores
+OptionPanel.separator.connectors=Liga\u00E7\u00F5es
 OptionPanel.separator.data_formats=Formata\u00E7\u00E3o e an\u00E1lise de dados
 OptionPanel.separator.default_colors=Cores predefinidas
 OptionPanel.separator.default_fonts=Tipo de letra predefinido
@@ -1269,19 +1270,19 @@ OptionPanel.separator.export=Exportar
 OptionPanel.separator.files=Ficheiros
 OptionPanel.separator.formula=F\u00F3rmulas
 OptionPanel.separator.General=Geral
-OptionPanel.separator.html_export=Exportar HTML
-OptionPanel.separator.html_import=Importar HTML
+OptionPanel.separator.html_export=Exporta\u00E7\u00E3o HTML
+OptionPanel.separator.html_import=Importa\u00E7\u00E3o HTML
 OptionPanel.separator.hyperlink_types=Tipos de hiperliga\u00E7\u00E3o
 OptionPanel.separator.icon_properties=\u00CDcones
-OptionPanel.separator.icons=\u00CDcones em "Selecionar \u00EDcone..."
+OptionPanel.separator.icons=\u00CDcones em "Seleccionar \u00EDcone..."
 OptionPanel.separator.initial_map_size=Tamanho inicial do mapa
 OptionPanel.separator.inline_editor=Editor em linha de n\u00F3s
 OptionPanel.separator.JoinNodesAction=Unir n\u00F3s
-OptionPanel.separator.key_typing=Escrever chave
+OptionPanel.separator.key_typing=Escrever
 OptionPanel.separator.language=Idioma
-OptionPanel.separator.latex=LaTex
+OptionPanel.separator.latex=LaTeX
 OptionPanel.separator.load=Carregar
-OptionPanel.separator.look_and_feel=Aspeto visual
+OptionPanel.separator.look_and_feel=Aspecto visual
 OptionPanel.separator.mouse_wheel=Roda do rato
 OptionPanel.separator.new_node_commands=Novos comandos do n\u00F3
 OptionPanel.separator.node_editing_commands=Comandos de edi\u00E7\u00E3o do n\u00F3
@@ -1300,29 +1301,30 @@ OptionPanel.separator.outline_view=Vista de destaque
 OptionPanel.separator.patterns=Padr\u00F5es
 OptionPanel.separator.reminderOptions=Op\u00E7\u00F5es de lembretes
 OptionPanel.separator.RichTextEditor=Editor de Rich-Text
-OptionPanel.separator.root_node_appearance=Apar\u00EAncia do n\u00F3-ra\u00EDz
+OptionPanel.separator.root_node_appearance=Apar\u00EAncia do n\u00F3-raiz
 OptionPanel.separator.save=Gravar
-OptionPanel.separator.scripting=Scripts
-OptionPanel.separator.scrollbar=Barra de deslocamento
+OptionPanel.separator.scripting=Scripting
+OptionPanel.separator.scrollbar=Barra de rolamento
 OptionPanel.separator.search=Procura
-OptionPanel.separator.selection_colors=Cores da sele\u00E7\u00E3o
-OptionPanel.separator.selection_method=M\u00E9todo de sele\u00E7\u00E3o
+OptionPanel.separator.selection_colors=Cores da selec\u00E7\u00E3o
+OptionPanel.separator.selection_method=M\u00E9todo de selec\u00E7\u00E3o
 OptionPanel.separator.single_instance_mode=Inst\u00E2ncia \u00FAnica do programa
 OptionPanel.separator.size_limits=Limites de tamanho
 OptionPanel.separator.spelling=Op\u00E7\u00F5es de verifica\u00E7\u00E3o ortogr\u00E1fica
 OptionPanel.separator.SplitToWordsAction=Dividir n\u00F3 em palavras
 OptionPanel.separator.status=Linha de estado
+OptionPanel.separator.surveys=Question\u00E1rios
 OptionPanel.separator.tooltip=Tempo das sugest\u00F5es
 OptionPanel.separator.undo=Desfazer
-OptionPanel.separator.updates=Atualiza\u00E7\u00F5es do programa
+OptionPanel.separator.updates=Actualiza\u00E7\u00F5es do programa
 OptionPanel.set_property_text=Alterar
 OptionPanel.set_property_text.tooltip=Marcar para alterar este estilo adequadamente
 OptionPanel.setscript=Alterar?
 OptionPanel.setscript.tooltip=Pode associar um script ao estilo.
 OptionPanel.shape_horizontal_margin=Margem horizontal
 OptionPanel.shape_vertical_margin=Margem vertical
-OptionPanel.sharp_bezier=Curva afiada (B\u00E9zier)
-OptionPanel.sharp_linear=Linear afiada
+OptionPanel.sharp_bezier=Curva precisa (B\u00E9zier)
+OptionPanel.sharp_linear=Linear precisa
 OptionPanel.shouldCenterSmallMaps=Centrar mapas pequenos
 OptionPanel.show_icon_for_attributes=Mostrar \u00EDcone para atributos
 OptionPanel.show_less_than_N_nodes_by_default_after_load=Carregar do mapa ou desdobrar alguns n\u00F3s
@@ -1333,16 +1335,16 @@ OptionPanel.signed_script_are_trusted=Confiar em scripts assinados (recomendado)
 OptionPanel.signed_script_are_trusted.tooltip=Se os scripts estiverem assinados por algu\u00E9m de confian\u00E7a (i.e. por autores do Freeplane ou por si mesmo), s\u00E3o executados sem restri\u00E7\u00F5es.
 OptionPanel.simplyhtml.default_paste_mode=Modo de colar predefinido
 OptionPanel.single_backup_directory=Usar pasta \u00FAnica para c\u00F3pias de seguran\u00E7a
-OptionPanel.single_backup_directory.tooltip=<html>Se as c\u00F3pias de seguran\u00E7a e autom\u00E1ticas devem ser gravadas numa pasta \u00FAnica em vez de numa subpasta da pasta do mapa</html>
+OptionPanel.single_backup_directory.tooltip=<html>Se as c\u00F3pias de seguran\u00E7a e autom\u00E1ticas devem ser gravadas numa pasta \u00FAnica em vez de numa sub-pasta da pasta do mapa</html>
 OptionPanel.single_backup_directory_path=Pasta de c\u00F3pias de seguran\u00E7a (se a op\u00E7\u00E3o acima estiver marcada)
 OptionPanel.single_backup_directory_path.tooltip=<html>Substitui a predefini\u00E7\u00E3o <freeplaneuserdir>/.backup</html>
 OptionPanel.single_instance=Abre os ficheiros na inst\u00E2ncia em execu\u00E7\u00E3o
 OptionPanel.single_instance_force=Evitar uma segunda inst\u00E2ncia em qualquer caso
 OptionPanel.single_instance_force.tooltip=Evitar uma segunda inst\u00E2ncia mesmo que n\u00E3o haja ficheiro a carregar
-OptionPanel.sk=Eslovaco / sloven\u010Dina
+OptionPanel.sk=Eslovaco/sloven\u010Dina
 OptionPanel.skip_template_selection=Saltar di\u00E1logo de selec\u00E7\u00E3o de modelo
-OptionPanel.sl=Esloveno / sloven\u0161\u010Dina
-OptionPanel.slow_scroll_selected_node=Deslocar lentamente para o n\u00F3 selecionado
+OptionPanel.sl=Esloveno/sloven\u0161\u010Dina
+OptionPanel.slow_scroll_selected_node=Rolar lentamente para o n\u00F3 seleccionado
 OptionPanel.small_bubble=Bolha pequena
 OptionPanel.small_wide_hexagon=Hex\u00E1gono pequeno
 OptionPanel.spelling_opt_case_sensitive=Distinguir mai\u00FAsculas/min\u00FAsculas
@@ -1356,50 +1358,50 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=Caracteres em palavras
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=manter n\u00F3 original vazio
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=n\u00FAmero do n\u00F3 na linha
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=gravar texto original como detalhes
-OptionPanel.sr=S\u00E9rvio / \u0441\u0440\u043F\u0441\u043A\u0438
+OptionPanel.sr=S\u00E9rvio/\u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=Ficheiro modelo padr\u00E3o
 OptionPanel.standardbackgroundcolor=Cor padr\u00E3o do fundo
-OptionPanel.standardbackgroundcolor.tooltip=<html>A cor padr\u00E3o do fundo em nota\u00E7\u00E3o HTML </html>
+OptionPanel.standardbackgroundcolor.tooltip=<html>A cor padr\u00E3o do fundo em nota\u00E7\u00E3o HTML</html>
 OptionPanel.standardcloudcolor=Cor padr\u00E3o da nuvem
-OptionPanel.standardcloudcolor.tooltip=<html>A cor padr\u00E3o da nuvem em nota\u00E7\u00E3o HTML </html>
+OptionPanel.standardcloudcolor.tooltip=<html>A cor padr\u00E3o da nuvem em nota\u00E7\u00E3o HTML</html>
 OptionPanel.standardcloudestyle=Estilo padr\u00E3o da nuvem
-OptionPanel.standardcloudestyle.tooltip=<html>O estilo padr\u00E3o da nuvem. Atualmente s\u00F3 'B\u00E9zier' \u00E9 suportado</html>
-OptionPanel.standarddrawrectangleforselection=Mostrar n\u00F3s selecionados em bolhas
-OptionPanel.standarddrawrectangleforselection.tooltip=<html>Marcar os n\u00F3s selecionados com bolhas.</html>
+OptionPanel.standardcloudestyle.tooltip=<html>O estilo padr\u00E3o da nuvem.</html>
+OptionPanel.standarddrawrectangleforselection=Mostrar n\u00F3s seleccionados em bolhas
+OptionPanel.standarddrawrectangleforselection.tooltip=<html>Marcar os n\u00F3s seleccionados com bolhas.</html>
 OptionPanel.standardlinkcolor=Cor padr\u00E3o da liga\u00E7\u00E3o
-OptionPanel.standardlinkcolor.tooltip=<html>A cor padr\u00E3o da liga\u00E7\u00E3o em nota\u00E7\u00E3o HTML </html>
+OptionPanel.standardlinkcolor.tooltip=<html>A cor padr\u00E3o da liga\u00E7\u00E3o em nota\u00E7\u00E3o HTML</html>
 OptionPanel.standardlinkestyle=Estilo padr\u00E3o da liga\u00E7\u00E3o
-OptionPanel.standardlinkestyle.tooltip=<html>O estilo padr\u00E3o da liga\u00E7\u00E3o. Atualmente s\u00F3 'B\u00E9zier' \u00E9 suportado</html>
-OptionPanel.standardselectednodecolor=Cor padr\u00E3o do n\u00F3 selecionado
-OptionPanel.standardselectednodecolor.tooltip=<html>A cor padr\u00E3o do n\u00F3 selecionado se selecionada. Em nota\u00E7\u00E3o HTML ( em valores hexadecimais #RRGGBB)</html>
-OptionPanel.standardselectednoderectanglecolor=Selecionar cor da bolha
-OptionPanel.standardselectednoderectanglecolor.tooltip=<html>A cor da bolha que marca os n\u00F3s selecionados. Em nota\u00E7\u00E3o html ( em valores hexadecimais #RRGGBB)</html>
+OptionPanel.standardlinkestyle.tooltip=<html>O estilo padr\u00E3o da liga\u00E7\u00E3o. Actualmente s\u00F3 "B\u00E9zier" \u00E9 suportado</html>
+OptionPanel.standardselectednodecolor=Cor padr\u00E3o do n\u00F3 seleccionado
+OptionPanel.standardselectednodecolor.tooltip=<html>A cor padr\u00E3o do n\u00F3 seleccionado se seleccionada. Em nota\u00E7\u00E3o HTML ( em valores hexadecimais #RRGGBB)</html>
+OptionPanel.standardselectednoderectanglecolor=Seleccionar cor da bolha
+OptionPanel.standardselectednoderectanglecolor.tooltip=<html>A cor da bolha que marca os n\u00F3s seleccionados. Em nota\u00E7\u00E3o html ( em valores hexadecimais #RRGGBB)</html>
 OptionPanel.STAR=Estrela
 OptionPanel.statesymbolwidth=Largura do s\u00EDmbolo de estado
 OptionPanel.structured_html_import=Importar HTML como estrutura de n\u00F3
 OptionPanel.structured_icon_toolbar=Barra de \u00EDcones estruturada
 OptionPanel.summary=Resumo
-OptionPanel.sv=Sueco / Svenska
+OptionPanel.sv=Sueco/Svenska
 OptionPanel.text.use_ctrl_key=Usar 'Atribuir atalho' no menu Ferramentas
 OptionPanel.textalignment=Alinhamento de texto
 OptionPanel.time_for_automatic_save=Tempo para grava\u00E7\u00E3o autom\u00E1tica
-OptionPanel.time_for_automatic_save.tooltip=<html> tempo decorrido entre duas grava\u00E7\u00F5es autom\u00E1ticas (em mseg): para desativar grava\u00E7\u00F5es autom\u00E1ticas defina este n\u00FAmero para 2000000000.</html>
-OptionPanel.time_for_delayed_selection=Tempo para atraso da sele\u00E7\u00E3o
-OptionPanel.time_for_delayed_selection.tooltip=<html>O tempo de atraso na sele\u00E7\u00E3o quando o rato est\u00E1 sobre os n\u00F3s (em mseg). Altere este valor para 1 se quiser que a sele\u00E7\u00E3o se fa\u00E7a imediatamente ao passar do rato.</html>
-OptionPanel.toolTipManager.dismissDelay=Atraso de sa\u00EDda, mseg
-OptionPanel.toolTipManager.initialDelay=Atraso inicial, mseg
+OptionPanel.time_for_automatic_save.tooltip=<html> tempo decorrido entre duas grava\u00E7\u00F5es autom\u00E1ticas (em ms): para desactivar grava\u00E7\u00F5es autom\u00E1ticas defina este n\u00FAmero para 2000000000.</html>
+OptionPanel.time_for_delayed_selection=Tempo para atraso da selec\u00E7\u00E3o
+OptionPanel.time_for_delayed_selection.tooltip=<html>O tempo de atraso na selec\u00E7\u00E3o quando o rato est\u00E1 sobre os n\u00F3s (em ms). Altere este valor para 1 se quiser que a selec\u00E7\u00E3o se fa\u00E7a imediatamente ao passar do rato.</html>
+OptionPanel.toolTipManager.dismissDelay=Atraso de sa\u00EDda, ms
+OptionPanel.toolTipManager.initialDelay=Atraso inicial, ms
 OptionPanel.toolTipManager.max_tooltip_height=Altura m\u00E1xima da sugest\u00E3o do n\u00F3
 OptionPanel.toolTipManager.max_tooltip_height.tooltip=A altura m\u00E1xima da sugest\u00E3o do n\u00F3, em pixels.
 OptionPanel.toolTipManager.max_tooltip_width=Largura m\u00E1xima da sugest\u00E3o do n\u00F3
 OptionPanel.toolTipManager.max_tooltip_width.tooltip=A largura m\u00E1xima da sugest\u00E3o do n\u00F3, em pixels.
-OptionPanel.toolTipManager.reshowDelay=Voltar a mostrar atraso, mseg
-OptionPanel.tr=Turco / T\u00FCrk\u00E7e
-OptionPanel.uk_UA=Ucraniano / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
-OptionPanel.undefined_font=Tipo de letra indefinida
+OptionPanel.toolTipManager.reshowDelay=Voltar a mostrar atraso, ms
+OptionPanel.tr=Turco/T\u00FCrk\u00E7e
+OptionPanel.uk_UA=Ucraniano/\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
+OptionPanel.undefined_font=Letra indefinida
 OptionPanel.undo_levels=N\u00EDveis de "Desfazer"
 OptionPanel.undo_levels.tooltip=<html>Determina quantos comandos ser\u00E3o gravados para desfazer.</html>
 OptionPanel.unfold_on_paste=Desdobrar o n\u00F3 ao colar
-OptionPanel.unfold_on_paste.tooltip=Desdobrar o n\u00F3 ao colar ou Arrastar e Largar
+OptionPanel.unfold_on_paste.tooltip=Desdobrar o n\u00F3 ao colar ou arrastar e largar
 OptionPanel.uniform_shape=Uniforme
 OptionPanel.use_common_out_point_for_root_node=As linhas come\u00E7am num ponto do n\u00F3-raiz
 OptionPanel.use_common_out_point_for_root_node.tooltip=As linhas come\u00E7am num ponto do n\u00F3-raiz
@@ -1410,18 +1412,18 @@ OptionPanel.validate_classpath_needs_readaccess=Scripts: ao definir o caminho de
 OptionPanel.validate_invalid_date_format=Formato padr\u00E3o de data inv\u00E1lido
 OptionPanel.validate_invalid_datetime_format=Formato padr\u00E3o de data/hora inv\u00E1lido
 OptionPanel.validate_invalid_number_format=Formato padr\u00E3o num\u00E9rico inv\u00E1lido
-OptionPanel.validate_write_without_read=Scripts: considere adicionar a leitura \u00E0 escrita de ficheiros.
+OptionPanel.validate_write_without_read=Scripts: considerar adicionar a leitura \u00E0 escrita de ficheiros.
 OptionPanel.validation_error=<html><body>Erro(s) de valida\u00E7\u00E3o:<p><em>{0}</em><p>por favor altere as prefer\u00EAncias para reparar o(s) erro(s).</body></html>
 OptionPanel.validation_warning=<html><body>Aviso(s) de valida\u00E7\u00E3o:<p><em>{0}</em></body></html>
-OptionPanel.vertical_child_gap=Espa\u00E7o do filho
+OptionPanel.vertical_child_gap=Espa\u00E7o do n\u00F3-filho
 OptionPanel.vertical_child_gap.tooltip=Dist\u00E2ncia vertical entre n\u00F3s-filho
-OptionPanel.vi=Vietnamita / Ti\u1EBFng Vi\u1EC7t
+OptionPanel.vi=Vietnamita/Ti\u1EBFng Vi\u1EC7t
 OptionPanel.wheel_velocity=Velocidade
 OptionPanel.wheel_velocity.tooltip=Um valor alto resulta num mais r\u00E1pido efeito dos movimentos da roda do rato no mapa.
 OptionPanel.wide_hexagon=Hex\u00E1gono largo
 OptionPanel.windows=Windows
-OptionPanel.zh_CN=Chin\u00EAs, simplificado / \u7B80\u4F53\u5B57
-OptionPanel.zh_TW=Chin\u00EAs, tradicional / \u7E41\u9AD4\u5B57
+OptionPanel.zh_CN=Chin\u00EAs simplificado/\u7B80\u4F53\u5B57
+OptionPanel.zh_TW=Chin\u00EAs tradicional/\u7E41\u9AD4\u5B57
 org.freeplane.plugin.bugreport.agree=Enviar
 org.freeplane.plugin.bugreport.always_agree=Enviar sempre
 org.freeplane.plugin.bugreport.always_deny=Nunca enviar
@@ -1429,15 +1431,15 @@ org.freeplane.plugin.bugreport.deny=N\u00E3o enviar
 org.freeplane.plugin.bugreport.dialog.title=Relat\u00F3rio de erro autom\u00E1tico
 org.freeplane.plugin.bugreport.freeplane_team=Mensagem da equipa do Freeplane
 org.freeplane.plugin.bugreport.lastreport=O relat\u00F3rio recebido
-org.freeplane.plugin.bugreport.never=Nunca me pedir ajuda
+org.freeplane.plugin.bugreport.never=Nunca pedir ajuda
 org.freeplane.plugin.bugreport.question=O Freeplane tem um motor de rastreio de erros autom\u00E1tico.
-org.freeplane.plugin.bugreport.report=Relat\u00F3rio atual
+org.freeplane.plugin.bugreport.report=Relat\u00F3rio actual
 org.freeplane.plugin.bugreport.wanted_bug=Ocorreu um erro interno e foi automaticamente reportado.
 org.freeplane.plugin.script.NodeIdHighlighter.node_is_not_defined=O n\u00F3 {0} n\u00E3o est\u00E1 definido
 out_of_memory=Sem mem\u00F3ria.
-overwrite_keyset_question=Substituir conjunto de chaves existente?
+overwrite_keyset_question=Sobrescrever conjunto de teclas existente?
 PageAction.text=Configurar impress\u00E3o...
-password_is_not_ascii=A palavra-passe n\u00E3o est\u00E1 em ASCII
+password_is_not_ascii=A senha n\u00E3o est\u00E1 em ASCII
 PasteAction.text=Colar
 PasteAttributes.text=Colar atributos
 PatternNewNameProperty=Novo padr\u00E3o
@@ -1459,14 +1461,14 @@ PeriodUnit.MINUTE=minutos
 PeriodUnit.MONTH=meses
 PeriodUnit.WEEK=semanas
 PeriodUnit.YEAR=anos
-plugins/latex/LatexNodeHook.editorTitle=Editar f\u00F3rmula LaTex
+plugins/latex/LatexNodeHook.editorTitle=Editar f\u00F3rmula LaTeX
 plugins/script_filter=Filtro de script {0}
 plugins/script_filter_error={0} devia ter devolvido um valor booleano em {1} mas devolveu {2}
 plugins/script_filter_execute_error=Erro ao executar {0}\npara o n\u00F3 {1}:\n{2}
 plugins/ScriptEditor.cancel=&Descartar altera\u00E7\u00F5es e sair
 plugins/ScriptEditor.exit=Gravar e&sair
-plugins/ScriptEditor.FORBIDDEN_ACTION=Os scripts groovy do Freeplane est\u00E3o restringidos. A opera\u00E7\u00E3o  {0,choice,0#File|1#Network|2#Exec} seguinte est\u00E1 proibida: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write} {2}. Pode alterar isto nas defini\u00E7\u00F5es do programa.
-plugins/ScriptEditor.menu_actions=&A\u00E7\u00F5es
+plugins/ScriptEditor.FORBIDDEN_ACTION=Os scripts groovy do Freeplane est\u00E3o restringidos. A opera\u00E7\u00E3o  {0,choice,0#File|1#Network|2#Exec} seguinte est\u00E1 proibida: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write} {2}. Pode fazer altera\u00E7\u00F5es nas defini\u00E7\u00F5es do programa.
+plugins/ScriptEditor.menu_actions=&Ac\u00E7\u00F5es
 plugins/ScriptEditor.new_script=Novo script
 plugins/ScriptEditor.run=Executa&r
 plugins/ScriptEditor.sign=Assinar script...
@@ -1480,33 +1482,33 @@ plugins/TimeList.xml_Icons=\u00CDcones
 plugins/TimeList.xml_Modified=Modificado
 plugins/TimeList.xml_Notes=Notas
 plugins/TimeList.xml_Text=Texto
-plugins/TimeManagement.xml_appendButton=Inserir data na sele\u00E7\u00E3o
+plugins/TimeManagement.xml_appendButton=Inserir data na selec\u00E7\u00E3o
 plugins/TimeManagement.xml_Cancel=Cancelar
 plugins/TimeManagement.xml_cancelButton=Cancelar
 plugins/TimeManagement.xml_closeButton=Fechar
-plugins/TimeManagement.xml_Export=Exportar n\u00F3s selecionados
-plugins/TimeManagement.xml_Find=Procurar
+plugins/TimeManagement.xml_Export=Exportar n\u00F3s seleccionados
+plugins/TimeManagement.xml_Find=Localizar
 plugins/TimeManagement.xml_Goto=Ir para
 plugins/TimeManagement.xml_hour=Hora:
-plugins/TimeManagement.xml_menu_actions=A\u00E7\u00F5es
+plugins/TimeManagement.xml_menu_actions=Ac\u00E7\u00F5es
 plugins/TimeManagement.xml_minute=Minuto:
-plugins/TimeManagement.xml_reminderButton=Lembrar-me nesta data
-plugins/TimeManagement.xml_reminderButton_tooltip=<html>Quando premido \u00E9 agendado um alarme para a data. Depois, os \u00EDcones cintilantes chamam-lhe a aten\u00E7\u00E3o.<br> Se fechar o mapa, os alarmes s\u00E3o reativados da pr\u00F3xima vez que o mapa for aberto.</html>
-plugins/TimeManagement.xml_reminderNode_onlyOneDate=<html>Atualmente, s\u00F3 pode haver um lembrete por n\u00F3. <br>O lembrete atual est\u00E1 definido para {0,date} {0,time}, a sua op\u00E7\u00E3o \u00E9 {1,date} {1,time}. <br><br>Quer alterar a hora do lembrete (SIM) <br>ou quer manter o anterior (N\u00C3O)?</html>
+plugins/TimeManagement.xml_reminderButton=Relembrar nesta data
+plugins/TimeManagement.xml_reminderButton_tooltip=<html>Quando premido \u00E9 agendado um alarme para a data. Depois, os \u00EDcones a piscar chamam-lhe a aten\u00E7\u00E3o.<br> Se fechar o mapa, os alarmes s\u00E3o reactivados da pr\u00F3xima vez que o mapa for aberto.</html>
+plugins/TimeManagement.xml_reminderNode_onlyOneDate=<html>Actualmente, s\u00F3 pode haver um lembrete por n\u00F3. <br>O lembrete actual est\u00E1 definido para {0,date} {0,time}, a sua op\u00E7\u00E3o \u00E9 {1,date} {1,time}. <br><br>Quer alterar a hora do lembrete (SIM) <br>ou quer manter o anterior (N\u00C3O)?</html>
 plugins/TimeManagement.xml_reminderNode_tooltip=Lembrete agendado a {0,date} {0,time}.
 plugins/TimeManagement.xml_remindLaterButton=Lembrar mais tarde
 plugins/TimeManagement.xml_remindLaterButton_tooltip=Lembrar mais tarde
 plugins/TimeManagement.xml_removeReminderButton=Remover lembrete
-plugins/TimeManagement.xml_removeReminderButton_tooltip=Remover todos os lembretes associados aos n\u00F3s selecionados.
+plugins/TimeManagement.xml_removeReminderButton_tooltip=Remover todos os lembretes associados aos n\u00F3s seleccionados.
 plugins/TimeManagement.xml_Replace=Substituir
 plugins/TimeManagement.xml_Replace_All=Substituir tudo
-plugins/TimeManagement.xml_Replace_Selected=Substituir selecionados
-plugins/TimeManagement.xml_Select=Selecionar
-plugins/TimeManagement.xml_todayButton=Hoje
+plugins/TimeManagement.xml_Replace_Selected=Substituir seleccionados
+plugins/TimeManagement.xml_Select=Seleccionar
+plugins/TimeManagement.xml_todayButton=Repor calend\u00E1rio
 plugins/TimeManagement.xml_WindowTitle=Gerir tempo
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Procurar & Substituir
 preferences=Prefer\u00EAncias
-print_preview_title=Pr\u00E9-visualizar impress\u00E3o
+print_preview_title=Antever impress\u00E3o
 PrintAction.text=Imprimir mapa...
 PrintDirectAction.text=Imprimir
 printing_settings=Escala de impress\u00E3o
@@ -1517,21 +1519,21 @@ PropertyAction.text=Prefer\u00EAncias...
 QuickFilterAction.text=Filtro r\u00E1pido
 QuickFindAction.BACK.text=Localizar anterior
 QuickFindAction.FORWARD.text=Localizar seguinte
-QuickFindAllAction.text=Selecionar todos os n\u00F3s coincidentes
-QuickHighlightAction.text=Real\u00E7ar todos os n\u00F3s coincidentes
+QuickFindAllAction.text=Seleccionar todos os que cumprem o crit\u00E9rio
+QuickHighlightAction.text=Real\u00E7ar todos os que cumprem o crit\u00E9rio
 QuitAction.text=Sair do Freeplane
 read_only=S\u00F3 de leitura
 ReadScriptError.text=Erro ao ler o script
-really_convert_to_current_version=<html>Este mapa foi criado com uma vers\u00E3o anterior do Freeplane.<br>Quer convert\u00EA-lo (recomendado)?<br>(De outra forma \u00E9 recebido como est\u00E1, sem qualquer garantia.) </html>
+really_convert_to_current_version=<html>Este mapa foi criado com uma vers\u00E3o anterior do Freeplane.<br>Quer convert\u00EA-lo (recomendado)?<br>De outra forma \u00E9 recebido como est\u00E1, sem qualquer garantia.</html>
 really_cut_node=Cortar realmente o(s) n\u00F3(s)?
-really_execute_script=Tem a certeza que quer executar os scripts inclu\u00EDdo neste mapa? \u00C9 poss\u00EDvel que danifiquem o computador.
+really_execute_script=Tem a certeza que quer executar os scripts inclu\u00EDdos neste mapa? \u00C9 poss\u00EDvel que danifiquem o computador.
 really_remove_node=Eliminar realmente o(s) n\u00F3(s)?
 really_remove_notes=Eliminar realmente a(s) nota(s)?
-ReapplyFilterAction.text=Reaplicar a\u00E7\u00E3o de filtragem
+ReapplyFilterAction.text=Re-aplicar ac\u00E7\u00E3o de filtragem
 red=Vermelho
 RedefineStyleAction.text=Redefinir estilo
 RedoAction.text=Refazer
-RedoFilterAction.text=Refazer a\u00E7\u00E3o de filtragem
+RedoFilterAction.text=Refazer ac\u00E7\u00E3o de filtragem
 regular_expressions=Express\u00F5es regulares
 ReminderHookAction.text=Remover lembrete
 ReminderHookAction.tooltip=Remove o lembrete de um n\u00F3.
@@ -1541,18 +1543,18 @@ remove_shortcut_question=Substituir atalho?
 RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Repor n\u00F3s desdobrados
 RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Permite dobrar todos os n\u00F3s
 RemoveAllIconsAction.text=Eliminar todos os \u00EDcones
-RemoveConnectorAction.text=Eliminar conector
-RemoveEncryption.text=Remover palavra-passe
+RemoveConnectorAction.text=Eliminar liga\u00E7\u00E3o
+RemoveEncryption.text=Remover senha
 RemoveFormatAction.text=Remover formato
 RemoveIcon_0_Action.text=Remover o primeiro \u00EDcone
-RemoveIconAction.text=Remover \u00FAltimo \u00EDcone
+RemoveIconAction.text=Remover o \u00FAltimo \u00EDcone
 RemoveNoteAction.text=Remover nota
 RemoveNoteAction.tooltip=<html>Remove o conte\u00FAdo das notas de possivelmente muitas notas</html>
 rename=&Renomear
 repair_link=Reparar liga\u00E7\u00E3o
 repair_link_question=Imposs\u00EDvel carregar o mapa ligado. Reparar a liga\u00E7\u00E3o manualmente?
 replace=Substituir
-replace_shortcut_question=Este atalho est\u00E1 atualmente atribu\u00EDdo a\n{0}.\nQuer substituir a atribui\u00E7\u00E3o?
+replace_shortcut_question=Este atalho est\u00E1 actualmente atribu\u00EDdo a\n{0}.\nQuer substituir a atribui\u00E7\u00E3o?
 replace_shortcut_title=Substituir atalho?
 ReportBugAction.text=Reportar um erro
 RequestFeatureAction.text=Sugerir uma funcionalidade
@@ -1569,7 +1571,7 @@ SaveAcceleratorPresetsAction.text=Gravar conjunto de atalhos...
 SaveAction.text=&Gravar mapa
 SaveAction_readonlyMsg=Este mapa \u00E9 s\u00F3 de leitura. Por favor, use "Ficheiro->Gravar mapa como..." para gravar este mapa.
 SaveAction_readonlyTitle=Tentativa de gravar mapa s\u00F3 de leitura
-SaveAll.text=Gravar &todos os mapas abertos
+SaveAll.text=Gr&avar todos os mapas abertos
 SaveAll.tooltip=Grava todos os mapas abertos
 SaveAs_toReadonlyMsg={0} \u00E9 s\u00F3 de leitura. Por favor, grave num ficheiro diferente.
 SaveAs_toReadonlyTitle=Tentativa de gravar num ficheiro s\u00F3 de leitura
@@ -1578,44 +1580,44 @@ saved=Gravado
 saving_canceled=Grava\u00E7\u00E3o cancelada
 scanners_not_loaded=Imposs\u00EDvel carregar os scanners, ficheiro corrompido
 scheme_evaluate=Avaliar!
-script_execution_disabled=Execu\u00E7\u00E3o de scripts desativada, veja Ferramentas/Prefer\u00EAncias/Plugins
-ScriptEditor.text=Editor de Scripts...
+script_execution_disabled=Execu\u00E7\u00E3o de scripts desactivada, veja Ferramentas/Prefer\u00EAncias/Extens\u00F5es
+ScriptEditor.text=Editar script...
 ScriptEditor.tooltip=Permite criar scripts grandes no Freeplane.
-ScriptEditorPanel.changed_cancel=Os scripts foram alterados. Tem a certeza que quer abandonar as altera\u00E7\u00F5es?
+ScriptEditorPanel.changed_cancel=Os scripts foram alterados. De certeza que quer abandonar as altera\u00E7\u00F5es?
 scripting=Scripts
 scripting_api_generator_legend=Legenda
 scripting_api_generator_proxy=Proxy
 scripting_api_generator_title=API de scripts
 scripting_api_generator_utilities=Utilidades
-scripting_api_generator_web=Recursos Web
-ScriptsRunToggleAction.ON_SELECTED_NODE.text=Executar scripts em todos os n\u00F3s selecionados
-ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=Executar scripts nos n\u00F3s selecionados, recursivamente
-ScriptsRunToggleAction.ON_SINGLE_NODE.text=Executar scripts num s\u00F3 n\u00F3 selecionado
+scripting_api_generator_web=Recursos web
+ScriptsRunToggleAction.ON_SELECTED_NODE.text=Executar scripts em todos os n\u00F3s seleccionados
+ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=Executar scripts nos n\u00F3s seleccionados, recursivamente
+ScriptsRunToggleAction.ON_SINGLE_NODE.text=Executar scripts num s\u00F3 n\u00F3 seleccionado
 select_favorites_folder=Escolha a pasta em que se encontram os seus favoritos
-select_file_export_to=Selecione o ficheiro para o qual exportar
+select_file_export_to=Seleccione o ficheiro para o qual exportar
 select_folder_for_importing=Escolha a pasta para importar
-select_icon=Selecione um \u00EDcone
-select_menu_item_dialog=Selecione um item de menu
+select_icon=Seleccione um \u00EDcone
+select_menu_item_dialog=Seleccione um item de menu
 select_menu_item_root_node=Menu
 select_template=Seleccionar modelo
-SelectAllAction.text=Selecionar todos os n\u00F3s vis\u00EDveis
-SelectBranchAction.text=Selecionar o ramo vis\u00EDvel
+SelectAllAction.text=Seleccionar todos os n\u00F3s vis\u00EDveis
+SelectBranchAction.text=Seleccionar o ramo vis\u00EDvel
 SelectedPasteAction.text=Colar como...
-selection_method_by_click=Clique \u00FAnico para selecionar
-selection_method_delayed=Sele\u00E7\u00E3o autom\u00E1tica atrasada
-selection_method_direct=Apontar para selecionar
-SelectNoteAction.text=Ir para o editor de notas
-SelectNoteAction.tooltip=Mudar para a janela de nota
-set_accelerator_on_next_click_action=Para criar um novo atalho de teclado: prima 'Ctrl' enquanto clica no comando de menu desejado.
+selection_method_by_click=Clique \u00FAnico para seleccionar
+selection_method_delayed=Selec\u00E7\u00E3o autom\u00E1tica atrasada
+selection_method_direct=Apontar para seleccionar
+SelectNoteAction.text=Abrir editor de notas
+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...
 SetAlwaysUnfoldedNodeFlagsAction.text=Manter n\u00F3s desdobrados
-SetAlwaysUnfoldedNodeFlagsAction.tooltip=Impedir dobras nos n\u00F3s atualmente desdobrados
+SetAlwaysUnfoldedNodeFlagsAction.tooltip=Impedir dobras nos n\u00F3s actualmente desdobrados
 SetImageByFileChooserAction.text=Imagem por escolha ou liga\u00E7\u00E3o...
 SetLinkAnchorAction.text=Definir \u00E2ncora da liga\u00E7\u00E3o
-SetLinkAnchorAction.tooltip=<html>definir o n\u00F3 selecionado como \u00E2ncora para cria\u00E7\u00E3o<br/>futura de liga\u00E7\u00F5es locais ou globais.
-SetLinkAnchorAction.tooltip_anchored=<html>definir o n\u00F3 selecionado como \u00E2ncora para cria\u00E7\u00E3o<br/>futura de liga\u00E7\u00F5es locais ou globais.\u00C2ncora atual:<br>{0}
+SetLinkAnchorAction.tooltip=<html>Definir o n\u00F3 seleccionado como \u00E2ncora para cria\u00E7\u00E3o<br/>futura de liga\u00E7\u00F5es locais ou globais.
+SetLinkAnchorAction.tooltip_anchored=<html>Definir o n\u00F3 seleccionado como \u00E2ncora para cria\u00E7\u00E3o<br/>futura de liga\u00E7\u00F5es locais ou globais. \u00C2ncora actual:<br>{0}
 SetLinkByFileChooserAction.text=Adicionar hiperliga\u00E7\u00E3o (escolha)...
 SetLinkByTextFieldAction.text=Adicionar/Modificar hiperliga\u00E7\u00E3o (tipo)...
 SetNodeLink.text=Definir liga\u00E7\u00E3o do n\u00F3...
@@ -1630,14 +1632,14 @@ ShowAncestorsAction.text=Mostrar ascendentes
 ShowAttributeDialogAction.text=Gerir atributos...
 ShowDescendantsAction.text=Mostrar descendentes
 ShowFilterToolbarAction.text=Barra de ferramentas de filtros
-ShowFormatPanel.text=Janela de propriedades
-ShowFormatPanel.tooltip=Mostra uma janela onde os atributos do n\u00F3 e da linha podem ser alterados simultaneamente.
-ShowHideNoteAction.text=Mostrar a janela de Notas
+ShowFormatPanel.text=Painel de propriedades
+ShowFormatPanel.tooltip=Mostra um painel onde os atributos do n\u00F3 e da linha podem ser alterados simultaneamente.
+ShowHideNoteAction.text=Mostrar a janela de notas
 ShowHideNoteAction.tooltip=Mostra/oculta a janela de notas.
-ShowNextChildAction.text=Mostrar pr\u00F3ximo n\u00F3-filho
+ShowNextChildAction.text=Mostrar n\u00F3-filho seguinte
 ShowNotesInMapAction.text=Mostrar notas no mapa
-ShowSelectedAttributesAction.text=Mostrar atributos selecionados
-ShowSelectionAsRectangleAction.text=Sele\u00E7\u00E3o retangular
+ShowSelectedAttributesAction.text=Mostrar atributos seleccionados
+ShowSelectionAsRectangleAction.text=Selec\u00E7\u00E3o rectangular
 simplyhtml.aboutFrameTitle=Acerca desta aplica\u00E7\u00E3o
 simplyhtml.aboutLabel=Acerca de SimplyHTML...
 simplyhtml.alignCenter=centrar
@@ -1701,8 +1703,8 @@ simplyhtml.fontColorTip=Cor do texto
 simplyhtml.fontDialogTitle=Formatar letra
 simplyhtml.fontItalicLabel=It\u00E1lico
 simplyhtml.fontItalicTip=Ligar/desligar it\u00E1lico
-simplyhtml.fontLabel=Tipo de letra...
-simplyhtml.fontTabLabel=Tipo de letra
+simplyhtml.fontLabel=Letra...
+simplyhtml.fontTabLabel=Letra
 simplyhtml.fontTip=Formatar letra...
 simplyhtml.fontUnderlineLabel=Sublinhado
 simplyhtml.fontUnderlineTip=Ligar/desligar sublinhado
@@ -1723,9 +1725,9 @@ simplyhtml.insertTableColLabel=Inserir coluna
 simplyhtml.insertTableLabel=Tabela...
 simplyhtml.insertTableMsg=Quantas colunas?
 simplyhtml.insertTableRowLabel=Inserir linha
-simplyhtml.insertTableTitle=inserir Tabela
+simplyhtml.insertTableTitle=inserir tabela
 simplyhtml.italicName=it\u00E1lico
-simplyhtml.layoutTabTitle=Desenho
+simplyhtml.layoutTabTitle=Vista de desenho
 simplyhtml.leftLabel=esquerda:
 simplyhtml.listDialogTitle=Formatar lista
 simplyhtml.listIndentTitle=Indentar:
@@ -1738,27 +1740,27 @@ simplyhtml.listTypeDisc=s\u00EDmbolo de ficheiro como marca
 simplyhtml.listTypeLabel=Tipo:
 simplyhtml.listTypeLowerAlpha=a.,b.,c.,d.
 simplyhtml.listTypeLowerRoman=i.,ii.,iii.,iv.
-simplyhtml.listTypeNone=nenhum
+simplyhtml.listTypeNone=sem marcas
 simplyhtml.listTypeSquare=marca quadrada
 simplyhtml.listTypeUpperAlpha=A.,B.,C.,D.
 simplyhtml.listTypeUpperRoman=I.,II.,III.,IV.
 simplyhtml.marginLabel=Exterior
-simplyhtml.matchApproximately=Coincid\u00EAncia aproximada
-simplyhtml.matchApproximately.tooltip=<html>Se se permitem coincid\u00EAncias aproximadas,<br/>i.e. procurar por 'meia' encontra 'miea'.</html>
-simplyhtml.matchCase=Respeitar mai\u00FAsculas/min\u00FAsculas
-simplyhtml.matchCase.tooltip=Se se quer respeitar mai\u00FAsculas e min\u00FAsculas.
+simplyhtml.matchApproximately=Resultado aproximado
+simplyhtml.matchApproximately.tooltip=<html>Se se permitem resultados aproximados,<br/>i.e. procurar por 'meia' encontra 'miea'.</html>
+simplyhtml.matchCase=Comparar mai\u00FAsculas/min\u00FAsculas
+simplyhtml.matchCase.tooltip=Se pretende comparar mai\u00FAsculas e min\u00FAsculas.
 simplyhtml.newStyleDefaultName=novo estilo
 simplyhtml.nextTableCellLabel=C\u00E9lula seguinte
 simplyhtml.noLineLabel=nenhum
-simplyhtml.noMoreOccurrencesFound=n\u00E3o foram encontradas (mais) ocorr\u00EAncias
+simplyhtml.noMoreOccurrencesFound=n\u00E3o se encontraram (mais) ocorr\u00EAncias
 simplyhtml.okBtnName=Aceitar
 simplyhtml.paddingLabel=Interior
 simplyhtml.paraAlignCenterLabel=Centrar
-simplyhtml.paraAlignCenterTip=Definir alinhamento do par\u00E1grafo ao centro
-simplyhtml.paraAlignLeftLabel=Alinhar \u00E0 esquerda
-simplyhtml.paraAlignLeftTip=Define alinhamento do par\u00E1grafo \u00E0 esquerda
-simplyhtml.paraAlignRightLabel=Alinhar \u00E0 direita
-simplyhtml.paraAlignRightTip=Define alinhamento do par\u00E1grafo \u00E0 direita
+simplyhtml.paraAlignCenterTip=Alinhar o par\u00E1grafo ao centro
+simplyhtml.paraAlignLeftLabel=\u00C0 esquerda
+simplyhtml.paraAlignLeftTip=Alinhar o par\u00E1grafo \u00E0 esquerda
+simplyhtml.paraAlignRightLabel=\u00C0 direita
+simplyhtml.paraAlignRightTip=Alinhar o par\u00E1grafo \u00E0 direita
 simplyhtml.paraStyleDialogTitle=Estilo de par\u00E1grafo
 simplyhtml.paraTabLabel=Par\u00E1grafo
 simplyhtml.pasteHTMLLabel=Colar HTML
@@ -1766,8 +1768,8 @@ simplyhtml.pasteLabel=Colar
 simplyhtml.pastePlainTextLabel=Colar texto simples
 simplyhtml.pasteTip=colar
 simplyhtml.plainName=simples
-simplyhtml.previewLabel=Pr\u00E9-visualizar
-simplyhtml.previewText=Pr\u00E9-visualizar texto
+simplyhtml.previewLabel=Antever
+simplyhtml.previewText=Antever texto
 simplyhtml.prevTableCellLabel=C\u00E9lula anterior
 simplyhtml.printLabel=Imprimir...
 simplyhtml.redFontColorLabel=Vermelho
@@ -1785,11 +1787,11 @@ simplyhtml.rightLabel=direita:
 simplyhtml.searchDown=Procurar para baixo
 simplyhtml.searchDown.tooltip=Procurar de cima para baixo.
 simplyhtml.searchFromStart=Procurar desde o in\u00EDcio
-simplyhtml.searchFromStart.tooltip=Come\u00E7ar procura no in\u00EDcio e n\u00E3o na posi\u00E7\u00E3o atual.
+simplyhtml.searchFromStart.tooltip=Come\u00E7ar procura no in\u00EDcio e n\u00E3o na posi\u00E7\u00E3o actual.
 simplyhtml.searchUp=Procurar para cima
 simplyhtml.searchUp.tooltip=Procurar de baixo para cima.
-simplyhtml.selectAllLabel=Selecionar tudo
-simplyhtml.selectedFontColorLabel=Cor da letra selecionada
+simplyhtml.selectAllLabel=Seleccionar tudo
+simplyhtml.selectedFontColorLabel=Cor da letra seleccionada
 simplyhtml.sizeLabel=Tamanho
 simplyhtml.standardStyleName=padr\u00E3o
 simplyhtml.strikeLabel=Rasurado
@@ -1807,9 +1809,9 @@ simplyhtml.thisCellRangeLabel=esta c\u00E9lula
 simplyhtml.thisColRangeLabel=esta coluna
 simplyhtml.thisRowRangeLabel=esta linha
 simplyhtml.toggleBulletsLabel=Ligar/desligar lista com marcas
-simplyhtml.toggleBulletsTip=ligar/desligar lista com marcas
+simplyhtml.toggleBulletsTip=Ligar/desligar lista com marcas
 simplyhtml.toggleNumbersLabel=Ligar/desligar lista numerada
-simplyhtml.toggleNumbersTip=ligar/desligar lista numerada
+simplyhtml.toggleNumbersTip=Ligar/desligar lista numerada
 simplyhtml.topLabel=em cima:
 simplyhtml.uLineLabel=Sublinhado
 simplyhtml.unableToOpenFileError=O ficheiro n\u00E3o pode ser aberto
@@ -1823,7 +1825,7 @@ simplyhtml.valignLabel=Alinhamento vertical:
 simplyhtml.valignMiddle=ao centro
 simplyhtml.valignTop=em cima
 simplyhtml.wholeWordsOnly=S\u00F3 palavras inteiras
-simplyhtml.wholeWordsOnly.tooltip=Restringir coincid\u00EAncias a palavras inteiras.
+simplyhtml.wholeWordsOnly.tooltip=Restringir resultados a palavras inteiras.
 SortNodes.text=Ordenar n\u00F3s-filho
 SortNodes.tooltip=Ordena alfabeticamente todos os n\u00F3s-filho.
 split=&Dividir
@@ -1841,7 +1843,7 @@ styledialog.cancel.text=Cancelar
 styledialog.ok.text=Aceitar
 styles=Est&ilos
 styles.AutomaticLayout=Aplicar estilos de n\u00EDvel
-styles.connection=Conex\u00E3o
+styles.connection=Liga\u00E7\u00E3o
 styles.date=Data
 styles.definition=Defini\u00E7\u00E3o
 styles.description=Descri\u00E7\u00E3o
@@ -1850,7 +1852,7 @@ styles.idea=Ideia
 styles.important=Importante
 styles.key=Chave
 styles.list=Lista
-styles.needs_action=Requer a\u00E7\u00E3o
+styles.needs_action=Requer ac\u00E7\u00E3o
 styles.note=Nota
 styles.ok=Aceitar
 styles.pending=Pendente
@@ -1858,16 +1860,16 @@ styles.predefined=Estilos predefinidos
 styles.question=Pergunta
 styles.quotation=Cita\u00E7\u00E3o
 styles.root_node=Estilos
-styles.subsubtopic=Subsubt\u00F3pico
-styles.subtopic=Subt\u00F3pico
+styles.subsubtopic=Sub-sub-t\u00F3pico
+styles.subtopic=Sub-t\u00F3pico
 styles.topic=T\u00F3pico
 styles.user-defined=Estilos do utilizador
-styles.website=P\u00E1gina Web
-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 Sobre este conjunto de estilo\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n Este padr\u00E3o foi desenvolvido ap\u00F3s 11 anos de persquisa pedag\u00F3gica so [...]
+styles.website=P\u00E1gina web
+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 Sobre este conjunto de estilo\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n Este padr\u00E3o foi desenvolvido ap\u00F3s 11 anos de pesquisa pedag\u00F3gica sob [...]
 styles_menu=Estilos dispon\u00EDveis
-submenu_keystroke_in_use_error=Imposs\u00EDvel usar o atalho {0} para o submenu {1}. Atalho removido.
+submenu_keystroke_in_use_error=Imposs\u00EDvel usar o atalho {0} para o sub-menu {1}. Atalho removido.
 summary_nodes=N\u00F3s-resumo
-summary_not_possible=Imposs\u00EDvel criar n\u00F3-resumo para a sele\u00E7\u00E3o atual
+summary_not_possible=Imposs\u00EDvel criar n\u00F3-resumo para a selec\u00E7\u00E3o actual
 svg=SVG
 template_dir=Modelos padr\u00E3o
 TextAlignAction.CENTER.text=Texto centrado
@@ -1891,10 +1893,10 @@ ToggleDetailsAction.text=Ocultar detalhes
 ToggleFBarAction.text=Barra de teclas de fun\u00E7\u00E3o
 ToggleFoldedAction.text=(Des)dobrar
 ToggleFullScreenAction.text=Modo Ecr\u00E3 completo
-ToggleLeftToolbarAction.text=Barra de ferramentas \u00CDcones
+ToggleLeftToolbarAction.text=Barra de \u00EDcones
 ToggleMenubarAction.text=Barra de menus
-ToggleScrollbarsAction.text=Barras de deslocamento
-ToggleStatusAction.text=Mostrar linha de estado
+ToggleScrollbarsAction.text=Barras de rolamento
+ToggleStatusAction.text=Mostrar barra de estado
 ToggleToolbarAction.text=Barra de ferramentas
 toolbars=Barras de ferramentas
 TranslatedElement.BORDER=Texto do contorno
@@ -1907,27 +1909,27 @@ underline=Sublinhado
 UnderlineAction.text=Sublinhado
 underlined=Sublinhado
 UndoAction.text=Desfazer
-UndoFilterAction.text=Desfazer a\u00E7\u00E3o de filtragem
+UndoFilterAction.text=Desfazer ac\u00E7\u00E3o de filtragem
 unfold=Desdobrar
 UnfoldAllAction.text=Desdobrar todos
-UnfoldAllAction.tooltip=<html>Desdobra os n\u00F3s selecionados e todos os seus n\u00F3s-filho.</html>
+UnfoldAllAction.tooltip=<html>Desdobra os n\u00F3s seleccionados e todos os seus n\u00F3s-filho.</html>
 UnfoldOneLevelAction.text=Desdobra um n\u00EDvel
-UnfoldOneLevelAction.tooltip=Desdobra os n\u00F3s selecionados um n\u00EDvel.
-unparsedLatexPatternFormat=LaTex n\u00E3o analisado
-up=Acima
+UnfoldOneLevelAction.tooltip=Desdobra os n\u00F3s seleccionados um n\u00EDvel.
+unparsedLatexPatternFormat=LaTeX n\u00E3o analisado
+up=A&cima
 UpConditionAction.text=Acima
-update_failed=A atualiza\u00E7\u00E3o falhou com a mensagem {0}
-UpdateCheckAction.text=Procurar atualiza\u00E7\u00F5es
-updatecheckdialog=Janela de procura por atualiza\u00E7\u00F5es
+update_failed=A actualiza\u00E7\u00E3o falhou com a mensagem {0}
+UpdateCheckAction.text=Procurar actualiza\u00E7\u00F5es
+updatecheckdialog=Janela de procura por actualiza\u00E7\u00F5es
 updater.component=Componente
 updater.goToDownload=Ir para a transfer\u00EAncia
 updater.version.installed=Vers\u00E3o instalada
 updater.version.latest=\u00DAltima vers\u00E3o
-updater.version.noUpdateUrl=N\u00E3o h\u00E1 URL/p\u00E1gina inicial para este suplemento.
+updater.version.noUpdateUrl=N\u00E3o h\u00E1 URL/p\u00E1gina inicial para esta extens\u00E3o.
 updater.version.unknown=desconhecido
 updater.version.unreachable=Origem inating\u00EDvel:
 updater.viewChangelog=Ver di\u00E1rio de altera\u00E7\u00F5es
-url_error=Este URL est\u00E1 incorreto!
+url_error=Este URL est\u00E1 incorrecto!
 url_load_error=Imposs\u00EDvel carregar mapa no endere\u00E7o:
 url_open_error=Imposs\u00EDvel abrir o URL {0}.
 used_in_menu=Imposs\u00EDvel definir este atalho, j\u00E1 \u00E9 usado como atalho de menu.
@@ -1946,13 +1948,13 @@ version_up_to_date=J\u00E1 tem a mais recente vers\u00E3o do programa
 view=&Ver
 ViewLayoutTypeAction.OUTLINE.text=Vista de destaque
 web_resources=Recursos web
-WebDocuAction.text=Documenta\u00E7\u00E3o Web
+WebDocuAction.text=Documenta\u00E7\u00E3o web
 WhatsNewAction.text=O que h\u00E1 de novo no Freeplane 1.5.x
 width=Largura
 wrong_regexp=Express\u00E3o regular errada "{0}", erro {1}
 xslt_export.html=Documento HTML
-xslt_export.latex=Documento LaTex
-xslt_export.latexbook=Livro LaTex
+xslt_export.latex=Documento LaTeX
+xslt_export.latexbook=Livro LaTeX
 xslt_export.mediawiki=Mediawiki
 xslt_export.ms_excel=Formato XML Microsoft Excel 2003
 xslt_export.ms_project=Formato XML Microsoft Project 2003
diff --git a/freeplane/resources/translations/Resources_ru.properties b/freeplane/resources/translations/Resources_ru.properties
index 72e8155..547dbd3 100644
--- a/freeplane/resources/translations/Resources_ru.properties
+++ b/freeplane/resources/translations/Resources_ru.properties
@@ -1,6 +1,6 @@
 about_text=Freeplane - \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0430 \u0434\u043B\u044F \u0440\u0430\u0431\u043E\u0442\u044B \u0441 \u043A\u0430\u0440\u0442\u0430\u043C\u0438 \u043F\u0430\u043C\u044F\u0442\u0438 \u0438 \u043F\u0440\u0438\u043D\u044F\u0442\u0438\u044F \u0440\u0435\u0448\u0435\u043D\u0438\u0439
 AboutAction.text=\u041E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0435...
-acceleratorPresets=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0435 \u0433\u043E\u0440\u044F\u0447\u0438\u0438 \u043A\u043B\u0430\u0432\u0438\u0448\u0438
+acceleratorPresets=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0435 \u0433\u043E\u0440\u044F\u0447\u0438\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0438
 accelerators_loading_error=\u041E\u0448\u0438\u0431\u043A\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u0430\u043A\u0441\u0435\u043B\u0435\u0440\u0430\u0442\u043E\u0440\u043E\u0432 \u0438\u0437 {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0444\u043E\u0440\u043C\u0430\u0442 \u0443\u0437\u043B\u043E\u0432
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0441\u0442\u0438\u043B\u044C
@@ -13,7 +13,7 @@ accessories/plugins/EncryptNode.properties_5=<html>\u0423\u0447\u0442\u0438\u044
 accessories/plugins/EncryptNode.properties_6=\u041E\u041A
 accessories/plugins/EncryptNode.properties_7=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C
 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_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/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.
@@ -153,7 +153,7 @@ AutomaticLayout.level.root=\u041A\u043E\u0440\u0435\u043D\u044C
 AutomaticLayoutAction.text=&\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 AutomaticLayoutAction.tooltip=<html>\u0424\u0438\u043A\u0441\u0438\u0440\u0443\u0435\u0442 \u0432\u0438\u0434 \u043A\u0430\u0440\u0442\u044B <br>\u0423\u0437\u043B\u044B \u043F\u0435\u0440\u0432\u043E\u0433\u043E \u0443\u0440\u043E\u0432\u043D\u044F \u0441\u0442\u0430\u043D\u0443\u0442 \u0447\u0435\u0440\u043D\u044B\u043C\u0438, \u0432\u0442\u043E\u0440\u043E\u0433\u043E - \u0441\u0438\u043D\u0438\u043C\u0438 \u0438 \u0442.\u0434.</html>
 AutomaticLayoutControllerAction.ALL.text=\u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u0443\u0437\u043B\u043E\u0432
-AutomaticLayoutControllerAction.COLUMNS.text=\u0434\u043B\u044F \u043A\u043E\u043B\u043E\u043D\u043D
+AutomaticLayoutControllerAction.COLUMNS.text=\u0434\u043B\u044F \u043A\u043E\u043B\u043E\u043D\u043E\u043A
 AutomaticLayoutControllerAction.HEADINGS.text=\u0434\u043B\u044F \u043D\u0435\u043A\u0440\u0430\u0439\u043D\u0438\u0445 \u0443\u0437\u043B\u043E\u0432
 AutomaticLayoutControllerAction.null.text=\u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D\u043E
 BackAction.text=\u041D\u0430\u0437\u0430\u0434
@@ -211,7 +211,7 @@ ClearLinkAnchorAction.tooltip=<html>\u043E\u0447\u0438\u0441\u0442\u0438\u0442\u
 CloneAction.text=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043A\u043B\u043E\u043D
 close_btn=&\u0417\u0430\u043A\u0440\u044B\u0442\u044C
 CloseAction.text=&\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u0442\u0435\u043A\u0443\u0449\u0443\u044E \u043A\u0430\u0440\u0442\u0443
-cloud_shapes=\u0424\u0438\u0433\u0443\u0440\u044B \u043E\u0431\u043B\u0430\u043A\u043E\u0432
+cloud_shapes=\u0424\u043E\u0440\u043C\u044B \u043E\u0431\u043B\u0430\u043A\u043E\u0432
 CloudAction.text=\u041E\u0431\u043B\u0430\u043A\u043E
 CloudColorAction.text=\u0426\u0432\u0435\u0442 \u043E\u0431\u043B\u0430\u043A\u0430 ...
 CloudShapeAction.ARC.text=\u0414\u0443\u0433\u0430
@@ -228,13 +228,14 @@ connector_label=\u041C\u0435\u0442\u043A\u0430 \u0441\u043E\u0435\u0434\u0438\u0
 connector_lines=\u041B\u0438\u043D\u0438\u0438 \u0441\u043E\u0435\u0434\u0438\u043D\u0438\u0442\u0435\u043B\u044F
 connector_shapes=\u0424\u043E\u0440\u043C\u044B \u0441\u043E\u0435\u0434\u0438\u043D\u0438\u0442\u0435\u043B\u044F
 ConnectorColorAction.text=\u0426\u0432\u0435\u0442 \u0441\u0432\u044F\u0437\u0438...
+ConvertCloneToIndependentNodeAction.text=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C \u043A\u043B\u043E\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 CopyAction.text=&\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C
 CopyAction.tooltip=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u0443\u044E \u0432\u0435\u0442\u0432\u044C
 CopyAttributes.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0410\u0442\u0440\u0438\u0431\u0443\u0442\u044B
-CopyIDAction.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C ID \u0443\u0437\u043B\u0430
+CopyIDAction.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C I&D \u0443\u0437\u043B\u0430
 CopyMapStylesAction.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0438\u043B\u044C \u043A\u0430\u0440\u0442\u044B \u0438\u0437...
 CopyNodeURIAction.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C URI \u0443\u0437\u043B\u0430
-copyright=2000-2014 \\u00A9 \u041F\u0440\u0430\u0432\u0430 \u043F\u0440\u0438\u043D\u0430\u0434\u043B\u0435\u0436\u0430\u0442 \u043A\u043E\u043C\u0430\u043D\u0434\u0435 Freeplane team \u0438 \u0434\u0440\u0443\u0433\u0438\u043C \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0430\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u0430
+copyright=2000-2016 \\u00A9 \u041F\u0440\u0430\u0432\u0430 \u043F\u0440\u0438\u043D\u0430\u0434\u043B\u0435\u0436\u0430\u0442 \u043A\u043E\u043C\u0430\u043D\u0434\u0435 Freeplane team \u0438 \u0434\u0440\u0443\u0433\u0438\u043C \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0430\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u0430
 CopySingleAction.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u044D\u0442\u043E\u0442 \u0443\u0437\u0435\u043B
 CopySingleAction.tooltip=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0443\u0437\u0435\u043B
 CopyStyleExtensionsAction.text=\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u043C\u043E\u0435 \u0438\u0437 \u0441\u0442\u0438\u043B\u044F
@@ -278,7 +279,9 @@ edge=\u0420\u0435\u0431\u0440\u043E
 edge_is_formatted_by_style=\u0424\u043E\u0440\u043C\u0430\u0442 \u0440\u0435\u0431\u043A\u0430 \u0443\u043F\u0440\u0430\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0441\u0442\u0438\u043B\u0435\u043C. \u0415\u0441\u043B\u0438 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044F, \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u0435 \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u043D\u044B\u0439 \u0441\u0442\u0438\u043B\u044C.
 edge_style=\u0422\u0438\u043F \u043B\u0438\u043D\u0438\u0438 \u0440\u0435\u0431\u0440\u0430
 edge_width=\u0422\u043E\u043B\u0449\u0438\u043D\u0430 \u0440\u0435\u0431\u0440\u0430
+edge_widths=\u0422\u043E\u043B\u0449\u0438\u043D\u0430 \u0440\u0451\u0431\u0435\u0440
 EdgeColorAction.text=\u0426\u0432\u0435\u0442 \u0440\u0435\u0431\u0440\u0430...
+EdgeProperties=\u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430 \u0440\u0451\u0431\u0435\u0440
 EdgeStyleAction.bezier.text=\u041A\u0440\u0438\u0432\u0430\u044F
 EdgeStyleAction.bezier.tooltip=<html>\u041E\u0442\u043E\u0431\u0440\u0430\u0437\u0438\u0442\u044C \u0440\u0435\u0431\u0440\u043E \u0432 \u0432\u0438\u0434\u0435 \u0433\u043B\u0430\u0434\u043A\u043E\u0439 \u043A\u0440\u0438\u0432\u043E\u0439.</html>
 EdgeStyleAction.hide_edge.text=\u0421\u043F\u0440\u044F\u0442\u0430\u0442\u044C \u0440\u0435\u0431\u0440\u043E
@@ -315,13 +318,15 @@ EditAttributesAction.text=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E
 EditDetailsAction.text=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u043E\u0434\u0440\u043E\u0431\u043D\u043E\u0441\u0442\u0438 \u0443\u0437\u043B\u0430 \u0432 \u0441\u0442\u0440\u043E\u043A\u0435
 EditDetailsInDialogAction.text=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u043E\u0434\u0440\u043E\u0431\u043D\u043E\u0441\u0442\u0438 \u0443\u0437\u043B\u0430 \u0432 \u043E\u043A\u043D\u0435
 EditFilterAction.text=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
-EditLongAction.text=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u0435\u043A\u0441\u0442 \u0432 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0435...
-EditNoteInDialogAction.text=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C &\u043F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u0435...
+EditLongAction.text=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u0435\u043A\u0441\u0442 \u0432 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0435
+EditNoteInDialogAction.text=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C &\u043F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u0435 \u0432 \u043E\u043A\u043D\u0435 \u0434\u0438\u0430\u043B\u043E\u0433\u0430
 EditScript=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442...
 EditStylesAction.text=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0438\u043B\u0438
 EncryptedMap.text=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043D\u0443\u044E \u0430\u0441\u0441\u043E\u0446\u0438\u0430\u0442\u0438\u0432\u043D\u0443\u044E \u043A\u0430\u0440\u0442\u0443...
 EncryptedMap.tooltip=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0431\u0443\u0434\u0435\u0442 \u043F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D
+encryption=\u0428\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 enter_base_url=\u0411\u0443\u0434\u0435\u0442 \u0432\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0430 \u043E\u0442\u043D\u043E\u0441\u0438\u0442\u0435\u043B\u044C\u043D\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430. \u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u043A\u043E\u0440\u043D\u0435\u0432\u043E\u0439 URL...
+enter_command=\u0412\u0432\u043E\u0434 \u043A\u043E\u043C\u0430\u043D\u0434\u044B
 enter_condition_name=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043C\u044F \u043D\u043E\u0432\u043E\u0433\u043E \u0443\u0441\u043B\u043E\u0432\u0438\u044F
 enter_confirms=\u041A\u043B\u0430\u0432\u0438\u0448\u0430 <&\u0412\u0412\u041E\u0414> \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0435\u0442 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 enter_keyset_name=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043C\u044F \u043D\u0430\u0431\u043E\u0440\u0430 \u0433\u043E\u0440\u044F\u0447\u0438\u0445 \u043A\u043B\u0430\u0432\u0438\u0448
@@ -335,7 +340,9 @@ error_applying_template=\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438
 error_creating_directory=\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0438 \u043F\u0430\u043F\u043A\u0438.
 error_in_template=\u041E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u044B \u043E\u0448\u0438\u0431\u043A\u0438 \u0432 \u0448\u0430\u0431\u043B\u043E\u043D\u0435 \u043A\u0430\u0440\u0442\u044B \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E {0}. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u043E\u0442 \u0444\u0430\u0439\u043B.
 errornumber={0} \u043E\u0448\u0438\u0431\u043A\u0430(\u043E\u043A)
-ExecuteScriptError.text=\u041E\u0448\u0438\u0431\u043A\u0430 \u0437\u0430\u043F\u0443\u0441\u043A\u0430 \u0441\u043A\u0440\u0438\u043F\u0442\u0430:\n   {0}\n\u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 \u043B\u043E\u0433 \u0444\u0430\u0439\u043B \u0434\u043B\u044F \u0443\u0442\u043E\u0447\u043D\u0435\u043D\u0438\u044F.
+ExecuteScript.available_modes_tooltip={0} \u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u0434\u043B\u044F
+ExecuteScript.script=\u0421\u0446\u0435\u043D\u0430\u0440\u0438\u0439
+ExecuteScriptError.text=\u041E\u0448\u0438\u0431\u043A\u0430 \u0437\u0430\u043F\u0443\u0441\u043A\u0430 \u0441\u043A\u0440\u0438\u043F\u0442\u0430:\n   {0}\n\u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 \u043B\u043E\u0433 \u0444\u0430\u0439\u043B \u0434\u043B\u044F \u0443\u0442\u043E\u0447\u043D\u0435\u043D\u0438\u044F
 ExecuteScriptForAllNodes.text=\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0432\u0441\u0435 \u0441\u043A\u0440\u0438\u043F\u0442\u044B
 ExecuteScriptForSelectionAction.text=\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0443\u0437\u043B\u043E\u0432\u044B\u0435 \u0441\u043A\u0440\u0438\u043F\u0442\u044B
 ExecuteScriptOnSelectedNode.text=\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C {0} \u043D\u0430 \u0432\u0441\u0435\u0445 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0445 \u0443\u0437\u043B\u0430\u0445
@@ -403,6 +410,8 @@ filter=\u0424&\u0438\u043B\u044C\u0442\u0440
 filter_add=&\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
 filter_and=&\u0418
 filter_any_text=\u0422\u0435\u043A\u0441\u0442, \u043F\u043E\u0434\u0440\u043E\u0431\u043D\u043E\u0441\u0442\u0438 \u0438\u043B\u0438 \u043F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u0435
+filter_clone_snapshot=\u0421\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0435 \u043A\u043B\u043E\u043D\u044B \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u043E\u0433\u043E
+filter_clones=\u041A\u043B\u043E\u043D\u044B \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u043E\u0433\u043E
 filter_conditions=\u0424\u0438\u043B\u044C\u0442\u0440\u044B
 filter_contains=\u0421\u043E\u0434\u0435\u0440\u0436\u0438\u0442
 filter_created_after=\u0421\u043E\u0437\u0434\u0430\u043D\u043D\u044B\u0435 \u043F\u043E\u0441\u043B\u0435
@@ -449,11 +458,16 @@ filter_selected_node_view=\u0412\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B
 filter_selected_node_view_snapshot=\u0421\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0439 \u0432\u044B\u0431\u043E\u0440
 filter_style=\u0421\u0442\u0438\u043B\u044C
 filter_time=\u0424\u0438\u043B\u044C\u0442\u0440 \u0434\u0430\u0442\u044B
+FilterCondition=\u0424\u0438\u043B\u044C\u0442\u0440 \u043F\u043E \u0443\u0441\u043B\u043E\u0432\u0438\u044F\u043C
+filterConditions=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0435 \u0444\u0438\u043B\u044C\u0442\u0440\u044B
+filterConditions.noActions=\u0424\u0438\u043B\u044C\u0442\u0440\u044B \u0431\u0435\u0437 \u0438\u043C\u0435\u043D\u0438
 filters_not_loaded=\u041D\u0435 \u043C\u043E\u0433\u0443 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0444\u0438\u043B\u044C\u0442\u0440, \u0444\u0430\u0439\u043B \u043F\u043E\u0432\u0440\u0435\u0436\u0434\u0435\u043D
+find=\u041F\u043E\u0438\u0441\u043A
 find_what=\u0418\u0441\u043A\u043E\u043C\u044B\u0439 \u0442\u0435\u043A\u0441\u0442
-FindAction.text=\u0418\u0441\u043A\u0430\u0442\u044C...
+FindAction.text=\u041F\u043E\u0438\u0441\u043A...
 FindNextAction.text=\u041D\u0430\u0439\u0442\u0438 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u0435
 FindPreviousAction.text=\u041D\u0430\u0439\u0442\u0438 \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0435\u0435
+fit_background_to_page=\u0412\u043F\u0438\u0441\u0430\u0442\u044C \u0444\u043E\u043D\u043E\u0432\u043E\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0432 \u0433\u0440\u0430\u043D\u0438\u0446\u044B \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B
 fit_map_to_page=&\u0423\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0435
 fit_map_to_page_height=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C &\u0432\u044B\u0441\u043E\u0442\u0443 \u0432 \u043E\u0434\u043D\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
 fit_map_to_page_width=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C &\u0448\u0438\u0440\u0438\u043D\u0443 \u0432 \u043E\u0434\u043D\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
@@ -464,7 +478,8 @@ FoldAllAction.text=\u0421\u0432\u0435\u0440\u043D\u0443\u0442\u044C \u0432\u0441
 FoldAllAction.tooltip=<html>\u0421\u0432\u043E\u0440\u0430\u0447\u0438\u0432\u0430\u0435\u0442 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0443\u0437\u043B\u044B \u0438 \u0432\u0441\u0435 \u043F\u043E\u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435 \u0443\u0437\u043B\u044B</html>
 FoldOneLevelAction.text=\u0421\u0432\u0435\u0440\u043D\u0443\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C
 FoldOneLevelAction.tooltip=<html>\u0421\u0432\u043E\u0440\u0430\u0447\u0438\u0432\u0430\u0435\u0442 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0443\u0437\u043B\u044B \u043D\u0430 \u043E\u0434\u0438\u043D \u0443\u0440\u043E\u0432\u0435\u043D\u044C</html>
-follow_graphical_link=\u041F\u0435\u0440\u0435\u0445\u043E\u0434 \u043A:
+follow_clone=\u0412\u043D\u0443\u0442\u0440\u0438 "{0}"
+follow_graphical_link=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u043A "{0}"
 FollowLinkAction.text=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u043F\u043E \u0441\u0441\u044B\u043B\u043A\u0435
 font=\u0428\u0440\u0438\u0444\u0442
 FontFamilyAction.text=\u0428\u0440\u0438\u0444\u0442
@@ -502,8 +517,10 @@ Freeplane.progress.startCreateController=\u0421\u043E\u0437\u0434\u0430\u043D\u0
 Freeplane.progress.updateLookAndFeel=\u041F\u043E\u0434\u0433\u043E\u0442\u043E\u0432\u043A\u0430 \u0432\u043D\u0435\u0448\u043D\u0435\u0433\u043E \u0432\u0438\u0434\u0430...
 freeplane_reverted=\u041F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u043D\u043D\u044B\u0439 Freeplane
 FreeplaneHelpStarter.text=\u041F\u043E\u043C\u043E\u0449\u044C ...
-FreeplaneHelpStarter.tooltip=\u041F\u043E\u043C\u043E\u0449\u044C...
+FreeplaneHelpStarter.tooltip=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u0430\u044F \u043F\u043E\u043C\u043E\u0449\u044C
 GettingStartedAction.text=\u041F\u0440\u0438\u0441\u0442\u0443\u043F\u0430\u044F \u043A \u0440\u0430\u0431\u043E\u0442\u0435
+goto=\u041F\u0435\u0440\u0435\u0439\u0442\u0438
+goto.noActions=\u041D\u0435\u0442 \u0446\u0435\u043B\u0435\u0432\u044B\u0445 \u0443\u0437\u043B\u043E\u0432
 GotoLinkNodeAction.text=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u043F\u043E \u0441\u0432\u044F\u0437\u0438
 GotoNodeAction.text=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0443\u0437\u0435\u043B \u0441 ID...
 GrabKeyDialog.common.cancel=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C
@@ -519,7 +536,7 @@ help=\u041F\u043E\u043C\u043E\u0449\u044C
 HideableAction.tooltip=<html>\u041E\u0442\u043C\u0435\u0447\u0430\u0435\u0442 \u0444\u043E\u043D \u0438\u0437\u043C\u0435\u043D\u0451\u043D\u043D\u043E\u0433\u043E \u0443\u0437\u043B\u0430.</html>
 HideAllAttributesAction.text=\u0421\u043F\u0440\u044F\u0442\u0430\u0442\u044C \u0432\u0441\u0435 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044B
 HierarchicalIcons2Action.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u043F\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043D\u0438\u044F \u0434\u043E\u0447\u0435\u0440\u043D\u0438\u0445 \u043F\u0438\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u043C
-HierarchicalIconsAction.text=\u0414\u043E\u0447\u0435\u0440\u043D\u0438\u0435 &\u043F\u0438\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u043C\u044B
+HierarchicalIconsAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u044E &\u043F\u0438\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u043C
 HierarchicalIconsAction.tooltip=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442 \u043F\u0438\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u043C\u044B \u043F\u043E\u0434\u0447\u0438\u043D\u0451\u043D\u043D\u044B\u0445 \u0443\u0437\u043B\u043E\u0432.
 hot_keys=\u0413\u043E\u0440\u044F\u0447\u0438\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0438
 hot_keys_table=\u0422\u0430\u0431\u043B\u0438\u0446\u0430 \u0433\u043E\u0440\u044F\u0447\u0438\u0445 \u043A\u043B\u0430\u0432\u0438\u0448
@@ -659,6 +676,7 @@ IconProgressIconUpAction.text=\u0412\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u
 IconProgressIconUpAction.tooltip=\u0423\u0432\u0435\u043B\u0438\u0447\u0438\u0442\u044C/ \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0437\u043D\u0430\u0447\u0435\u043A \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F (0% -> 25% -> 50% -> 75% -> 100% + OK).
 IconProgressRemoveAction.text=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435
 IconProgressRemoveAction.tooltip=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u043A\u043E\u043D\u043A\u0438 \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u0438 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u043E\u0433\u043E \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F.
+icons=\u0418\u043A\u043E\u043D\u043A\u0438
 IconSelectionPlugin.text=\u0412\u044B\u0431\u043E\u0440 \u043F\u0438\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u043C\u044B...
 IconSelectionPlugin.tooltip=<html>\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u043E\u043A\u043D\u043E \u0432\u044B\u0431\u043E\u0440\u0430 \u043F\u0438\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u043C\u044B</html>
 image_covertLink=\u041F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443 \u0432 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435
@@ -672,6 +690,7 @@ ImportFolderStructureAction.text=\u0418\u043C\u043F\u043E\u0440\u0442\u0438\u044
 ImportLinkedBranchAction.text=\u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u0435\u0442\u0432\u044C \u0438\u0437 \u0441\u0441\u044B\u043B\u043A\u0438
 ImportLinkedBranchWithoutRootAction.text=\u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0438\u0437 \u0441\u0441\u044B\u043B\u043A\u0438 \u0431\u0435\u0437 \u043A\u043E\u0440\u043D\u0435\u0432\u043E\u0433\u043E \u0443\u0437\u043B\u0430...
 ImportMindmanagerFiles.text=\u041A\u0430\u0440\u0442\u0430 \u0434\u043B\u044F MindManager X5 ...
+ImportXmlFile.text=\u0418\u043C\u043F\u043E\u0440\u0442 xml \u0444\u0430\u0439\u043B\u0430
 increase_branch_font_size=\u0423\u0432\u0435\u043B\u0438\u0447\u0438\u0442\u044C \u0448\u0440\u0438\u0444\u0442 \u0432\u0441\u0435\u0439 \u0432\u0435\u0442\u0432\u0438
 IncreaseNodeFontAction.text=\u0423\u0432\u0435\u043B\u0438\u0447\u0438\u0442\u044C \u0448\u0440\u0438\u0444\u0442 \u0432\u0441\u0435\u0439 \u0432\u0435\u0442\u0432\u0438
 internal_error_tooltip=\u0412\u043E\u0437\u043D\u0438\u043A\u043D\u043E\u0432\u0435\u043D\u0438\u0435 \u0432\u043D\u0443\u0442\u0440\u0435\u043D\u043D\u0435\u0439 \u043E\u0448\u0438\u0431\u043A\u0438. \u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0438\u0442\u0435 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0439 log \u0444\u0430\u0439\u043B {0} \u0434\u043B\u044F \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0439 \u0438\u043D\u0444\u043E\u0440\u [...]
@@ -683,9 +702,12 @@ invalid_url_msg=\u041E\u0448\u0438\u0431\u043A\u0430 \u0441\u043E\u0437\u0434\u0
 ItalicAction.text=\u041A\u0443\u0440\u0441\u0438\u0432
 italicise_branch=\u0428\u0440\u0438\u0444\u0442 \u0432\u0441\u0435\u0439 \u0432\u0435\u0442\u0432\u0438 \u043A\u0443\u0440\u0441\u0438\u0432
 java_version=\u0412\u0435\u0440\u0441\u0438\u044F Java: {0}
+JoinNodesAction.separator.format=\u041E\u0431\u044A\u0435\u0434\u0438\u043D\u0438\u0442\u044C \u0443\u0437\u043B\u044B \u0441 "{0}"
+lastOpenedMaps=\u041D\u0435\u0434\u0430\u0432\u043D\u043E \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u043A\u0430\u0440\u0442\u044B
+lastOpenedMaps.noActions=\u041D\u0435 \u0431\u044B\u043B\u043E \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0445 \u043A\u0430\u0440\u0442
 latex_editor=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u043E\u0440\u043C\u0443\u043B\u0443 LaTex
 LatexDeleteLatexAction.text=\u0423\u0434\u0430\u043B\u0438\u0442\u044C LaTe&X \u0444\u043E\u0440\u043C\u0443\u043B\u0443
-LatexEditLatexAction.text=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C &LaTeX \u0444\u043E\u0440\u043C\u0443\u043B\u0443...
+LatexEditLatexAction.text=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C &LaTeX \u0444\u043E\u0440\u043C\u0443\u043B\u0443...
 LatexInsertLatexAction.msg1=<html>\u0412\u044B \u043F\u044B\u0442\u0430\u0435\u0442\u0435\u0441\u044C \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u044C <i>\u0443\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0443\u044E</i> \u0444\u043E\u0440\u043C\u0443\u043B\u0443 LaTeX.<br/>\u041D\u043E\u0432\u044B\u0439 \u0441\u043F\u043E\u0441\u043E\u0431 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F LaTeX \u0442\u0435\u043A\u0441\u0442\u0430/\u0444\u043E\u0440\u043C\u0443\u043B \u043E\u043F\u0438\u04 [...]
 LatexInsertLatexAction.msg2=<html>\u0412 \u043A\u0440\u0430\u0434\u0446\u0435: <ul><li>\u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u043F\u0440\u0435\u0444\u0438\u043A\u0441 "\\latex " \u0432 \u0442\u0435\u043A\u0441\u0442\u0435 \u0443\u0437\u043B\u0430 \u0438\u043B\u0438</li><li><i>\u0412\u0438\u0434 -> \u041F\u0430\u043D\u0435\u043B\u044C \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F </i>, \u0437\u0430\u0442\u0435\u043C <i>  [...]
 LatexInsertLatexAction.text=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C &LaTeX \u0444\u043E\u0440\u043C\u0443\u043B\u0443...
@@ -704,6 +726,7 @@ link_not_found=\u0421\u0441\u044B\u043B\u043A\u0430 {0} \u043D\u0435 \u043D\u043
 links=\u0421\u0441\u044B\u043B\u043A\u0438
 load=&\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C
 load_accelerator_presets=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C
+load_accelerator_presets.noActions=\u041D\u0435\u0442 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043A
 LoadAcceleratorPresetsAction.textPatterns.text=\u0428\u0430\u0431\u043B\u043E\u043D\u044B \u0442\u0435\u043A\u0441\u0442\u0430
 locking_failed_by_open=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442 {0} \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0434\u0440\u0443\u0433\u043E\u0439 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043E\u0439 \u0438 \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442\u0441\u044F \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0447\u0442\u0435\u043D\u0438\u044F.
 locking_failed_by_save_as=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442 {0} \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0434\u0440\u0443\u0433\u043E\u0439 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043E\u0439 \u0438 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D.
@@ -711,8 +734,9 @@ locking_old_lock_removed=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442 {0} \u
 long_node_changed_cancel=\u0412\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u043B\u0438 \u0443\u0437\u0435\u043B. \u0425\u043E\u0442\u0438\u0442\u0435 \u043E\u0442\u043A\u0430\u0437\u0430\u0442\u044C\u0441\u044F \u043E\u0442 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439?
 long_node_changed_submit=\u0412\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u043B\u0438 \u0443\u0437\u0435\u043B. \u0425\u043E\u0442\u0438\u0442\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F?
 lots_of_links_warning=\u0412\u044B \u0441\u043E\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044C \u0441\u043E\u0437\u0434\u0430\u0442\u044C \u043C\u043D\u043E\u0433\u043E \u0441\u0432\u044F\u0437\u0435\u0439 \u0441\u0440\u0430\u0437\u0443. \u0412\u044B \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u044D\u0442\u043E\u0433\u043E \u0445\u043E\u0442\u0438\u0442\u0435?
+main_menu=\u041C\u0435\u043D\u044E
 main_resource_directory=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043E\u0447\u043D\u044B\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u044B: {0}
-MainView.errorUpdateText=\u041E\u0448\u0438\u0431\u043A\u0430 \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F \u0442\u0435\u043A\u0441\u0442\u0430 \u0432 \u0442\u0435\u043A\u0443\u0449\u0438\u0439 \u0432\u0432\u043E\u0434: {0}\n \u041E\u0448\u0438\u0431\u043A\u0430: {1}
+MainView.errorUpdateText=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432\u0432\u043E\u0434\u0430 \u0442\u0435\u043A\u0441\u0442\u0430: {0}\n\u0422\u0435\u043A\u0441\u0442 \u043E\u0448\u0438\u0431\u043A\u0438: {1}
 MakeLinkFromAnchorAction.text=\u0421\u0434\u0435\u043B\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443 \u0438\u0437 \u044F\u043A\u043E\u0440\u044F
 MakeLinkFromAnchorAction.tooltip=<html>\u0441\u043E\u0437\u0434\u0430\u0442\u044C \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u0443\u044E \u0438\u043B\u0438 \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u0443\u044E \u0441\u0441\u044B\u043B\u043A\u0443 \u043E\u0442 \u0443\u0437\u043B\u0430-\u044F\u043A\u043E\u0440\u044F<br/>\u043A \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u043C\u0443 \u0443\u0437\u043B\u0443</html>
 MakeLinkToAnchorAction.text=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443 \u043D\u0430 \u044F\u043A\u043E\u0440\u044C
@@ -759,12 +783,17 @@ ManageAddOnsDialog.visit.addon.page=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \
 ManageConditionalStylesAction.text=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0443\u0441\u043B\u043E\u0432\u043D\u044B\u043C\u0438 \u0441\u0442\u0438\u043B\u044F\u043C\u0438 \u043A\u0430\u0440\u0442\u044B
 ManageNodeConditionalStylesAction.text=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0443\u0441\u043B\u043E\u0432\u043D\u044B\u043C\u0438 \u0441\u0442\u0438\u043B\u044F\u043C\u0438 \u0443\u0437\u043B\u0430
 map_already_exists=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442 \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442. \u0412\u044B \u0445\u043E\u0442\u0438\u0442\u0435 \u043F\u0435\u0440\u0435\u043F\u0438\u0441\u0430\u0442\u044C \u0435\u0433\u043E?
+map_background=\u0424\u043E\u043D \u043A\u0430\u0440\u0442\u044B
+map_background_image=\u0424\u043E\u043D\u043E\u0432\u043E\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435
 map_corrupted=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442 \u043F\u043E\u0432\u0440\u0435\u0436\u0434\u0435\u043D. \u0421\u043E\u043E\u0431\u0449\u0438\u0442\u044C \u043F\u043E\u0434\u0440\u043E\u0431\u043D\u043E\u0441\u0442\u0438?
 map_load_error=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u043A\u0430\u0440\u0442\u0443 {0}
 map_locked_by_open=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442 {0} \u0443\u0436\u0435 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0443\u0435\u0442\u0441\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C {1}. \u041E\u043D \u0431\u0443\u0434\u0435\u0442 \u043E\u0442\u043A\u0440\u044B\u0442\u0430 \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0447\u0442\u0435\u043D\u0438\u044F.
 map_locked_by_save_as=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442 {0} \u0443\u0436\u0435 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0443\u0435\u0442\u0441\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C {1} \u0438 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D.
 map_not_saved=\u042D\u0442\u0430 \u043A\u0430\u0440\u0442\u0430 \u043D\u0435 \u0431\u044B\u043B\u0430 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0430 \u0440\u0430\u043D\u0435\u0435.
+MapBackgroundClearAction.text=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0444\u043E\u043D\u043E\u0432\u043E\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435
 MapBackgroundColorAction.text=\u0424\u043E\u043D \u043A\u0430\u0440\u0442\u044B
+MapBackgroundImageAction.text=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0444\u043E\u043D\u043E\u0432\u043E\u0435 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435...
+maps=\u041A\u0430\u0440\u0442\u044B
 MaxNodeWidth.text=\u0417\u0430\u0434\u0430\u0442\u044C \u043C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0443\u044E \u0448\u0438\u0440\u0438\u043D\u0443 \u0443\u0437\u043B\u0430
 menu_applyStyle=\u041F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C \u0441\u0442\u0438\u043B\u044C
 menu_attributes=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C &\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044B
@@ -775,7 +804,7 @@ menu_details=\u041F\u043E\u0434\u0440\u043E\u0431\u043D\u043E\u0441\u0442\u0438
 menu_displayAttributes=\u0410\u0442\u0440\u0438\u0431\u0443\u0442\u044B \u0443\u0437\u043B\u0430
 menu_encryption=\u0428\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 menu_error=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u043E\u0433\u043E \u043C\u0435\u043D\u044E {0}:\n{1}\n\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u0438\u0435
-menu_extensions=\u0420\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0443\u0437\u043B\u0430
+menu_extensions=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0443\u0437\u043B\u0430
 menu_group=\u0413\u0440\u0443\u043F\u043F\u0430 \u0443\u0437\u043B\u043E\u0432
 menu_hoverView=\u0412\u0441\u043F\u043B\u044B\u0432\u0430\u044E\u0449\u0438\u0435 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0438
 menu_iconByCategory=\u0418\u043A\u043E\u043D\u043A\u0438 \u043F\u043E \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044F\u043C...
@@ -810,19 +839,21 @@ mode_File=\u0424\u0430\u0439\u043B\u043E\u0432\u044B\u0439 \u0440\u0435\u0436\u0
 mode_MindMap=\u0420\u0435\u0436\u0438\u043C \u0438\u043D\u0442\u0435\u043B\u043B\u0435\u043A\u0442-\u043A\u0430\u0440\u0442\u044B
 mode_na=\u0420\u0435\u0436\u0438\u043C \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u0435\u043D
 mode_status=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D \u0440\u0435\u0436\u0438\u043C {0}
+mode_StyleMap=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0441\u0442\u0438\u043B\u044F
 mode_title=Freeplane - {0}
 modes=\u0420\u0435\u0436\u0438\u043C\u044B
 ModesMenuAction.Browse.text=\u041E\u0431\u043E\u0437\u0440\u0435\u0432\u0430\u0442\u0435\u043B\u044C \u043A\u0430\u0440\u0442
 ModesMenuAction.File.text=\u041E\u0431\u043E\u0437\u0440\u0435\u0432\u0430\u0442\u0435\u043B\u044C \u0444\u0430\u0439\u043B\u043E\u0432
 ModesMenuAction.MindMap.text=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043A\u0430\u0440\u0442 \u043C\u044B\u0448\u043B\u0435\u043D\u0438\u044F
 most_recent_files=&\u041D\u0435\u0434\u0430\u0432\u043D\u0438\u0435 \u0444\u0430\u0439\u043B\u044B
+MoveAction.text=\u041F\u0435\u0440\u0435\u043D\u0435\u0441\u0442\u0438
 MoveToRootAction.text=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u043A\u043E\u0440\u043D\u0435\u0432\u043E\u0439 \u0443\u0437\u0435\u043B
 NameConditionAction.text=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0438\u043C\u044F
 navigate=&\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
 NavigationNextMapAction.text=\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0430\u044F \u043A\u0430\u0440\u0442\u0430
 NavigationPreviousMapAction.text=\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0430\u044F \u043A\u0430\u0440\u0442\u0430
 new=&\u0421\u043E\u0437\u0434\u0430\u0442\u044C
-new_map_from_user_templates.text=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043A\u0430\u0440\u0442\u0443...
+new_map_from_user_templates.text=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043A\u0430\u0440\u0442\u0443 \u043D\u0430 \u043E\u0441\u043D\u043E\u0432\u0435 \u0448\u0430\u0431\u043B\u043E\u043D\u0430...
 new_mindmap=\u041D\u043E\u0432\u0430\u044F \u043A\u0430\u0440\u0442\u0430
 new_node=\u041D\u043E\u0432\u044B\u0439 \u0443\u0437\u0435\u043B
 new_node_as_sibling_not_possible_for_the_root=\u0423 \u043A\u043E\u0440\u043D\u0435\u0432\u043E\u0433\u043E \u0443\u0437\u043B\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0441\u043C\u0435\u0436\u043D\u043E\u0433\u043E \u0443\u0437\u043B\u0430
@@ -839,6 +870,7 @@ NewerFileRevisionsFoundDialog.question=\u041D\u0430\u0439\u0434\u0435\u043D\u043
 NewerFileRevisionsFoundDialog.restore=\u0412\u043E&\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C
 NewerFileRevisionsFoundDialog.restore.tooltip=\u0417\u0430\u043C\u0435\u043D\u0438\u0442\u044C {0} \u043D\u0430 {1}
 NewerFileRevisionsFoundDialog.title=\u041E\u0431\u043D\u043E\u0440\u0443\u0436\u0435\u043D\u0430 \u043D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F \u0444\u0430\u0439\u043B\u0430!
+NewFreeNodeAction.text=\u041D\u043E\u0432\u044B\u0439 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u0439 \u0443\u0437\u0435\u043B
 NewLevelStyleAction.text=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0441\u043A\u0438\u0439 \u0441\u0442\u0438\u043B\u044C \u0443\u0440\u043E\u0432\u043D\u044F
 newmap.install.addon.question={0} \u043F\u043E\u0445\u043E\u0436 \u043D\u0430 \u043F\u0430\u043A\u0435\u0442 \u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F\n\u0411\u0443\u0434\u0435\u0442\u0435 \u0435\u0433\u043E \u0443\u0441\u0442\u0430\u043D\u0430\u0432\u043B\u0438\u0432\u0430\u0442\u044C?\n(\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 "\u041D\u0435\u0442", \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u043E\u0441\u0442\u043E \u043E\u0442\u043A\u0440\u044B\u0442\u044C \ [...]
 newmap.install.addon.title=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435?
@@ -863,10 +895,12 @@ no_found_from=<html>\u0422\u0435\u043A\u0441\u0442 <u>{0}</u> \u043D\u0435
 no_more_found_from=<html>\u0422\u0435\u043A\u0441\u0442 <u>{0}</u> \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0432\u0441\u0442\u0440\u0435\u0447\u0430\u0435\u0442\u0441\u044F \u0432 "{1}".</html>
 no_previous_find=\u0411\u043E\u043B\u0435\u0435 \u0440\u0430\u043D\u043D\u0438\u0445 \u0441\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0439 \u043D\u0435\u0442.
 no_styles_found_in_map=\u0421\u0442\u0438\u043B\u0435\u0439 \u0432 \u043A\u0430\u0440\u0442\u0435 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u043E
+no_translation_strings_found=\u041D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u044B \u043F\u0435\u0440\u0435\u0432\u0435\u0434\u0451\u043D\u043D\u044B\u0435 \u0441\u0442\u0440\u043E\u043A\u0438
 node=\u0423\u0437\u0435\u043B
 node_changed_discard_changes=\u0412\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u043B\u0438 \u0443\u0437\u0435\u043B. \u0425\u043E\u0442\u0438\u0442\u0435 \u043E\u0442\u043A\u0430\u0437\u0430\u0442\u044C\u0441\u044F \u043E\u0442 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439?
 node_is_write_protected=\u0423\u0437\u0435\u043B-\u043F\u0440\u0438\u0435\u043C\u043D\u0438\u043A \u0437\u0430\u0449\u0438\u0449\u0435\u043D \u043E\u0442 \u0437\u0430\u043F\u0438\u0441\u0438.
 node_location_help=\u041F\u0435\u0440\u0435\u0442\u0430\u0441\u043A\u0438\u0432\u0430\u043D\u0438\u0435 \u0438\u0437\u043C\u0435\u043D\u044F\u0435\u0442 \u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u0443\u0437\u043B\u0430, <ctrl>+\u043F\u0435\u0440\u0435\u0442\u0430\u0441\u043A\u0438\u0432\u0430\u043D\u0438\u0435 \u0438\u0437\u043C\u0435\u043D\u044F\u0435\u0442 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435 \u043C\u0435\u0436\u0434\u0443 \u0443\u0437\u043B\u0430\ [...]
+node_popup_scripting=\u0421\u0446\u0435\u043D\u0430\u0440\u0438\u0438
 node_selector=\u0412\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0443\u0437\u0435\u043B
 node_selector_message=\u0414\u0432\u043E\u0439\u043D\u043E\u0439 \u0449\u0435\u043B\u0447\u0451\u043A \u043D\u0430 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u043C \u0443\u0437\u043B\u0435
 node_styles=\u0421\u0442\u0438\u043B\u0438 \u0443\u0437\u043B\u0430
@@ -880,6 +914,10 @@ NodeListAction.text=\u041D\u0430\u0439\u0442\u0438 \u0438 \u0437\u0430\u043C\u04
 NodeListAction.tooltip=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u0441\u0435 \u0443\u0437\u043B\u044B \u043A\u0430\u043A \u0441\u043F\u0438\u0441\u043E\u043A \u0441 \u043F\u043E\u0438\u0441\u043A\u043E\u043C \u0438 \u0444\u0438\u043B\u044C\u0442\u0440\u043E\u043C.
 NodeShapeAction.bubble.text=\u0422\u0438\u043F \u0443\u0437\u043B\u0430 "&\u041E\u0432\u0430\u043B"
 NodeShapeAction.fork.text=\u0422\u0438\u043F \u0443\u0437\u043B\u0430 "&\u041A\u0440\u0438\u0432\u0430\u044F"
+NodeShapeAction.narrow_hexagon.text=\u0423\u0437\u043A\u0438\u0439 \u0448\u0435\u0441\u0442\u0438\u0443\u0433\u043E\u043B\u044C\u043D\u0438\u043A
+NodeShapeAction.oval.text=\u041E\u0432\u0430\u043B
+NodeShapeAction.rectangle.text=\u041F\u0440\u044F\u043C\u043E\u0443\u0433\u043E\u043B\u044C\u043D\u0438\u043A
+NodeShapeAction.wide_hexagon.text=\u0428\u0438\u0440\u043E\u043A\u0438\u0439 \u0448\u0435\u0441\u0442\u0438\u0443\u0433\u043E\u043B\u044C\u043D\u0438\u043A
 NodeUpAction.text=\u041F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u0432\u0432\u0435\u0440\u0445
 nonboldify_branch=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u043E\u043B\u0443\u0436\u0438\u0440\u043D\u043E\u0435 \u043D\u0430\u0447\u0435\u0440\u0442\u0430\u043D\u0438\u0435
 nonitalicise_branch=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C \u043A\u0443\u0440\u0441\u0438\u0432\u043D\u043E\u0435 \u043D\u0430\u0447\u0435\u0440\u0442\u0430\u043D\u0438\u0435
@@ -888,6 +926,10 @@ not_saved_for_image_error=\u041A\u0430\u0440\u0442\u0430 \u0434\u043E\u043B\u043
 not_saved_for_link_error=\u041A\u0430\u0440\u0442\u0430 \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0430 \u043F\u0435\u0440\u0435\u0434 \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435\u043C \u0444\u0430\u0439\u043B\u043E\u0432\u043E\u0439 \u0441\u0441\u044B\u043B\u043A\u0438
 note_window_location=\u041F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u043F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u0439
 notes=\u0417\u0430\u043C\u0435\u0442\u043A\u0430
+NotificationOptions.CLOSE=\u0417\u0430\u043A\u0440\u044B\u0442\u044C
+NotificationOptions.REMIND_ME_LATER=\u041D\u0430\u043F\u043E\u043C\u043D\u0438\u0442\u044C \u043F\u043E\u0437\u0436\u0435
+NotificationOptions.REMOVE_REMINDER=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043D\u0430\u043F\u043E\u043C\u0438\u043D\u0430\u043D\u0438\u0435
+NotificationOptions.SELECT_NODE=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u043A \u043D\u0430\u043F\u043E\u043C\u0438\u043D\u0430\u043D\u0438\u044E
 ok=&\u041E\u041A
 OKAction.text=&\u041E\u041A
 OnlineReference.text=\u041E\u043D\u043B\u0430\u0439\u043D \u043A\u0430\u0440\u0442\u044B \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430\u0446\u0438\u0438
@@ -916,6 +958,7 @@ OptionPanel.always_load_last_maps.tooltip=\u041E\u0442\u043A\u0440\u044B\u0432\u
 OptionPanel.always_save_folding=\u0412\u0441\u0435\u0433\u0434\u0430
 OptionPanel.always_save_folding_state=\u0412\u0441\u0435\u0433\u0434\u0430 \u0441\u043E\u0445\u0440\u0430\u043D\u044F\u0442\u044C \u0438\u0437\u043C\u0435\u043D\u0438\u044F \u0441\u0432\u043E\u0440\u0430\u0447\u0438\u0432\u0430\u043D\u0438\u044F
 OptionPanel.always_save_folding_state.tooltip=\u0415\u0441\u043B\u0438 \u043E\u0442\u043C\u0435\u0447\u0435\u043D\u043E, \u043A\u0430\u0436\u0434\u043E\u0435 \u0441\u0432\u0435\u0440\u0442\u044B\u0432\u0430\u043D\u0438\u0435/\u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044B\u0432\u0430\u043D\u0438\u0435 \u0438\u0437\u043C\u0435\u043D\u044F\u0435\u0442 \u043A\u0430\u0440\u0442\u0443 \u0438 \u043D\u0430\u043F\u043E\u043C\u0438\u043D\u0430\u0435\u0442 \u043E \u043D\u0435\u043E\u0431\u0445\u0 [...]
+OptionPanel.always_show_less_than_N_nodes_after_load=\u0420\u0430\u0437\u0432\u0435\u0440\u043D\u0443\u0442\u044C \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0443\u0437\u043B\u044B
 OptionPanel.always_unfold_all_after_load=\u0420\u0430\u0437\u0432\u0435\u0440\u043D\u0443\u0442\u044C \u0432\u0441\u0435
 OptionPanel.antialias=\u0421\u0433\u043B\u0430\u0436\u0438\u0432\u0430\u043D\u0438\u0435
 OptionPanel.antialias.tooltip=<html>\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F.</html>
@@ -936,6 +979,10 @@ OptionPanel.automaticFormat_level2=\u0424\u043E\u0440\u043C\u0430\u0442 \u0443\u
 OptionPanel.backup_file_number=\u0427\u0438\u0441\u043B\u043E \u0445\u0440\u0430\u043D\u0438\u043C\u044B\u0445 \u0440\u0435\u0437\u0435\u0440\u0432\u043D\u044B\u0445 \u043A\u043E\u043F\u0438\u0439 \u0444\u0430\u0439\u043B\u043E\u0432
 OptionPanel.Behaviour=\u041F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u0435
 OptionPanel.bezier=\u041A\u0440\u0438\u0432\u0430\u044F
+OptionPanel.border_color=\u0426\u0432\u0435\u0442
+OptionPanel.border_color_matches_edge_color=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0446\u0432\u0435\u0442 \u0440\u0435\u0431\u0440\u0430
+OptionPanel.border_width=\u0422\u043E\u043B\u0449\u0438\u043D\u0430 \u043B\u0438\u043D\u0438\u0438
+OptionPanel.border_width_matches_edge_width=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0442\u043E\u043B\u0449\u0438\u043D\u0443 \u0440\u0435\u0431\u0440\u0430
 OptionPanel.bubble=\u041E\u0432\u0430\u043B
 OptionPanel.ca=\u041A\u0430\u0442\u0430\u043B\u0430\u043D\u0441\u043A\u0438\u0439
 OptionPanel.Cancel=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C
@@ -952,6 +999,8 @@ OptionPanel.combined=\u041A\u043E\u043C\u0431\u0438\u043D\u0438\u0440\u043E\u043
 OptionPanel.compare_as_number=\u0421\u0440\u0430\u0432\u043D\u0438\u0432\u0430\u0442\u044C \u043A\u0430\u043A \u0447\u0438\u0441\u043B\u0430
 OptionPanel.convert_to_current_version=<html>\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u043F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u043E\u0432\u044B\u0432\u0430\u0442\u044C \u043A\u0430\u0440\u0442\u044B \u0441\u0442\u0430\u0440\u044B\u0445 \u0432\u0435\u0440\u0441\u0438\u0439 Freeplane <br>\u0432 \u0444\u043E\u0440\u043C\u0430\u0442 \u044D\u0442\u043E\u0439 \u0432\u0435\u0440\u0441\u0438\u0438</html>
 OptionPanel.convert_to_current_version.tooltip=<html>\u0422\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u043E\u0447\u0435\u043D\u044C \u0431\u043E\u043B\u044C\u0448\u0438\u0445 \u043A\u0430\u0440\u0442 \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043D\u0435 \u043D\u0443\u0436\u043D\u043E \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C <br>(\u0434\u043B\u044F \u043E\u043F\u044B\u0442\u043D\u044B\u0445 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0 [...]
+OptionPanel.copyFormatToNewSibling=\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043D\u0430 \u0434\u043E\u0447\u0435\u0440\u043D\u0438\u0439 \u0443\u0437\u0435\u043B
+OptionPanel.copyFormatToNewSiblingIncludesIcons=\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u043E\u0440\u043C\u0430\u0442 \u0441 \u0438\u043A\u043E\u043D\u043A\u0430\u043C\u0438
 OptionPanel.cs=\u0427\u0435\u0448\u0441\u043A\u0438\u0439
 OptionPanel.cut_nodes_without_question=\u0412\u044B\u0440\u0435\u0437\u0430\u0442\u044C \u0443\u0437\u043B\u044B \u0431\u0435\u0437 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F?
 OptionPanel.cut_nodes_without_question.tooltip=\u0415\u0441\u043B\u0438 \u044D\u0442\u043E\u0442 \u0444\u043B\u0430\u0433 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D \u0443\u0437\u043B\u044B \u0432\u044B\u0440\u0435\u0437\u0430\u044E\u0442\u0441\u044F \u0431\u0435\u0437 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F. \u042D\u0442\u043E \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0437\u0432\u0430\u0442\u044C \u043F\u043E\u0442\u0435\u0440\ [...]
@@ -973,6 +1022,7 @@ OptionPanel.default_browser_command_windows_9x.tooltip=<html>\u0414\u043B\u044F
 OptionPanel.default_browser_command_windows_nt=\u0411\u0440\u0430\u0443\u0437\u0435\u0440 \u0434\u043B\u044F  Windows NT
 OptionPanel.default_browser_command_windows_nt.tooltip=<html>\u0414\u043B\u044F  Windows (\u043A\u0430\u0432\u044B\u0447\u043A\u0438 "" \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u044B \u0438\u0437-\u0437\u0430 \u0430\u0434\u0440\u0435\u0441\u043E\u0432 (URL), \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0449\u0438\u0445 "=").</html>
 OptionPanel.default_charset=\u041A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430
+OptionPanel.default_save_dir=\u0414\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044F \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u043F\u043E-\u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E
 OptionPanel.Defaults=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u044B
 OptionPanel.delete_automatic_saves_at_exit=\u0423\u0434\u0430\u043B\u044F\u0442\u044C \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0435 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u044B \u043F\u0440\u0438 \u0432\u044B\u0445\u043E\u0434\u0435 \u0438\u0437 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B
 OptionPanel.delete_automatic_saves_at_exit.tooltip=<html> \u041F\u043E\u0441\u0442\u0430\u0432\u044C\u0442\u0435 \u0433\u0430\u043B\u043E\u0447\u043A\u0443, \u0447\u0442\u043E\u0431\u044B \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0435 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u044B \u0431\u044B\u043B\u0438 \u0443\u0434\u0430\u043B\u0435\u043D\u044B \u043F\u043E\u0441\u043B\u0435 \u04 [...]
@@ -1004,6 +1054,7 @@ OptionPanel.en=\u0410\u043D\u0433\u043B\u0438\u0439\u0441\u043A\u0438\u0439
 OptionPanel.Environment=\u041E\u043A\u0440\u0443\u0436\u0435\u043D\u0438\u0435
 OptionPanel.es=\u0418\u0441\u043F\u0430\u043D\u0441\u043A\u0438\u0439
 OptionPanel.et=\u042D\u0441\u0442\u043E\u043D\u0441\u043A\u0438\u0439
+OptionPanel.eu=\u0411\u0430\u0441\u043A\u0441\u043A\u0438\u0439
 OptionPanel.execute_scripts_without_asking=\u0412\u044B\u043F\u043E\u043B\u043D\u044F\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442\u044B \u0431\u0435\u0437 \u0437\u0430\u043F\u0440\u043E\u0441\u0430
 OptionPanel.execute_scripts_without_asking.tooltip=<html>\u0421\u043A\u0440\u0438\u043F\u0442\u044B Freeplane \u043E\u0431\u044B\u0447\u043D\u043E \u043C\u043E\u0433\u0443\u0442 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0442\u044C \u043B\u044E\u0431\u043E\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u043D\u0430 \u0432\u0430\u0448\u0435\u043C \u041F\u041A. <br>\u041F\u043E\u044D\u0442\u043E\u043C\u0443 \u0412\u044B \u043D\u0435 \u0434\u043E\u043B\u0436\u043D\u044B \u0437\u043 [...]
 OptionPanel.execute_scripts_without_exec_restriction=\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044C \u0437\u0430\u043F\u0443\u0441\u043A\u0430\u0442\u044C \u0434\u0440\u0443\u0433\u0438\u0435 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B (\u041D\u0415 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F)
@@ -1021,6 +1072,7 @@ OptionPanel.export_icons_in_html.tooltip=<html> \u041F\u0440\u0435\u0434\u0443\u
 OptionPanel.exported_image_resolution_dpi=\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435 (\u0432 \u043F\u0438\u043A\u0441\u0435\u043B\u0430\u0445 \u043D\u0430 \u0434\u044E\u0439\u043C) \u044D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u0443\u0435\u043C\u043E\u0433\u043E \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F
 OptionPanel.Files=\u0424\u0430\u0439\u043B\u044B
 OptionPanel.first=\u041F\u0435\u0440\u0432\u044B\u0439
+OptionPanel.fit_to_viewport=\u0420\u0430\u0441\u0442\u044F\u043D\u0443\u0442\u044C \u0444\u043E\u043D \u043F\u043E \u0448\u0438\u0440\u0438\u043D\u0435 \u043E\u043A\u043D\u0430
 OptionPanel.fold_on_click_inside=\u0421\u0432\u043E\u0440\u0430\u0447\u0438\u0432\u0430\u0442\u044C \u043F\u043E \u0449\u0435\u043B\u0447\u043A\u0443 \u0432\u043D\u0443\u0442\u0440\u0438
 OptionPanel.foldingsymbolwidth=\u0420\u0430\u0437\u043C\u0435\u0440 \u0437\u043D\u0430\u043A\u0430 \u0441\u0432\u0435\u0440\u043D\u0443\u0442\u044B\u0445 \u0443\u0437\u043B\u043E\u0432
 OptionPanel.foldingsymbolwidth.tooltip=<html> \u0420\u0430\u0437\u043C\u0435\u0440 \u0437\u043D\u0430\u043A\u0430, \u043E\u0431\u043E\u0437\u043D\u0430\u0447\u0430\u044E\u0449\u0435\u0433\u043E \u0441\u0432\u0435\u0440\u043D\u0443\u0442\u044B\u0439 \u0443\u0437\u0435\u043B</html>
@@ -1059,8 +1111,10 @@ OptionPanel.id=\u0418\u043D\u0434\u043E\u043D\u0435\u0437\u0438\u0439\u0441\u043
 OptionPanel.IGNORE=\u041D\u0438\u0447\u0435\u0433\u043E \u043D\u0435 \u0434\u0435\u043B\u0430\u0442\u044C
 OptionPanel.il__enter_confirms_by_default=<\u0412\u0412\u041E\u0414> \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0430\u0435\u0442 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E
 OptionPanel.image_cache=\u0434\u043B\u044F \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439
+OptionPanel.indentationUsesTabsInTextOutput=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0442\u0430\u0431\u0443\u043B\u044F\u0446\u0438\u0438 \u0432 \u0432\u044B\u0432\u043E\u0434\u0435 \u0442\u0435\u043A\u0441\u0442\u0430
 OptionPanel.it=\u0418\u0442\u0430\u043B\u044C\u044F\u043D\u0441\u043A\u0438\u0439
 OptionPanel.ja=\u042F\u043F\u043E\u043D\u0441\u043A\u0438\u0439
+OptionPanel.JoinNodesAction.textSeparators=\u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u0435\u043B\u044C \u0442\u0435\u043A\u0441\u0442\u0430
 OptionPanel.key_type_action=\u041F\u0440\u0438 \u043D\u0430\u0431\u043E\u0440\u0435
 OptionPanel.Keystrokes=\u041A\u043B\u0430\u0432\u0438\u0448\u0438
 OptionPanel.ko=\u041A\u043E\u0440\u0435\u0439\u0441\u043A\u0438\u0439
@@ -1274,6 +1328,7 @@ OptionPanel.spelling_opt_ignore_capitalization=\u0418\u0433\u043D\u043E\u0440\u0
 OptionPanel.spelling_opt_ignore_words_with_numbers=\u0418\u0433\u043D\u043E\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043B\u043E\u0432\u0430 \u0441 \u0446\u0438\u0444\u0440\u0430\u043C\u0438
 OptionPanel.spelling_opt_suggestions_limit_dialog=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043E\u043A \u0432 \u0434\u0438\u0430\u043B\u043E\u0433\u0435
 OptionPanel.spelling_opt_suggestions_limit_menu=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043E\u043A \u0432 \u043C\u0435\u043D\u044E
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u043B\u043E\u0432 \u0432 \u0441\u0442\u0440\u043E\u043A\u0435
 OptionPanel.sr=\u0421\u0435\u0440\u0431\u0441\u043A\u0438\u0439 / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 \u0444\u0430\u0439\u043B \u0448\u0430\u0431\u043B\u043E\u043D\u0430
 OptionPanel.standardbackgroundcolor=\u0426\u0432\u0435\u0442 \u0444\u043E\u043D\u0430
@@ -1301,11 +1356,11 @@ OptionPanel.text.use_ctrl_key=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u
 OptionPanel.time_for_automatic_save=\u0418\u043D\u0442\u0435\u0440\u0432\u0430\u043B \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u0432
 OptionPanel.time_for_automatic_save.tooltip=<html>\u043F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u043A \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \u043C\u0435\u0436\u0434\u0443 \u0434\u0432\u0443\u043C\u044F \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u043C\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F\u043C\u0438 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u0432 (\u0432 \u043C\u0438\u043B\u043B\u0438\u0441\u0435\ [...]
 OptionPanel.time_for_delayed_selection=\u0412\u0440\u0435\u043C\u044F \u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0438
-OptionPanel.time_for_delayed_selection.tooltip=<html> \u0417\u0430\u0434\u0435\u0440\u0436\u043A\u0430 \u043F\u0435\u0440\u0435\u0434 \u0442\u0435\u043C, \u043A\u0430\u043A \u0443\u0437\u0435\u043B \u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0441\u044F \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u043C, \u043A\u043E\u0433\u0434\u0430 \u0443\u043A\u0430\u0437\u0430\u0442\u0435\u043B\u044C \u043C\u044B\u0448\u0438 \u043F\u0435\u0440\u0435\u043C\u0435\u0449\u0430\u0435\u0442\u0441 [...]
+OptionPanel.time_for_delayed_selection.tooltip=<html>\u0412\u0440\u0435\u043C\u044F \u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0438 \u043F\u0435\u0440\u0435\u0434 \u0442\u0435\u043C, \u043A\u0430\u043A \u0443\u0437\u0435\u043B \u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0441\u044F \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u043C, \u043A\u043E\u0433\u0434\u0430 \u0443\u043A\u0430\u0437\u0430\u0442\u0435\u043B\u044C \u043C\u044B\u0448\u0438 \u043F\u0435\u0440\u0435\u043C\u0435 [...]
 OptionPanel.toolTipManager.dismissDelay=\u0414\u043B\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043F\u043E\u043A\u0430\u0437\u0430, \u043C\u0441
 OptionPanel.toolTipManager.initialDelay=\u041D\u0430\u0447\u0430\u043B\u044C\u043D\u0430\u044F \u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0430, \u043C\u0441
-OptionPanel.toolTipManager.max_tooltip_width=\u0420\u0430\u0437\u043C\u0435\u0440 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0438
-OptionPanel.toolTipManager.max_tooltip_width.tooltip=<html>\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0438 \u0432 \u043F\u0438\u043A\u0441\u0435\u043B\u044F\u0445.</html>
+OptionPanel.toolTipManager.max_tooltip_width=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0430\u044F \u0448\u0438\u0440\u0438\u043D\u0430 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0438
+OptionPanel.toolTipManager.max_tooltip_width.tooltip=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0438 \u0432 \u043F\u0438\u043A\u0441\u0435\u043B\u044F\u0445.
 OptionPanel.toolTipManager.reshowDelay=\u0417\u0430\u0434\u0435\u0440\u0436\u043A\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0430, \u043C\u0441
 OptionPanel.tr=\u0422\u0443\u0440\u0435\u0446\u043A\u0438\u0439
 OptionPanel.uk_UA=\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0439
@@ -1422,8 +1477,8 @@ PrintDirectAction.text=\u041D\u0430\u043F\u0435\u0447\u0430\u0442\u0430\u0442\u0
 printing_settings=\u041C\u0430\u0441\u0448\u0442\u0430\u0431 \u043F\u0435\u0447\u0430\u0442\u0438
 PrintPreviewAction.text=\u041F\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440...
 progress=\u0412\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435
-PropertyAction.dialog=\u0423\u0441\u0442\u0430\u043D\u0432\u043E\u043A\u0438
-PropertyAction.text=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0438 ...
+PropertyAction.dialog=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0438
+PropertyAction.text=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438...
 QuickFilterAction.text=\u0411\u044B\u0441\u0442\u0440\u044B\u0439 \u0444\u0438\u043B\u044C\u0442\u0440
 QuickFindAction.BACK.text=\u041D\u0430\u0439\u0442\u0438 \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0435\u0435
 QuickFindAction.FORWARD.text=\u041D\u0430\u0439\u0442\u0438 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u0435
@@ -1474,14 +1529,14 @@ save_unsaved=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0441\u043B
 save_unsaved_styles=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0441\u0442\u0438\u043B\u0438?
 SaveAcceleratorPresetsAction.text=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043D\u0430\u0431\u043E\u0440 \u0433\u043E\u0440\u044F\u0447\u0438\u0445 \u043A\u043B\u0430\u0432\u0438\u0448...
 SaveAction.text=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
-SaveAll.text=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C &\u0432\u0441\u0451
+SaveAll.text=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C &\u0432\u0441\u0435 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u043A\u0430\u0440\u0442\u044B
 SaveAll.tooltip=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0432\u0441\u0435 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u043A\u0430\u0440\u0442\u044B
 SaveAsAction.text=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043A\u0430\u043A...
 saved=\u0421\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u043E
 saving_canceled=\u0421\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0435 \u043E\u0442\u043C\u0435\u043D\u0435\u043D\u043E
 scanners_not_loaded=\u0421\u043A\u0430\u043D\u0435\u0440\u044B \u043D\u0435 \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u044B, \u0444\u0430\u0439\u043B \u043F\u043E\u0432\u0440\u0435\u0436\u0434\u0435\u043D
 scheme_evaluate=\u041F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C!
-script_execution_disabled=\u0417\u0430\u043F\u0443\u0441\u043A \u0441\u043A\u0440\u0438\u043F\u0442\u043E\u0432 \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D
+script_execution_disabled=\u0417\u0430\u043F\u0443\u0441\u043A \u0441\u043A\u0440\u0438\u043F\u0442\u043E\u0432 \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D (\u0441\u043C. \u0414\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u043E/\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438/\u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F)
 ScriptEditor.text=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0441\u043A\u0440\u0438\u043F\u0442\u043E\u0432...
 ScriptEditor.tooltip=\u041F\u043E\u0437\u0432\u043E\u043B\u044F\u0435\u0442 \u0441\u043E\u0437\u0434\u0430\u0432\u0430\u0442\u044C \u0434\u043B\u0438\u043D\u043D\u044B\u0435 \u0441\u043A\u0440\u0438\u043F\u0442\u044B \u0432\u043E Freeplane.
 ScriptEditorPanel.changed_cancel=\u0421\u043A\u0440\u0438\u043F\u0442 \u0431\u044B\u043B \u0438\u0437\u043C\u0435\u043D\u0435\u043D. \u0412\u044B \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u043E\u0442\u043A\u0430\u0437\u0430\u0442\u044C\u0441\u044F \u043E\u0442 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439?
@@ -1496,7 +1551,7 @@ select_folder_for_importing=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435  \u
 select_icon=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0438\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u043C\u0443
 select_menu_item_dialog=\u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u043F\u0443\u043D\u043A\u0442 \u043C\u0435\u043D\u044E
 select_menu_item_root_node=\u041C\u0435\u043D\u044E
-SelectAllAction.text=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0435
+SelectAllAction.text=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0451
 SelectBranchAction.text=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u044E \u0432\u0435\u0442\u0432\u044C
 SelectedPasteAction.text=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043A\u0430\u043A...
 selection_method_by_click=\u0412\u044B\u0431\u043E\u0440 \u043E\u0434\u0438\u043D\u043E\u0447\u043D\u044B\u043C \u0449\u0435\u043B\u0447\u043A\u043E\u043C
@@ -1504,16 +1559,16 @@ selection_method_delayed=\u0412\u044B\u0431\u043E\u0440 \u043D\u0430\u0435\u0437
 selection_method_direct=\u0412\u044B\u0431\u043E\u0440 \u043D\u0430\u0435\u0437\u0434\u043E\u043C
 SelectNoteAction.text=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u043A \u043F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u044E \u0443\u0437\u043B\u0430
 SelectNoteAction.tooltip=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u043E\u0442 \u0443\u0437\u043B\u0430 \u043A \u043F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u044E \u0438 \u043D\u0430\u043E\u0431\u043E\u0440\u043E\u0442
-set_accelerator_on_next_click_action=\u0414\u043B\u044F \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u0433\u043E\u0440\u044F\u0447\u0435\u0439 \u043A\u043B\u0430\u0432\u0438\u0448\u044B \u0437\u0430\u0436\u043C\u0438\u0442\u0435 CTRL \u0438 \u043A\u043B\u0438\u043A\u043D\u0438\u0442\u0435 \u043D\u0430 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u0435 \u043C\u0435\u043D\u044E.
+set_accelerator_on_next_click_helpmessage=\u0414\u043B\u044F \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u0433\u043E\u0440\u044F\u0447\u0435\u0439 \u043A\u043B\u0430\u0432\u0438\u0448\u0438 \u043A\u043B\u0438\u043A\u043D\u0438\u0442\u0435 \u043D\u0430 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u0435 \u043C\u0435\u043D\u044E.
 SetAccelerator.dialogTitle=\u041D\u0430\u0437\u043D\u0430\u0447\u0438\u0442\u044C \u0433\u043E\u0440\u044F\u0447\u0443\u044E \u043A\u043B\u0430\u0432\u0438\u0448\u0443
 SetAccelerator.keystrokeDetected=\u041D\u0430\u0436\u0430\u0442\u0438\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0438 "{0}" \u043D\u0435 \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0430 \u043D\u0438 \u043D\u0430 \u043E\u0434\u0438\u043D \u043F\u0443\u043D\u043A\u0442 \u043C\u0435\u043D\u044E.
 SetAcceleratorOnNextClickAction.text=\u041D\u0430\u0437\u043D\u0430\u0447\u0438\u0442\u044C \u0433\u043E\u0440\u044F\u0447\u0443\u044E \u043A\u043B\u0430\u0432\u0438\u0448\u0443...
-SetImageByFileChooserAction.text=\u0418\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0438\u0437 \u0444\u0430\u0439\u043B\u0430
+SetImageByFileChooserAction.text=\u0418\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0438\u0437 \u0444\u0430\u0439\u043B\u0430...
 SetLinkAnchorAction.text=\u0417\u0430\u0434\u0430\u0442\u044C \u044F\u043A\u043E\u0440\u044C \u0434\u043B\u044F \u0441\u0441\u044B\u043B\u043A\u0438
 SetLinkAnchorAction.tooltip=<html>\u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0443\u0437\u0435\u043B \u0432 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u044F\u043A\u043E\u0440\u044F \u0434\u043B\u044F \u0431\u0443\u0434\u0443\u0449\u0435\u0433\u043E<br/>\u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0445 \u0438\u043B\u0438 \u0433\u043B\u043E\u0431\u0430\u043 [...]
 SetLinkAnchorAction.tooltip_anchored=<html>\u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0443\u0437\u0435\u043B \u0432 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u044F\u043A\u043E\u0440\u044F \u0434\u043B\u044F \u0431\u0443\u0434\u0443\u0449\u0435\u0433\u043E<br/>\u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0445 \u0438\u043B\u0438 \u0433\u043B\u043E\u0431\u [...]
-SetLinkByFileChooserAction.text=\u0421\u0441\u044B\u043B\u043A\u0430 (\u0432\u044B\u0431\u043E\u0440 \u0444\u0430\u0439\u043B\u0430)
-SetLinkByTextFieldAction.text=\u0421\u0441\u044B\u043B\u043A\u0430 (\u0442\u0435\u043A\u0441\u0442\u043E\u0432\u043E\u0435 \u043F\u043E\u043B\u0435)
+SetLinkByFileChooserAction.text=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443 (\u0432\u044B\u0431\u043E\u0440)...
+SetLinkByTextFieldAction.text=\u0421\u0441\u044B\u043B\u043A\u0430 (\u0442\u0435\u043A\u0441\u0442\u043E\u0432\u043E\u0435 \u043F\u043E\u043B\u0435)...
 SetNodeLink.text=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443 \u0443\u0437\u043B\u0430...
 SetNoteWindowPosition.bottom.text=\u0432\u043D\u0438\u0437\u0443
 SetNoteWindowPosition.left.text=\u0441\u043B\u0435\u0432\u0430
@@ -1712,7 +1767,7 @@ simplyhtml.valignMiddle=\u0432 \u0441\u0435\u0440\u0435\u0434\u0438\u043D\u0435
 simplyhtml.valignTop=\u0441\u0432\u0435\u0440\u0445\u0443
 simplyhtml.wholeWordsOnly=\u0422\u043E\u043B\u044C\u043A\u043E \u0441\u043B\u043E\u0432\u0430
 simplyhtml.wholeWordsOnly.tooltip=\u041E\u0433\u0440\u0430\u043D\u0438\u0447\u0438\u0442\u044C \u0441\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u044F \u0446\u0435\u043B\u044B\u043C\u0438 \u0441\u043B\u043E\u0432\u0430\u043C\u0438.
-SortNodes.text=\u0423\u043F\u043E\u0440\u044F\u0434\u043E\u0447\u0438\u0442\u044C \u0443\u0437\u043B\u044B
+SortNodes.text=\u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0443\u0437\u043B\u044B
 SortNodes.tooltip=\u0423\u043F\u043E\u0440\u044F\u0434\u043E\u0447\u0438\u0442\u044C \u0432\u0441\u0435 \u043F\u043E\u0434\u0447\u0438\u043D\u0451\u043D\u043D\u044B\u0435 \u0443\u0437\u043B\u044B \u043F\u043E \u0430\u043B\u0444\u0430\u0432\u0438\u0442\u0443.
 split=&\u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u044C
 SplitConditionAction.text=\u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u044C
@@ -1769,8 +1824,9 @@ ToggleLeftToolbarAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C/\u
 ToggleMenubarAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C/\u0441\u043F\u0440\u044F\u0442\u0430\u0442\u044C \u043C\u0435\u043D\u044E
 ToggleScrollbarsAction.text=\u041F\u043E\u043B\u043E\u0441\u044B \u043F\u0440\u043E\u043A\u0440\u0443\u0442\u043A\u0438
 ToggleStatusAction.text=\u041E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0442\u044C \u0441\u0442\u0440\u043E\u043A\u0443 \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u044F
-ToggleToolbarAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C/\u0441\u043F\u0440\u044F\u0442\u0430\u0442\u044C \u0432\u0435\u0440\u0445\u043D\u044E\u044E \u043F\u0430\u043D\u0435\u043B\u044C \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432
+ToggleToolbarAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C/\u0441\u043F\u0440\u044F\u0442\u0430\u0442\u044C \u043F\u0430\u043D\u0435\u043B\u044C \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432
 toolbars=\u041F\u0430\u043D\u0435\u043B\u0438 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432
+uiTextChanger.replaceText=\u0417\u0430\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u0435\u043A\u0441\u0442
 undefined_error=\u041D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u0430\u044F \u043E\u0448\u0438\u0431\u043A\u0430. \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0441\u043E\u043E\u0431\u0449\u0438\u0442\u0435 \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u0447\u0438\u043A\u0430\u043C \u0447\u0435\u0440\u0435\u0437 \u0444\u043E\u0440\u0443\u043C.
 underline=\u041F\u043E\u0434\u0447\u0451\u0440\u043A\u0438\u0432\u0430\u043D\u0438\u0435
 UnderlineAction.text=\u041F\u043E\u0434\u0447\u0451\u0440\u043A\u0438\u0432\u0430\u043D\u0438\u0435
@@ -1796,7 +1852,7 @@ updater.version.noUpdateUrl=\u041D\u0435 \u0443\u043A\u0430\u0437\u0430\u043D UR
 updater.version.unknown=\u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E
 updater.version.unreachable=\u041D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0439 \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A:
 updater.viewChangelog=\u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F
-url_error=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432 \u0430\u0434\u0440\u0435\u0441\u0435 URL
+url_error=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432 \u0430\u0434\u0440\u0435\u0441\u0435 URL!
 url_load_error=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u043A\u0430\u0440\u0442\u0443 \u0441 \u0430\u0434\u0440\u0435\u0441\u0430 URL:
 url_open_error=\u041E\u0448\u0438\u0431\u043A\u0430 \u043E\u0442\u043A\u0440\u044B\u0442\u0438\u044F URL {0}.
 used_in_menu=\u0422\u0430\u043A\u0430\u044F \u043A\u043E\u043C\u0431\u0438\u043D\u0430\u0446\u0438\u044F \u043A\u043B\u0430\u0432\u0438\u0448 \u043D\u0435\u043B\u044C\u0437\u044F \u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C, \u043F\u043E\u0441\u043A\u043E\u043B\u044C\u043A\u0443 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0434\u043B\u044F \u043C\u0435\u043D\u044E.
@@ -1804,7 +1860,7 @@ UsePlainTextAction.text=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u
 user_config_folder=\u041F\u0430\u043F\u043A\u0430 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043A \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F: {0}
 user_defined_filters=\u0424\u0438\u043B\u044C\u0442\u0440\u044B \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
 user_defined_scale=\u041C\u0430\u0441\u0448\u0442\u0430\u0431 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C
-user_defined_zoom=\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u043E \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C..
+user_defined_zoom=\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u043E \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C
 user_defined_zoom_status_bar=\u0417\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u043C\u0430\u0441\u0448\u0442\u0430\u0431\u0430 \u043F\u043E \u0432\u044B\u0431\u043E\u0440\u0443 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F \u043C\u0435\u043D\u044F\u0435\u0442\u0441\u044F \u043D\u0430 {0}%.
 user_icon=\u0418\u043A\u043E\u043D\u043A\u0430 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F "{0}"
 user_template_dir=\u0428\u0430\u0431\u043B\u043E\u043D\u044B \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
diff --git a/freeplane/resources/translations/Resources_sr.properties b/freeplane/resources/translations/Resources_sr.properties
index 043fc68..72bb9e3 100644
--- a/freeplane/resources/translations/Resources_sr.properties
+++ b/freeplane/resources/translations/Resources_sr.properties
@@ -1457,7 +1457,6 @@ selection_method_delayed=\u041E\u0434\u043B\u043E\u0436\u0435\u043D\u043E \u0430
 selection_method_direct=\u041F\u043E\u043A\u0430\u0437\u0438\u0432\u0430\u0447 \u043D\u0430 \u0438\u0437\u0430\u0431\u0440\u0430\u043D\u043E
 SelectNoteAction.text=\u041F\u0440\u0435\u0431\u0430\u0446\u0438\u0442\u0435 \u0441\u0435 \u043D\u0430 \u0443\u0440\u0435\u0452\u0438\u0432\u0430\u045A\u0435 \u0431\u0435\u043B\u0435\u0448\u043A\u0435
 SelectNoteAction.tooltip=\u041F\u0440\u0435\u0431\u0430\u0446\u0443\u0458\u0435 \u043D\u0430 \u043E\u0434\u0433\u043E\u0432\u0430\u0440\u0430\u0458\u0443\u045B\u0438 \u043E\u043A\u043D\u043E \u0431\u0435\u043B\u0435\u0448\u043A\u0435
-set_accelerator_on_next_click_action=\u041A\u043B\u0438\u043A\u043D\u0438\u0442\u0435 \u043D\u0430 \u0431\u0438\u043B\u043E \u043A\u043E\u0458\u0443 \u0441\u0442\u0430\u0432\u043A\u0443 \u0438\u0437\u0431\u043E\u0440\u043D\u0438\u043A\u0430 \u0437\u0430 \u0434\u043E\u0434\u0435\u043B\u0443 \u043D\u043E\u0432\u0435 \u0442\u0430\u0441\u0442\u0435\u0440\u0441\u043A\u0435 \u043F\u0440\u0435\u0447\u0438\u0446\u0435
 SetAcceleratorOnNextClickAction.text=\u041F\u0440\u0438\u0434\u0440\u0443\u0436\u0438 \u0442\u0430\u0441\u0442\u0435\u0440\u0441\u043A\u0443 \u043F\u0440\u0435\u0447\u0438\u0446\u0443
 SetImageByFileChooserAction.text=\u0421\u043B\u0438\u043A\u0430 \u043F\u043E \u0438\u0437\u0431\u043E\u0440\u0443 \u0438\u043B\u0438 \u0432\u0435\u0437\u0438...
 SetLinkAnchorAction.text=\u041F\u043E\u0441\u0442\u0430\u0432\u0438 \u0441\u0438\u0434\u0440\u043E \u0432\u0435\u0437\u0435
diff --git a/freeplane/resources/translations/Resources_sv.properties b/freeplane/resources/translations/Resources_sv.properties
index 050721f..3cd22a0 100644
--- a/freeplane/resources/translations/Resources_sv.properties
+++ b/freeplane/resources/translations/Resources_sv.properties
@@ -51,7 +51,7 @@ ApplySelectedViewConditionAction.text=Filtrera valda grenar
 ApplyToVisibleAction.text=Verkst\u00E4ll p\u00E5 filtrerade grenar
 as_parent=Som f\u00F6r\u00E4lder
 AskForHelp.text=Fr\u00E5ga om hj\u00E4lp
-AssignAttributesAction.text=Ange egenskaper
+AssignAttributesAction.text=Hitta och \u00E4ndra egenskaper...
 attribute_delete=Ta bort alla v\u00E4rden
 attribute_delete_value=Ta bort detta v\u00E4rde
 attribute_font_size_tooltip=Egenskaper teckenstorlek
@@ -100,48 +100,57 @@ bitmaps=Bitmap-bilder
 black=Svart
 BlinkingNodeHookAction.text=Blinkande gren
 BlinkingNodeHookAction.tooltip=<html>Detta g\u00F6r s\u00E5 att grenen blinkar. Var f\u00F6rsiktig.<br> Anv\u00E4nd inte i f\u00F6r m\u00E5nga grenar, och <strong> inte med andra auto format p\u00E5 samma gren</strong></html>
-blue=Bl?
+blue=Bl\u00E5
 BoldAction.text=Fet
 boldify_branch=G\u00F6r fetare
 branch=F\u00F6rgrening
 browse=Bl\u00E4ddra...
-can_not_connect_to_info_server=Kan inte ansluta till info-servern
-can_not_delete_predefined_style=Can not delete predefined style
-can_not_delete_root_style=Can not delete root style
-can_not_delete_style_group=Can not delete style group
+calendar_attributes_panel=Kalender och egenskaper
+calendar_panel=Kalender
+can_not_clone_encrypted_node=Kan inte klona krypterade noder
+can_not_connect_to_info_server=Kan inte ansluta till informationsservern
+can_not_delete_predefined_style=Kan inte radera f\u00F6rinst\u00E4lld stil
+can_not_delete_root_style=Kan inte \u00E4ndra root-utseendet
+can_not_delete_style_group=Kan inte radera designgruppen
+can_not_encrypt_cloned_node=Kan inte kryptera klonade noder
 can_not_save_key_set=Kan inte spara snabbtangentsupps\u00E4ttning
-cancel=Avbryt
+cancel=&Avbryt
 CancelAction.text=Avbryt
 cannot_add_parent_diff_parents=Alla grenar m\u00E5ste ha samma basgren f\u00F6r att kunna anv\u00E4nda funktionen.
 cannot_add_parent_to_root=Endast en rotgren till?ts i kartan.
 cannot_delete_root=Rotgrenen kan inte raderas eller klippas ut.
 cannot_join_nodes_with_children=Kan inte f\u00F6rbinda gren med undergren
+cannot_move_into_child_node=Kan inte flytta till undergren
 cannot_move_to_child=Kan inte flytta gren till egen undergren.
 CenterAction.text=Centrera
 CenterSelectedNodeAction.text=Centrera vald gren
-ChangeConnectorArrowsAction.backward.text=Tllbaka
-ChangeConnectorArrowsAction.both.text=B\u00E5da
-ChangeConnectorArrowsAction.forward.text=Fram\u00E5t
+ChangeConnectorArrowsAction.backward.text=Dra pekaren bak\u00E5t
+ChangeConnectorArrowsAction.both.text=Dra pekaren fram och tillbaka
+ChangeConnectorArrowsAction.forward.text=Dra pekaren fram\u00E5t
 ChangeConnectorArrowsAction.none.text=Ingen
 ChangeConnectorArrowsAction.text=\u00C4ndra f\u00F6rbindelsens pilar
+ChangeConnectorShapeAction.CUBIC_CURVE.text=Kurva
+ChangeConnectorShapeAction.LINE.text=Linje
+ChangeConnectorShapeAction.LINEAR_PATH.text=Linj\u00E4r s\u00F6kv\u00E4g
 ChangeNodeLevelLeftsAction.text=Gren till v\u00E4nster
 ChangeNodeLevelLeftsAction.tooltip=P\u00E5 v\u00E4nster sida om rotgrenen flyttas grenar ned\u00E5t.<br> Blir undergren till ovanliggande syskongren. P\u00E5 h\u00F6ger sida om rotgrenen flyttas gren upp\u00E5t.<br> Direkt p\u00E5 rotgrenen byter grenarna sida.
 ChangeNodeLevelRightsAction.text=Gren till h\u00F6ger
 ChangeNodeLevelRightsAction.tooltip=P\u00E5 h\u00F6ger sida om rotgrenen flyttas grenar ned\u00E5t.<br> Blir undergren till ovanliggande syskongren.<br> P\u00E5 v\u00E4nster sida om rotgrenen flyttas grenar upp\u00E5t.<br> Direkt p\u00E5 rotgrenen byter grenarna sida.
 choose_background_color=V\u00E4lj bakgrundsf\u00E4rg:
-choose_cloud_color=V\u00E4lj moln f\u00E4rg:
-choose_edge_color=V\u00E4lj kantlinje f\u00E4rg
-choose_map_background_color=V\u00E4lj kart bakgrundsf\u00E4rg
-choose_node_background_color=V\u00E4lj gren bakgrundsf\u00E4rg:
-choose_node_color=V\u00E4lj gren f\u00E4rg:
-CloseAction.text=St\u00E4ng
-CloudAction.text=Moln
-CloudColorAction.text=Moln f\u00E4rg
-CloudShapeAction.ARC.text=Rundad
+choose_cloud_color=V\u00E4lj molnf\u00E4rg:
+choose_edge_color=V\u00E4lj kantf\u00E4rg
+choose_map_background_color=V\u00E4lj kartans bakgrundsf\u00E4rg
+choose_node_background_color=V\u00E4lj grenens bakgrundsf\u00E4rg:
+choose_node_color=V\u00E4lj grenf\u00E4rg:
+CloseAction.text=&St\u00E4ng nuvarande karta
+cloud_shapes=Molnutseende
+CloudAction.text=L\u00E4gg till / Radera moln (standard)
+CloudColorAction.text=Molnf\u00E4rg...
+CloudShapeAction.ARC.text=B\u00E5ge
 CloudShapeAction.RECT.text=Rektangel
 CloudShapeAction.ROUND_RECT.text=Rundad Rektangel
-CloudShapeAction.STAR.text=Taggig
-ColorProperty.ResetColor=\u00C5ngra f\u00E4rg
+CloudShapeAction.STAR.text=Asterisk
+ColorProperty.ResetColor=\u00C5terst\u00E4ll f\u00E4rg
 combined=Kombinerad
 condition=Villkor
 confirmation=Bekr\u00E4ftelse
@@ -1082,7 +1091,6 @@ selection_method_delayed=F\u00F6rsenad automatisk markering
 selection_method_direct=Peka f\u00F6r att v\u00E4lja
 SelectNoteAction.text=Visa redigerare f\u00F6r anteckningar
 SelectNoteAction.tooltip=Anteckningsf\u00F6nster
-set_accelerator_on_next_click_action=Klicka p\u00E5 ett menyalterativ f\u00F6r att tilldela ett nytt snabbkommando
 SetAcceleratorOnNextClickAction.text=Nytt snabbkommando
 SetImageByFileChooserAction.text=Bild (Dokumentv\u00E4ljare eller l\u00E4nk)...
 SetLinkByFileChooserAction.text=Hyperl\u00E4nk (Dokumentv\u00E4ljare)...
diff --git a/freeplane/resources/translations/Resources_uk_UA.properties b/freeplane/resources/translations/Resources_uk_UA.properties
index 2f3c278..bf3b36a 100644
--- a/freeplane/resources/translations/Resources_uk_UA.properties
+++ b/freeplane/resources/translations/Resources_uk_UA.properties
@@ -1155,6 +1155,7 @@ OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=\u0412\u0443\u0437\u044C\u043A\u0438\u0439 \u0448\u0435\u0441\u0442\u0438\u043A\u0443\u0442\u043D\u0438\u043A
 OptionPanel.nb=\u041D\u043E\u0440\u0432\u0435\u0437\u044C\u043A\u0430 \u0431\u0443\u043A\u043C\u043E\u043B / Norsk bokm\u00E5l
 OptionPanel.never_save_folding=\u041D\u0456\u043A\u043E\u043B\u0438
+OptionPanel.neverShowSurvey=\u041D\u0435 \u043F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043F\u0438\u0442\u0430\u043D\u044C, \u043E\u0433\u043B\u044F\u0434\u0456\u0432 \u0456 \u043F\u0456\u0434\u043A\u0430\u0437\u043E\u043A
 OptionPanel.nl=\u0424\u043B\u0430\u043C\u0430\u043D\u0434\u0441\u044C\u043A\u0430 / Nederlands, Vlaams
 OptionPanel.nn=\u041D\u043E\u0440\u0432\u0435\u0437\u044C\u043A\u0430 \u043D\u044E\u043D\u043E\u0448\u043A / Norsk nynorsk
 OptionPanel.nodebackgroundcolor=\u0422\u043B\u043E
@@ -1310,6 +1311,7 @@ OptionPanel.separator.size_limits=\u041C\u0435\u0436\u0456 \u0440\u043E\u0437\u0
 OptionPanel.separator.spelling=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u043F\u0435\u0440\u0435\u0432\u0456\u0440\u043A\u0438 \u043F\u0440\u0430\u0432\u043E\u043F\u0438\u0441\u0443
 OptionPanel.separator.SplitToWordsAction=\u041F\u043E\u0434\u0456\u043B\u0438\u0442\u0438 \u0432\u0443\u0437\u043E\u043B \u043D\u0430 \u0441\u043B\u043E\u0432\u0430
 OptionPanel.separator.status=\u0420\u044F\u0434\u043E\u043A \u0441\u0442\u0430\u043D\u0443
+OptionPanel.separator.surveys=\u041E\u0433\u043B\u044F\u0434\u0438
 OptionPanel.separator.tooltip=\u0427\u0430\u0441\u043E\u0432\u0456 \u0456\u043D\u0442\u0435\u0440\u0432\u0430\u043B\u0438 \u043F\u0456\u0434\u043A\u0430\u0437\u043E\u043A
 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
@@ -1602,7 +1604,7 @@ selection_method_delayed=\u0412\u0438\u0431\u0456\u0440 \u043D\u0430\u0457\u0437
 selection_method_direct=\u0412\u0438\u0431\u0456\u0440 \u043D\u0430\u0457\u0437\u0434\u043E\u043C
 SelectNoteAction.text=\u041F\u0435\u0440\u0435\u043C\u043A\u043D\u0443\u0442\u0438 \u0437\u043C\u0456\u043D\u0443 \u043F\u0440\u0438\u043C\u0456\u0442\u043A\u0438
 SelectNoteAction.tooltip=\u041F\u0435\u0440\u0435\u043C\u0438\u043A\u0430\u043D\u043D\u044F \u043F\u0430\u043D\u0435\u043B\u0456 \u043F\u0440\u0438\u043C\u0456\u0442\u043E\u043A
-set_accelerator_on_next_click_action=\u0414\u043B\u044F \u0441\u0442\u0432\u043E\u0440\u0435\u043D\u043D\u044F \u0441\u043F\u043E\u043B\u0443\u0447\u0435\u043D\u043D\u044F \u043A\u043B\u0430\u0432\u0456\u0448 \u0443\u0442\u0440\u0438\u043C\u0443\u0439\u0442\u0435 'Ctrl' \u043F\u0440\u0438 \u043A\u043B\u0430\u0446\u0430\u043D\u043D\u0456 \u043D\u0430 \u0435\u043B\u0435\u043C\u0435\u043D\u0442\u0456 \u0441\u0442\u0440\u0456\u0447\u043A\u0438 \u0430\u0431\u043E \u043C\u0435\u043D\u044E.
+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...
diff --git a/freeplane/resources/translations/Resources_zh_CN.properties b/freeplane/resources/translations/Resources_zh_CN.properties
index 4229c29..b4c7de1 100644
--- a/freeplane/resources/translations/Resources_zh_CN.properties
+++ b/freeplane/resources/translations/Resources_zh_CN.properties
@@ -707,7 +707,7 @@ lastOpenedMaps.noActions=\u5386\u53F2\u8BB0\u5F55\u4E2D\u65E0\u5BFC\u56FE
 latex_editor=\u7F16\u8F91 LaTeX \u516C\u5F0F
 LatexDeleteLatexAction.text=\u79FB\u9664 LaTeX \u516C\u5F0F
 LatexEditLatexAction.text=\u7F16\u8F91 LaTeX \u516C\u5F0F...
-LatexInsertLatexAction.msg1=<html>You are trying to insert a <i>legacy</i> LaTeX formula.<br/>The new way to create LaTeX text/formulae is described on this page:</html>
+LatexInsertLatexAction.msg1=<html>\u60A8\u5C1D\u8BD5\u63D2\u5165\u4E00\u4E2A<i>\u65E7\u5F0F</i>\u7684 LaTeX \u516C\u5F0F\u3002<br/>\u521B\u5EFA LaTeX \u6587\u672C\u6216\u516C\u5F0F\u7684\u65B0\u65B9\u6CD5\u8BF7\u89C1\u9875\u9762\uFF1A</html>
 LatexInsertLatexAction.msg2=<html>In short: <ul><li>use a "\\latex " prefix in node text or</li><li><i>View->Properties panel</i>, then <i>Core text->Format->Latex</i></li></ul></html>
 LatexInsertLatexAction.text=\u6DFB\u52A0 LaTeX \u516C\u5F0F...
 latexPatternFormat=LaTeX
@@ -887,6 +887,7 @@ no_found_from=<html>\u672A\u627E\u5230 <u>"{0}"</u> \u5728 "{1}" \u4E2D\u3002</h
 no_more_found_from=<html>\u6CA1\u6709\u627E\u5230\u66F4\u591A\u7684 <u>"{0}"</u> \u5728 "{1}" \u4E2D\u3002</html>
 no_previous_find=\u524D\u8FB9\u6CA1\u6709\u4E86.
 no_styles_found_in_map=\u5728\u601D\u7EF4\u5BFC\u56FE\u4E2D\u627E\u4E0D\u5230\u6837\u5F0F
+no_translation_strings_found=\u6CA1\u6709\u53D1\u73B0\u53EF\u7FFB\u8BD1\u7684\u5B57\u7B26\u4E32
 node=\u8282\u70B9(node)
 node_changed_discard_changes=\u60A8\u786E\u8BA4\u653E\u5F03\u5BF9\u8282\u70B9\u6240\u505A\u66F4\u6539?
 node_is_write_protected=\u76EE\u6807\u8282\u70B9\u5199\u4FDD\u62A4\u3002
@@ -971,6 +972,10 @@ OptionPanel.automaticFormat_level2=1. \u7EA7\u8282\u70B9\u683C\u5F0F
 OptionPanel.backup_file_number=\u4FDD\u5B58\u5907\u4EFD\u6587\u4EF6\u7684\u4E2A\u6570
 OptionPanel.Behaviour=\u884C\u4E3A
 OptionPanel.bezier=\u8D1D\u585E\u5C14\u66F2\u7EBF
+OptionPanel.border_color=\u989C\u8272
+OptionPanel.border_color_matches_edge_color=\u4F7F\u7528\u8FB9\u7F18\u989C\u8272
+OptionPanel.border_width=\u7EBF\u5BBD
+OptionPanel.border_width_matches_edge_width=\u4F7F\u7528\u8FB9\u7F18\u5BBD\u5EA6
 OptionPanel.bubble=\u6C14\u6CE1
 OptionPanel.ca=\u52A0\u6CF0\u7F57\u5C3C\u4E9A\u8BED
 OptionPanel.Cancel=\u53D6\u6D88
@@ -1073,9 +1078,9 @@ OptionPanel.fr=\u6CD5\u8BED
 OptionPanel.gl=\u683C\u9675\u5170\u8BED
 OptionPanel.goto_note_end_on_edit=\u79FB\u52A8\u6CE8\u89E3\u5149\u6807\u5230\u6700\u540E
 OptionPanel.grid_size=\u683C\u70B9\u95F4\u683C\u5927\u5C0F
-OptionPanel.groovy_editor_font=Font for Groovy Syntax Highlighting Editor
+OptionPanel.groovy_editor_font=Groovy Syntax Highlighting Editor \u6240\u7528\u5B57\u4F53
 OptionPanel.groovy_editor_font.tooltip=Use 'Dialog' or 'Monospaced' if you need unicode chars!
-OptionPanel.groovy_editor_font_size=Font size for Groovy Syntax Highlighting Editor
+OptionPanel.groovy_editor_font_size=Groovy Syntax Highlighting Editor \u6240\u7528\u5B57\u4F53\u5927\u5C0F
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=\u9690\u85CF\u8FDE\u7EBF
 OptionPanel.highlight_formulas=\u9AD8\u4EAE\u516C\u5F0F
@@ -1114,9 +1119,9 @@ OptionPanel.last=\u6700\u540E
 OptionPanel.last_opened_list_length=\u2014\u6700\u8FD1\u7684\u6587\u4EF6\u2014\u5217\u8868\u957F\u5EA6
 OptionPanel.latex_disable_editor=\u7981\u7528 LaTeX \u8BED\u6CD5\u9AD8\u4EAE\u7F16\u8F91\u5668
 OptionPanel.latex_disable_editor.tooltip=\u5982\u679C\u60A8\u9047\u5230 LaTeX \u7F16\u8F91\u5668\u7684\u95EE\u9898\uFF0C\u8BF7\u67E5\u770B\u8FD9\u4E2A
-OptionPanel.latex_editor_font=Font for LaTeX Syntax Highlighting Editor
+OptionPanel.latex_editor_font=LaTeX Syntax Highlighting Editor \u6240\u7528\u5B57\u4F53
 OptionPanel.latex_editor_font.tooltip=Use 'Dialog' or 'Monospaced' if you need unicode chars!
-OptionPanel.latex_editor_font_size=Font size for LaTeX Syntax Highlighting Editor
+OptionPanel.latex_editor_font_size=LaTeX Syntax Highlighting Editor \u6240\u7528\u5B57\u4F53\u5927\u5C0F
 OptionPanel.latex_macros=\u5E38\u7528 LaTeX \u5B8F
 OptionPanel.layout_map_on_text_change=\u7F16\u8F91\u65F6\u66F4\u65B0\u601D\u7EF4\u5BFC\u56FE
 OptionPanel.layout_map_on_text_change.tooltip=\u4E0D\u4F7F\u7528\u6765\u83B7\u5F97\u66F4\u597D\u7684\u6027\u80FD
@@ -1130,6 +1135,8 @@ OptionPanel.load_last_map=\u81EA\u52A8\u6253\u5F00\u6700\u540E\u7684\u5BFC\u56FE
 OptionPanel.load_last_map.tooltip=<html>\u5982\u679C\u9009\u4E2D\u7684\u8BDD\uFF0CFreeplane \u542F\u52A8\u65F6\u81EA\u52A8\u52A0\u8F7D\u4E0A\u6B21\u6253\u5F00\u7684\u601D\u7EF4\u5BFC\u56FE.</html>
 OptionPanel.load_last_maps=\u52A0\u8F7D\u4E0A\u6B21\u6240\u6709\u7684\u5BFC\u56FE
 OptionPanel.lookandfeel=\u5916\u89C2\u611F\u89C9
+OptionPanel.lookandfeel.scaleuifonts=\u7F29\u653E UI \u5B57\u4F53
+OptionPanel.lookandfeel.scaleuifonts.tooltip=\u9002\u7528\u4E8E\u9AD8\u5206\u8FA8\u7387\u663E\u793A\u5668
 OptionPanel.lookandfeel.tooltip=<html>\u4F7F\u7528\u5916\u89C2\u611F\u89C9. \u652F\u6301 'metal','windows','motif', 'gtk', \u4F7F\u7528MacOS\u65F6 'mac' \u53EF\u7528. \u9ED8\u8BA4\u662F\u6307, \u91C7\u7528\u9ED8\u8BA4\u89C2\u611F. \u5982\u679C\u60F3\u4F7F\u7528\u81EA\u5DF1\u7684\u89C2\u611F, \u8F93\u5165class\u540D\u79F0, \u5E76\u4E14\u786E\u8BA4\u76F8\u5E94\u7684jar\u6587\u4EF6\u88AB\u52A0\u8F7D. \u5982\u679C\u89C2\u611F\u6709\u95EE\u9898, \u9009\u62E9 'nothing' . \u5BF9applet\u540C\u68 [...]
 OptionPanel.lt=\u7ACB\u9676\u5B9B\u8BED
 OptionPanel.max_displayed_node_count=\u6700\u5927\u663E\u793A\u8282\u70B9\u6570
@@ -1145,6 +1152,7 @@ OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=\u72ED\u7A84\u516D\u89D2\u5F62
 OptionPanel.nb=\u632A\u5A01\u8BED(\u4F2F\u514B\u6885\u5C14)
 OptionPanel.never_save_folding=\u4ECE\u4E0D
+OptionPanel.neverShowSurvey=\u6C38\u4E0D\u663E\u793A\u95EE\u9898\u3001\u8C03\u67E5\u6216\u63D0\u793A
 OptionPanel.nl=\u5C3C\u52A0\u62C9\u74DC\u8BED
 OptionPanel.nn=\u632A\u5A01\u8BED(\u5C3C\u8BFA\u65AF\u514B)
 OptionPanel.nodebackgroundcolor=\u8282\u70B9\u80CC\u666F\u989C\u8272
@@ -1274,6 +1282,7 @@ OptionPanel.separator.mouse_wheel=\u9F20\u6807\u6EDA\u8F6E
 OptionPanel.separator.new_node_commands=\u65B0\u5EFA\u8282\u70B9\u547D\u4EE4
 OptionPanel.separator.node_editing_commands=\u8282\u70B9\u7F16\u8F91\u547D\u4EE4
 OptionPanel.separator.node_navigation_commands=\u8282\u70B9\u5BFC\u822A\u547D\u4EE4
+OptionPanel.separator.NodeBorder=\u8282\u70B9\u8FB9\u754C
 OptionPanel.separator.NodeColors=\u8282\u70B9\u989C\u8272
 OptionPanel.separator.NodeFont=\u8282\u70B9\u5B57\u4F53
 OptionPanel.separator.NodeShape=\u8282\u70B9\u5F62\u72B6
@@ -1299,6 +1308,7 @@ OptionPanel.separator.size_limits=\u5927\u5C0F\u9650\u5236
 OptionPanel.separator.spelling=\u62FC\u5199\u68C0\u67E5\u9009\u9879
 OptionPanel.separator.SplitToWordsAction=\u5206\u79BB\u8282\u70B9\u5230\u5355\u8BCD
 OptionPanel.separator.status=\u72B6\u6001\u884C
+OptionPanel.separator.surveys=\u8C03\u67E5
 OptionPanel.separator.tooltip=\u5DE5\u5177\u63D0\u793A\u65F6\u95F4
 OptionPanel.separator.undo=\u64A4\u9500
 OptionPanel.separator.updates=\u7A0B\u5E8F\u66F4\u65B0
@@ -1327,6 +1337,7 @@ OptionPanel.single_instance=\u5728\u5F53\u524D\u8FD0\u884C\u7684\u5B9E\u4F8B\u4E
 OptionPanel.single_instance_force=\u53EA\u8FD0\u884C\u4E00\u4E2A\u5B9E\u4F8B
 OptionPanel.single_instance_force.tooltip=\u5373\u662F\u6CA1\u6709\u6587\u4EF6\u88AB\u6253\u5F00\u4E5F\u907F\u514D\u8FD0\u884C\u7B2C\u4E8C\u4E2A\u5B9E\u4F8B
 OptionPanel.sk=\u65AF\u6D1B\u4F10\u514B\u8BED
+OptionPanel.skip_template_selection=\u8DF3\u8FC7\u6A21\u677F\u9009\u62E9\u5BF9\u8BDD
 OptionPanel.sl=\u585E\u62C9\u5229\u6602\u8BED
 OptionPanel.slow_scroll_selected_node=\u7F13\u6162\u6EDA\u52A8\u5230\u9009\u4E2D\u8282\u70B9
 OptionPanel.spelling_opt_case_sensitive=\u5927\u5C0F\u5199\u654F\u611F
@@ -1398,7 +1409,7 @@ OptionPanel.validate_write_without_read=Scripting: \u5C06 Read/File \u52A0\u5230
 OptionPanel.validation_error=<html><body>\u9A8C\u8BC1\u9519\u8BEF:<p><em>{0}</em><p>\u8BF7\u4FEE\u6539\u9996\u9009\u9879.</body></html>
 OptionPanel.validation_warning=<html><body>\u9A8C\u8BC1\u8B66\u544A:<p><em>{0}</em></body></html>
 OptionPanel.vertical_child_gap=\u5B50\u95F4\u9694
-OptionPanel.vertical_child_gap.tooltip=Vertical distance between child nodes
+OptionPanel.vertical_child_gap.tooltip=\u5B50\u8282\u70B9\u95F4\u7684\u5782\u76F4\u8DDD\u79BB
 OptionPanel.vi=\u8D8A\u5357\u8BED
 OptionPanel.wheel_velocity=\u901F\u5EA6
 OptionPanel.wheel_velocity.tooltip=\u503C\u8D8A\u5927\u8F6C\u52A8\u6EDA\u8F6E\u65F6\u56FE\u6EDA\u52A8\u7684\u8D8A\u5FEB.
@@ -1487,7 +1498,7 @@ plugins/TimeManagement.xml_Replace_All=\u5168\u90E8\u66FF\u6362
 plugins/TimeManagement.xml_Replace_Selected=\u66FF\u6362\u9009\u5B9A
 plugins/TimeManagement.xml_Select=\u9009\u62E9
 plugins/TimeManagement.xml_todayButton=\u4ECA\u5929
-plugins/TimeManagement.xml_WindowTitle=\u65F6\u95F4\u7BA1\u7406
+plugins/TimeManagement.xml_WindowTitle=\u7BA1\u7406\u65F6\u95F4
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=\u67E5\u627E\u66FF\u6362
 preferences=\u9996\u9009\u9879
 print_preview_title=\u6253\u5370\u9884\u89C8
@@ -1582,6 +1593,7 @@ select_folder_for_importing=\u9009\u62E9\u5BFC\u5165\u7684\u76EE\u5F55
 select_icon=\u9009\u62E9\u56FE\u6807
 select_menu_item_dialog=\u9009\u62E9\u83DC\u5355\u9879
 select_menu_item_root_node=\u83DC\u5355
+select_template=\u9009\u62E9\u6A21\u677F
 SelectAllAction.text=\u9009\u62E9\u6240\u6709\u53EF\u89C1\u9879
 SelectBranchAction.text=\u9009\u62E9\u53EF\u89C1\u5206\u679D
 SelectedPasteAction.text=\u7C98\u8D34\u4E3A...
@@ -1590,7 +1602,6 @@ selection_method_delayed=\u5EF6\u8FDF\u81EA\u52A8\u9009\u5B9A\u6A21\u5F0F\uFF08\
 selection_method_direct=\u6307\u5411\u65F6\u9009\u5B9A
 SelectNoteAction.text=\u6CE8\u89E3\u7F16\u8F91\u5207\u6362
 SelectNoteAction.tooltip=\u5207\u6362\u6CE8\u89E3\u7A97\u53E3\u4E0E\u5BFC\u56FE\u7A97\u53E3\u7126\u70B9
-set_accelerator_on_next_click_action=\u6309\u4F4F Ctrl \u70B9\u51FB\u83DC\u5355\u9879\u4EE5\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u952E\u76D8\u5FEB\u6377\u65B9\u5F0F\u3002
 SetAccelerator.dialogTitle=\u5206\u914D\u5FEB\u6377\u952E
 SetAccelerator.keystrokeDetected=\u6309\u952E ''{0}'' \u5C1A\u672A\u6307\u5B9A\u7ED9\u4EFB\u4F55\u83DC\u5355\u9879\u3002
 SetAcceleratorOnNextClickAction.text=\u6307\u5B9A\u5FEB\u6377\u65B9\u5F0F\u2026
@@ -1634,6 +1645,8 @@ simplyhtml.appendTableColLabel=\u9644\u52A0\u5217
 simplyhtml.appendTableRowLabel=\u9644\u52A0\u884C
 simplyhtml.applyCellAttrLabel=\u5E94\u7528\u4E8E
 simplyhtml.backgroundLabel=\u80CC\u666F:
+simplyhtml.blackFontColorLabel=\u9ED1\u8272
+simplyhtml.blueFontColorLabel=\u84DD\u8272
 simplyhtml.boldItalicName=\u7C97\u659C\u4F53
 simplyhtml.boldName=\u7C97\u4F53
 simplyhtml.borderColorLabel=\u989C\u8272:
@@ -1663,6 +1676,7 @@ simplyhtml.cTagNamePara=\u6BB5\u843D
 simplyhtml.cTagNameUL=\u65E0\u5E8F\u5217\u8868
 simplyhtml.cutLabel=\u526A\u5207
 simplyhtml.cutTip=\u526A\u5207
+simplyhtml.decreaseFontSizeLabel=\u66F4\u5C0F
 simplyhtml.defaultDocName=\u65E0\u6807\u9898
 simplyhtml.deleteTableColLabel=\u5220\u9664\u5217
 simplyhtml.deleteTableRowLabel=\u5220\u9664\u884C
@@ -1695,9 +1709,11 @@ simplyhtml.formatParaLabel=\u6BB5\u843D...
 simplyhtml.formatParaTip=\u6539\u53D8\u6BB5\u843D\u683C\u5F0F
 simplyhtml.formatTableLabel=\u8868\u683C...
 simplyhtml.formatTableTip=\u8868\u683C\u683C\u5F0F
+simplyhtml.greenFontColorLabel=\u7EFF\u8272
 simplyhtml.helpLabel=\u5E2E\u52A9
 simplyhtml.htmlTabTitle=HTML\u4EE3\u7801\u89C6\u56FE
 simplyhtml.imageFileDesc=\u56FE\u50CF\u6587\u4EF6
+simplyhtml.increaseFontSizeLabel=\u66F4\u5927
 simplyhtml.insertTableColLabel=\u63D2\u5165\u5217
 simplyhtml.insertTableLabel=\u8868\u683C...
 simplyhtml.insertTableMsg=\u591A\u5C11\u5217?
@@ -1749,8 +1765,10 @@ simplyhtml.previewLabel=\u9884\u89C8
 simplyhtml.previewText=\u9884\u89C8\u6587\u672C
 simplyhtml.prevTableCellLabel=\u4E0A\u4E00\u4E2A\u5355\u5143\u683C
 simplyhtml.printLabel=\u6253\u5370...
+simplyhtml.redFontColorLabel=\u7EA2\u8272
 simplyhtml.redoLabel=\u91CD\u505A
 simplyhtml.redoTip=\u91CD\u505A
+simplyhtml.removeFontColorLabel=\u53BB\u6389\u989C\u8272
 simplyhtml.replace=\u66FF\u6362...
 simplyhtml.replaceAll=\u5168\u9009
 simplyhtml.replaceDone=\u5B8C\u6210
@@ -1766,6 +1784,7 @@ simplyhtml.searchFromStart.tooltip=\u4ECE\u6700\u4E0A\u4E00\u884C\u5F00\u59CB\u6
 simplyhtml.searchUp=\u5411\u4E0A\u67E5\u627E
 simplyhtml.searchUp.tooltip=\u4ECE\u6700\u672B\u4E00\u884C\u5F80\u4E0A\u67E5\u627E\u3002
 simplyhtml.selectAllLabel=\u5168\u9009
+simplyhtml.selectedFontColorLabel=\u9009\u62E9\u5B57\u4F53\u989C\u8272
 simplyhtml.sizeLabel=\u5B57\u53F7
 simplyhtml.standardStyleName=\u6807\u51C6
 simplyhtml.strikeLabel=\u52A0\u5220\u9664\u7EBF
@@ -1851,6 +1870,7 @@ TextAlignAction.DEFAULT.text=\u9ED8\u8BA4
 TextAlignAction.LEFT.text=\u6587\u5B57\u5DE6\u5BF9\u9F50
 TextAlignAction.RIGHT.text=\u6587\u5B57\u53F3\u5BF9\u9F50
 textalignment=\u6587\u5B57\u5BF9\u9F50
+TextChangeHotKeyAction.text=\u8BBE\u5B9A\u6539\u53D8\u6587\u672C\u7684\u70ED\u952E
 TimeListAction.text=\u663E\u793A\u65E5\u7A0B\u5B89\u6392 ...
 TimeListAction.tooltip=\u663E\u793A\u6240\u6709\u65E5\u7A0B\u53CA\u76F8\u5E94\u8282\u70B9.
 TimeManagementAction.text=\u663E\u793A\u65E5\u5386...
@@ -1872,6 +1892,11 @@ ToggleScrollbarsAction.text=\u6EDA\u52A8
 ToggleStatusAction.text=\u663E\u793A\u72B6\u6001\u5217
 ToggleToolbarAction.text=\u5DE5\u5177\u680F
 toolbars=\u5DE5\u5177\u680F
+TranslatedElement.BORDER=\u8FB9\u7F18\u6587\u672C
+TranslatedElement.TEXT=\u6587\u672C
+TranslatedElement.TOOLTIP=\u63D0\u793A
+uiTextChanger.originalTextIsNotDefined=\u521D\u59CB\u6587\u672C\u672A\u5B9A\u4E49
+uiTextChanger.replaceText=\u66FF\u6362 UI \u6587\u672C
 undefined_error=\u53D1\u751F\u4E86\u4E00\u4E2A\u610F\u5916\u9519\u8BEF\u3002\u8BF7\u8BD5\u7740\u63D0\u4EA4\u4E00\u4E2A\u9519\u8BEF\u62A5\u544A\u3002
 underline=\u4E0B\u5212\u7EBF
 UnderlineAction.text=\u4E0B\u5212\u7EBF
diff --git a/freeplane/resources/translations/Resources_zh_TW.properties b/freeplane/resources/translations/Resources_zh_TW.properties
index 475ed14..0ce08a3 100644
--- a/freeplane/resources/translations/Resources_zh_TW.properties
+++ b/freeplane/resources/translations/Resources_zh_TW.properties
@@ -1525,7 +1525,6 @@ selection_method_delayed=\u6ED1\u9F20\u6307\u6A19\u79FB\u5230\u7BC0\u9EDE\u4E00\
 selection_method_direct=\u6ED1\u9F20\u6307\u6A19\u79FB\u5230\u7BC0\u9EDE\u5373\u81EA\u52D5\u9078\u53D6
 SelectNoteAction.text=\u5207\u63DB\u8A3B\u89E3\u8996\u7A97
 SelectNoteAction.tooltip=\u5207\u63DB\u8A3B\u89E3\u8996\u7A97
-set_accelerator_on_next_click_action=\u8981\u5EFA\u7ACB\u4E00\u500B\u65B0\u7684\u5FEB\u6377\u9375\uFF1A\u6309\u4E0B'Ctrl'\u9375\u540C\u6642\u5728\u9078\u55AE\u4E2D\u9EDE\u9078\u60F3\u8981\u7684\u6307\u4EE4\u3002
 SetAccelerator.dialogTitle=\u5FEB\u901F\u9375\u6307\u5B9A
 SetAccelerator.keystrokeDetected=\u6309\u9375 ''{0}'' \u4E0D\u6703\u6307\u5B9A\u7D66\u4EFB\u4F55\u9078\u55AE\u9805\u76EE\u3002
 SetAcceleratorOnNextClickAction.text=\u6307\u5B9A\u5FEB\u901F\u9375...
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/ResourceController.java b/freeplane/src/main/java/org/freeplane/core/resources/ResourceController.java
index 6e12f62..f8e32ed 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/ResourceController.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/ResourceController.java
@@ -200,7 +200,7 @@ public abstract class ResourceController {
     }
 
 	/** register defaults in freeplane.properties respectively defaults.properties instead. */
-	public long getLongProperty(final String key, final int defaultValue) {
+	public long getLongProperty(final String key, final long defaultValue) {
 		try {
 			return Long.parseLong(getProperty(key));
 		}
@@ -282,6 +282,10 @@ public abstract class ResourceController {
 		setProperty(name, Integer.toString(value));
 	}
 
+	public void setProperty(String name, long value) {
+		setProperty(name, Long.toString(value));
+	}
+
 	abstract public void setProperty(final String property, final String value);
 	
 	/** adds properties from url to properties. Existing properties in resultProps will be overridden.
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java b/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java
index 6275b2b..9e235b8 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java
@@ -50,6 +50,7 @@ import javax.swing.event.ChangeListener;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.tree.DefaultMutableTreeNode;
 
+import com.jgoodies.forms.factories.Borders;
 import org.apache.commons.lang.StringUtils;
 import org.dpolivaev.mnemonicsetter.MnemonicSetter;
 import org.freeplane.core.resources.ResourceController;
@@ -134,7 +135,7 @@ public class OptionPanel {
 				final TabProperty newTab = (TabProperty) control;
 				bottomLayout = new FormLayout(newTab.getName(), "");
 				bottomBuilder = new DefaultFormBuilder(bottomLayout);
-				bottomBuilder.setDefaultDialogBorder();
+				bottomBuilder.border(Borders.DIALOG);
 				final JScrollPane bottomComponent = new JScrollPane(bottomBuilder.getPanel());
 				UITools.setScrollbarIncrement(bottomComponent);
 				final String tabName = TextUtils.getOptionalText(newTab.getLabel());
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/PropertyAction.java b/freeplane/src/main/java/org/freeplane/core/resources/components/ShowPreferencesAction.java
similarity index 89%
rename from freeplane/src/main/java/org/freeplane/core/resources/components/PropertyAction.java
rename to freeplane/src/main/java/org/freeplane/core/resources/components/ShowPreferencesAction.java
index 50c2e8e..540c70e 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/PropertyAction.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/ShowPreferencesAction.java
@@ -45,7 +45,7 @@ import org.freeplane.core.util.TextUtils;
 /**
  * @author foltin
  */
-public class PropertyAction extends AFreeplaneAction {
+public class ShowPreferencesAction extends AFreeplaneAction {
 	/**
 	 *
 	 */
@@ -56,7 +56,7 @@ public class PropertyAction extends AFreeplaneAction {
 	 * @param controls
 	 *
 	 */
-	public PropertyAction( final DefaultMutableTreeNode controls) {
+	public ShowPreferencesAction( final DefaultMutableTreeNode controls) {
 		super("PropertyAction");
 		this.controls = controls;
 	}
@@ -67,16 +67,11 @@ public class PropertyAction extends AFreeplaneAction {
 			final Object source = e.getSource();
 			if(source instanceof Component){
 				final Window window = SwingUtilities.getWindowAncestor((Component) source);
-				if(window instanceof Dialog){
-					dialog= new JDialog((Dialog)window, true /* modal */);
-				}
-				else if(window instanceof Frame){
-					dialog= new JDialog((Frame)window, true /* modal */);
-				}
+				dialog = createDialog(window);
 			}
 		}
 		if(dialog == null){
-			dialog= new JDialog((Frame) UITools.getMenuComponent(), true /* modal */);
+			dialog= createDialog((Window) UITools.getMenuComponent());
 		}
 		dialog.setResizable(true);
 		dialog.setUndecorated(false);
@@ -132,6 +127,17 @@ public class PropertyAction extends AFreeplaneAction {
 		dialog.setVisible(true);
 	}
 
+	private JDialog createDialog(final Window window) {
+		if(window instanceof Dialog){
+			return new JDialog((Dialog)window, true /* modal */);
+		}
+		else if(window instanceof Frame){
+			return new JDialog((Frame)window, true /* modal */);
+		}
+		else
+			return null;
+	}
+
 	@Override
     public void afterMapChange(final Object newMap) {
     }
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/AccelerateableAction.java b/freeplane/src/main/java/org/freeplane/core/ui/AccelerateableAction.java
index b961189..6b1106e 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/AccelerateableAction.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/AccelerateableAction.java
@@ -48,7 +48,7 @@ public class AccelerateableAction implements IFreeplaneAction {
 		return setAcceleratorOnNextClickActionDialog != null;
 	}
 
-	private static final String SET_ACCELERATOR_ON_NEXT_CLICK_ACTION = "set_accelerator_on_next_click_action";
+	private static final String SET_ACCELERATOR_ON_NEXT_CLICK_ACTION = "set_accelerator_on_next_click_helpmessage";
 
 	static void setNewAcceleratorOnNextClick(KeyStroke accelerator) {
 		if (AccelerateableAction.isNewAcceleratorOnNextClickEnabled()) {
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/ActionAcceleratorManager.java b/freeplane/src/main/java/org/freeplane/core/ui/ActionAcceleratorManager.java
index 6844e81..0c72349 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/ActionAcceleratorManager.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/ActionAcceleratorManager.java
@@ -2,6 +2,7 @@ package org.freeplane.core.ui;
 
 import java.awt.Event;
 import java.awt.event.KeyEvent;
+import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -9,9 +10,11 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -76,7 +79,11 @@ public class ActionAcceleratorManager implements IKeyStrokeProcessor, IAccelerat
  	}
 
 	private void loadDefaultAccelerators(String resource){
-		try (final InputStream resourceStream = ResourceController.getResourceController().getResourceStream(resource)) {
+		final ResourceController resourceController = ResourceController.getResourceController();
+		final URL resourceUrl = resourceController.getResource(resource);
+		if(resourceUrl == null)
+			return;
+		try (final InputStream resourceStream = new BufferedInputStream(resourceUrl.openStream())) {
 			overwritttenDefaultProps.load(resourceStream);
 		}
 		catch (Exception e) {
@@ -129,18 +136,23 @@ public class ActionAcceleratorManager implements IKeyStrokeProcessor, IAccelerat
 	}
 
 	private void setAccelerator(ModeController modeController, final AFreeplaneAction action, final KeyStroke keyStroke) {
+		final AFreeplaneAction oldAction = accelerators.get(key(modeController, keyStroke));
+ 		if (action == oldAction) {
+ 			return;
+ 		}
+ 		if (keyStroke != null && oldAction != null) {
+			if (acceleratorIsDefinedByUserProperties(oldAction, modeController, keysetProps))
+				return;
+			else {
+				actionMap.remove(key(modeController, oldAction.getKey()));
+				fireAcceleratorChanged(modeController, oldAction, keyStroke, null);
+			}
+		}
  		if(action == null) {
  			return;
  		}
  		if(keyStroke != null) {
-			final AFreeplaneAction oldAction = accelerators.put(key(modeController, keyStroke), action);
-    		if(action == oldAction || (oldAction != null && action.getKey().equals(oldAction.getKey()))) {
-    			return;
-    		}
-    		if (oldAction != null) {
-				accelerators.put(key(modeController, keyStroke), oldAction);
-    			return;
-    		}
+			accelerators.put(key(modeController, keyStroke), action);
  		}
 		final KeyStroke removedAccelerator = removeAccelerator(modeController, action);
 		final String actionKey = action.getKey();
@@ -251,7 +263,11 @@ public class ActionAcceleratorManager implements IKeyStrokeProcessor, IAccelerat
 
  	public void newAccelerator(final AFreeplaneAction action, final KeyStroke newAccelerator) {
 		final String shortcutKey = getPropertyKey(action.getKey());
-		final String oldShortcut = getShortcut(shortcutKey);
+		final String oldShortcut;
+		if(getAccelerator(action) != null)
+			oldShortcut = getShortcut(shortcutKey);
+		else
+			oldShortcut = null;
 		if (newAccelerator == null || !new KeystrokeValidator(action).isValid(newAccelerator, newAccelerator.getKeyChar())) {
 			final GrabKeyDialog grabKeyDialog = new GrabKeyDialog(oldShortcut);
 			final IKeystrokeValidator validator = new KeystrokeValidator(action);
@@ -351,13 +367,8 @@ public class ActionAcceleratorManager implements IKeyStrokeProcessor, IAccelerat
  			if (!keystrokeString.equals("")) {
 				keyStroke = UITools.getKeyStroke(keystrokeString);
  				final AFreeplaneAction oldAction = accelerators.get(key(modeController, keyStroke));
- 				if (oldAction != null) {
- 					final Object key = oldAction.getKey();
- 					final String oldShortcutKey = getPropertyKey(modeController, key.toString());
- 					final boolean keepOldPreset = allPresets.containsKey(oldShortcutKey);
-					if(! keepOldPreset)
- 						setAccelerator(modeController, oldAction, null);
- 				}
+ 				if (! acceleratorIsDefinedByUserProperties(oldAction, modeController, allPresets))
+					setAccelerator(modeController, oldAction, null);
  			}
  			else {
  				keyStroke = null;
@@ -370,6 +381,18 @@ public class ActionAcceleratorManager implements IKeyStrokeProcessor, IAccelerat
  		setKeysetProperty(shortcutKey, keystrokeString);
  	}
 
+	private boolean acceleratorIsDefinedByUserProperties(final AFreeplaneAction oldAction, final ModeController modeController,
+			Hashtable<?, ?> userProperties) {
+		if (oldAction != null) {
+			final Object key = oldAction.getKey();
+			final String oldShortcutKey = getPropertyKey(modeController, key.toString());
+			final boolean acceleratorWasNotLoadedYet = userProperties.containsKey(oldShortcutKey) && !"".equals(userProperties.get(oldShortcutKey));
+			return acceleratorWasNotLoadedYet;
+		}
+		else
+			return false;
+	}
+
 	public void storeAcceleratorPreset(OutputStream out) {
  		try {
  			final OutputStream output = new BufferedOutputStream(out);
@@ -443,7 +466,7 @@ public class ActionAcceleratorManager implements IKeyStrokeProcessor, IAccelerat
 			if (askForReplaceShortcutViaDialog(oldMenuItemTitle)) {
 				setAccelerator(action, null);
 				final String shortcutKey = getPropertyKey(action.getKey());
-				setKeysetProperty(shortcutKey, "");
+				keysetProps.remove(shortcutKey);
 				return true;
 			} else {
 				return false;
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/html/CssRuleBuilder.java b/freeplane/src/main/java/org/freeplane/core/ui/components/html/CssRuleBuilder.java
index fc15d40..c04de2c 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/html/CssRuleBuilder.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/html/CssRuleBuilder.java
@@ -14,29 +14,47 @@ public class CssRuleBuilder {
 		return rule.toString();
 	}
 
-	public CssRuleBuilder withFont(Font font) {
-		return withFont(font, 1f);
+	public CssRuleBuilder withHTMLFont(Font font) {
+		return withHTMLFont(font, 1f);
 	}
 
-	public CssRuleBuilder withFont(Font font, float fontScaleFactor) {
+	public CssRuleBuilder withCSSFont(Font font) {
+		return withCSSFont(font, 1f);
+	}
+
+	public CssRuleBuilder withHTMLFont(Font font, float fontScaleFactor) {
+		if (font != null) {
+			withFontFamily(font.getFamily(), """);
+			withFontConfiguration(font, fontScaleFactor);
+		}
+		return this;
+	}
+
+	public CssRuleBuilder withCSSFont(Font font, float fontScaleFactor) {
 		if (font != null) {
-			rule.append(" font-family: ");
-			rule.append(font.getFamily());
-			rule.append("; ");
-			rule.append(" font-size: ");
-			final int fontSize = Math.round(font.getSize() / fontScaleFactor);
-			rule.append(fontSize);
-			rule.append("pt;");
-			if (font.isBold()) {
-				rule.append(" font-weight: bold;");
-			}
-			if (font.isItalic()) {
-				rule.append(" font-style: italic;");
-			}
+			withFontFamily(font.getFamily(), "\"");
+			withFontConfiguration(font, fontScaleFactor);
 		}
 		return this;
 	}
 
+	private void withFontConfiguration(Font font, float fontScaleFactor) {
+		rule.append(" font-size: ");
+		final int fontSize = Math.round(font.getSize() / fontScaleFactor);
+		rule.append(fontSize);
+		rule.append("pt;");
+		if (font.isBold()) {
+			rule.append(" font-weight: bold;");
+		}
+		if (font.isItalic()) {
+			rule.append(" font-style: italic;");
+		}
+	}
+
+	private void withFontFamily(String family, String quote) {
+		rule.append(" font-family: ").append(quote).append(family).append(quote).append("; ");
+	}
+
 	public CssRuleBuilder withColor(Color color) {
 		if (color != null) {
 			rule.append("color: ").append(ColorUtils.colorToString(color)).append(";");
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledEditorKit.java b/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledEditorKit.java
index 3d7e578..bf89481 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledEditorKit.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledEditorKit.java
@@ -92,7 +92,7 @@ public class ScaledEditorKit extends HTMLEditorKit {
 		HTMLDocument doc = new HTMLDocument(ss);
 		doc.setPreservesUnknownTags(false);
 		doc.getStyleSheet().addRule(new StringBuffer("body {").append(new CssRuleBuilder()
-		.withFont(font, UITools.FONT_SCALE_FACTOR)
+		.withCSSFont(font, UITools.FONT_SCALE_FACTOR)
 		.withColor(foreground)
 		.withAlignment(c.getHorizontalAlignment())).append("}").toString());
 		doc.setParser(getParser());
diff --git a/freeplane/src/main/java/org/freeplane/core/util/MenuUtils.java b/freeplane/src/main/java/org/freeplane/core/util/MenuUtils.java
index 3a2f05d..2c3ff41 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/MenuUtils.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/MenuUtils.java
@@ -44,7 +44,7 @@ import org.freeplane.features.icon.MindIcon;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
-import org.freeplane.features.mode.mindmapmode.MModeController;
+import org.freeplane.features.mode.ModeController;
 
 /** Utilities for dealing with the Freeplane menu: In scripts available as "global variable" menuUtils. */
 public class MenuUtils {
@@ -314,7 +314,7 @@ public class MenuUtils {
 	}
 
 	private static IUserInputListenerFactory userInputFactory() {
-		final MModeController modeController = (MModeController) Controller.getCurrentModeController();
+		ModeController  modeController = Controller.getCurrentModeController();
 		return modeController.getUserInputListenerFactory();
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeController.java b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeController.java
index f4150b3..f2ee1ea 100644
--- a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeController.java
+++ b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeController.java
@@ -169,7 +169,7 @@ public class AttributeController implements IExtension {
 		        final Font font = style.getFont(attributeStyleNode);
 		        final StringBuilder tooltip = new StringBuilder();
 				tooltip.append("<html><body><table style='border: 1px solid;");
-				tooltip.append( new CssRuleBuilder().withFont(font)
+				tooltip.append( new CssRuleBuilder().withHTMLFont(font)
 						.withBackground(style.getBackgroundColor(attributeStyleNode))
 						.withColor(style.getColor(attributeStyleNode))
 						);
diff --git a/freeplane/src/main/java/org/freeplane/features/clipboard/MindMapHTMLWriter.java b/freeplane/src/main/java/org/freeplane/features/clipboard/MindMapHTMLWriter.java
index e1d090c..b6babd9 100644
--- a/freeplane/src/main/java/org/freeplane/features/clipboard/MindMapHTMLWriter.java
+++ b/freeplane/src/main/java/org/freeplane/features/clipboard/MindMapHTMLWriter.java
@@ -24,6 +24,7 @@ import java.awt.Font;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Collection;
+
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.util.ColorUtils;
 import org.freeplane.core.util.FileUtils;
@@ -43,7 +44,7 @@ import org.freeplane.features.url.UrlManager;
 
 
 class MindMapHTMLWriter {
-	private static String el = System.getProperty("line.separator");
+	private static String lf = System.getProperty("line.separator");
 
 	private static String convertSpecialChar(final char c) {
 		String cvt;
@@ -148,7 +149,7 @@ class MindMapHTMLWriter {
 				fontStyle.append("font-size: ").append(fontSize).append( "pt; ");
 			final String fontFamily = font.getFamily();
 			if (defaultFont == null || ! fontFamily.equals(defaultFont.getFamily()))
-				fontStyle.append("font-family: ").append(fontFamily).append( ", sans-serif; ");
+				fontStyle.append("font-family: \"").append(fontFamily).append( "\", sans-serif; ");
 			if ((defaultFont == null || ! defaultFont.isItalic()) && font.isItalic()) {
 				fontStyle.append("font-style: italic; ");
 			}
@@ -165,13 +166,13 @@ class MindMapHTMLWriter {
 
 	private void writeBodyWithFolding(final NodeModel rootNodeOfBranch) throws IOException {
 		writeJavaScript();
-		fileout.write("<SPAN class=\"foldspecial\" onclick=\"fold_document()\">All +</SPAN>" + MindMapHTMLWriter.el);
-		fileout.write("<SPAN class=\"foldspecial\" onclick=\"unfold_document()\">All -</SPAN>" + MindMapHTMLWriter.el);
+		fileout.write("<SPAN class=\"foldspecial\" onclick=\"fold_document()\">All +</SPAN>" + lf);
+		fileout.write("<SPAN class=\"foldspecial\" onclick=\"unfold_document()\">All -</SPAN>" + lf);
 		writeHTML(rootNodeOfBranch, "1", 0, /* isRoot */true, true, /* depth */
 		1);
-		fileout.write("<SCRIPT type=\"text/javascript\">" + MindMapHTMLWriter.el);
-		fileout.write("fold_document();" + MindMapHTMLWriter.el);
-		fileout.write("</SCRIPT>" + MindMapHTMLWriter.el);
+		fileout.write("<SCRIPT type=\"text/javascript\">" + lf);
+		fileout.write("fold_document();" + lf);
+		fileout.write("</SCRIPT>" + lf);
 	}
 
 	private void writeFoldingButtons(final String localParentID) throws IOException {
@@ -182,18 +183,18 @@ class MindMapHTMLWriter {
 	}
 
 	void writeHTML(final Collection<NodeModel> selectedNodes) throws IOException {
-		fileout.write("<html>" + MindMapHTMLWriter.el + "<head>" + MindMapHTMLWriter.el);
+		fileout.write("<html>" + lf + "<head>" + lf);
 		if(! selectedNodes.isEmpty()){
 			final MapModel map = selectedNodes.iterator().next().getMap();
 			setDefaultsFrom(map);
 			writeStyle();
 		}
-		fileout.write(MindMapHTMLWriter.el + "</head>" + MindMapHTMLWriter.el + "<body>" + MindMapHTMLWriter.el);
+		fileout.write(lf + "</head>" + lf + "<body>" + lf);
 		for (NodeModel node : selectedNodes) {
 			writeHTML(node, "1", 0, /* isRoot */true, true, /* depth */1);
 		}
-		fileout.write("</body>" + MindMapHTMLWriter.el);
-		fileout.write("</html>" + MindMapHTMLWriter.el);
+		fileout.write("</body>" + lf);
+		fileout.write("</html>" + lf);
 		fileout.close();
 		resetDefaults();
 	}
@@ -219,18 +220,19 @@ class MindMapHTMLWriter {
 		ResourceController.getResourceController().getBooleanProperty("export_icons_in_html");
 		fileout
 		    .write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
-		            + MindMapHTMLWriter.el + "<html>" + MindMapHTMLWriter.el + "<head>" + MindMapHTMLWriter.el);
+		                + lf + "<html>" + lf + "<head>" + lf);
 		fileout.write("<title>"
 		        + MindMapHTMLWriter.writeHTML_escapeUnicodeAndSpecialCharacters(TextController.getController().getPlainTextContent(rootNodeOfBranch)
-		            .replace('\n', ' ')) + "</title>" + MindMapHTMLWriter.el);
+		                .replace('\n', ' '))
+		        + "</title>" + lf);
 		writeStyle();
-		fileout.write(MindMapHTMLWriter.el + "</head>" + MindMapHTMLWriter.el + "<body");
+		fileout.write(lf + "</head>" + lf + "<body");
 		final MapStyleModel style = MapStyleModel.getExtension(rootNodeOfBranch.getMap());
 		final Color background = style != null ? style.getBackgroundColor() : null;
 		if (background != null) {
 			fileout.write(" bgcolor=" + ColorUtils.colorToString(background));
 		}
-		fileout.write(">" + MindMapHTMLWriter.el);
+		fileout.write(">" + lf);
 		if (writeFoldingCode) {
 			writeBodyWithFolding(rootNodeOfBranch);
 		}
@@ -238,8 +240,8 @@ class MindMapHTMLWriter {
 			writeHTML(rootNodeOfBranch, "1", 0, /* isRoot */true, true, /* depth */
 			1);
 		}
-		fileout.write("</body>" + MindMapHTMLWriter.el);
-		fileout.write("</html>" + MindMapHTMLWriter.el);
+		fileout.write("</body>" + lf);
+		fileout.write("</html>" + lf);
 		fileout.close();
 		resetDefaults();
 	}
@@ -272,7 +274,7 @@ class MindMapHTMLWriter {
 		}
 		else {
 			if (heading) {
-				fileout.write("<h" + depth + ">");
+				fileout.write(lf + "<h" + depth + ">");
 			}
 			else if (!hasHtml) {
 				fileout.write("<p>");
@@ -285,7 +287,8 @@ class MindMapHTMLWriter {
 			writeFoldingButtons(localParentID);
 		}
 		final String fontStyle = fontStyle(nodeStyleController.getColor(model), nodeStyleController.getFont(model));
-		if (!fontStyle.equals("")) {
+		boolean shouldOutputFontStyle = !fontStyle.equals("");
+		if (shouldOutputFontStyle) {
 			fileout.write("<span style=\"" + fontStyle + "\">");
 		}
 		String link = NodeLinks.getLinkAsString(model);
@@ -300,9 +303,9 @@ class MindMapHTMLWriter {
 		}
 		writeModelContent(text);
 		if (link != null) {
-			fileout.write("</a>" + MindMapHTMLWriter.el);
+			fileout.write("</a>" + lf);
         }
-		if (fontStyle != "") {
+		if (shouldOutputFontStyle) {
 			fileout.write("</span>");
 		}
         final String detailText = DetailTextModel.getDetailTextText(model);
@@ -313,9 +316,8 @@ class MindMapHTMLWriter {
         if(noteContent != null){
         	writeModelContent(noteContent);
             }
-		fileout.write(MindMapHTMLWriter.el);
 		if (heading) {
-			fileout.write("</h" + depth + ">" + MindMapHTMLWriter.el);
+			fileout.write("</h" + depth + ">" + lf);
 		}
 		if (getProperty("html_export_folding").equals("html_export_based_on_headings")) {
 			for (final NodeModel child : mapController.childrenUnfolded(model)) {
@@ -332,8 +334,8 @@ class MindMapHTMLWriter {
 				}
 			}
 			else if (createFolding) {
-				fileout.write("<ul id=\"fold" + localParentID
-				        + "\" style=\"POSITION: relative; VISIBILITY: visible;\">");
+				fileout.write(lf + "<ul id=\"fold" + localParentID
+				        + "\" style=\"POSITION: relative; VISIBILITY: visible;\">" + lf);
 				int localLastChildNumber = 0;
 				for (final NodeModel child : mapController.childrenUnfolded(model)) {
 					localLastChildNumber = writeHTML(child, localParentID, localLastChildNumber,
@@ -341,17 +343,16 @@ class MindMapHTMLWriter {
 				}
 			}
 			else {
-				fileout.write("<ul>");
+				fileout.write(lf + "<ul>" + lf);
 				for (final NodeModel child : mapController.childrenUnfolded(model)) {
 					lastChildNumber = writeHTML(child, parentID, lastChildNumber,
 					/* isRoot= */false, false, depth + 1);
 				}
 			}
-			fileout.write(MindMapHTMLWriter.el);
-			fileout.write("</ul>");
+			fileout.write("</ul>" + lf);
 		}
 		if (!treatAsParagraph) {
-			fileout.write(MindMapHTMLWriter.el + "</li>" + MindMapHTMLWriter.el);
+			fileout.write("</li>" + lf);
 		}
 		return lastChildNumber;
 	}
@@ -365,9 +366,9 @@ class MindMapHTMLWriter {
 	}
 
 	private void writeJavaScript() throws IOException {
-		fileout.write("<script type=\"text/javascript\">" + MindMapHTMLWriter.el);
+		fileout.write("<script type=\"text/javascript\">" + lf);
 		fileout.write(FileUtils.slurpResource("/html/folding.js"));
-		fileout.write(MindMapHTMLWriter.el + "</script>" + MindMapHTMLWriter.el);
+		fileout.write(lf + "</script>" + lf);
 	}
 
 	private void writeModelContent(final String string) throws IOException {
@@ -398,14 +399,14 @@ class MindMapHTMLWriter {
 		}
     }
 	private void writeStyle() throws IOException {
-		fileout.write("<style type=\"text/css\">" + MindMapHTMLWriter.el);
+		fileout.write("<style type=\"text/css\">" + lf);
 		fileout.write("    body {");
 		writeDefaultFontStyle();
-		fileout.write("}" + MindMapHTMLWriter.el);
+		fileout.write("}" + lf);
 		fileout.write(FileUtils.slurpResource("/html/freeplane.css"));
 		if(writeFoldingCode)
 			fileout.write(FileUtils.slurpResource("/html/folding.css"));
-		fileout.write(MindMapHTMLWriter.el + MindMapHTMLWriter.el + "</style>" + MindMapHTMLWriter.el
+		fileout.write(lf + "</style>" + lf //
 			      + "<!-- ^ Position is not set to relative / absolute here because of Mozilla -->");
 	}
 
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 69f2b98..5d09cc9 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
@@ -39,6 +39,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Element;
 import javax.swing.text.ElementIterator;
@@ -123,6 +124,11 @@ public class MClipboardController extends ClipboardController {
 		}
 
 		public void paste(Transferable t, final NodeModel target, final boolean asSibling, final boolean isLeft, int dropAction) {
+	        if (LinkController.getLinkType() == LinkController.LINK_RELATIVE_TO_MINDMAP && target.getMap().getFile() == null) {
+	        	JOptionPane.showMessageDialog(Controller.getCurrentController().getViewController().getCurrentRootComponent(),
+	        	    TextUtils.getText("map_not_saved"), "Freeplane", JOptionPane.WARNING_MESSAGE);
+	        	return;
+	        }
 			boolean pasteImages = dropAction == DnDConstants.ACTION_COPY;
 			ViewerController viewerController = ((ViewerController)Controller.getCurrentModeController().getExtension(ViewerController.class));
 			for (final File file : fileList) {
@@ -662,7 +668,7 @@ public class MClipboardController extends ClipboardController {
 		}
 		if (t.isDataFlavorSupported(DataFlavor.imageFlavor)) {
 			try {
-				BufferedImage image = (BufferedImage) t.getTransferData(DataFlavor.imageFlavor);
+				Image image = (Image) t.getTransferData(DataFlavor.imageFlavor);
 				handlerList.add(new ImageFlavorHandler(image));
 			}
 			catch (final UnsupportedFlavorException e) {
diff --git a/freeplane/src/main/java/org/freeplane/features/link/LinkController.java b/freeplane/src/main/java/org/freeplane/features/link/LinkController.java
index 956e1b1..032b235 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/LinkController.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/LinkController.java
@@ -594,91 +594,63 @@ public class LinkController extends SelectionController implements IExtension {
 		return result.toString();
 	}
 
-	public URI createRelativeURI(final File map, final File input, final int linkType) {
+	public URI createRelativeURI(final File mapFile, final File target, final int linkType) {
 		if (linkType == LINK_ABSOLUTE) {
 			return null;
 		}
-		try {
-			URI mapUri = null;
-			if (map != null) {
-				mapUri = map.getAbsoluteFile().toURI();
-			}
+		final URI fileUri = target.getAbsoluteFile().toURI();
+		return createRelativeURI(mapFile, fileUri);
+	}
 
-			final URI fileUri = input.getAbsoluteFile().toURI();
-			boolean isUNCinput = fileUri.getPath().startsWith("//");
-			boolean isUNCmap = mapUri.getPath().startsWith("//");
-			if((isUNCinput != isUNCmap)) {
-				return fileUri;
-			}
-			final String filePathAsString = fileUri.getRawPath();
-			final String mapPathAsString = mapUri.getRawPath();
-			int differencePos;
-			final int lastIndexOfSeparatorInMapPath = mapPathAsString.lastIndexOf("/");
-			final int lastIndexOfSeparatorInFilePath = filePathAsString.lastIndexOf("/");
-			int lastCommonSeparatorPos = -1;
-			for (differencePos = 0; differencePos <= lastIndexOfSeparatorInMapPath
-			        && differencePos <= lastIndexOfSeparatorInFilePath
-			        && filePathAsString.charAt(differencePos) == mapPathAsString.charAt(differencePos); differencePos++) {
-				if (filePathAsString.charAt(differencePos) == '/') {
-					lastCommonSeparatorPos = differencePos;
-				}
-			}
-			if (lastCommonSeparatorPos < 0) {
-				return fileUri;
+	public URI createRelativeURI(final File mapFile, final URI targetUri) {
+		if (mapFile != null) {
+			URI mapUri = mapFile.getAbsoluteFile().toURI();
+			return createRelativeURI(mapUri, targetUri);
+		}
+		else
+			return targetUri;
+	}
+
+	public URI createRelativeURI(URI mapUri, final URI targetUri){
+		boolean isUNCinput = targetUri.getPath().startsWith("//");
+		boolean isUNCmap = mapUri.getPath().startsWith("//");
+		if((isUNCinput != isUNCmap)) {
+			return targetUri;
+		}
+		final String filePathAsString = targetUri.getRawPath();
+		final String mapPathAsString = mapUri.getRawPath();
+		int differencePos;
+		final int lastIndexOfSeparatorInMapPath = mapPathAsString.lastIndexOf("/");
+		final int lastIndexOfSeparatorInFilePath = filePathAsString.lastIndexOf("/");
+		int lastCommonSeparatorPos = -1;
+		for (differencePos = 0; differencePos <= lastIndexOfSeparatorInMapPath
+		        && differencePos <= lastIndexOfSeparatorInFilePath
+		        && filePathAsString.charAt(differencePos) == mapPathAsString.charAt(differencePos); differencePos++) {
+			if (filePathAsString.charAt(differencePos) == '/') {
+				lastCommonSeparatorPos = differencePos;
 			}
-			final StringBuilder relativePath = new StringBuilder();
-			for (int i = lastCommonSeparatorPos + 1; i <= lastIndexOfSeparatorInMapPath; i++) {
-				if (mapPathAsString.charAt(i) == '/') {
-					relativePath.append("../");
-				}
+		}
+		if (lastCommonSeparatorPos < 0) {
+			return targetUri;
+		}
+		final StringBuilder relativePath = new StringBuilder();
+		for (int i = lastCommonSeparatorPos + 1; i <= lastIndexOfSeparatorInMapPath; i++) {
+			if (mapPathAsString.charAt(i) == '/') {
+				relativePath.append("../");
 			}
-			relativePath.append(filePathAsString.substring(lastCommonSeparatorPos + 1));
-
+		}
+		relativePath.append(filePathAsString.substring(lastCommonSeparatorPos + 1));
+		final String rawFragment = targetUri.getRawFragment();
+		if(rawFragment != null)
+			relativePath.append("#" + rawFragment);
+		try {
 			return new URI(relativePath.toString());
 		}
 		catch (final URISyntaxException e) {
-			e.printStackTrace();
+			return null;
 		}
-		return null;
-	}
 
-//	public static URI toRelativeURI(final File map, final File input) {
-//		try {
-//			final URI fileUri = input.getAbsoluteFile().toURI();
-//			if (map == null) {
-//				return fileUri;
-//			}
-//			final URI mapUri = map.getAbsoluteFile().toURI();
-//			final String filePathAsString = fileUri.getRawPath();
-//			final String mapPathAsString = mapUri.getRawPath();
-//			int differencePos;
-//			final int lastIndexOfSeparatorInMapPath = mapPathAsString.lastIndexOf("/");
-//			final int lastIndexOfSeparatorInFilePath = filePathAsString.lastIndexOf("/");
-//			int lastCommonSeparatorPos = 0;
-//			for (differencePos = 1; differencePos <= lastIndexOfSeparatorInMapPath
-//			        && differencePos <= lastIndexOfSeparatorInFilePath
-//			        && filePathAsString.charAt(differencePos) == mapPathAsString.charAt(differencePos); differencePos++) {
-//				if (filePathAsString.charAt(differencePos) == '/') {
-//					lastCommonSeparatorPos = differencePos;
-//				}
-//			}
-//			if (lastCommonSeparatorPos == 0) {
-//				return fileUri;
-//			}
-//			final StringBuilder relativePath = new StringBuilder();
-//			for (int i = lastCommonSeparatorPos + 1; i <= lastIndexOfSeparatorInMapPath; i++) {
-//				if (mapPathAsString.charAt(i) == '/') {
-//					relativePath.append("../");
-//				}
-//			}
-//			relativePath.append(filePathAsString.substring(lastCommonSeparatorPos + 1));
-//			return new URI(relativePath.toString());
-//		}
-//		catch (final URISyntaxException e) {
-//			e.printStackTrace();
-//		}
-//		return null;
-//	}
+	}
 
 	// patterns only need to be compiled once
 	static Pattern patSMB = Pattern.compile( // \\host\path[#fragement]
diff --git a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MLinkController.java b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MLinkController.java
index dd3923f..06d34d8 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MLinkController.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MLinkController.java
@@ -730,12 +730,13 @@ public class MLinkController extends LinkController {
 	}
 
 	private URI relativeLink(final URI argUri, final NodeModel node, final int linkType) {
-		if (linkType != LINK_ABSOLUTE && "file".equals(argUri.getScheme())) {
+		if (linkType == LINK_RELATIVE_TO_MINDMAP && "file".equals(argUri.getScheme())) {
 			try {
 				final File mapFile = node.getMap().getFile();
-				return LinkController.toRelativeURI(mapFile, new File(argUri), linkType);
+				return createRelativeURI(mapFile, argUri);
 			}
 			catch (Exception e) {
+				e.printStackTrace();
 			}
 		}
 		return argUri;
diff --git a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkFromAnchorAction.java b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkFromAnchorAction.java
index 5f13cbd..a056b2e 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkFromAnchorAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkFromAnchorAction.java
@@ -45,51 +45,36 @@ public class MakeLinkFromAnchorAction extends AFreeplaneAction {
 
 	public void actionPerformed(final ActionEvent e) {
 
-		// get reference to current modeController
 		final ModeController modeControllerForSelectedMap = Controller.getCurrentModeController();
 
-		// get reference of selected node (target)
 		final NodeModel targetNode = modeControllerForSelectedMap.getMapController().getSelectedNode();
-		// get file path of selected node (target)
 		final File targetMapFile = targetNode.getMap().getFile();
 		if(targetMapFile == null) {
 			UITools.errorMessage(TextUtils.getRawText("map_not_saved"));
 			return;
 		}
-		// extract file name string (URI) for target
 		final String targetMapFileNameURI = targetMapFile.toURI().toString();
-		// extract file name string for target
 		final String targetMapFileName = targetMapFileNameURI.substring(targetMapFileNameURI.indexOf("/")+1);
-		// get ID (consisting of fileName and nodeID) of selected node (as targetID)
 		final String targetID = targetMapFile.toURI().toString() + '#' + targetNode.createID();
 
-		// get anchorID (as sourceID) from MLinkController
 		final String sourceID = ((MLinkController)(LinkController.getController())).getAnchorID();
-		// check if anchorID valid (should be null when file is closed or anchor is cleared)
 		if( sourceID == null) {
 			return;
 		}
-		// extract anchorMapFileName (source)
 		final String sourceMapFileName = sourceID.substring( sourceID.indexOf("/") +1, sourceID.indexOf("#") );
 		
-		// check if target and source reside within same map
 		if( targetMapFileName.equals(sourceMapFileName) ) {
 		
-			// get link controller
 			final MLinkController linkController = (MLinkController) MLinkController.getController();
 			
-			// get nodeID of anchored node (source)
 			final String sourceNodeID = sourceID.substring( sourceID.indexOf("#")+1 );
 			
-			// get reference to node from ID-String (source)
 			final NodeModel sourceNode = modeControllerForSelectedMap.getMapController().getNodeFromID(sourceNodeID);
 
-			// insert only targetNodeID as link
-			linkController.setLink(sourceNode, targetID.substring(targetID.indexOf("#")), LinkController.LINK_ABSOLUTE);
+			linkController.setLinkTypeDependantLink(sourceNode, targetID.substring(targetID.indexOf("#")));
 			
 		} else {
 		
-			// navigate to anchored map (source)
 			final MLinkController linkController_selected = (MLinkController) MLinkController.getController();
 			try {
 				final URI linkToAnchorNode = LinkController.createURI(sourceID.trim());
@@ -97,33 +82,27 @@ public class MakeLinkFromAnchorAction extends AFreeplaneAction {
 			}
 			catch (final URISyntaxException e1) {
 				LogUtils.warn(e1);
-	//			UITools.errorMessage(TextUtils.format("invalid_uri", link));
 				return;
 			}
 
-			// get reference of anchor node within anchor map
 			final NodeModel sourceNode = modeControllerForSelectedMap.getMapController().getSelectedNode();
 	
-			// set link in anchored node within anchored map
 			final MLinkController linkController_anchored = (MLinkController) MLinkController.getController();
 			try {
 				final URI linkToCurrentNode = LinkController.createURI(targetID.trim());
-				linkController_anchored.setLink(sourceNode, linkToCurrentNode, LinkController.LINK_ABSOLUTE);
+				linkController_anchored.setLinkTypeDependantLink(sourceNode, linkToCurrentNode);
 			}
 			catch (final URISyntaxException e1) {
 				LogUtils.warn(e1);
-	//			UITools.errorMessage(TextUtils.format("invalid_uri", link));
 				return;
 			}
 	
-			// re-navigate to target map
 			try {
 				final URI linkBackToSelectedNode = LinkController.createURI(targetID.trim());
 				linkController_anchored.loadURI(linkBackToSelectedNode);
 			}
 			catch (final URISyntaxException e1) {
 				LogUtils.warn(e1);
-	//			UITools.errorMessage(TextUtils.format("invalid_uri", link));
 				return;
 			}
 		}
diff --git a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkToAnchorAction.java b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkToAnchorAction.java
index 3313737..28c4030 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkToAnchorAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkToAnchorAction.java
@@ -47,7 +47,7 @@ public class MakeLinkToAnchorAction extends AFreeplaneAction {
 		final MLinkController mLinkController = (MLinkController)(LinkController.getController());
 		final String link = mLinkController.getAnchorIDforNode(selectedNode);
         if(link != null)
-        	mLinkController.setLink(selectedNode, link, LinkController.LINK_ABSOLUTE);
+        	mLinkController.setLinkTypeDependantLink(selectedNode, link);
 	}
 
 	@Override
diff --git a/freeplane/src/main/java/org/freeplane/features/map/MapController.java b/freeplane/src/main/java/org/freeplane/features/map/MapController.java
index fb046b3..adb9af9 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/MapController.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/MapController.java
@@ -325,7 +325,7 @@ public class MapController extends SelectionController implements IExtension{
 	}
 
 	public void setFoldedAndScroll(final NodeModel node, final boolean folded){
-		if(node.isFolded() != folded){
+		if(Controller.getCurrentController().getMapViewManager().isFoldedOnCurrentView(node) != folded){
 			setFolded(node, folded);
 			if(! folded && ResourceController.getResourceController().getBooleanProperty("scrollOnUnfold")){
 				SwingUtilities.invokeLater(new Runnable() {
diff --git a/freeplane/src/main/java/org/freeplane/features/map/MapNavigationUtils.java b/freeplane/src/main/java/org/freeplane/features/map/MapNavigationUtils.java
index ba4ae9a..25627a3 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/MapNavigationUtils.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/MapNavigationUtils.java
@@ -20,10 +20,10 @@ public class MapNavigationUtils {
     		}
     		final int index = parentNode.getIndex(current) + 1;
     		final int childCount = parentNode.getChildCount();
+    		if (direction == Direction.FORWARD_N_FOLD) {
+    			Controller.getCurrentModeController().getMapController().setFolded(current, true);
+    		}
     		if (index < childCount) {
-    			if (direction == Direction.FORWARD_N_FOLD) {
-    				Controller.getCurrentModeController().getMapController().setFolded(current, true);
-    			}
     			final NodeModel next = (NodeModel) parentNode.getChildAt(index);
     			if (atEnd(next, end)) {
     				return null;
diff --git a/freeplane/src/main/java/org/freeplane/features/map/ToggleFoldedAction.java b/freeplane/src/main/java/org/freeplane/features/map/ToggleFoldedAction.java
index ec058ac..440e825 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/ToggleFoldedAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/ToggleFoldedAction.java
@@ -46,7 +46,8 @@ class ToggleFoldedAction extends AFreeplaneAction {
 			r.toggleFolded(selectedNodes);
 		else {
 			final NodeModel selectedNode = r.getSelectedNode();
-			r.setFoldedAndScroll(selectedNode, ! selectedNode.isFolded());
+			boolean folded = Controller.getCurrentController().getMapViewManager().isFoldedOnCurrentView(selectedNode);
+			r.setFoldedAndScroll(selectedNode, ! folded);
 		}
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/map/filemode/CenterAction.java b/freeplane/src/main/java/org/freeplane/features/map/filemode/CenterAction.java
index c6c86ab..58c4d13 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/filemode/CenterAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/filemode/CenterAction.java
@@ -23,6 +23,7 @@ import java.awt.event.ActionEvent;
 import java.io.File;
 
 import org.freeplane.core.ui.AFreeplaneAction;
+import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 
 public class CenterAction extends AFreeplaneAction {
@@ -36,9 +37,11 @@ public class CenterAction extends AFreeplaneAction {
 	}
 
 	public void actionPerformed(final ActionEvent e) {
-		if (Controller.getCurrentModeController().getMapController().getSelectedNode() != null) {
-			final File file = ((FNodeModel) Controller.getCurrentModeController().getMapController().getSelectedNode()).getFile();
-			((FMapController) Controller.getCurrentModeController().getMapController()).newMap(file);
+		final NodeModel selectedNode = Controller.getCurrentModeController().getMapController().getSelectedNode();
+		if (selectedNode != null && ! selectedNode.isRoot()) {
+			final File file = ((FNodeModel) selectedNode).getFile();
+			if(file != null)
+				((FMapController) Controller.getCurrentModeController().getMapController()).newMap(file);
 		}
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapController.java b/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapController.java
index 50c63e8..6dc0115 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapController.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapController.java
@@ -39,11 +39,10 @@ public class FMapController extends MapController {
 		return (FModeController) Controller.getCurrentModeController();
 	}
 
-	public MapModel newMap(final File file) {
-		final FMapModel fileMapModel = new FMapModel(file);
+	public MapModel newMap(final File[] roots) {
+		final FMapModel fileMapModel = new FMapModel(roots);
 		fireMapCreated(fileMapModel);
 		newMapView(fileMapModel);
-		// FIXME: setSaved(true) necessary? (it's removed from newMapView())
 		return fileMapModel;
 	}
 
@@ -57,4 +56,8 @@ public class FMapController extends MapController {
 			setFolded(node, !isFolded(node));
 		}
 	}
+
+	public void newMap(File file) {
+		newMap(new File[]{file});
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapModel.java b/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapModel.java
index 389a2dd..863a1fd 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapModel.java
@@ -25,11 +25,14 @@ import org.freeplane.features.attribute.AttributeRegistry;
 import org.freeplane.features.map.MapModel;
 
 class FMapModel extends MapModel {
-	public FMapModel(final File root) {
+	public FMapModel(final File[] roots) {
 		super();
 		// create empty attribute registry
 		AttributeRegistry.getRegistry(this);
-		setRoot(new FNodeModel(root, this));
+		if(roots.length == 1)
+			setRoot(new FNodeModel(roots[0], this));
+		else
+			setRoot(new FNodeModel(roots, this));
 		getRootNode().setFolded(false);
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/map/filemode/FNodeModel.java b/freeplane/src/main/java/org/freeplane/features/map/filemode/FNodeModel.java
index 806a2c9..c08479d 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/filemode/FNodeModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/filemode/FNodeModel.java
@@ -32,26 +32,33 @@ import org.freeplane.features.map.NodeModel;
  */
 class FNodeModel extends NodeModel {
 	final private File file;
+	final private File[] directoryFiles;
 
 	public FNodeModel(final File file, final MapModel map) {
 		super(map);
 		this.file = file;
+		directoryFiles = null;
 		final String[] children = file.list();
 		setFolded(children != null && children.length > 0);
 	}
 
+	public FNodeModel(final File[] directoryFiles, final MapModel map) {
+		super(map);
+		this.file = null;
+		this.directoryFiles = directoryFiles;
+		setFolded(directoryFiles.length > 0);
+	}
+
 	@Override
 	public List<NodeModel> getChildren() {
 		if (!getChildrenInternal().isEmpty()) {
 			return super.getChildren();
 		}
 		try {
-			final String[] files = file.list();
+			final File[] files = file != null ? file.listFiles() : directoryFiles;
 			if (files != null) {
-				final String path = file.getPath();
-				for (int i = 0; i < files.length; i++) {
-					final File childFile = new File(path, files[i]);
-					if (!childFile.isHidden()) {
+				for (File childFile : files) {
+					if (!childFile.isHidden() || file == null) {
 						final FNodeModel fileNodeModel = new FNodeModel(childFile, getMap());
 						NodeLinks.createLinkExtension(fileNodeModel).setHyperLink(childFile.toURI());
 						fileNodeModel.setLeft(isNewChildLeft());
@@ -72,21 +79,23 @@ class FNodeModel extends NodeModel {
 
 	@Override
     public Object getUserObject() {
+		if(file == null)
+			return "Files";
         String name = file.getName();
         if (name.equals("")) {
-            name = "Root";
+            name = file.getPath();
         }
         return name;
     }
 
     @Override
 	public boolean hasChildren() {
-		return !file.isFile() && !getChildren().isEmpty();
+		return directoryFiles != null || !file.isFile() && !getChildren().isEmpty();
 	}
 
 	@Override
 	public boolean isLeaf() {
-		return file.isFile();
+		return directoryFiles == null && file.isFile();
 	}
 
 	@Override
diff --git a/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapController.java b/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapController.java
index 08c569f..f133923 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapController.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapController.java
@@ -358,7 +358,7 @@ public class MMapController extends MapController {
 			final int returnVal = JOptionPane.showOptionDialog(dialogParent, text, title,
 					JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null);
 			if (returnVal == JOptionPane.YES_OPTION) {
-				final boolean savingNotCancelled = ((MFileManager) UrlManager.getController())
+				final boolean savingNotCancelled = ((MFileManager) getModeController().getExtension(UrlManager.class))
 						.save(map);
 				if (!savingNotCancelled) {
 					return false;
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/Controller.java b/freeplane/src/main/java/org/freeplane/features/mode/Controller.java
index 764be2b..36b61a1 100644
--- a/freeplane/src/main/java/org/freeplane/features/mode/Controller.java
+++ b/freeplane/src/main/java/org/freeplane/features/mode/Controller.java
@@ -190,10 +190,10 @@ public class Controller extends AController implements FreeplaneActions, IMapLif
 
 	public boolean shutdown() {
 		getViewController().saveProperties();
-		ResourceController.getResourceController().saveProperties();
 		if (!getViewController().quit()) {
 			return false;
 		}
+		ResourceController.getResourceController().saveProperties();
 		extensionContainer.getExtensions().clear();
 		return true;
 	}
@@ -288,10 +288,6 @@ public class Controller extends AController implements FreeplaneActions, IMapLif
 		return optionPanelController;
 	}
 
-	/** returns an unmodifiableList. */
-	public List<ApplicationLifecycleListener> getApplicationLifecycleListeners() {
-		return Collections.unmodifiableList(applicationLifecycleListeners);
-	}
 
 	public void addApplicationLifecycleListener(ApplicationLifecycleListener applicationLifecycleListener) {
 		this.applicationLifecycleListeners.add(applicationLifecycleListener);
@@ -321,4 +317,17 @@ public class Controller extends AController implements FreeplaneActions, IMapLif
 		fireMapRemoved(map);
 		
 	}
+	
+	public void fireStartupFinished() {
+		for (ApplicationLifecycleListener listener : applicationLifecycleListeners) {
+			listener.onStartupFinished();
+		}
+	}
+
+	public void fireApplicationStopped() {
+		for (ApplicationLifecycleListener listener : applicationLifecycleListeners) {
+			listener.onApplicationStopped();
+		}
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/filemode/FModeController.java b/freeplane/src/main/java/org/freeplane/features/mode/filemode/FModeController.java
index 8ee8a52..da0654e 100644
--- a/freeplane/src/main/java/org/freeplane/features/mode/filemode/FModeController.java
+++ b/freeplane/src/main/java/org/freeplane/features/mode/filemode/FModeController.java
@@ -42,7 +42,7 @@ public class FModeController extends ModeController {
 		final Controller controller = getController();
 		controller.getMapViewManager().changeToMode(MODENAME);
 		if (controller.getMap() == null) {
-			((FMapController) getMapController()).newMap(new File(File.separator));
+			((FMapController) getMapController()).newMap(File.listRoots());
 		}
 		super.startup();
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/mindmapmode/MModeController.java b/freeplane/src/main/java/org/freeplane/features/mode/mindmapmode/MModeController.java
index fd8436c..7f326a5 100644
--- a/freeplane/src/main/java/org/freeplane/features/mode/mindmapmode/MModeController.java
+++ b/freeplane/src/main/java/org/freeplane/features/mode/mindmapmode/MModeController.java
@@ -27,7 +27,7 @@ import javax.swing.UIManager.LookAndFeelInfo;
 
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.resources.components.OptionPanelBuilder;
-import org.freeplane.core.resources.components.PropertyAction;
+import org.freeplane.core.resources.components.ShowPreferencesAction;
 import org.freeplane.core.ui.IndexedTree;
 import org.freeplane.core.undo.IActor;
 import org.freeplane.core.undo.IUndoHandler;
@@ -107,10 +107,10 @@ public class MModeController extends ModeController {
 		final ResourceController resourceController = ResourceController.getResourceController();
 		URL preferences = resourceController.getResource("/xml/preferences.xml");
 		optionPanelBuilder.load(preferences);
-		addAction(createPropertyAction(optionPanelBuilder));
+		getController().addAction(createShowPreferencesAction(optionPanelBuilder));
 	}
 
-	public static PropertyAction createPropertyAction(OptionPanelBuilder optionPanelBuilder) {
+	public static ShowPreferencesAction createShowPreferencesAction(OptionPanelBuilder optionPanelBuilder) {
 	    final LookAndFeelInfo[] lafInfo = UIManager.getInstalledLookAndFeels();
 		final Vector<String> lafNames = new Vector<String>(lafInfo.length + 1);
 		final Vector<String> translatedLafNames = new Vector<String>(lafInfo.length + 1);
@@ -125,7 +125,7 @@ public class MModeController extends ModeController {
 		addCurrentLookAndFeelIfNecessary(lafNames, translatedLafNames);
 		optionPanelBuilder.addEditableComboProperty("Appearance/look_and_feel/lookandfeel", LOOKANDFEEL_PROPERTY, lafNames,
 		    translatedLafNames, IndexedTree.AS_CHILD);
-		return new PropertyAction(optionPanelBuilder.getRoot());
+		return new ShowPreferencesAction(optionPanelBuilder.getRoot());
     }
 
     private static void addCurrentLookAndFeelIfNecessary(Vector<String> lafNames, Vector<String> translatedLafNames) {
diff --git a/freeplane/src/main/java/org/freeplane/features/note/NoteController.java b/freeplane/src/main/java/org/freeplane/features/note/NoteController.java
index 1cecf6f..553baa0 100644
--- a/freeplane/src/main/java/org/freeplane/features/note/NoteController.java
+++ b/freeplane/src/main/java/org/freeplane/features/note/NoteController.java
@@ -151,7 +151,7 @@ public class NoteController implements IExtension {
 		return Boolean.parseBoolean(property);
 	}
 
-	protected String getNoteCSSStyle(ModeController modeController, NodeModel node, boolean withWidth) {
+	protected String getNoteCSSStyle(ModeController modeController, NodeModel node, boolean asHtmlFragment) {
 		final StringBuilder rule = new StringBuilder();
 		// set default font for notes:
 		final NodeStyleController style = (NodeStyleController) Controller.getCurrentModeController().getExtension(
@@ -164,12 +164,15 @@ public class NoteController implements IExtension {
 		    Color noteBackground = style.getBackgroundColor(noteStyleNode);
 		    Color noteForeground = style.getColor(noteStyleNode);
 		    final int alignment = style.getTextAlign(noteStyleNode).swingConstant;
-		    final CssRuleBuilder cssRuleBuilder = new CssRuleBuilder()
-		    		.withFont(noteFont)
-		    		.withColor(noteForeground)
+		    final CssRuleBuilder cssRuleBuilder = new CssRuleBuilder();
+		    if(asHtmlFragment)
+		    	cssRuleBuilder.withHTMLFont(noteFont);
+		    else
+			    cssRuleBuilder.withCSSFont(noteFont);
+		    cssRuleBuilder.withColor(noteForeground)
 					.withBackground(noteBackground)
 					.withAlignment(alignment);
-		    if(withWidth)
+		    if(asHtmlFragment)
 		    	cssRuleBuilder.withMaxWidthAsPt(NodeSizeModel.getMaxNodeWidth(noteStyleNode), style.getMaxWidth(node));
 			rule.append(cssRuleBuilder);
 		}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MUIFactory.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MUIFactory.java
index db646cd..cb382e5 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MUIFactory.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MUIFactory.java
@@ -26,12 +26,14 @@ import java.util.Collection;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
+import javax.swing.JLabel;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 
 import org.freeplane.core.extension.IExtension;
 import org.freeplane.core.ui.FixedBasicComboBoxEditor;
 import org.freeplane.core.ui.components.JComboBoxWithBorder;
+import org.freeplane.core.ui.components.UITools;
 import org.freeplane.features.map.IMapChangeListener;
 import org.freeplane.features.map.IMapSelection;
 import org.freeplane.features.map.IMapSelectionListener;
@@ -203,9 +205,13 @@ public class MUIFactory implements INodeSelectionListener, INodeChangeListener,
 	}
 
 	public Container createFontBox() {
-		final JComboBox fontsBox = new JComboBoxWithBorder(fonts);
+		final JComboBox fontsBox = new JComboBoxWithBorder();
 		fontsBox.setMaximumRowCount(9);
 		fontsBox.setRenderer(new ComboBoxRendererWithTooltip(fontsBox));
+		final Dimension preferredSize = fontsBox.getPreferredSize();
+		preferredSize.width = Math.round(150 * UITools.FONT_SCALE_FACTOR);
+		fontsBox.setPreferredSize(preferredSize);
+		fontsBox.setModel(fonts);
 		return fontsBox;
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
index 941129e..156996d 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
@@ -113,7 +113,7 @@ import org.freeplane.features.ui.IMapViewChangeListener;
 import org.freeplane.features.ui.IMapViewManager;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.forms.layout.FormLayout;
 
 public class StyleEditorPanel extends JPanel {
@@ -842,7 +842,7 @@ public class StyleEditorPanel extends JPanel {
 		final String form = "right:max(20dlu;p), 2dlu, p, 1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
 		final FormLayout rightLayout = new FormLayout(form, "");
 		final DefaultFormBuilder rightBuilder = new DefaultFormBuilder(rightLayout);
-		rightBuilder.border(Borders.DLU2);
+		rightBuilder.border(Paddings.DLU2);
 		new SeparatorProperty("OptionPanel.separator.NodeStyle").layout(rightBuilder);
 		if (addStyleBox) {
 			addAutomaticLayout(rightBuilder);
diff --git a/freeplane/src/main/java/org/freeplane/features/text/TextController.java b/freeplane/src/main/java/org/freeplane/features/text/TextController.java
index ba7f032..586e24a 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/TextController.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/TextController.java
@@ -301,7 +301,7 @@ public class TextController implements IExtension {
 					
 					final StringBuilder htmlBodyStyle = new StringBuilder("<body><div style=\"")
 							.append(new CssRuleBuilder()
-							.withFont(detailFont)
+							.withHTMLFont(detailFont)
 							.withColor(detailForeground)
 							.withBackground(detailBackground)
 							.withAlignment(alignment)
@@ -328,7 +328,7 @@ public class TextController implements IExtension {
 				    final NodeStyleController style = (NodeStyleController) modeController.getExtension(NodeStyleController.class);
 				    final Font font = style.getFont(node);
 					final StringBuilder htmlBodyStyle = new StringBuilder("<body><div style=\"")
-							.append(new CssRuleBuilder().withFont(font)
+							.append(new CssRuleBuilder().withHTMLFont(font)
 							.withColor(view.getForeground())
 							.withBackground(view.getNodeView().getTextBackground())
 							.withAlignment(view.getHorizontalAlignment())
diff --git a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeDialog.java b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeDialog.java
index e3bf887..df14fd0 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeDialog.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeDialog.java
@@ -304,7 +304,7 @@ public class EditNodeDialog extends EditNodeBase {
 		final EditDialog dialog = new LongNodeDialog(frame, title, getBackground());
 		redispatchKeyEvents(textComponent, firstEvent);
         if (firstEvent == null) {
-            textComponent.setCaretPosition(getText().length());
+            textComponent.setCaretPosition(textComponent.getDocument().getLength());
         }
 		dialog.getDialog().setModal(isModal);
 		dialog.getDialog().pack();
diff --git a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeWYSIWYG.java b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeWYSIWYG.java
index 80ef178..992f3d8 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeWYSIWYG.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeWYSIWYG.java
@@ -243,7 +243,7 @@ public class EditNodeWYSIWYG extends EditNodeBase {
 			final StringBuilder ruleBuilder = new StringBuilder(100);
 			ruleBuilder.append("body {");
 			ruleBuilder.append(new CssRuleBuilder()
-					.withFont(font, UITools.FONT_SCALE_FACTOR)
+					.withCSSFont(font, UITools.FONT_SCALE_FACTOR)
 					.withColor(textColor)
 					.withBackground(getBackground())
 					.withAlignment(horizontalAlignment));
diff --git a/freeplane/src/main/java/org/freeplane/main/applet/FreeplaneApplet.java b/freeplane/src/main/java/org/freeplane/main/applet/FreeplaneApplet.java
index d5f72c8..9814df7 100644
--- a/freeplane/src/main/java/org/freeplane/main/applet/FreeplaneApplet.java
+++ b/freeplane/src/main/java/org/freeplane/main/applet/FreeplaneApplet.java
@@ -36,6 +36,7 @@ import java.util.concurrent.locks.ReentrantLock;
 import javax.swing.JApplet;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 import javax.swing.text.html.parser.ParserDelegator;
 
 import org.freeplane.core.resources.ResourceController;
@@ -125,10 +126,8 @@ public class FreeplaneApplet extends JApplet {
 					setDefaultDTD();
 				}
 			};
-			updateLookAndFeel();
-			createRootPane();
 			controller = new Controller(appletResourceController);
-			appletResourceController.init();
+			updateLookAndFeel();
 			Controller.setCurrentController(controller);
 			final Container contentPane = getContentPane();
 			contentPane.setLayout(new BorderLayout());
@@ -163,11 +162,16 @@ public class FreeplaneApplet extends JApplet {
 
 			controller.selectMode(browseController);
 			appletResourceController.setPropertyByParameter(this, "browsemode_initial_map");
-			appletViewController.init(controller);
 			final GlassPane glassPane = new GlassPane();
 			setGlassPane(glassPane);
 			glassPane.setVisible(true);
 			controller.getViewController().setMenubarVisible(false);
+			SwingUtilities.invokeLater(new Runnable() {
+				@Override
+				public void run() {
+					appletViewController.init(controller);
+				}
+			});
 		}
 		catch(RuntimeException e){
 			e.printStackTrace();
diff --git a/freeplane/src/main/java/org/freeplane/main/application/ApplicationLifecycleListener.java b/freeplane/src/main/java/org/freeplane/main/application/ApplicationLifecycleListener.java
index eef1f51..8e9e289 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/ApplicationLifecycleListener.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/ApplicationLifecycleListener.java
@@ -2,4 +2,5 @@ package org.freeplane.main.application;
 
 public interface ApplicationLifecycleListener {
 	void onStartupFinished();
+	void onApplicationStopped();
 }
diff --git a/freeplane/src/main/java/org/freeplane/main/application/ApplicationResourceController.java b/freeplane/src/main/java/org/freeplane/main/application/ApplicationResourceController.java
index 7b3ef6e..2c89993 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/ApplicationResourceController.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/ApplicationResourceController.java
@@ -29,6 +29,8 @@ import java.io.OutputStreamWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Properties;
@@ -49,43 +51,33 @@ public class ApplicationResourceController extends ResourceController {
 	final private Properties defProps;
 	private LastOpenedList lastOpened;
 	final private Properties props;
-	final private ClassLoader urlResourceLoader;
 	public static final String FREEPLANE_BASEDIRECTORY_PROPERTY = "org.freeplane.basedirectory";
 	public static final String FREEPLANE_GLOBALRESOURCEDIR_PROPERTY = "org.freeplane.globalresourcedir";
 	public static final String DEFAULT_FREEPLANE_GLOBALRESOURCEDIR = "resources";
+	private ArrayList<File> resourceDirectories;
 
 	/**
 	 * @param controller
 	 */
 	public ApplicationResourceController() {
 		super();
+		resourceDirectories = new ArrayList<File>(2);
 		defProps = readDefaultPreferences();
 		props = readUsersPreferences(defProps);
-		final File userDir = createUserDirectory(defProps);
-		final ArrayList<URL> urls = new ArrayList<URL>(2);
+		final File userDir = createUserDirectory();
 		final String resourceBaseDir = getResourceBaseDir();
 		if (resourceBaseDir != null) {
 			try {
 				final File userResourceDir = new File(userDir, "resources");
 				userResourceDir.mkdirs();
-				if (userResourceDir.exists()) {
-					final URL userResourceUrl = Compat.fileToUrl(userResourceDir);
-					urls.add(userResourceUrl);
-				}
+				resourceDirectories.add(userResourceDir);
 				final File resourceDir = new File(resourceBaseDir);
-				if (resourceDir.exists()) {
-					final URL globalResourceUrl = Compat.fileToUrl(resourceDir);
-					urls.add(globalResourceUrl);
-				}
+				resourceDirectories.add(resourceDir);
 			}
 			catch (final Exception e) {
 				e.printStackTrace();
 			}
 		}
-		if(urls.size() > 0)
-			urlResourceLoader = new URLClassLoader(urls.toArray(new URL[]{}), null);
-		else
-			urlResourceLoader = null;
 		setDefaultLocale(props);
 		autoPropertiesFile = getUserPreferencesFile();
 		addPropertyChangeListener(new IFreeplanePropertyListener() {
@@ -97,7 +89,7 @@ public class ApplicationResourceController extends ResourceController {
 		});
 	}
 
-	private File createUserDirectory(final Properties pDefaultProperties) {
+	private File createUserDirectory() {
 		final File userPropertiesFolder = new File(getFreeplaneUserDirectory());
 		try {
 			if (!userPropertiesFolder.exists()) {
@@ -139,41 +131,50 @@ public class ApplicationResourceController extends ResourceController {
 
 	@Override
 	public URL getResource(final String name) {
-		if (urlResourceLoader == null) {
-			return super.getResource(name);
-		}
-		final String relName;
-		if (name.startsWith("/")) {
-			relName = name.substring(1);
-		}
-		else {
-			relName = name;
-		}
-		URL resource = urlResourceLoader.getResource(relName);
-		if (resource != null) {
-			return resource;
-		}
-		resource = super.getResource(name);
-		if (resource != null) {
-			return resource;
-		}
-		if ("/lib/freeplaneviewer.jar".equals(name)) {
-			final String rootDir = new File(getResourceBaseDir()).getAbsoluteFile().getParent();
-			try {
-				final File try1 = new File(rootDir + "/plugins/org.freeplane.core/lib/freeplaneviewer.jar");
-				if (try1.exists()) {
-					return try1.toURL();
+		return AccessController.doPrivileged(new PrivilegedAction<URL>() {
+
+			@Override
+			public URL run() {
+				final String relName;
+				if (name.startsWith("/")) {
+					relName = name.substring(1);
 				}
-				final File try2 = new File(rootDir + "/lib/freeplaneviewer.jar");
-				if (try2.exists()) {
-					return try2.toURL();
+				else {
+					relName = name;
 				}
+				for(File directory : resourceDirectories) {
+					File fileResource = new File(directory, relName);
+					if (fileResource.exists()) {
+						try {
+							return Compat.fileToUrl(fileResource);
+						} catch (MalformedURLException e) {
+							throw new RuntimeException(e);
+						}
+					}
+				}
+				URL resource = ApplicationResourceController.super.getResource(name);
+				if (resource != null) {
+					return resource;
+				}
+				if ("/lib/freeplaneviewer.jar".equals(name)) {
+					final String rootDir = new File(getResourceBaseDir()).getAbsoluteFile().getParent();
+					try {
+						final File try1 = new File(rootDir + "/plugins/org.freeplane.core/lib/freeplaneviewer.jar");
+						if (try1.exists()) {
+							return try1.toURL();
+						}
+						final File try2 = new File(rootDir + "/lib/freeplaneviewer.jar");
+						if (try2.exists()) {
+							return try2.toURL();
+						}
+					}
+					catch (final MalformedURLException e) {
+						e.printStackTrace();
+					}
+				}
+				return null;
 			}
-			catch (final MalformedURLException e) {
-				e.printStackTrace();
-			}
-		}
-		return null;
+		});
 	}
 
 	@Override
@@ -237,7 +238,6 @@ public class ApplicationResourceController extends ResourceController {
 
 	@Override
 	public void saveProperties() {
-		lastOpened.saveProperties();
 		OutputStream out = null;
 		try {
 			out = new FileOutputStream(autoPropertiesFile);
diff --git a/freeplane/src/main/java/org/freeplane/main/application/ApplicationViewController.java b/freeplane/src/main/java/org/freeplane/main/application/ApplicationViewController.java
index 4535187..0be202f 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/ApplicationViewController.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/ApplicationViewController.java
@@ -77,7 +77,7 @@ class ApplicationViewController extends FrameController {
 	final private JSplitPane mSplitPane;
 	final private NavigationNextMapAction navigationNextMap;
 	final private NavigationPreviousMapAction navigationPreviousMap;
-	final private ResourceController resourceController;
+	final private ApplicationResourceController resourceController;
 	private JComponent mapPane;
 	private MapViewDockingWindows mapViewWindows;
 	@SuppressWarnings("serial")
@@ -89,7 +89,7 @@ class ApplicationViewController extends FrameController {
 		controller.addAction(navigationPreviousMap);
 		navigationNextMap = new NavigationNextMapAction();
 		controller.addAction(navigationNextMap);
-		resourceController = ResourceController.getResourceController();
+		resourceController = (ApplicationResourceController) ResourceController.getResourceController();
 		this.frame = frame;
 		frame.getContentPane().setLayout(new BorderLayout());
 		// --- Set Note Window Location ---
@@ -218,6 +218,7 @@ class ApplicationViewController extends FrameController {
 		if (!super.quit()) {
 			return false;
 		}
+		controller.fireApplicationStopped();
 		frame.dispose();
 		return true;
 	}
@@ -268,6 +269,7 @@ class ApplicationViewController extends FrameController {
 			resourceController.setProperty("appwindow_state", String.valueOf(winState));
 		}
 		mapViewWindows.saveLayout();
+		resourceController.getLastOpenedList().saveProperties();
 	}
 
 	private void saveSplitPanePosition() {
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 12ed021..e0d01a9 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java
@@ -28,6 +28,7 @@ import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
 import java.util.Collections;
 import java.util.Set;
 
@@ -76,6 +77,9 @@ import org.freeplane.features.ui.FrameController;
 import org.freeplane.features.url.mindmapmode.MFileManager;
 import org.freeplane.main.addons.AddOnsController;
 import org.freeplane.main.application.CommandLineParser.Options;
+import org.freeplane.main.application.survey.FreeplaneSurveyProperties;
+import org.freeplane.main.application.survey.SurveyRunner;
+import org.freeplane.main.application.survey.SurveyStarter;
 import org.freeplane.main.browsemode.BModeControllerFactory;
 import org.freeplane.main.filemode.FModeControllerFactory;
 import org.freeplane.main.mindmapmode.MModeControllerFactory;
@@ -213,6 +217,10 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
 			    new LogicalStyleFilterController());
 			MapController.install();
 			NodeHistory.install(controller);
+			final FreeplaneSurveyProperties freeplaneSurveyProperties = new FreeplaneSurveyProperties();
+			if(freeplaneSurveyProperties.mayAskUserToFillSurveys()) {
+				controller.addApplicationLifecycleListener(new SurveyStarter(freeplaneSurveyProperties, new SurveyRunner(freeplaneSurveyProperties), Math.random()));
+			}
 			return controller;
 		}
 		catch (final Exception e) {
@@ -295,10 +303,8 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
 		});
 	}
 
-	protected void fireStartupFinished() {
-		for (ApplicationLifecycleListener listener : Controller.getCurrentController().getApplicationLifecycleListeners()) {
-			listener.onStartupFinished();
-		}
+	private void fireStartupFinished() {
+		Controller.getCurrentController().fireStartupFinished();
 	}
 
 	private void loadMaps( final String[] args) {
diff --git a/freeplane/src/main/java/org/freeplane/main/application/LastOpenedList.java b/freeplane/src/main/java/org/freeplane/main/application/LastOpenedList.java
index 5cf27e6..ae08fec 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/LastOpenedList.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/LastOpenedList.java
@@ -77,16 +77,10 @@ import org.freeplane.view.swing.map.NodeView;
 
 public class LastOpenedList implements IMapViewChangeListener, IMapChangeListener {
     static class RecentFile {
-        public RecentFile(String restorable, String mapName) {
-            this.restorable = restorable;
-            this.mapName = mapName;
-        }
         public RecentFile(String restorable) {
-            this(restorable, null);
+            this.restorable = restorable;
         }
         String restorable;
-        /** map.toString(), not-null only if opened. */
-        String mapName;
         /** persisted, but not necessary not-null. */
         String lastVisitedNodeId;
         @Override
@@ -253,7 +247,7 @@ public class LastOpenedList implements IMapViewChangeListener, IMapChangeListene
 		if(map.containsExtension(DocuMapAttribute.class))
 			return null;
 		final ModeController modeController = Controller.getCurrentModeController();
-		if (!modeController.getModeName().equals(MModeController.MODENAME)) {
+		if (modeController == null || !modeController.getModeName().equals(MModeController.MODENAME)) {
 			return null;
 		}
 		final File file = map.getFile();
@@ -293,18 +287,12 @@ public class LastOpenedList implements IMapViewChangeListener, IMapChangeListene
         final StringTokenizer tokens = new StringTokenizer(recentFile.restorable, ":");
         if (!tokens.hasMoreTokens())
             return;
-        final boolean changedToMapView = tryToChangeToMapView(recentFile);
-        if (changedToMapView)
-            return;
         final String mode = tokens.nextToken();
         Controller.getCurrentController().selectMode(mode);
         File file = createFileFromRestorable(tokens);
-		if(!changedToMapView)
-            Controller.getCurrentModeController().getMapController().newMap(Compat.fileToUrl(file));
-        else {
-            final MapModel map = Controller.getCurrentController().getMap();
-            Controller.getCurrentModeController().getMapController().newMapView(map);
-        }
+        final URL url = Compat.fileToUrl(file);
+        if (!tryToChangeToMapView(url))
+			Controller.getCurrentModeController().getMapController().newMap(url);
     }
 
 	public File createFileFromRestorable(StringTokenizer tokens) {
@@ -318,8 +306,7 @@ public class LastOpenedList implements IMapViewChangeListener, IMapChangeListene
 
 	void openLastMapOnStart() {
 		if (mapSelectedOnStart != null) {
-			if(!tryToChangeToMapView(mapSelectedOnStart))
-				safeOpen(mapSelectedOnStart);
+			safeOpen(mapSelectedOnStart);
 		}
 	}
 
@@ -416,8 +403,13 @@ public class LastOpenedList implements IMapViewChangeListener, IMapChangeListene
 	    return result;
 	}
 
-    private boolean tryToChangeToMapView(final RecentFile mapSelectedOnStart) {
-		return Controller.getCurrentController().getMapViewManager().tryToChangeToMapView(mapSelectedOnStart.mapName);
+    private boolean tryToChangeToMapView(URL url) {
+		try {
+			return Controller.getCurrentController().getMapViewManager().tryToChangeToMapView(url);
+		} catch (MalformedURLException e) {
+			LogUtils.warn(e);
+			return false;
+		}
 	}
 
 	private void updateList(final MapModel map, final String restoreString) {
@@ -428,11 +420,10 @@ public class LastOpenedList implements IMapViewChangeListener, IMapChangeListene
 			RecentFile recentFile = findRecentFileByRestorable(restoreString);
 			if (recentFile != null) {
 				lastOpenedList.remove(recentFile);
-				recentFile.mapName = map.getTitle();
 				lastOpenedList.add(0, recentFile);
 			}
 			else {
-				lastOpenedList.add(0, new RecentFile(restoreString, map.getTitle()));
+				lastOpenedList.add(0, new RecentFile(restoreString));
 			}
 		}
 		updateMenus();
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 cb407a9..fcabba1 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/MapViewDockingWindows.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/MapViewDockingWindows.java
@@ -253,6 +253,10 @@ class MapViewDockingWindows implements IMapViewChangeListener {
 			for (int i = 0; i < mapViews.size(); ++i) {
 				if (mapViews.get(i) == pNewMap) {
 					View dockedView = getContainingDockedWindow(pNewMap);
+					Frame window = JOptionPane.getFrameForComponent(dockedView);
+					int frameState = window.getExtendedState();
+					if((frameState & Frame.ICONIFIED) != 0)
+						window.setExtendedState(frameState & ~Frame.ICONIFIED);
 					if(dockedView.isMinimized())
 						dockedView.restore();
 					else
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
new file mode 100644
index 0000000..7b5a38c
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/main/application/survey/FreeplaneSurveyProperties.java
@@ -0,0 +1,94 @@
+package org.freeplane.main.application.survey;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Date;
+
+import org.freeplane.core.resources.ResourceController;
+
+public class FreeplaneSurveyProperties {
+	static private final long ONE_DAY_IN_MILLISECONDS = 24 * 60 * 60 * 1000; 
+	static final String NEVER_SHOW_SURVEY_PROPERTY = "neverShowSurvey";
+	static final String NEXT_SURVEY_CHECK_DAY_PROPERTY = "nextSurveyCheck";
+	private static final String REMIND_ME_LATER_PROPERTY = "remindMeAboutSurveyIsActive";
+	static final String FILLED_SURVEY = "filledSurvey";
+	private static final String SURVEY_URL_PROPERTY = "surveyUrl";
+	
+	final private ResourceController resourceController;
+	final private long nextCheckDay;
+	private boolean remindMeLaterIsActive;
+	
+	public FreeplaneSurveyProperties() {
+		resourceController = ResourceController.getResourceController();
+		nextCheckDay = resourceController.getLongProperty(NEXT_SURVEY_CHECK_DAY_PROPERTY, 0);
+		remindMeLaterIsActive = resourceController.getBooleanProperty(REMIND_ME_LATER_PROPERTY, false);
+		if(remindMeLaterIsActive)
+			resourceController.setProperty(REMIND_ME_LATER_PROPERTY, false);
+	}
+
+	void setNextSurveyDay(int minimalDaysBetweenSurveys) {
+		resourceController.setProperty(NEXT_SURVEY_CHECK_DAY_PROPERTY, dayNow() + minimalDaysBetweenSurveys);
+	}
+	
+	long getNextCheckDay() {
+		return nextCheckDay;
+	}
+	
+	private long dayNow() {
+		return new Date().getTime() / ONE_DAY_IN_MILLISECONDS;
+	}
+	void markSurveyAsFilled(String surveyId) {
+		resourceController.setProperty(filledSurveyPropertyOf(surveyId), "true");
+	}
+	private String filledSurveyPropertyOf(String surveyId) {
+		return FILLED_SURVEY + "." + surveyId;
+	}
+	
+	void setNeverShowSurvey() {
+		resourceController.setProperty(NEVER_SHOW_SURVEY_PROPERTY, "true");
+	}
+	
+	public boolean mayAskUserToFillSurveys() {
+		return ! resourceController.getBooleanProperty(NEVER_SHOW_SURVEY_PROPERTY)
+				&& isLanguageSupported();
+	}
+	private boolean isLanguageSupported() {
+		return resourceController.getLanguageCode().equals("en");
+	}
+	
+	boolean mayAskUserToFillSurvey(String surveyId) {
+		return  mayAskUserToFillSurveys() && ! hasUserAlreadyFilled(surveyId) && mayAskUserAgain();
+	}
+	
+	boolean mayAskUserAgain() {
+		return dayNow() > getNextCheckDay();
+	}
+	
+	private boolean hasUserAlreadyFilled(String surveyId) {
+		return Boolean.parseBoolean(resourceController.getProperty(filledSurveyPropertyOf(surveyId), "false"));
+	}
+	
+	private URL getSurveyUrl() {
+		try {
+			String surveyUrl = resourceController.getProperty(SURVEY_URL_PROPERTY) + "_en.properties";
+			return new URL(surveyUrl);
+		} catch (MalformedURLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	public InputStream openRemoteConfiguration() throws IOException {
+		return getSurveyUrl().openStream();
+	}
+
+	public void activateRemindMeLater() {
+		resourceController.setProperty(REMIND_ME_LATER_PROPERTY, "true");
+	}
+
+	public boolean remindMeLaterIsActive() {
+		return remindMeLaterIsActive;
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/main/application/survey/SurveyRunner.java b/freeplane/src/main/java/org/freeplane/main/application/survey/SurveyRunner.java
new file mode 100644
index 0000000..8803735
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/main/application/survey/SurveyRunner.java
@@ -0,0 +1,136 @@
+package org.freeplane.main.application.survey;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Image;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
+import java.net.URL;
+import java.util.List;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+
+import org.freeplane.core.ui.components.UITools;
+import org.freeplane.features.mode.Controller;
+
+public class SurveyRunner {
+
+	private static class OptionButtonListener implements ActionListener {
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			final Component source = (Component) e.getSource();
+			JOptionPane pane = (JOptionPane) SwingUtilities.getAncestorOfClass(JOptionPane.class, source);
+			pane.setValue(source);
+		}
+	}
+
+	enum Options {GO_OPTION, NOT_INTERESTED_OPTION, REMIND_ME_LATER_OPTION, NEVER_OPTION};
+	private static final int MINIMAL_DAYS_BETWEEN_SURVEYS = 11;
+	private static final int MINIMAL_DAYS_BETWEEN_SURVEY_REMINDERS = 3;
+	
+	private final FreeplaneSurveyProperties freeplaneSurveyProperties;
+	private String surveyId;
+	private boolean userVisitedVotingLink = false;
+
+	public SurveyRunner(FreeplaneSurveyProperties freeplaneSurveyProperties) {
+		super();
+		this.freeplaneSurveyProperties = freeplaneSurveyProperties;
+	}
+
+	public void runServey(String id, String title, String question, String surveyUrl) {
+		if(! freeplaneSurveyProperties.mayAskUserToFillSurvey(surveyId))
+			return;
+		this.surveyId = id;
+		freeplaneSurveyProperties.setNextSurveyDay(MINIMAL_DAYS_BETWEEN_SURVEYS);
+		final JButton go = new JButton("With pleasure");
+		go.setToolTipText("Thank you so much!");
+		final JButton notInterested = new JButton("Not interested");
+		notInterested.setToolTipText("We shall not repeat this question, but may be ask you another one.");
+		final JButton remindMeLater = new JButton("Remind me later");
+		remindMeLater.setToolTipText("The same question can be repeated some days later.");
+		final JButton never = new JButton("Don't ask me anything again");
+		never.setToolTipText("We are sorry! We shall never ask you any question like this again.");
+		final JButton[] options = new JButton[]{go, notInterested, remindMeLater, never};
+		final OptionButtonListener optionButtonListener = new OptionButtonListener();
+		for(JButton button : options)
+			button.addActionListener(optionButtonListener);
+		final List<Image> iconImages = UITools.getFrame().getIconImages();
+		final JEditorPane messageComponent = new JEditorPane("text/html", question);
+		messageComponent.setBorder( BorderFactory.createCompoundBorder(
+				BorderFactory.createLineBorder(Color.BLACK), BorderFactory.createEmptyBorder(10, 10, 10, 10)));
+		messageComponent.addHyperlinkListener(new HyperlinkListener() {
+			
+			@Override
+			public void hyperlinkUpdate(HyperlinkEvent e) {
+				if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+					try {
+						final URL url = e.getURL();
+						openSurvey(url);
+					} catch (Exception ex) {
+					}
+					userVisitedVotingLink = true;
+					SwingUtilities.getWindowAncestor(messageComponent).setVisible(false);
+				}
+			}
+		});
+		messageComponent.setEditable(false);
+		messageComponent.addHierarchyListener(new HierarchyListener() {
+			
+			@Override
+			public void hierarchyChanged(HierarchyEvent e) {
+				if(messageComponent.isShowing()){
+					messageComponent.removeHierarchyListener(this);
+					final Window window = SwingUtilities.getWindowAncestor(messageComponent);
+					if(window instanceof JDialog)
+						((JDialog)window).setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
+					window.setIconImages(iconImages);
+				}
+				
+			}
+		});
+		final int userDecision = JOptionPane.showOptionDialog(UITools.getCurrentFrame(), messageComponent, title, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION,
+				null,
+				options, remindMeLater);
+		switch(userDecision) {
+		case JOptionPane.CLOSED_OPTION:
+			if(userVisitedVotingLink)
+				freeplaneSurveyProperties.markSurveyAsFilled(surveyId);
+			break;
+		default:
+			switch(Options.values()[userDecision]){
+			case GO_OPTION:
+				try {
+					freeplaneSurveyProperties.markSurveyAsFilled(surveyId);
+					final URL survey = new URL(surveyUrl);
+					openSurvey(survey);
+				} catch (Exception e) {
+				}
+				break;
+			case NOT_INTERESTED_OPTION:
+				freeplaneSurveyProperties.markSurveyAsFilled(surveyId);
+				break;
+			case REMIND_ME_LATER_OPTION:
+				freeplaneSurveyProperties.setNextSurveyDay(MINIMAL_DAYS_BETWEEN_SURVEY_REMINDERS);
+				freeplaneSurveyProperties.activateRemindMeLater();
+				break;
+			case NEVER_OPTION:
+				freeplaneSurveyProperties.setNeverShowSurvey();
+				break;
+			}
+		}
+	}
+
+	private void openSurvey(final URL url) throws Exception {
+		Controller.getCurrentController().getViewController().openDocument(url);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/main/application/survey/SurveyStarter.java b/freeplane/src/main/java/org/freeplane/main/application/survey/SurveyStarter.java
new file mode 100644
index 0000000..2637b58
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/main/application/survey/SurveyStarter.java
@@ -0,0 +1,81 @@
+package org.freeplane.main.application.survey;
+
+import java.io.InputStream;
+import java.util.Properties;
+
+import javax.swing.SwingUtilities;
+
+import org.freeplane.main.application.ApplicationLifecycleListener;
+
+public class SurveyStarter implements ApplicationLifecycleListener{
+	
+	enum RunningPoint{
+		ON_START, ON_QUIT, NEVER
+	}
+	
+	private static final String SURVEY_ID_KEY = "surveyId";
+	private static final String SURVEY_URL_KEY = "surveyUrl";
+	private static final String QUESTION_KEY = "question";
+	private static final String TITLE_KEY = "title";
+	private static final String RUN_ON_KEY = "runOn";
+	private static final String FREQUENCY_KEY = "frequency";
+
+
+	private final FreeplaneSurveyProperties freeplaneSurveyProperties;
+	private final SurveyRunner surveyRunner;
+	private String surveyId;
+	private String title;
+	private String question;
+	private String surveyUrl;
+	private RunningPoint runOn;
+	private final double randomNumber;
+
+	public SurveyStarter(FreeplaneSurveyProperties freeplaneSurveyProperties, SurveyRunner surveyRunner, double randomNumber) {
+		this.freeplaneSurveyProperties = freeplaneSurveyProperties;
+		this.surveyRunner = surveyRunner;
+		this.randomNumber = randomNumber;
+	}
+
+	@Override
+	public void onStartupFinished() {
+		if (freeplaneSurveyProperties.mayAskUserAgain()) {
+			freeplaneSurveyProperties.setNextSurveyDay(1);
+			new Thread(new Runnable() {
+				@Override
+				public void run() {
+					final Properties surveyProperties = new Properties();
+					try (final InputStream input = freeplaneSurveyProperties.openRemoteConfiguration()) {
+						surveyProperties.load(input);
+						final int frequency = Integer.parseInt(surveyProperties.getProperty(FREQUENCY_KEY));
+						if(frequency > 0 && randomNumber < 1. / frequency || freeplaneSurveyProperties.remindMeLaterIsActive()) {
+							surveyId = surveyProperties.getProperty(SURVEY_ID_KEY);
+							title = surveyProperties.getProperty(TITLE_KEY);
+							question = surveyProperties.getProperty(QUESTION_KEY);
+							surveyUrl = surveyProperties.getProperty(SURVEY_URL_KEY);
+							runOn = RunningPoint.valueOf(surveyProperties.getProperty(RUN_ON_KEY, RunningPoint.NEVER.name()));
+						}
+						else
+							runOn = RunningPoint.NEVER;
+					} catch (Exception e) {
+						runOn = RunningPoint.NEVER;
+					}
+					if(RunningPoint.ON_START == runOn)
+						SwingUtilities.invokeLater(new Runnable() {
+							@Override
+							public void run() {
+								surveyRunner.runServey(surveyId, title, question, surveyUrl);
+							}
+						});
+				}
+			}).start();
+		}
+		
+	}
+
+	@Override
+	public void onApplicationStopped() {
+		if(RunningPoint.ON_QUIT == runOn)
+			surveyRunner.runServey(surveyId, title, question, surveyUrl);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/main/mindmapmode/MModeControllerFactory.java b/freeplane/src/main/java/org/freeplane/main/mindmapmode/MModeControllerFactory.java
index b428fe5..47e7b92 100644
--- a/freeplane/src/main/java/org/freeplane/main/mindmapmode/MModeControllerFactory.java
+++ b/freeplane/src/main/java/org/freeplane/main/mindmapmode/MModeControllerFactory.java
@@ -302,9 +302,6 @@ public class MModeControllerFactory {
 			    @Override
 			    public Component createComponent(Entry entry) {
 				    final Container fontBox = uiFactory.createFontBox();
-				    final Dimension preferredSize = fontBox.getPreferredSize();
-				    preferredSize.width = 90;
-				    fontBox.setPreferredSize(preferredSize);
 				    return fontBox;
 			    }
 		    }), EntryVisitor.EMTPY);
diff --git a/freeplane/src/main/java/org/freeplane/main/mindmapmode/stylemode/SModeControllerFactory.java b/freeplane/src/main/java/org/freeplane/main/mindmapmode/stylemode/SModeControllerFactory.java
index 9a584b3..8af70d4 100644
--- a/freeplane/src/main/java/org/freeplane/main/mindmapmode/stylemode/SModeControllerFactory.java
+++ b/freeplane/src/main/java/org/freeplane/main/mindmapmode/stylemode/SModeControllerFactory.java
@@ -105,11 +105,13 @@ public class SModeControllerFactory {
 	private ExtensionInstaller extentionInstaller;
 
 	Controller createController(final JDialog dialog) {
+		Controller currentController = Controller.getCurrentController();
 		final Controller controller = new Controller(ResourceController.getResourceController());
 		Controller.setCurrentController(controller);
 		final MapViewController mapViewController = new MMapViewController(controller);
 		final DialogController viewController = new DialogController(controller, mapViewController, dialog);
 		controller.setViewController(viewController);
+		controller.addAction(currentController.getAction("AboutAction"));
 		FilterController.install();
 		TextController.install();
 		controller.addAction(new ViewLayoutTypeAction(MapViewLayout.OUTLINE));
diff --git a/freeplane/src/main/java/org/freeplane/main/osgi/ActivatorImpl.java b/freeplane/src/main/java/org/freeplane/main/osgi/ActivatorImpl.java
index 29e6acc..b5d7c58 100644
--- a/freeplane/src/main/java/org/freeplane/main/osgi/ActivatorImpl.java
+++ b/freeplane/src/main/java/org/freeplane/main/osgi/ActivatorImpl.java
@@ -78,6 +78,9 @@ class ActivatorImpl implements BundleActivator {
 
 	public void start(final BundleContext context) throws Exception {
 		try {
+			final String userDirectory = System.getProperty("org.freeplane.user.dir");
+			if(userDirectory != null)
+				System.setProperty("user.dir", userDirectory);
 			startFramework(context);
 		}
 		catch (final Exception e) {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/BitmapViewerComponent.java b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/BitmapViewerComponent.java
index 7844dea..fc41f25 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/BitmapViewerComponent.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/BitmapViewerComponent.java
@@ -25,6 +25,7 @@ import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
@@ -227,7 +228,7 @@ public class BitmapViewerComponent extends JComponent implements ScalableCompone
 			cachedImage = ImageIO.read(cacheFile);
 		}
 		catch (final IOException e) {
-			LogUtils.severe("ImageIO can not read cache file " + cacheFile , e);
+			logImageReadingException(e);
 		}
 	}
 
@@ -260,11 +261,19 @@ public class BitmapViewerComponent extends JComponent implements ScalableCompone
 			tempImage = ImageIO.read(url);
 		}
 		catch (final IOException e) {
-			LogUtils.severe(e);
+			logImageReadingException(e);
 		}
 		return tempImage;
 	}
 
+	private void logImageReadingException(final IOException e) {
+		final Throwable cause = e.getCause();
+		if(! (cause instanceof FileNotFoundException))
+			LogUtils.severe(e);
+		else
+			LogUtils.warn(cause.getMessage());
+	}
+
 	private void flushImage() {
 		final CacheType cacheType = getCacheType();
 		if (CacheType.IC_RAM.equals(cacheType)) {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NodeList.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NodeList.java
index b02c4ef..98dfac4 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NodeList.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NodeList.java
@@ -19,6 +19,7 @@
  */
 package org.freeplane.view.swing.features.time.mindmapmode.nodelist;
 
+import java.awt.Component;
 import java.awt.Container;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -414,6 +415,7 @@ public class NodeList {
 			storage.addTimeWindowColumnSetting(setting);
 		}
 		storage.storeDialogPositions(dialog, windowPreferenceStorageProperty);
+		final boolean dialogWasFocused = dialog.isFocused();
 		dialog.setVisible(false);
 		dialog.dispose();
 		dialog = null;
@@ -421,7 +423,13 @@ public class NodeList {
 		final MapController mapController = modeController.getMapController();
 		mapController.removeMapChangeListener(mapChangeListener);
 		mapController.removeNodeChangeListener(mapChangeListener);
-		Controller.getCurrentController().getMapViewManager().removeMapSelectionListener(mapChangeListener);
+		final IMapViewManager mapViewManager = Controller.getCurrentController().getMapViewManager();
+		mapViewManager.removeMapSelectionListener(mapChangeListener);
+		if(dialogWasFocused) {
+			final Component selectedComponent = mapViewManager.getSelectedComponent();
+			if(selectedComponent != null)
+				selectedComponent.requestFocus();
+		}
 	}
 
 	protected void exportSelectedRowsAndClose() {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTable.java b/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTable.java
index 9d71128..8341524 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTable.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTable.java
@@ -822,8 +822,10 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 
 	private void updateComponentColors(final JComponent c) {
 		final NodeView nodeView = attributeView.getNodeView();
-		if(! SwingUtilities.isDescendingFrom(this, nodeView))
+		if(! SwingUtilities.isDescendingFrom(this, nodeView)) {
+			c.setFont(c.getFont().deriveFont(12f));
 			return;
+		}
 		final MapView mapView = nodeView.getMap();
 		final ModeController modeController = mapView.getModeController();
 		final NodeStyleController style = (NodeStyleController) modeController.getExtension(NodeStyleController.class);
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/mindmapmode/EditNodeTextField.java b/freeplane/src/main/java/org/freeplane/view/swing/map/mindmapmode/EditNodeTextField.java
index 1f7393a..0a4f22a 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/mindmapmode/EditNodeTextField.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/mindmapmode/EditNodeTextField.java
@@ -400,7 +400,7 @@ public class EditNodeTextField extends EditNodeBase {
 
 		protected boolean isSplitActionTriggered(final KeyEvent e) {
 			final int keyCode = e.getKeyCode();
-			if (keyCode == SPLIT_KEY_CODE && keyCode != -1 && e.isAltDown() && ! Compat.isMacOsX())
+			if (keyCode == SPLIT_KEY_CODE && keyCode != -1 && e.isAltDown()&& !e.isAltGraphDown()&& !e.isControlDown() && ! Compat.isMacOsX())
 				return true;
 			final KeyStroke splitNodeHotKey = ResourceController.getResourceController().getAcceleratorManager().getAccelerator("SplitNode");
 			return splitNodeHotKey != null && splitNodeHotKey.getKeyCode() == keyCode  &&  
@@ -672,7 +672,7 @@ public class EditNodeTextField extends EditNodeBase {
 		ruleBuilder.append("body {");
 		final int labelHorizontalAlignment = parent.getHorizontalAlignment();
 		ruleBuilder.append(new CssRuleBuilder()
-				.withFont(font, UITools.FONT_SCALE_FACTOR)
+				.withCSSFont(font, UITools.FONT_SCALE_FACTOR)
 				.withColor(nodeTextColor)
 				.withBackground(getBackground())
 				.withAlignment(labelHorizontalAlignment));
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeMouseMotionListener.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeMouseMotionListener.java
index fa0dbcf..668f782 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeMouseMotionListener.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeMouseMotionListener.java
@@ -98,7 +98,7 @@ public class DefaultNodeMouseMotionListener implements IMouseListener {
 				}
 
 				if(inside && e.getClickCount() == 1 && ResourceController.getResourceController().getBooleanProperty(FOLD_ON_CLICK_INSIDE)){
-					final boolean fold = ! node.isFolded();
+					final boolean fold = !isFoldedOnCurrentView(node);
 					if (!nodeSelector.shouldSelectOnClick(e)) {
 						doubleClickTimer.start(new Runnable() {
 							public void run() {
@@ -120,7 +120,7 @@ public class DefaultNodeMouseMotionListener implements IMouseListener {
 		if ((plainEvent && inFoldingRegion
 				|| (inFoldingRegion || inside) && Compat.isCtrlShiftEvent(e))
 		        && !nodeSelector.shouldSelectOnClick(e)) {
-			final boolean fold = ! node.isFolded();
+			final boolean fold = ! isFoldedOnCurrentView(node);
 			doubleClickTimer.cancel();
 			mapController.setFolded(node, fold);
 			e.consume();
@@ -129,6 +129,9 @@ public class DefaultNodeMouseMotionListener implements IMouseListener {
 		if(inside && e.getButton() == 1 &&  ! e.isAltDown())
 			nodeSelector.extendSelection(e);
 	}
+	private boolean isFoldedOnCurrentView(final NodeModel node) {
+		return Controller.getCurrentController().getMapViewManager().isFoldedOnCurrentView(node);
+	}
 
 
 	protected void loadLink(final String link) {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/UserInputListenerFactory.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/UserInputListenerFactory.java
index f395faa..e2fd0a4 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/UserInputListenerFactory.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/UserInputListenerFactory.java
@@ -26,8 +26,10 @@ import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseWheelListener;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -72,6 +74,7 @@ import org.freeplane.core.ui.menubuilders.generic.RecursiveMenuStructureProcesso
 import org.freeplane.core.ui.menubuilders.generic.SubtreeProcessor;
 import org.freeplane.core.ui.menubuilders.menu.MenuAcceleratorChangeListener;
 import org.freeplane.core.ui.menubuilders.menu.MenuBuildProcessFactory;
+import org.freeplane.core.util.Compat;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.map.IMapSelectionListener;
@@ -434,7 +437,6 @@ public class UserInputListenerFactory implements IUserInputListenerFactory {
 		
 		final URL genericStructure = ResourceController.getResourceController().getResource(
 		    menuStructureResource);
-		final boolean isUserDefined = genericStructure.getProtocol().equalsIgnoreCase("file");
 		try {
 			final FreeplaneResourceAccessor resourceAccessor = new FreeplaneResourceAccessor();
 			final EntriesForAction entries = new EntriesForAction();
@@ -457,6 +459,7 @@ public class UserInputListenerFactory implements IUserInputListenerFactory {
 				outputUnusedActions();
 		}
 		catch (Exception e) {
+			final boolean isUserDefined = isUserDefined(genericStructure);
 			if (isUserDefined) {
 				LogUtils.warn(e);
 				String myMessage = TextUtils.format("menu_error", genericStructure.getPath(), e.getMessage());
@@ -464,11 +467,25 @@ public class UserInputListenerFactory implements IUserInputListenerFactory {
 				JOptionPane.showMessageDialog(UITools.getMenuComponent(), myMessage, "Freeplane", JOptionPane.ERROR_MESSAGE);
 				System.exit(-1);
 			}
-			throw new RuntimeException(e);
+			throw new RuntimeException("Error in menu resource " + menuStructureResource, e);
 		}
 
 	}
 
+	private boolean isUserDefined(final URL location){
+		try {
+			if(! location.getProtocol().equalsIgnoreCase("file"))
+				return false;
+			String freeplaneUserDirectory = ResourceController.getResourceController().getFreeplaneUserDirectory();
+			if(freeplaneUserDirectory == null)
+				return false;
+			String userResourcesUrl = Compat.fileToUrl(new File(freeplaneUserDirectory, "resources")).getPath();
+			return location.getPath().startsWith(userResourcesUrl);
+		} catch (MalformedURLException e) {
+			return false;
+		}
+	}
+
 	private void filterPlugins(Entry entry, Set<String> plugins) {
 		final Iterator<Entry> iterator = entry.children().iterator();
 		while(iterator.hasNext()){
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MNodeMouseWheelListener.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MNodeMouseWheelListener.java
index 6ccd4d3..d0ef9ba 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MNodeMouseWheelListener.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MNodeMouseWheelListener.java
@@ -38,7 +38,7 @@ public class MNodeMouseWheelListener extends DefaultNodeMouseWheelListener {
 			map.selectAsTheOnlyOneSelected(nodeView);
 		
 		final double factor = e.isControlDown() ? 1 : 6 * LengthUnits.pt.factor();
-		double newZoomedWidth =  (view.getWidth() - wheelRotation * factor) / map.getZoom();
+		double newZoomedWidth =  Math.max((view.getWidth() - wheelRotation * factor) / map.getZoom(), 0);
 		final IMapSelection selection = Controller.getCurrentController().getSelection();
 		Quantity<LengthUnits> newZoomedWidthQuantity = LengthUnits.pixelsInPt(newZoomedWidth);
 		final ModeController modeController = map.getModeController();
diff --git a/freeplane/src/test/java/org/freeplane/core/ui/components/html/CssRuleBuilderShould.java b/freeplane/src/test/java/org/freeplane/core/ui/components/html/CssRuleBuilderShould.java
index c28cbd6..6be1500 100644
--- a/freeplane/src/test/java/org/freeplane/core/ui/components/html/CssRuleBuilderShould.java
+++ b/freeplane/src/test/java/org/freeplane/core/ui/components/html/CssRuleBuilderShould.java
@@ -30,24 +30,31 @@ public class CssRuleBuilderShould {
 
 	@Test
 	public void ignoreNullFont() throws Exception {
-		cssRuleBuilder.withFont(null);
+		cssRuleBuilder.withHTMLFont(null);
 		assertRule("");
 	}
 
 	@Test
 	public void addFont() throws Exception {
-		final Font font = new Font("arial", Font.BOLD | Font.ITALIC, 10);
-		cssRuleBuilder.withFont(font);
-		assertRule(" font-family: " + font.getFamily() + ";  font-size: 10pt; font-weight: bold; font-style: italic;");
+		final Font font = new Font("Times New Roman", Font.BOLD | Font.ITALIC, 10);
+		cssRuleBuilder.withHTMLFont(font);
+		assertRule(" font-family: "" + font.getFamily() + "";  font-size: 10pt; font-weight: bold; font-style: italic;");
+	}
+
+	@Test
+	public void addCSSFont() throws Exception {
+		final Font font = new Font("Times New Roman", Font.BOLD | Font.ITALIC, 10);
+		cssRuleBuilder.withCSSFont(font);
+		assertRule(" font-family: \"" + font.getFamily() + "\";  font-size: 10pt; font-weight: bold; font-style: italic;");
 	}
 
 
 	@Test
 	public void addFontScaleSize() throws Exception {
 		final float fontScaleFactor = 2f;
-		final Font font = new Font("arial", Font.BOLD | Font.ITALIC, 10);
-		cssRuleBuilder.withFont(font, fontScaleFactor);
-		assertRule(" font-family: " + font.getFamily() + ";  font-size: 5pt; font-weight: bold; font-style: italic;");
+		final Font font = new Font("Times New Roman", Font.BOLD | Font.ITALIC, 10);
+		cssRuleBuilder.withHTMLFont(font, fontScaleFactor);
+		assertRule(" font-family: "" + font.getFamily() + "";  font-size: 5pt; font-weight: bold; font-style: italic;");
 	}
 
 
diff --git a/freeplane/src/test/java/org/freeplane/main/application/survey/SurveyStarterShould.java b/freeplane/src/test/java/org/freeplane/main/application/survey/SurveyStarterShould.java
new file mode 100644
index 0000000..b7b60a8
--- /dev/null
+++ b/freeplane/src/test/java/org/freeplane/main/application/survey/SurveyStarterShould.java
@@ -0,0 +1,186 @@
+package org.freeplane.main.application.survey;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Properties;
+
+import javax.swing.SwingUtilities;
+
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+
+public class SurveyStarterShould {
+
+	private static final String SURVEY_ID_KEY = "surveyId";
+	private static final String SURVEY_URL_KEY = "surveyUrl";
+	private static final String QUESTION_KEY = "question";
+	private static final String TITLE_KEY = "title";
+	private static final String RUN_ON_KEY = "runOn";
+	private static final String FREQUENCY_KEY = "frequency";
+
+	@Test
+	public void givenRunOnStartIsTrue_loadPropertiesOnStart() throws Exception {
+		Properties configProperties = createSurveyProperites();
+		configProperties.setProperty(RUN_ON_KEY, "ON_START");
+		final SurveyRunner surveyRunner = mock(SurveyRunner.class);
+		FreeplaneSurveyProperties freeplaneSurveyProperties = mockSurveyProperties(configProperties);
+		final SurveyStarter surveyStarter = new SurveyStarter(freeplaneSurveyProperties, surveyRunner, 0.49);
+		surveyStarter.onStartupFinished();
+		waitForOtherThreadToRun();
+		verify(surveyRunner).runServey("myId", "myTitle", "myQuestion", "mySurveyUrl");
+	}
+
+	private void waitForOtherThreadToRun() throws InterruptedException, InvocationTargetException {
+		Thread.sleep(100);
+		SwingUtilities.invokeAndWait(new Runnable() {
+			
+			@Override
+			public void run() {
+			}
+		});
+	}
+
+	@Test
+	public void givenRunOnStartIsFalse_loadNoPropertiesOnStart() throws Exception {
+		Properties configProperties = createSurveyProperites();
+		configProperties.setProperty(RUN_ON_KEY, "NEVER");
+		final SurveyRunner surveyRunner = mock(SurveyRunner.class);
+		FreeplaneSurveyProperties freeplaneSurveyProperties = mockSurveyProperties(configProperties);
+		final SurveyStarter surveyStarter = new SurveyStarter(freeplaneSurveyProperties, surveyRunner, 0.49);
+		surveyStarter.onStartupFinished();
+		waitForOtherThreadToRun();
+		verify(surveyRunner, never()).runServey("myId", "myTitle", "myQuestion", "mySurveyUrl");
+	}
+
+	@Test
+	public void givenRunOnStartIsTrue_loadPropertiesOnFinish() throws Exception {
+		Properties configProperties = createSurveyProperites();
+		configProperties.setProperty(RUN_ON_KEY, "ON_QUIT");
+		final SurveyRunner surveyRunner = mock(SurveyRunner.class);
+		FreeplaneSurveyProperties freeplaneSurveyProperties = mockSurveyProperties(configProperties);
+		final SurveyStarter surveyStarter = new SurveyStarter(freeplaneSurveyProperties, surveyRunner, 0.49);
+		surveyStarter.onStartupFinished();
+		waitForOtherThreadToRun();
+		surveyStarter.onApplicationStopped();
+		verify(surveyRunner).runServey("myId", "myTitle", "myQuestion", "mySurveyUrl");
+	}
+
+	private Properties createSurveyProperites() {
+		Properties configProperties = new Properties();
+		configProperties.setProperty(SURVEY_ID_KEY, "myId");
+		configProperties.setProperty(TITLE_KEY, "myTitle");
+		configProperties.setProperty(QUESTION_KEY, "myQuestion");
+		configProperties.setProperty(SURVEY_URL_KEY, "mySurveyUrl");
+		configProperties.setProperty(FREQUENCY_KEY, "2");
+		return configProperties;
+	}
+
+	private FreeplaneSurveyProperties mockSurveyProperties(Properties configProperties)
+			throws IOException, FileNotFoundException, MalformedURLException {
+		final File configFile = File.createTempFile("survey", ".properties");
+		configFile.deleteOnExit();
+		try (final FileOutputStream propertyStream = new FileOutputStream(configFile)){
+			configProperties.store(propertyStream, "");
+		}
+		final URL configurationUrl = configFile.toURL();
+		FreeplaneSurveyProperties freeplaneSurveyProperties = mock(FreeplaneSurveyProperties.class);
+		when(freeplaneSurveyProperties.openRemoteConfiguration()).thenAnswer(new Answer<InputStream>() {
+
+			@Override
+			public InputStream answer(InvocationOnMock invocation) throws Throwable {
+				return configurationUrl.openStream();
+			}
+		});
+		when(freeplaneSurveyProperties.mayAskUserAgain()).thenReturn(true);
+		return freeplaneSurveyProperties;
+	}
+
+	@Test
+	public void givenMayNotAskAgain_doesNotRequestSurveyConfiguration() throws Exception {
+		Properties configProperties = createSurveyProperites();
+		final SurveyRunner surveyRunner = mock(SurveyRunner.class);
+		FreeplaneSurveyProperties freeplaneSurveyProperties = mockSurveyProperties(configProperties);
+		when(freeplaneSurveyProperties.mayAskUserAgain()).thenReturn(false);
+		final SurveyStarter surveyStarter = new SurveyStarter(freeplaneSurveyProperties, surveyRunner, 0.49);
+		surveyStarter.onStartupFinished();
+		verify(freeplaneSurveyProperties).mayAskUserAgain();
+		verifyNoMoreInteractions(freeplaneSurveyProperties, surveyRunner);
+	}
+	
+	@Test
+	public void givenMayAskAgain_setsNextMinimalServerCheckDay() throws Exception {
+		Properties configProperties = createSurveyProperites();
+		final SurveyRunner surveyRunner = mock(SurveyRunner.class);
+		FreeplaneSurveyProperties freeplaneSurveyProperties = mockSurveyProperties(configProperties);
+		when(freeplaneSurveyProperties.mayAskUserAgain()).thenReturn(true);
+		final SurveyStarter surveyStarter = new SurveyStarter(freeplaneSurveyProperties, surveyRunner, 0.49);
+		surveyStarter.onStartupFinished();
+		verify(freeplaneSurveyProperties).setNextSurveyDay(1);
+	}
+	
+
+	@Test
+	public void givenTooRandomNumberLargerThanMiddleRunFrequency_doesNotRunServey() throws Exception {
+		Properties configProperties = createSurveyProperites();
+		configProperties.setProperty(RUN_ON_KEY, "ON_START");
+		final SurveyRunner surveyRunner = mock(SurveyRunner.class);
+		FreeplaneSurveyProperties freeplaneSurveyProperties = mockSurveyProperties(configProperties);
+		final SurveyStarter surveyStarter = new SurveyStarter(freeplaneSurveyProperties, surveyRunner, 0.51);
+		surveyStarter.onStartupFinished();
+		waitForOtherThreadToRun();
+		verify(freeplaneSurveyProperties).remindMeLaterIsActive();
+		verify(freeplaneSurveyProperties).mayAskUserAgain();
+		verify(freeplaneSurveyProperties).setNextSurveyDay(1);
+		verify(freeplaneSurveyProperties).openRemoteConfiguration();
+		verifyNoMoreInteractions(freeplaneSurveyProperties, surveyRunner);
+	}
+
+
+	@Test
+	public void givenNonPositiveMiddleCheckRunPeriodMiddleRunFrequency_doesNotRunServey() throws Exception {
+		Properties configProperties = createSurveyProperites();
+		configProperties.setProperty(RUN_ON_KEY, "ON_START");
+		configProperties.setProperty(FREQUENCY_KEY, "0");
+		final SurveyRunner surveyRunner = mock(SurveyRunner.class);
+		FreeplaneSurveyProperties freeplaneSurveyProperties = mockSurveyProperties(configProperties);
+		final SurveyStarter surveyStarter = new SurveyStarter(freeplaneSurveyProperties, surveyRunner, 0.49);
+		surveyStarter.onStartupFinished();
+		waitForOtherThreadToRun();
+		verify(freeplaneSurveyProperties).remindMeLaterIsActive();
+		verify(freeplaneSurveyProperties).mayAskUserAgain();
+		verify(freeplaneSurveyProperties).setNextSurveyDay(1);
+		verify(freeplaneSurveyProperties).openRemoteConfiguration();
+		verifyNoMoreInteractions(freeplaneSurveyProperties, surveyRunner);
+	}
+	@Test
+	public void givenNonPositiveMiddleCheckRunPeriodMiddleRunFrequencyAndRemindMeLaterSet_runsServey() throws Exception {
+		Properties configProperties = createSurveyProperites();
+		configProperties.setProperty(RUN_ON_KEY, "ON_START");
+		configProperties.setProperty(FREQUENCY_KEY, "0");
+		final SurveyRunner surveyRunner = mock(SurveyRunner.class);
+		FreeplaneSurveyProperties freeplaneSurveyProperties = mockSurveyProperties(configProperties);
+		when(freeplaneSurveyProperties.remindMeLaterIsActive()).thenReturn(true);
+		final SurveyStarter surveyStarter = new SurveyStarter(freeplaneSurveyProperties, surveyRunner, 0.49);
+		surveyStarter.onStartupFinished();
+		waitForOtherThreadToRun();
+		verify(freeplaneSurveyProperties).remindMeLaterIsActive();
+		verify(freeplaneSurveyProperties).mayAskUserAgain();
+		verify(freeplaneSurveyProperties).setNextSurveyDay(1);
+		verify(freeplaneSurveyProperties).openRemoteConfiguration();
+		verify(surveyRunner).runServey("myId", "myTitle", "myQuestion", "mySurveyUrl");
+	}
+}
diff --git a/freeplane/viewer-resources/freeplane.properties b/freeplane/viewer-resources/freeplane.properties
index 8d0beea..5e2811f 100644
--- a/freeplane/viewer-resources/freeplane.properties
+++ b/freeplane/viewer-resources/freeplane.properties
@@ -8,6 +8,7 @@ AutomaticEdgeColorHookAction.icon=/images/AutomaticEdgeColorHookAction.png
 BackAction.icon=/images/MoveTo_PrevNode.png
 BlinkingNodeHookAction.icon=/images/xeyes.png
 BoldAction.icon=/images/Bold16.png
+CenterAction.icon=/images/CenterSelectedNodeAction.png
 CenterSelectedNodeAction.icon=/images/CenterSelectedNodeAction.png
 ChangeConnectorArrowsAction.backward.icon=/images/arrow-mode-backward.png
 ChangeConnectorArrowsAction.both.icon=/images/arrow-mode-both.png
@@ -111,7 +112,7 @@ PasteAction.icon=/images/editpaste.png
 PrintAction.icon=/images/fileprint.png
 PrintDirectAction.icon=/images/fileprint.png
 PrintPreviewAction.icon=/images/print_preview.png
-PropertyAction.icon=/images/PropertyAction.png
+PropertyAction.icon=/images/ShowPreferencesAction.png
 QuickFilterAction.icon=/images/apply_quick_filter.png
 FindNextAction.icon=/images/find_next.png
 QuickFindAction.FORWARD.icon=/images/find_next.png
@@ -501,3 +502,6 @@ locales=ar,ca,cs,da,de,el,es,et,eu,fr,gl,hr,hu,id,it,ja,ko,lt,nb,nl,nn,pl,pt_BR,
 org.freeplane.plugin.bugreport.dialog.disabled=false
 lookandfeel.scaleuifonts=true
 weblateUrlFormat=https://hosted.weblate.org/translate/freeplane/translation/{0}/?q={1}&search=exact&context=on&type=all&ignored=False
+surveyUrl=https://raw.githubusercontent.com/freeplane/conf/master/survey/surveyConfig
+neverShowSurvey=false
+
diff --git a/freeplane/viewer-resources/translations/Resources_en.properties b/freeplane/viewer-resources/translations/Resources_en.properties
index 0af6d8f..0166a84 100644
--- a/freeplane/viewer-resources/translations/Resources_en.properties
+++ b/freeplane/viewer-resources/translations/Resources_en.properties
@@ -1151,6 +1151,7 @@ OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Narrow hexagon
 OptionPanel.nb=Norwegian Bokm\u00E5l / Norsk bokm\u00E5l
 OptionPanel.never_save_folding=Never
+OptionPanel.neverShowSurvey=Never show questions, surveys and tips
 OptionPanel.nl=Dutch, Flemish / Nederlands, Vlaams
 OptionPanel.nn=Norwegian Nynorsk / Norsk nynorsk
 OptionPanel.nodebackgroundcolor=Background
@@ -1306,6 +1307,7 @@ OptionPanel.separator.size_limits=Size limits
 OptionPanel.separator.spelling=Spell checker options
 OptionPanel.separator.SplitToWordsAction=Splitting node to words
 OptionPanel.separator.status=Status line
+OptionPanel.separator.surveys=Surveys
 OptionPanel.separator.tooltip=Tooltip times
 OptionPanel.separator.undo=Undo
 OptionPanel.separator.updates=Program updates
@@ -1598,7 +1600,7 @@ selection_method_delayed=Delayed Automatic selection
 selection_method_direct=Point to Select
 SelectNoteAction.text=Note Edit Switch
 SelectNoteAction.tooltip=Switch to resp. from note panel
-set_accelerator_on_next_click_action=To create a new keyboard shortcut: press 'Ctrl' while clicking on the desired command in the menu.
+set_accelerator_on_next_click_helpmessage=To create a new keyboard shortcut click on the desired command in the menu.
 SetAccelerator.dialogTitle=Hot key assignment
 SetAccelerator.keystrokeDetected=Keystroke ''{0}'' is not assigned to any menu item.
 SetAcceleratorOnNextClickAction.text=Assign hot key...
diff --git a/freeplane/viewer-resources/version.properties b/freeplane/viewer-resources/version.properties
index 338d569..78a315c 100644
--- a/freeplane/viewer-resources/version.properties
+++ b/freeplane/viewer-resources/version.properties
@@ -1,2 +1,2 @@
-freeplane_version=1.5.16
+freeplane_version=1.5.18
 freeplane_version_status=
diff --git a/freeplane/viewer-resources/xml/appletmenu.xml b/freeplane/viewer-resources/xml/appletmenu.xml
index 6974b55..33d1d60 100644
--- a/freeplane/viewer-resources/xml/appletmenu.xml
+++ b/freeplane/viewer-resources/xml/appletmenu.xml
@@ -83,12 +83,14 @@
 		<Entry name="extras">
 				<Entry name="EnterPassword" />
 		</Entry>
+		<Entry name="help">
+				<Entry name="OpenFreeplaneSiteAction" />
+				<Entry name="AboutAction"/>
+		</Entry>
 	</Entry>
-	<Entry name="help">
-			<Entry name="OpenFreeplaneSiteAction" />
-			<Entry name="AboutAction"/>
-	</Entry>
-	<Entry name="map_popup" builder="map_popup">
+	<Entry name="map_popup" builder="map_popup" processOnPopup="true">
+		<Entry builder="navigate_maps,radio_button_group" />
+		<Entry builder="separator" />
 		<Entry name="ToggleMenubarAction"/>
 		<Entry name="ToggleToolbarAction" />
 		<Entry name="ShowFilterToolbarAction" />
@@ -105,6 +107,7 @@
 		<Entry name="CopySingleAction" accelerator="control shift C" />
 	</Entry>
 	<Entry name="main_toolbar" builder="toolbar,ignore">
+		<Entry name="url" builder="main_toolbar_url" />
 		<Entry builder="main_toolbar_zoom" name="zoom" />
 		<Entry name="open">
 			<Entry name="PrintAction" />
diff --git a/freeplane_ant/src/test/resources/unsorted/Test_en.properties b/freeplane_ant/src/test/resources/unsorted/Test_en.properties
index 416e724..26aa2ff 100644
--- a/freeplane_ant/src/test/resources/unsorted/Test_en.properties
+++ b/freeplane_ant/src/test/resources/unsorted/Test_en.properties
@@ -1012,7 +1012,7 @@ selection_method_delayed = Delayed Automatic Selection
 selection_method_direct = Point to Select
 SelectNoteAction.text = Note Edit Switch
 SelectNoteAction.tooltip = Switch to resp. from note window
-set_accelerator_on_next_click_action = Click on any menu item to assign a new short cut
+set_accelerator_on_next_click_helpmessage = Click on any menu item to assign a new short cut
 SetAcceleratorOnNextClickAction.text = Assign short cut
 SetImageByFileChooserAction.text = Image (File Chooser or Link)...
 SetLinkByFileChooserAction.text = Hyperlink (File Chooser)...
diff --git a/freeplane_framework/script/freeplane.policy b/freeplane_framework/script/freeplane.policy
index 9daaeb1..6c5dabf 100644
--- a/freeplane_framework/script/freeplane.policy
+++ b/freeplane_framework/script/freeplane.policy
@@ -2,6 +2,10 @@ grant codeBase "file:${org.freeplane.basedirectory}/-" {
         permission java.security.AllPermission;
 };
 
+grant codeBase "file:${org.freeplane.os.lib.ext}/*" {
+        permission java.security.AllPermission;
+};
+
 grant {
         permission java.lang.RuntimePermission "getClassLoader";
 };
diff --git a/freeplane_framework/script/freeplane.sh b/freeplane_framework/script/freeplane.sh
index e0db923..a9e3e4e 100644
--- a/freeplane_framework/script/freeplane.sh
+++ b/freeplane_framework/script/freeplane.sh
@@ -173,6 +173,11 @@ fi
 # enable this in order to turn off the splash screen:
 #JAVA_OPTS="-Dorg.freeplane.nosplash=true $JAVA_OPTS"
 
+# grant all permissions to shared java extension libs if available
+if [ -d "/usr/share/java" ] ; then
+	JAVA_OPTS="-Dorg.freeplane.os.lib.ext=/usr/share/java $JAVA_OPTS"
+fi
+
 _debug "Calling: "\
 "${JAVACMD}" -Xmx512m\
  "-Dorg.freeplane.userfpdir=$userfpdir"\
diff --git a/freeplane_framework/src/main/java/org/freeplane/launcher/Launcher.java b/freeplane_framework/src/main/java/org/freeplane/launcher/Launcher.java
index 547592e..5659f4c 100644
--- a/freeplane_framework/src/main/java/org/freeplane/launcher/Launcher.java
+++ b/freeplane_framework/src/main/java/org/freeplane/launcher/Launcher.java
@@ -83,11 +83,23 @@ public class Launcher {
 	private void setDefines() {
 		setDefine("org.knopflerfish.framework.readonly", "true");
 		setDefine("org.knopflerfish.gosg.jars", "reference:file:" + getAbsolutePath("core") + '/');
+		setDefine("org.freeplane.user.dir", System.getProperty("user.dir"));
 		setDefine("org.freeplane.basedirectory", getAbsolutePath());
+		System.setProperty("user.dir", getAbsolutePath());
 		setDefineIfNeeded("org.freeplane.globalresourcedir", getAbsolutePath("resources"));
 		setDefineIfNeeded("java.security.policy", getAbsolutePath("freeplane.policy"));
 		setDefine("org.osgi.framework.storage", getAbsolutePath("fwdir"));
-		System.setSecurityManager(new SecurityManager());
+		System.setSecurityManager(new SecurityManager(){
+
+			@Override
+			public void checkConnect(String pHost, int pPort, Object pContext) {
+				if(pContext != null)
+					super.checkConnect(pHost, pPort, pContext);
+				else
+					super.checkConnect(pHost, pPort);
+			}
+			
+		});
 	}
 
 	private void setDefineIfNeeded(String name, String value) {
diff --git a/freeplane_framework/windows-installer/Freeplane_without_Java.iss b/freeplane_framework/windows-installer/Freeplane_without_Java.iss
index 8283fab..96e616b 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.5.16"
+#define MyVersion "1.5.18"
 #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 00843dd..2f8e852 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.5.16.1
-DisplayVersion=1.5.16
+PackageVersion=1.5.18.1
+DisplayVersion=1.5.18
 
 [SpecialPaths]
 Plugins=NONE
diff --git a/freeplane_plugin_latex/build.gradle b/freeplane_plugin_latex/build.gradle
index 15cecc7..5533629 100644
--- a/freeplane_plugin_latex/build.gradle
+++ b/freeplane_plugin_latex/build.gradle
@@ -1,7 +1,8 @@
 dependencies {
     compile project(':freeplane')
     compile project(':freeplane_plugin_jsyntaxpane')
-    compile group: 'org.scilab.forge', name: 'jlatexmath', version:'1.0.2'
+    // from flatDir "localGitDepsRepository" (jlatexmath-1.0.3 is not in maven!)
+    compile ':jlatexmath-1.0.3'
 }
 
 jar {
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java
index 8defc07..0aec76d 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java
@@ -129,6 +129,7 @@ public class GroovyScript implements IScript {
                 throw new ExecuteScriptException(errorsInScript.getMessage(), errorsInScript);
             }
             final PrintStream oldOut = System.out;
+            ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
             try {
                 trustedCompileAndCache();
                 final Binding binding = createBinding(node);
@@ -137,6 +138,7 @@ public class GroovyScript implements IScript {
 				return compiledScript.run();
             } finally {
                 System.setOut(oldOut);
+                Thread.currentThread().setContextClassLoader(contextClassLoader);
             }
         } catch (final GroovyRuntimeException e) {
             handleScriptRuntimeException(e);
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/InternationalizedSecurityManager.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/InternationalizedSecurityManager.java
index 06149ab..652e948 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/InternationalizedSecurityManager.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/InternationalizedSecurityManager.java
@@ -64,13 +64,20 @@ class InternationalizedSecurityManager extends SecurityManager {
 	@Override
 	public void checkConnect(final String pHost, final int pPort, final Object pContext) {
 		try{
-			super.checkConnect(pHost, pPort, pContext);
+			checkConnectHandleNullContext(pHost, pPort, pContext);
 		}
 		catch(AccessControlException e){
 			throw getException(e, InternationalizedSecurityManager.PERM_GROUP_NETWORK, InternationalizedSecurityManager.PERM_Connect);
 		}
 	}
 
+	private void checkConnectHandleNullContext(final String pHost, final int pPort, final Object pContext) {
+		if(pContext != null)
+			super.checkConnect(pHost, pPort, pContext);
+		else
+			super.checkConnect(pHost, pPort);
+	}
+
 	@Override
 	public void checkDelete(final String pFile) {
 		try{
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 f2cb8ef..d8697d3 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
@@ -77,6 +77,7 @@ class ScriptingPolicy extends Policy {
 		permissions.add(new RuntimePermission("queuePrintJob"));
 		permissions.add(new RuntimePermission("setIO"));
 		permissions.add(new RuntimePermission("exitVM.0"));
+		permissions.add(new RuntimePermission("setContextClassLoader"));
 		permissions.add(new PropertyPermission("*", "read,write"));
 		permissions.add(new AdminPermission("*", "resolve,resource"));
 		permissions.add(new AWTPermission("showWindowWithoutWarningBanner"));
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingRegistration.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingRegistration.java
index 9b3ae7a..57685b0 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingRegistration.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingRegistration.java
@@ -274,6 +274,10 @@ class ScriptingRegistration {
 					script.execute(null);
 				}
 			}
+
+			@Override
+			public void onApplicationStopped() {
+			}
 		});
 	}
 
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/ManageAddOnsPanel.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/ManageAddOnsPanel.java
index 13b0144..64a74ed 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/ManageAddOnsPanel.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/ManageAddOnsPanel.java
@@ -202,7 +202,7 @@ public class ManageAddOnsPanel extends JPanel {
 				else {
 					OptionPanelBuilder optionPanelBuilder = new OptionPanelBuilder();
 					optionPanelBuilder.load(new StringReader(addOn.getPreferencesXml()));
-					MModeController.createPropertyAction(optionPanelBuilder).actionPerformed(e);
+					MModeController.createShowPreferencesAction(optionPanelBuilder).actionPerformed(e);
 				}
 			}
 		};
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Convertible.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Convertible.java
index 88a4e61..1ba78a5 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Convertible.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Convertible.java
@@ -15,7 +15,7 @@ import org.freeplane.core.util.HtmlUtils;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.format.FormattedDate;
 
-/** Utility class that is used to convert node texts to different types.
+/** Utility wrapper class around a String that is used to convert node texts to different types.
  * It's especially important for Formulas. */
 // Unfortunately it seems impossible to implement Comparable<Object> since in this case
 // TypeTransformation.compareToWithEqualityCheck() is called and will return false for
@@ -24,22 +24,22 @@ import org.freeplane.features.format.FormattedDate;
 public class Convertible extends GroovyObjectSupport /*implements Comparable<Object>*/ {
 	private final String text;
 
-	/** doesn't evaluate formulas since this would require a calculation rule or NodeModel. */
+	/** Use the {@code text} unchanged, i. e. oesn't evaluate formulas since this would require
+	 * a calculation rule or NodeModel.
+	 * @param text the String to convert. */
 	public Convertible(String text) {
 		this.text = text;
 	}
 
-	/** same as toString(text), i.e. conversion is done properly. */
+	/** Use {@link Convertible#toString(Object)} to convert to String, i.e. conversion is done properly.
+	 * @param text the Object to convert */
 	public Convertible(Object text) {
 		this.text = toString(text);
     }
 
-	/**
-	 * returns a Long or a Double, whatever fits best. All Java number literals are allowed as described
-	 * by {@link Long#decode(String)}
-	 * 
-	 * @throws ConversionException if text is not a number.
-	 */
+	/** Convert to Number. All Java number literals are allowed as described by {@link Long#decode(String)}
+	 * @return a Long or a Double, whatever fits best.
+	 * @throws ConversionException if text is not a number. */
 	public Number getNum() throws ConversionException {
 		try {
 			return TextUtils.toNumber(text);
@@ -50,12 +50,8 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
 	}
 
 
-	/**
-	 * "Safe" variant of getNum(): returns a Long or a Double if text is convertible to it or 0 otherwise
-	 * (even if text is null).
-	 * 
-	 * @throws nothing - on any error (long) 0 is returned.
-	 */
+	/** Safe variant of {@link #getNum()}, throws nothing - on any error (long) 0 is returned.
+	 * @return a Long or a Double if text is convertible to it or 0 otherwise (even if text is null). */
 	public Number getNum0() {
 	    try {
 	        final Number result = getNum();
@@ -66,23 +62,28 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
         }
     }
 
+	/** No conversion.
+	 * @return The original string. */
 	public String getString() {
 		return text;
 	}
 
+	/** No conversion.
+	 * @return The original string. */
 	public String getText() {
 		return text;
 	}
 
+	/** Removes HTML markup if necessary.
+	 * @return The result of {@link HtmlUtils#htmlToPlain(String)} */
 	public String getPlain() {
 		return text == null ? null : HtmlUtils.htmlToPlain(text);
 	}
 
-	/**
-	 * returns a Date for the parsed text.
-	 * The valid date patterns are "yyyy-MM-dd HH:dd:ss.SSSZ" with optional '-', ':'. ' ' may be replaced by 'T'. 
-	 * @throws ConversionException if the text is not convertible to a date.
-	 */
+	/** Converts to Date if possible. The valid date patterns are "yyyy-MM-dd HH:dd:ss.SSSZ"
+	 * with optional '-', ':'. ' ' may be replaced by 'T'. 
+	 * @return a Date for the parsed text
+	 * @throws ConversionException if the text is not convertible to a Date. */
 	public Date getDate() throws ConversionException {
 		return text == null ? null : parseDate(text);
 	}
@@ -94,10 +95,9 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
 		throw new ConversionException("not a date: " + text);
 	}
 
-	/**
-	 * returns a Calendar for the parsed text. 
-	 * @throws ConversionException if the text is not convertible to a date.
-	 */
+	/** Converts to Calendar if possible. See {@link #getDate()} for recognized patterns.
+	 * @return a Calendar for the parsed text. 
+	 * @throws ConversionException if the text is not convertible to a Date. */
 	public Calendar getCalendar() throws ConversionException {
 		if (text == null)
 			return null;
@@ -107,6 +107,9 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
 		return result;
 	}
 
+	/** Converts to URI if possible.
+	 * @return a URI 
+	 * @throws ConversionException if the text is not convertible to a URI. */
     public URI getUri() throws ConversionException {
         if (text == null)
             return null;
@@ -120,8 +123,7 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
         throw new ConversionException("not an uri: " + text);
     }
 
-	/**
-	 * Uses the following priority ranking to determine the type of the text:
+	/** Uses the following priority ranking to determine the type of the text:
 	 * <ol>
 	 * <li>null
 	 * <li>Long
@@ -129,8 +131,7 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
 	 * <li>Date
 	 * <li>String
 	 * </ol>
-	 * @return Object - the type that fits best.
-	 */
+	 * @return Object - the type that fits best. */
 	public Object getObject() {
 		if (text == null)
 			return null;
@@ -152,23 +153,28 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
 		}
 	}
 
-    /** Allow statements like this: <code>node['attr_name'].to.num</code>. */
+    /** Allow statements like this: <code>node['attr_name'].to.num</code>.
+     * @return this */
 	public Convertible getTo() {
 		return this;
 	}
 
-	/** returns true if the text is convertible to number. */
+	/** Type check.
+	 * @return true if the text is convertible to number. */
 	public boolean isNum() {
 		// handles null -> false
 		return TextUtils.isNumber(text);
 	}
 
-	/** returns true if the text is convertible to date. */
+	/** Type check.
+	 * @return true if the text is convertible to date. */
 	public boolean isDate() {
 		return FormattedDate.isDate(text);
 	}
 
-	/** pretend we are a String if we don't provide a property for ourselves. */
+	/** pretend we are a String if we don't provide a property for ourselves.
+	 * @param property a property of {@link String}, e. g. "bytes".
+	 * @return the property of the original string. */
 	public Object getProperty(String property) {
 		// called methods should handle null values
 		try {
@@ -190,7 +196,10 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
 		}
 	}
 
-	/** pretend we are a String if we don't provide a method for ourselves. */
+	/** pretend we are a String if we don't provide a method for ourselves.
+	 * @param name method name
+	 * @param args method args
+	 * @return the result of the method invocation on the original string. */
 	public Object invokeMethod(String name, Object args) {
 		try {
 			// called methods should handle null values
@@ -209,6 +218,8 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
 	 * <li>null is "converted" to null
 	 * </ul>
 	 * All other types are converted via value.toString().
+	 * @param value the object to convert
+	 * @return the converted string
 	 */
 	public static String toString(Object value) {
 		if (value == null)
@@ -280,12 +291,14 @@ public class Convertible extends GroovyObjectSupport /*implements Comparable<Obj
 		throw new NotImplementedException("Convertibles are immutable; property to be changed: " + property);
     }
 
-	/** parses the text (case insensitive) as boolean via {@link Boolean#parseBoolean(String)}. */
+	/** parses the text (case insensitive) as boolean via {@link Boolean#parseBoolean(String)}.
+	 * @return boolean */
 	public boolean getBool() {
 	    return Boolean.parseBoolean(text);
 	}
 
-	/** For implicit conversion to boolean: true if the text is not empty. */
+	/** For implicit conversion to boolean: true if the text is not empty.
+	 * @return boolean */
 	public boolean asBoolean() {
 	    return text != null && text.length() > 0;
 	}
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Proxy.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Proxy.java
index f20b8a1..a7783aa 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Proxy.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Proxy.java
@@ -93,13 +93,11 @@ public interface Proxy {
 		java.util.Map<String, Object> getMap();
 
 		/** returns the attribute value at the given index.
-		 * @throws IndexOutOfBoundsException if index is out of range <tt>(index
-		 *         < 0 || index >= size())</tt>.*/
+		 * @throws IndexOutOfBoundsException if index is out of range, i. e. {@code index < 0 || index >= size()}.*/
 		Object get(final int index);
 		
 		/** returns the attribute key at the given index.
-		 * @throws IndexOutOfBoundsException if index is out of range <tt>(index
-		 *         < 0 || index >= size())</tt>.*/
+		 * @throws IndexOutOfBoundsException if index is out of range, i. e. {@code index < 0 || index >= size()}.*/
 		String getKey(final int index);
 
 		/** @deprecated since 1.2 - use {@link #findFirst(String)} instead. */
@@ -114,9 +112,9 @@ public interface Proxy {
 		/** returns the values of all attributes for which the closure returns true. The fact that the values are
 		 * returned as a list of {@link Convertible} enables conversion. The following formula sums all attributes
 		 * whose names are not equal to 'TOTAL':
-		 * <pre>
-		 *  = attributes.findValues{key,val→ key != 'TOTAL'}.sum(0){it.num0}
-		 * </pre>
+		 * <pre>{@code
+		 *  = attributes.findValues{key, val -> key != 'TOTAL'}.sum(0){it.num0}
+		 * }</pre>
 		 * @param closure A closure that accepts two arguments (String key, Object value) and returns boolean/Boolean. 
 		 * @since 1.2 */
 		List<? extends Convertible> findValues(Closure<Boolean> closure);
@@ -181,13 +179,11 @@ public interface Proxy {
 	 */
 	interface Attributes extends AttributesRO {
 		/** sets the value of the attribute at an index. This method will not create new attributes.
-		 * @throws IndexOutOfBoundsException if index is out of range <tt>(index
-		 *         < 0 || index >= size())</tt>. */
+		 * @throws IndexOutOfBoundsException if index is out of range, i. e. {@code index < 0 || index >= size()}.*/
 		void set(final int index, final Object value);
 
 		/** sets name and value of the attribute at the given index. This method will not create new attributes.
-		 * @throws IndexOutOfBoundsException if index is out of range <tt>(index
-		 *         < 0 || index >= size())</tt>. */
+		 * @throws IndexOutOfBoundsException if index is out of range, i. e. {@code index < 0 || index >= size()}.*/
 		void set(final int index, final String name, final Object value);
 
 		/** removes the <em>first</em> attribute with this name.
@@ -201,8 +197,7 @@ public interface Proxy {
 		boolean removeAll(final String name);
 
 		/** removes the attribute at the given index.
-		 * @throws IndexOutOfBoundsException if index is out of range <tt>(index
-		 *         < 0 || index >= size())</tt>. */
+		 * @throws IndexOutOfBoundsException if index is out of range, i. e. {@code index < 0 || index >= size()}.*/
 		void remove(final int index);
 
 		/** adds an attribute if there is no attribute with the given name or changes
@@ -368,7 +363,7 @@ public interface Proxy {
 		/** A read-only list of selected nodes. That is you cannot select a node by adding it to the returned list. */
 		List<Node> getSelecteds();
 
-		/** returns List<Node> of Node objects sorted on Y
+		/** returns {@code List<Node>} sorted by the node's vertical position.
 		 *
 		 * @param differentSubtrees if true
 		 *   children/grandchildren/grandgrandchildren/... nodes of selected
@@ -378,15 +373,15 @@ public interface Proxy {
 		/**
 		 * returns Freeplane version.
 		 * Use it like this:
-		 * <pre>
+		 * <pre>{@code
 		 *   import org.freeplane.core.util.FreeplaneVersion
 		 *   import org.freeplane.core.ui.components.UITools
 		 * 
 		 *   def required = FreeplaneVersion.getVersion("1.1.2");
-		 *   if (c.freeplaneVersion < required)
+		 *   if (c.freeplaneVersion < required)
 		 *       UITools.errorMessage("Freeplane version " + c.freeplaneVersion
 		 *           + " not supported - update to at least " + required);
-		 * </pre>
+		 * }</pre>
 		 */
 		FreeplaneVersion getFreeplaneVersion();
 
@@ -461,15 +456,20 @@ public interface Proxy {
 		 * @since 1.2 */
 		boolean isInteractive();
 
+		/** returns a list of export type descriptions that can be used to specify a specific export type
+		 * in {@link #export(Map, File, String, boolean)}. These descriptions are internationalized.
+		 * @since 1.3.5 */
 		List<String> getExportTypeDescriptions();
 
         /** exports map to destination file, example:
          * <pre>
-         *   println c.getExportTypeDescriptions.join('\n')
+         *   println c.exportTypeDescriptions.join('\n')
          *   boolean overwriteExistingFile = true
          *   c.export(node.map, new File('/tmp/t.png'), 'Portable Network Graphic (PNG) (.png)', overwriteExistingFile)
          * </pre>
-         * @param exportTypeDescription Use {@link #getExportTypeDescriptions()} to look up available exportTypes
+         * @param exportTypeDescription Use {@link #getExportTypeDescriptions()} to look up available exportTypes.
+         *   Note that the file format does not suffice to specify a specific export since there may be more than
+         *   one, as for HTML.
          * @since 1.3.5 */
         void export(Map map, File destinationFile, String exportTypeDescription, boolean overwriteExisting);
 	}
@@ -488,14 +488,14 @@ public interface Proxy {
 		
 		void select(Node toSelect);
 		
-		/** toSelect is a List<Node> of Node objects
+		/** selects multiple Nodes.
 		 * @since 1.4 */
 		void select(Collection<Node> toSelect);
 
 		/** selects branchRoot and all children */
 		void selectBranch(Node branchRoot);
 
-		/** toSelect is a Collection<Node> of Node objects */
+		/** same as {@link #select(Collection)} */
 		void selectMultipleNodes(Collection<Node> toSelect);
 
 		/** reset undo / redo lists and deactivate Undo for current script */
@@ -650,7 +650,7 @@ public interface Proxy {
 
 	/** Node's icons: <code>node.icons</code> - read-only. */
 	interface IconsRO {
-		/** returns the name of the icon at the given index (starting at 0) or null if <code>index ≥ size</code>.
+		/** returns the name of the icon at the given index (starting at 0) or null if {@code index >= size}.
 		 * Use it like this: <pre>
 		 *   def secondIconName = node.icons[1]
 		 * </pre>
@@ -826,7 +826,7 @@ public interface Proxy {
 		/**
 		 * closes a map. Note that there is <em>no undo</em> for this method!
 		 * @param force close map even if there are unsaved changes.
-		 * @param allowInteraction if (allowInteraction && ! force) a saveAs dialog will be opened if there are
+		 * @param allowInteraction {@code if (allowInteraction && ! force)} a saveAs dialog will be opened if there are
 		 *        unsaved changes.
 		 * @return false if the saveAs was cancelled by the user and true otherwise.
 		 * @throws RuntimeException if the map contains changes and parameter force is false.
@@ -1125,7 +1125,6 @@ public interface Proxy {
 		 * </dl>
 		 * @return ConvertibleObject
 		 * @throws ExecuteScriptException on formula evaluation errors
-		 * @throws ConversionException on parse errors, e.g. if to.date is invoked on "0.25"
 		 * @since 1.2
 		 */
 		Convertible getTo();
@@ -1166,7 +1165,7 @@ public interface Proxy {
 		/** if this node's text is shortened for display. */
 		boolean isMinimized();
 
-		/** The count of node sharing their content with this node. Use <code>if (node.countNodesSharingContent() > 0)</code>
+		/** The count of node sharing their content with this node. Use {@code if (node.countNodesSharingContent() > 0)}
 		 * to check if a node has any clones.
 		 * <br><em>Note:</em> {@link #getCountNodesSharingContent()} ≥ {@link #getCountNodesSharingContentAndSubtree()}.
 		 * @return 0 if this node is standalone or the number of other nodes sharing content otherwise. 
@@ -1355,7 +1354,7 @@ public interface Proxy {
 		 * <li>If the conversion result is not valid HTML it will be automatically converted to HTML.
 		 * </ul>
 		 * <p>
-		 * <pre>
+		 * <pre>{@code
 		 *   // converts numbers and other stuff with toString()
 		 *   node.note = 1.2
 		 *   assert node.note.text == "<html><body><p>1.2"
@@ -1375,7 +1374,7 @@ public interface Proxy {
 		 *   // == remove note
 		 *   node.note = null
 		 *   assert node.note.text == null
-		 * </pre>
+		 * }</pre>
 		 * @param value An object for conversion to String. Works well for all types that {@link Convertible}
 		 *        handles, particularly {@link Convertible}s itself.
 		 * @since 1.2 (note that the old setNoteText() did not support non-String arguments.
@@ -1758,8 +1757,7 @@ public interface Proxy {
          * </pre>
          * @param remindAt The timestamp when the reminder fires first.
          * @param periodUnit one of ["MINUTE", "HOUR", "DAY", "WEEK", "MONTH", "YEAR"].
-         * @param period counts the periodUnits.
-         * @throws Exception if there is no reminder yet. */
+         * @param period counts the periodUnits. */
         void createOrReplace(Date remindAt, String periodUnit, Integer period);
 
         /** optional: a Groovy script to execute when the reminder fires.
diff --git a/gitinfo.properties b/gitinfo.properties
index 12e2391..9fd004d 100644
--- a/gitinfo.properties
+++ b/gitinfo.properties
@@ -1 +1 @@
-git-revision=34552bb3e49d7f4626fd03c87306a1c89f4e25e9 Dimitry Polivaev 2016-09-17 10:32:23 +0200
\ No newline at end of file
+git-revision=7fce59ed725da3f50ae4643d1846198a58bddd7c Dimitry Polivaev 2016-12-04 19:31:29 +0100
\ No newline at end of file
diff --git a/gitinfo.txt b/gitinfo.txt
index 12e2391..9fd004d 100644
--- a/gitinfo.txt
+++ b/gitinfo.txt
@@ -1 +1 @@
-git-revision=34552bb3e49d7f4626fd03c87306a1c89f4e25e9 Dimitry Polivaev 2016-09-17 10:32:23 +0200
\ No newline at end of file
+git-revision=7fce59ed725da3f50ae4643d1846198a58bddd7c Dimitry Polivaev 2016-12-04 19:31:29 +0100
\ No newline at end of file

-- 
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